From patchwork Tue Apr 12 10:02:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Boris Sukholitko X-Patchwork-Id: 12810513 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6361DC433F5 for ; Tue, 12 Apr 2022 11:13:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346004AbiDLLP4 (ORCPT ); Tue, 12 Apr 2022 07:15:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48476 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1355479AbiDLLP1 (ORCPT ); Tue, 12 Apr 2022 07:15:27 -0400 Received: from mail-pj1-x102a.google.com (mail-pj1-x102a.google.com [IPv6:2607:f8b0:4864:20::102a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C5EB79681A for ; Tue, 12 Apr 2022 03:03:20 -0700 (PDT) Received: by mail-pj1-x102a.google.com with SMTP id o5so5469729pjr.0 for ; Tue, 12 Apr 2022 03:03:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version; bh=IGf67+tppx6Iv0/Y/2I5BTA2mkX8qfpP/BpSd5StRlE=; b=DL2aQZCVz60QnPfgjhTW1HrdRxjMtOJGqMpK5037o6ChyYzBx7/DE+eudc79M+fzxk IVQRSOHNJVmwYArJWbdyTISHG7GiidTUlB3nLD+yrR/We5elmjnX9jJyZyQAph6vToqP vO08hFa1VpHdofeZe1uXbfgiLCXRSe/xIoDhc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version; bh=IGf67+tppx6Iv0/Y/2I5BTA2mkX8qfpP/BpSd5StRlE=; b=RmECpxBNnHOCXMIlxSA8fdT3JLonFrEUX01wewgy8op6vkr3OTWolnPLkyLJx6OKqr lQd7ByK/AVacRKVta6ElAI3NkenwzjQKni9NjsD78NgSDhI1+chGzyfKa6xFzyAQgk09 vM+VvySaxC7/9FJY1cdkrvnqqiJPH+tV0QIfMncb5Q9nkKW6JTBfVN8PUZfpVJjRh18p hX6Sqed2URyYuo7IGWzW5CVMBAYU9H1GFzuH5Rp/VYjhH9xyQDQC0bQdTvPK2zlhwlwE qnInbnWid1UXA5xSd2jU1fsk5EYZZVqgBnc3hCStMlG9SsB3S6vOS072+XwNseZMX0s5 IHhg== X-Gm-Message-State: AOAM530TsV593Hawhj/eOwlF+giWepVanoQ9CzGk25bKnr4hpc6QLeLH wPr/7HP0/xlVasVXCRQ8WaQ18LcAcBll3C/jFTeP4aLtMJ596wJa+jbUT7IWK6msFdvqq5+6Vlv aEbM4xaId7GnTHCJ1KxUtYEE4UodtHrZQCdYk21affOB7a+EHWnLkmlcJYMXgEUNZJyIc3lDtye DkxUkttoJQQw== X-Google-Smtp-Source: ABdhPJwaMpbUHv5+BXl489tR2WzJW5XMeIpwb49qKKLUXaRmsBiUYi0kB8s5uwDH7D6LB3C2HhPGAQ== X-Received: by 2002:a17:90b:2249:b0:1cc:d191:fc0a with SMTP id hk9-20020a17090b224900b001ccd191fc0amr1961078pjb.6.1649757799266; Tue, 12 Apr 2022 03:03:19 -0700 (PDT) Received: from localhost.localdomain ([192.19.250.250]) by smtp.gmail.com with ESMTPSA id u17-20020a056a00159100b004faef351ebcsm37020020pfk.45.2022.04.12.03.03.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Apr 2022 03:03:18 -0700 (PDT) From: Boris Sukholitko To: netdev@vger.kernel.org, "David S . Miller" , Jakub Kicinski , Jamal Hadi Salim , Cong Wang , Jiri Pirko , "Gustavo A . R . Silva" , Vladimir Oltean , Eric Dumazet , zhang kai , Yoshiki Komachi Cc: Ilya Lifshits , Boris Sukholitko Subject: [PATCH net-next v2 3/5] flow_dissector: Add number of vlan tags dissector Date: Tue, 12 Apr 2022 13:02:34 +0300 Message-Id: <20220412100236.27244-4-boris.sukholitko@broadcom.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20220412100236.27244-1-boris.sukholitko@broadcom.com> References: <20220412100236.27244-1-boris.sukholitko@broadcom.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org Our customers in the fiber telecom world have network configurations where they would like to control their traffic according to the number of tags appearing in the packet. For example, TR247 GPON conformance test suite specification mostly talks about untagged, single, double tagged packets and gives lax guidelines on the vlan protocol vs. number of vlan tags. This is different from the common IT networks where 802.1Q and 802.1ad protocols are usually describe single and double tagged packet. GPON configurations that we work with have arbitrary mix the above protocols and number of vlan tags in the packet. This new dissector allows extracting the number of vlan tags existing in the packet. Signed-off-by: Boris Sukholitko --- include/net/flow_dissector.h | 9 +++++++++ net/core/flow_dissector.c | 20 ++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/include/net/flow_dissector.h b/include/net/flow_dissector.h index aa33e1092e2c..10b83e03af01 100644 --- a/include/net/flow_dissector.h +++ b/include/net/flow_dissector.h @@ -251,6 +251,14 @@ struct flow_dissector_key_hash { u32 hash; }; +/** + * struct flow_dissector_key_num_of_vlans: + * @num_of_vlans: num_of_vlans value + */ +struct flow_dissector_key_num_of_vlans { + u8 num_of_vlans; +}; + enum flow_dissector_key_id { FLOW_DISSECTOR_KEY_CONTROL, /* struct flow_dissector_key_control */ FLOW_DISSECTOR_KEY_BASIC, /* struct flow_dissector_key_basic */ @@ -280,6 +288,7 @@ enum flow_dissector_key_id { FLOW_DISSECTOR_KEY_META, /* struct flow_dissector_key_meta */ FLOW_DISSECTOR_KEY_CT, /* struct flow_dissector_key_ct */ FLOW_DISSECTOR_KEY_HASH, /* struct flow_dissector_key_hash */ + FLOW_DISSECTOR_KEY_NUM_OF_VLANS, /* struct flow_dissector_key_num_of_vlans */ FLOW_DISSECTOR_KEY_MAX, }; diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c index 03b6e649c428..19015289c2eb 100644 --- a/net/core/flow_dissector.c +++ b/net/core/flow_dissector.c @@ -1035,6 +1035,16 @@ bool __skb_flow_dissect(const struct net *net, memcpy(key_eth_addrs, ð->h_dest, sizeof(*key_eth_addrs)); } + if (dissector_uses_key(flow_dissector, + FLOW_DISSECTOR_KEY_NUM_OF_VLANS)) { + struct flow_dissector_key_num_of_vlans *key_num_of_vlans; + + key_num_of_vlans = skb_flow_dissector_target(flow_dissector, + FLOW_DISSECTOR_KEY_NUM_OF_VLANS, + target_container); + key_num_of_vlans->num_of_vlans = 0; + } + proto_again: fdret = FLOW_DISSECT_RET_CONTINUE; @@ -1158,6 +1168,16 @@ bool __skb_flow_dissect(const struct net *net, nhoff += sizeof(*vlan); } + if (dissector_uses_key(flow_dissector, + FLOW_DISSECTOR_KEY_NUM_OF_VLANS)) { + struct flow_dissector_key_num_of_vlans *key_nvs; + + key_nvs = skb_flow_dissector_target(flow_dissector, + FLOW_DISSECTOR_KEY_NUM_OF_VLANS, + target_container); + key_nvs->num_of_vlans++; + } + if (dissector_vlan == FLOW_DISSECTOR_KEY_MAX) { dissector_vlan = FLOW_DISSECTOR_KEY_VLAN; } else if (dissector_vlan == FLOW_DISSECTOR_KEY_VLAN) {