From patchwork Tue May 25 15:35:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Boris Sukholitko X-Patchwork-Id: 12279341 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 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, URIBL_BLOCKED,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 45F36C2B9F8 for ; Tue, 25 May 2021 15:38:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 176CD613D6 for ; Tue, 25 May 2021 15:38:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234222AbhEYPjb (ORCPT ); Tue, 25 May 2021 11:39:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34882 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234191AbhEYPja (ORCPT ); Tue, 25 May 2021 11:39:30 -0400 Received: from mail-pl1-x631.google.com (mail-pl1-x631.google.com [IPv6:2607:f8b0:4864:20::631]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 38C4DC061574 for ; Tue, 25 May 2021 08:38:01 -0700 (PDT) Received: by mail-pl1-x631.google.com with SMTP id v13so16530592ple.9 for ; Tue, 25 May 2021 08:38:01 -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=iyubgVIgN9mWbrfZmCC6Zed9u6EAzHTKdSZRiTzxPbo=; b=JDbgGHMaR9As27G2QvnjBTOqKaxUWxn/zRncvZ89Cd6W09eE3Sr79a/QRuKuln/cF1 CnLYW04DdCm7gEEiFP5w9nXfKU8oHT1paycq3P8ivyTxg0p2lr90FUBYrzMYTntGdsnS 8r0JRkXwXJ4vkHsc7cEJLQwWCnQP1j+eBA3QY= 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=iyubgVIgN9mWbrfZmCC6Zed9u6EAzHTKdSZRiTzxPbo=; b=hUDeTZu+q6ov5QEXzZxdzNu4FKK0kZ52rBebesCCN4oOuIHDdWyt1Zu9pu9OtDBVjA yxsb1UrkiL93kpC8PEDmgMoZ2Cpja+fFFghzT+3QjjkEVmsxdTYBQ5dDnH2N04HqwQo5 KBl3dKhC+UJoRPxbOCUOx3AodA4XXMztSbRWKE0yiIaAFfmhntZdTuKyUaaHsWwKPhNU JwgODtB6oeLgJ+S9BPgpsbJKHicn3PgP6HgL8rUZKWJ0+ywVJYd3rd4t6rD6TZ3Y4QYt lQk4Ab+ZcufUyXSoU3Pj2n33YM8y2QhZjYwUiFST7MH64adrJjC3NYqu9zXLSEEe5krG qWtw== X-Gm-Message-State: AOAM533C0KvShrVcpI4ydYmSWOjDosdhMoVyqtCk06PU05Og8bcXUx6b X0MGdu+CWA4+Kq+TpzDoGzuMP5Lj4UQvphGG/Cj6F0qbm/pgJApuVB5Wm5MP33mjA9EHE/W8239 yWoTHADboGqDCymC7qiPRLZQYMeV8BN/0XD7NuvdUq7dZyGxmiREGkashjmlW0lMieGUU2bEmuW dHcyB1R/Q= X-Google-Smtp-Source: ABdhPJxh2cJm3QoDtEpNRfxf6s1wi6sPm4crKmAlQAZw4IoSVMUJ3dm6ZVKJ0gp4rtqlaK7FzK/NrA== X-Received: by 2002:a17:903:1c3:b029:f1:ecf4:f971 with SMTP id e3-20020a17090301c3b02900f1ecf4f971mr31180578plh.6.1621957080062; Tue, 25 May 2021 08:38:00 -0700 (PDT) Received: from localhost.localdomain ([192.19.250.250]) by smtp.gmail.com with ESMTPSA id f14sm13388369pjq.50.2021.05.25.08.37.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 May 2021 08:37:59 -0700 (PDT) From: Boris Sukholitko To: netdev@vger.kernel.org, Jamal Hadi Salim , Jiri Pirko , Cong Wang Cc: Ilya Lifshits , Shmulik Ladkani , Jakub Kicinski , Davide Caratti , Boris Sukholitko Subject: [PATCH net-next v2 1/3] net/sched: act_vlan: Fix modify to allow 0 Date: Tue, 25 May 2021 18:35:59 +0300 Message-Id: <20210525153601.6705-2-boris.sukholitko@broadcom.com> X-Mailer: git-send-email 2.29.3 In-Reply-To: <20210525153601.6705-1-boris.sukholitko@broadcom.com> References: <20210525153601.6705-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 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..cca10b5e99c9 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; p->tcfv_push_proto = push_proto; if (action == TCA_VLAN_ACT_PUSH_ETH) {