From patchwork Mon Apr 11 13:30:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Boris Sukholitko X-Patchwork-Id: 12809106 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 2CAB8C433EF for ; Mon, 11 Apr 2022 13:31:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346512AbiDKNeC (ORCPT ); Mon, 11 Apr 2022 09:34:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51334 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346513AbiDKNeA (ORCPT ); Mon, 11 Apr 2022 09:34:00 -0400 Received: from mail-pj1-x102f.google.com (mail-pj1-x102f.google.com [IPv6:2607:f8b0:4864:20::102f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B5EA93BBC4 for ; Mon, 11 Apr 2022 06:31:44 -0700 (PDT) Received: by mail-pj1-x102f.google.com with SMTP id a16-20020a17090a6d9000b001c7d6c1bb13so16825137pjk.4 for ; Mon, 11 Apr 2022 06:31:44 -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=HEoyXaWkvnAxKhM21UuxTaOS4Bto0EbDHpM2P0C/hW4=; b=JtFAmekAW4Pk79HTrF5X8OyElhanENYP/VGd/2qKcw37+dkYCteqrUAP2F8qN56Ria Ycc2iJ1+v7KRZwa2H176tFnoIHIEcb+eNRWz46McZlOsK/u1m7YJuNwmEu+e6BjjZj7E PtCVRBFtsXEl00rEY6E44Z4oSKvIJcLlmrtI4= 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=HEoyXaWkvnAxKhM21UuxTaOS4Bto0EbDHpM2P0C/hW4=; b=oF9YdxGc85XwTgsNJUI34viF22FFNhdRN0KhGiETSMKyMIfD9sNomvnQgVjPtKSCNZ rERPX01jIONOjpE3cTlb0syduXcT2YjOoSqg7ubMuuL/EO8X9Jw11ab5J/kW+Gwa5O3s TViSPXFzmWT5Z+GFbdcfTnyaLNsnPY6zf+K+7+GsSW9hoqTpcLTLzktA/Xs46CQio3+O F8Mw2eyoRSHCnB2NCU/r2j9Uf/YKfuLl3VsBK65S3PGcKMZz/Jrl6UMned9NTCIj08FF oJpCmPqLalBC2bYPrHli7PWIR7sqVP+P2R82tK9BD8HJV6RnSBDCKEc7sTn1LSJsKJqo eJOw== X-Gm-Message-State: AOAM532nBEgsTN3FHTnQaumcsokjZ5lOGyp2KnM6/PWFAqdB2vhNZDhI 1WUbYc9m4R2LMRlZazRIOapS7tNK2ykrpVO85PzLWuFpbYgUJ5YyoWJMG8uLIOWmZVwHrj8Jxu9 houUgYBQD3fqMK4n8IowfoHqrd9Erb+8WJgFt4gYZ1g044p0UQ57XclhaEno9hovXq1kWAkN5Ec Xw0k2aN3WnEw== X-Google-Smtp-Source: ABdhPJzEEQeDseIWfNEWbom4iMMycKmnsfyPq25mGtC+n35UGEte2Krv1zHJ9bM0fRnlwArAfuZCYQ== X-Received: by 2002:a17:902:e84d:b0:156:bf35:6449 with SMTP id t13-20020a170902e84d00b00156bf356449mr32325397plg.26.1649683903606; Mon, 11 Apr 2022 06:31:43 -0700 (PDT) Received: from localhost.localdomain ([192.19.250.250]) by smtp.gmail.com with ESMTPSA id a38-20020a056a001d2600b004f70d5e92basm35716311pfx.34.2022.04.11.06.31.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Apr 2022 06:31:43 -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: Mon, 11 Apr 2022 16:30:58 +0300 Message-Id: <20220411133100.18126-4-boris.sukholitko@broadcom.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20220411133100.18126-1-boris.sukholitko@broadcom.com> References: <20220411133100.18126-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) {