From patchwork Thu Apr 14 12:51:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Boris Sukholitko X-Patchwork-Id: 12813495 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 8572EC433FE for ; Thu, 14 Apr 2022 12:52:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243630AbiDNMyl (ORCPT ); Thu, 14 Apr 2022 08:54:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50882 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243626AbiDNMyi (ORCPT ); Thu, 14 Apr 2022 08:54:38 -0400 Received: from mail-qt1-x836.google.com (mail-qt1-x836.google.com [IPv6:2607:f8b0:4864:20::836]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 95D9492327 for ; Thu, 14 Apr 2022 05:52:13 -0700 (PDT) Received: by mail-qt1-x836.google.com with SMTP id cp8so404221qtb.6 for ; Thu, 14 Apr 2022 05:52:13 -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=EY8Fl9WKc/vRuSnp08VTVc4E8G8rP0zTcU+ndLth3eU=; b=BpxKg3mxitjYV5FK5FEKgPyXMFxbPw4ua6JzXdbmUQZr300kyTh3CQEYWWxgjOoE5S /ieKQaL31gz8dcnfNMaCvnvNBD9/uNdTRbZ0Z1TfQdqQO5pEETMd7sIqxNlnbg8nF+XS G4kYwdEYRLCnBPtNdjkbX45hl+9+czmG5ExJI= 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=EY8Fl9WKc/vRuSnp08VTVc4E8G8rP0zTcU+ndLth3eU=; b=qbXYu/xI0AAQ7uEgj4fcjFw4NNO0mSQRvfVdkJLGJKLvvPMyM1zl1QuJ0BWVq/G/4S BcNKI3QKpmOHh5RFFQwMpZSaSXEmz0/JMVGH0oxvXET+yAfakxz6HrELy2jcheTo4pMU IbPQ0OuGQpZ19EuLUozQQYhsHthX4J4sFBlVy0pBtQlDTBY3QakfVnWEwbiNgnFIYEiL P0jLxS3u7ucPET4okfje08Ze5oSL+xnLQzMuZ4N5PRHRF3zrARTUhvQMVjBkGRGvtlq9 7T9gRSx+KznKUndKfilE0ksl64ba4gG0xY8x1dD9eX+V2RVNa1StOj6uBqzoA4AzXLEr 9+fw== X-Gm-Message-State: AOAM532pSaEDa2zW0GdvRklKQDcFfARNZszW8r9VrhV3q3Czdho9Ha6G Kqx/3wmqSZWo6eGL/z2FOhqcT/NI7bywyKFRERiicdTwaHVheNLq+FDV0yuwDZDHc7hRqbzTDGL xUnnsPZeR1zXa1El4Tb6r0dKXCSvxE9fYBuinK+keOtDPCbtxeW6Q1ifuifjtZi0oTkobqJ3sWV LLmi/XbSBDuQ== X-Google-Smtp-Source: ABdhPJzP+npHYszcaiXe8UAiELMWaEECdSbhKfJtDzheXaR1JxqvbWIcqpRwQviwJglhr9i8F1hotw== X-Received: by 2002:ac8:5502:0:b0:2f1:e732:b3a6 with SMTP id j2-20020ac85502000000b002f1e732b3a6mr827681qtq.107.1649940732442; Thu, 14 Apr 2022 05:52:12 -0700 (PDT) Received: from localhost.localdomain ([192.19.250.250]) by smtp.gmail.com with ESMTPSA id o10-20020a05620a15ca00b0069c39e2970bsm875910qkm.80.2022.04.14.05.52.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Apr 2022 05:52:11 -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 , Paolo Abeni Cc: Ilya Lifshits , Boris Sukholitko Subject: [PATCH net-next v3 3/5] flow_dissector: Add number of vlan tags dissector Date: Thu, 14 Apr 2022 15:51:19 +0300 Message-Id: <20220414125121.13599-4-boris.sukholitko@broadcom.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20220414125121.13599-1-boris.sukholitko@broadcom.com> References: <20220414125121.13599-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. The goal is to make the following TC commands possible: tc filter add dev eth1 ingress flower \ num_of_vlans 1 vlan_prio 5 action drop From our logs, we have redirect rules such that: tc filter add dev $GPON ingress flower num_of_vlans $N \ action mirred egress redirect dev $DEV where N can range from 0 to 3 and $DEV is the function of $N. Also there are rules setting skb mark based on the number of vlans: tc filter add dev $GPON ingress flower num_of_vlans $N vlan_prio \ $P action skbedit mark $M 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) {