From patchwork Tue Jun 1 12:30:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Boris Sukholitko X-Patchwork-Id: 451624 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9DAA9C47080 for ; Tue, 1 Jun 2021 12:31:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7C0426008E for ; Tue, 1 Jun 2021 12:31:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233837AbhFAMdY (ORCPT ); Tue, 1 Jun 2021 08:33:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55570 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233835AbhFAMdY (ORCPT ); Tue, 1 Jun 2021 08:33:24 -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 B6766C061574 for ; Tue, 1 Jun 2021 05:31:42 -0700 (PDT) Received: by mail-pj1-x102f.google.com with SMTP id pi6-20020a17090b1e46b029015cec51d7cdso1818361pjb.5 for ; Tue, 01 Jun 2021 05:31:42 -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=5KkOLtWPPT4XjMFxWFh95vsrYDoPtn5QCpEmUqQMk0s=; b=C3ypn5shV676gxYR6UKxgyRxvkluZUrtbUBYTl27BAlghKVdNYD3bykyP4skV+MUln 5owS/TzLYFgnY68uXQwmJ8/9cJwXcrt7EjkoIsiYjHKvckyLjgeKVOYff8Ggtnuc/Dr1 R0Qp7DWYQ4HRfZaZJLj7I3JiQZ+LNeQZKVtHU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version; bh=5KkOLtWPPT4XjMFxWFh95vsrYDoPtn5QCpEmUqQMk0s=; b=E+Y62UbgqEaMTobAjFDpW/VfNYAqhQHCpBJBsgj+zmO4t/cgNK4hTeYLTF0A3BNYRd hMJ5Eqgt2JDcTwL+ck0jhjaEkz2aFZkVcBZb9ZWvRgx7CCjXTJU8W6rJzFWV/VwUKmxg AaFypkLzmzUKGchT9JufQUJoziRF/lpse2wb2GbqrGS/DxQPwsIaShLTOTzz+4W1x/NO bN+GIaazG61/HTrfHQvhHwY0sZxADdZcajo3N+bc01Ij7PY//O1leADjLI0hGD9i5rZa 7BmD0A5wZaEfSVUpsqGifWr+e2Fa1M4CfcLTvsOdmMeMaCeYf+Yw1QEgogUJtgmn2fLv GBhQ== X-Gm-Message-State: AOAM532NW0Z9VJKZ4ueW9u9YyofXTKRaL7hXSitpGVQb4mHRwTAWitac nnXZp8BmqIwv0OmQ8FoXAiY+gA== X-Google-Smtp-Source: ABdhPJzAcDn5U2RdAcN7oQ9fvqORdTVUVPYzHUVtM5/MBnRAa9zKlKIIezEj1oogtsznH9Q7BnN9fg== X-Received: by 2002:a17:90a:4817:: with SMTP id a23mr4898086pjh.192.1622550702241; Tue, 01 Jun 2021 05:31:42 -0700 (PDT) Received: from localhost.localdomain ([192.19.250.250]) by smtp.gmail.com with ESMTPSA id p19sm13887734pgi.59.2021.06.01.05.31.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Jun 2021 05:31:41 -0700 (PDT) From: Boris Sukholitko To: netdev@vger.kernel.org, Jamal Hadi Salim , Jiri Pirko , Cong Wang Cc: "David S . Miller" , linux-kselftest@vger.kernel.org, shuah@kernel.org, Ilya Lifshits , Shmulik Ladkani , Jakub Kicinski , Davide Caratti , Boris Sukholitko Subject: [PATCH net-next v4 1/3] net/sched: act_vlan: Fix modify to allow 0 Date: Tue, 1 Jun 2021 15:30:50 +0300 Message-Id: <20210601123052.3887-2-boris.sukholitko@broadcom.com> X-Mailer: git-send-email 2.29.3 In-Reply-To: <20210601123052.3887-1-boris.sukholitko@broadcom.com> References: <20210601123052.3887-1-boris.sukholitko@broadcom.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org Currently vlan modification action checks existence of vlan priority by comparing it to 0. Therefore it is impossible to modify existing vlan tag to have priority 0. For example, the following tc command will change the vlan id but will not affect vlan priority: tc filter add dev eth1 ingress matchall action vlan modify id 300 \ priority 0 pipe mirred egress redirect dev eth2 The incoming packet on eth1: ethertype 802.1Q (0x8100), vlan 200, p 4, ethertype IPv4 will be changed to: ethertype 802.1Q (0x8100), vlan 300, p 4, ethertype IPv4 although the user has intended to have p == 0. The fix is to add tcfv_push_prio_exists flag to struct tcf_vlan_params and rely on it when deciding to set the priority. Fixes: 45a497f2d149a4a8061c (net/sched: act_vlan: Introduce TCA_VLAN_ACT_MODIFY vlan action) Signed-off-by: Boris Sukholitko --- include/net/tc_act/tc_vlan.h | 1 + net/sched/act_vlan.c | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/include/net/tc_act/tc_vlan.h b/include/net/tc_act/tc_vlan.h index f051046ba034..f94b8bc26f9e 100644 --- a/include/net/tc_act/tc_vlan.h +++ b/include/net/tc_act/tc_vlan.h @@ -16,6 +16,7 @@ struct tcf_vlan_params { u16 tcfv_push_vid; __be16 tcfv_push_proto; u8 tcfv_push_prio; + bool tcfv_push_prio_exists; struct rcu_head rcu; }; diff --git a/net/sched/act_vlan.c b/net/sched/act_vlan.c index 1cac3c6fbb49..a108469c664f 100644 --- a/net/sched/act_vlan.c +++ b/net/sched/act_vlan.c @@ -70,7 +70,7 @@ static int tcf_vlan_act(struct sk_buff *skb, const struct tc_action *a, /* replace the vid */ tci = (tci & ~VLAN_VID_MASK) | p->tcfv_push_vid; /* replace prio bits, if tcfv_push_prio specified */ - if (p->tcfv_push_prio) { + if (p->tcfv_push_prio_exists) { tci &= ~VLAN_PRIO_MASK; tci |= p->tcfv_push_prio << VLAN_PRIO_SHIFT; } @@ -121,6 +121,7 @@ static int tcf_vlan_init(struct net *net, struct nlattr *nla, struct tc_action_net *tn = net_generic(net, vlan_net_id); struct nlattr *tb[TCA_VLAN_MAX + 1]; struct tcf_chain *goto_ch = NULL; + bool push_prio_exists = false; struct tcf_vlan_params *p; struct tc_vlan *parm; struct tcf_vlan *v; @@ -189,7 +190,8 @@ static int tcf_vlan_init(struct net *net, struct nlattr *nla, push_proto = htons(ETH_P_8021Q); } - if (tb[TCA_VLAN_PUSH_VLAN_PRIORITY]) + push_prio_exists = !!tb[TCA_VLAN_PUSH_VLAN_PRIORITY]; + if (push_prio_exists) push_prio = nla_get_u8(tb[TCA_VLAN_PUSH_VLAN_PRIORITY]); break; case TCA_VLAN_ACT_POP_ETH: @@ -241,6 +243,7 @@ static int tcf_vlan_init(struct net *net, struct nlattr *nla, p->tcfv_action = action; p->tcfv_push_vid = push_vid; p->tcfv_push_prio = push_prio; + p->tcfv_push_prio_exists = push_prio_exists || action == TCA_VLAN_ACT_PUSH; p->tcfv_push_proto = push_proto; if (action == TCA_VLAN_ACT_PUSH_ETH) { From patchwork Tue Jun 1 12:30:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Boris Sukholitko X-Patchwork-Id: 451623 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2AFC1C47080 for ; Tue, 1 Jun 2021 12:32:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0A679613B1 for ; Tue, 1 Jun 2021 12:32:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233900AbhFAMdv (ORCPT ); Tue, 1 Jun 2021 08:33:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55684 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233905AbhFAMdq (ORCPT ); Tue, 1 Jun 2021 08:33:46 -0400 Received: from mail-pf1-x42d.google.com (mail-pf1-x42d.google.com [IPv6:2607:f8b0:4864:20::42d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3DEB7C061756 for ; Tue, 1 Jun 2021 05:32:05 -0700 (PDT) Received: by mail-pf1-x42d.google.com with SMTP id d16so11231481pfn.12 for ; Tue, 01 Jun 2021 05:32:05 -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=pVs03MuZSONzhRJ5N1rTtJ1UzmBMUikVNlIQU0sSxWk=; b=SacrMR9OEru+vYv9fwFCooP8smYof5FYiCzI4IYYvk9LycdbGcoC/caQ8nGLz4Nm1l 1KWHa6ERu4MQCe3gvEEh9JzUvqUbzIiED9qOEfmpE8fBTkhoF+i1mss60S2HZXG5v1bA DqVfhDHpS/bNcMoSeQHpNIsE31tRWNxdYB07Y= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version; bh=pVs03MuZSONzhRJ5N1rTtJ1UzmBMUikVNlIQU0sSxWk=; b=nFrAkTg0dUQkgEGbvcZQ0YZASQEj62NuuGEGIcuBQWM1TsbeBfZHTibZGrHlm0mf9U iPghbDlnJDTi39PoeSp+MPD5TG3GUFOGQeBAUcIJ48PuVVakbGcjkE0ItAcdAGxALO15 fEgcL9cg7y8jyVU6pQtW6Fx+TigkWOLwC8lFAxLE8Ms2B+A8bSQ44WzD4mfnd+HSwYb8 9lyh0lhWJaCpioOpn3qczyNgGIPBpefaT3tXamKiAF6MJ4qWox4AMx65zyvr00HZFKph nFytIrNP58/Z/V0o2j46eMhLWNqlBGL20D0+79kBP69x7tg/dOkA06xS5pok4w+qQmGi Qh2g== X-Gm-Message-State: AOAM533xkOXS/5EgVBWD/n0idqAqG9FObhCAywcvHe8Nco1ikHu8m+VF EkZ/T2q9iDScSuPWTcA31tp07A== X-Google-Smtp-Source: ABdhPJxD/X8s1k4pf+S3cGwqvq1F7TnK1ZMzF/ZJTv0gpOiAYJm0E0zoyCR+oXDZzBEX3rBYk4zYcA== X-Received: by 2002:a05:6a00:cd4:b029:2e1:b937:77e8 with SMTP id b20-20020a056a000cd4b02902e1b93777e8mr21959900pfv.43.1622550724699; Tue, 01 Jun 2021 05:32:04 -0700 (PDT) Received: from localhost.localdomain ([192.19.250.250]) by smtp.gmail.com with ESMTPSA id p19sm13887734pgi.59.2021.06.01.05.31.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Jun 2021 05:32:04 -0700 (PDT) From: Boris Sukholitko To: netdev@vger.kernel.org, Jamal Hadi Salim , Jiri Pirko , Cong Wang Cc: "David S . Miller" , linux-kselftest@vger.kernel.org, shuah@kernel.org, Ilya Lifshits , Shmulik Ladkani , Jakub Kicinski , Davide Caratti , Boris Sukholitko Subject: [PATCH net-next v4 3/3] net/sched: act_vlan: Test priority 0 modification Date: Tue, 1 Jun 2021 15:30:52 +0300 Message-Id: <20210601123052.3887-4-boris.sukholitko@broadcom.com> X-Mailer: git-send-email 2.29.3 In-Reply-To: <20210601123052.3887-1-boris.sukholitko@broadcom.com> References: <20210601123052.3887-1-boris.sukholitko@broadcom.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org Because explicitly being set, the priority 0 should appear in the output. Signed-off-by: Boris Sukholitko --- .../tc-testing/tc-tests/actions/vlan.json | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/tools/testing/selftests/tc-testing/tc-tests/actions/vlan.json b/tools/testing/selftests/tc-testing/tc-tests/actions/vlan.json index 1d9d261aa0b3..7467021b31ca 100644 --- a/tools/testing/selftests/tc-testing/tc-tests/actions/vlan.json +++ b/tools/testing/selftests/tc-testing/tc-tests/actions/vlan.json @@ -445,6 +445,30 @@ "matchCount": "0", "teardown": [] }, + { + "id": "ba5b", + "name": "Add vlan modify action for protocol 802.1Q setting priority 0", + "category": [ + "actions", + "vlan" + ], + "setup": [ + [ + "$TC actions flush action vlan", + 0, + 1, + 255 + ] + ], + "cmdUnderTest": "$TC actions add action vlan modify protocol 802.1Q id 5 priority 0 index 100", + "expExitCode": "0", + "verifyCmd": "$TC actions get action vlan index 100", + "matchPattern": "action order [0-9]+: vlan.*modify id 100 priority 0 protocol 802.1Q pipe.*index 100 ref", + "matchCount": "0", + "teardown": [ + "$TC actions flush action vlan" + ] + }, { "id": "6812", "name": "Add vlan modify action for protocol 802.1Q",