From patchwork Wed Mar 23 10:56:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Boris Sukholitko X-Patchwork-Id: 12789675 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 51404C433F5 for ; Wed, 23 Mar 2022 10:57:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243650AbiCWK64 (ORCPT ); Wed, 23 Mar 2022 06:58:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52046 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243653AbiCWK6x (ORCPT ); Wed, 23 Mar 2022 06:58:53 -0400 Received: from mail-pg1-x530.google.com (mail-pg1-x530.google.com [IPv6:2607:f8b0:4864:20::530]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D1C71E0B2 for ; Wed, 23 Mar 2022 03:57:20 -0700 (PDT) Received: by mail-pg1-x530.google.com with SMTP id s72so804885pgc.5 for ; Wed, 23 Mar 2022 03:57: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=aK38zu/2Mu+Y7RpHPWRyO4IfzwCIUy/CJrY/LjbOk+4=; b=G2Mj4Co7ZfwZg3rOLz5EAtWgds7atpi4blMN8ZSgiF4TnNTBmk7/AQJ+lZJdgRC6GV 9GpNb12VypYI2Mrf9frlAfg36sAVm4hha1qX1CfT21Mt/1u0KkCctTFUllSuM8wDhY0g o1lSKGStbo2SLkDw5Ee+EfKDVPZFin72+3YYs= 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=aK38zu/2Mu+Y7RpHPWRyO4IfzwCIUy/CJrY/LjbOk+4=; b=C1SV905Z2Hb3mvHYvxM/MDlpuSTtpmm/Mjc/NS97IT2nQbt1jShL2/qBXVe+k6hynG 2hDqAakGv1FP/myAu/ulAmrWbr/yTSUthdkch6E0TJxtvDVwwxZTiZ2Y5C6hDbKYBicQ phLO7TUcnWmD5akbNBd44sJ8B87QNQIRgnPKkxz6+ptAWTFst+DPWE1rtRHc5vdHAgx6 Ar98SfZIypDj0x8rgsIs0rjz1MDQCafOC8GiB4XirhiexN8CUcrp/6hxrYr1VAaACrM9 jkRLpGMmk7gl0tW831ecbDHglfihBIhzDrezByqIetdRPD/+oZpCJo3Siye9+RhU3l0B MLOQ== X-Gm-Message-State: AOAM530f/QJzXDbyOUZbNLzbBgTjPDdqptTXBIqWSQe2/KsHR2GD+pqh BFCDzNlLkjK2a+++NrbEr9z9M7J7GEPrrOobykjD9brXBHexKDRaNm+5unfOBhUIr7tXdfGczPu 3DrgL+unEspSqtZ4MUs6b8Q17SjnFy3fMKpRRDHWel1GsHj/nCiFqZarsKST65mRNGZ2RFeNbgy 4ssbNgOV/jew== X-Google-Smtp-Source: ABdhPJy0/dIKtZcyCS1vGKNm8D2hL5b2tC3nAwxusLpYh+FG4LFPbTxyPF8m6WEAv4OlZQTUPdJHRQ== X-Received: by 2002:aa7:88c1:0:b0:4fa:7031:895a with SMTP id k1-20020aa788c1000000b004fa7031895amr26794950pff.22.1648033039962; Wed, 23 Mar 2022 03:57:19 -0700 (PDT) Received: from localhost.localdomain ([192.19.250.250]) by smtp.gmail.com with ESMTPSA id d11-20020aa7868b000000b004f768dfe93asm25535927pfo.176.2022.03.23.03.57.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Mar 2022 03:57:19 -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 3/5] Add number of vlan tags dissector Date: Wed, 23 Mar 2022 12:56:00 +0200 Message-Id: <20220323105602.30072-4-boris.sukholitko@broadcom.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20220323105602.30072-1-boris.sukholitko@broadcom.com> References: <20220323105602.30072-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 15833e1d6ea1..2027e8e72aad 100644 --- a/net/core/flow_dissector.c +++ b/net/core/flow_dissector.c @@ -1034,6 +1034,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; @@ -1157,6 +1167,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) {