From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 75F61A0524 for ; Fri, 5 Feb 2021 12:30:16 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 708D2188980; Fri, 5 Feb 2021 12:30:16 +0100 (CET) Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by mails.dpdk.org (Postfix) with ESMTP id 6982E188980 for ; Fri, 5 Feb 2021 12:30:15 +0100 (CET) Received: by mail-wr1-f47.google.com with SMTP id u14so7328635wri.3 for ; Fri, 05 Feb 2021 03:30:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BpqPSDbqITpz8BX09ZGEPoSfTCOiFpj+NysWO7kGppI=; b=Wcs4O/Z7ykJOzqKz+aa1qwM5fnHdlOtTshol9+7L/QotUo112CBQdU64R1FJpNrV+d AQrV4EkenHlM0g4+XsHzJgW1NP/otrcnN6oCywpA/wq84+ixDZa0HrdWMMNsjkVmyd/q 4pJ9MUbdFhNRUtXQUE7mT5AoCy8ksSQRbDBrmobALmTLFKa/Qb6gEq6O8Rq1UFQr5bNa Dw5v26ZAbbYvSfY63sGbv/GzFDCUFWUDUOSI/EqqyCNli0MySa0hFG3KSzajBxuTGz9K /7rHWNJ4Qz6yt2dU+zXFjJf8Q36+KEryqDiItGWmap18sG0od6cE/dzkj1K6KoWz4ogp XlVA== 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:content-transfer-encoding; bh=BpqPSDbqITpz8BX09ZGEPoSfTCOiFpj+NysWO7kGppI=; b=VFCbwJi7MNKIGkzrjDEQFYRVfH6e8wOHiUSqRiru0Udrw6q/9qchUDddUrSK0SCPyp U4rVnVoC/JveV+1zMdtfKFxYVv8/SmHDbVYC9xIsCS+XUtXzpoxNKw5CcKr9tNXre2v6 O20S45r+HYEIVf8I9VM3rumh2QITlFNJzaakiAiY7gRu4yxyYewPUNQxRVHvWairfybc z07OFPyZosyLlBWhKP774+fyGMFZGj/r9Q2uUUFUBL8KUEiXROzjuNoPwVpru+SqFFlu Z1+LqKJZWrEZ2+/H0JO++HLJfQ884jZo9kUb46PPjhfLpXDcwwND8zinODwtJK4ENgKv 0oQw== X-Gm-Message-State: AOAM530RQCoZDMdKn706gnSwyxbRUfetp9JARMjgtD5Qb4eagdWKL0jn w5qlbyBJiO9ekZfjrDLENimE5iNI+WKCo1Hx X-Google-Smtp-Source: ABdhPJwA9NA/viSlbGoQ0IXXucClOszRSObJYx6yTb7psr7gBeQR2B2kZ27dX40VjZqxrDhlfFgQfQ== X-Received: by 2002:adf:d852:: with SMTP id k18mr4638147wrl.262.1612524615187; Fri, 05 Feb 2021 03:30:15 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id m10sm11961513wro.7.2021.02.05.03.30.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:30:14 -0800 (PST) From: luca.boccassi@gmail.com To: Karra Satwik Cc: Rahul Lakkireddy , dpdk stable Date: Fri, 5 Feb 2021 11:16:24 +0000 Message-Id: <20210205111920.1272063-98-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210205111920.1272063-1-luca.boccassi@gmail.com> References: <20210205111920.1272063-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/cxgbe: accept VLAN flow items without ethertype' has been queued to stable release 20.11.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/07/21. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/ae734622835b1e111caeae48b8f69c47f1494ea4 Thanks. Luca Boccassi --- >From ae734622835b1e111caeae48b8f69c47f1494ea4 Mon Sep 17 00:00:00 2001 From: Karra Satwik Date: Mon, 21 Dec 2020 04:14:43 +0530 Subject: [PATCH] net/cxgbe: accept VLAN flow items without ethertype [ upstream commit c3bbc381477f299eef3078ab7c4ef57165fe3121 ] When apps pass the RTE_FLOW_ITEM_TYPE_VLAN without setting the ethertype field in RTE_FLOW_ITEM_TYPE_ETH, then assume 0x8100 VLAN by default and don't reject the rule. Fixes: 55f003d8884c ("net/cxgbe: support flow API for matching QinQ VLAN") Signed-off-by: Karra Satwik Signed-off-by: Rahul Lakkireddy --- drivers/net/cxgbe/cxgbe_flow.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/net/cxgbe/cxgbe_flow.c b/drivers/net/cxgbe/cxgbe_flow.c index f7c4f36962..520a5a5c9a 100644 --- a/drivers/net/cxgbe/cxgbe_flow.c +++ b/drivers/net/cxgbe/cxgbe_flow.c @@ -245,11 +245,6 @@ ch_rte_parsetype_vlan(const void *dmask, const struct rte_flow_item *item, /* If user has not given any mask, then use chelsio supported mask. */ mask = umask ? umask : (const struct rte_flow_item_vlan *)dmask; - if (!fs->mask.ethtype) - return rte_flow_error_set(e, EINVAL, RTE_FLOW_ERROR_TYPE_ITEM, - item, - "Can't parse VLAN item without knowing ethertype"); - /* If ethertype is already set and is not VLAN (0x8100) or * QINQ(0x88A8), then don't proceed further. Otherwise, * reset the outer ethertype, so that it can be replaced by @@ -275,7 +270,7 @@ ch_rte_parsetype_vlan(const void *dmask, const struct rte_flow_item *item, fs->mask.ethtype = 0; fs->val.ethtype = 0; } - } else if (fs->val.ethtype == RTE_ETHER_TYPE_VLAN) { + } else { CXGBE_FILL_FS(1, 1, ivlan_vld); if (spec) { if (spec->tci || (umask && umask->tci)) -- 2.29.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-05 11:18:33.658431296 +0000 +++ 0098-net-cxgbe-accept-VLAN-flow-items-without-ethertype.patch 2021-02-05 11:18:28.950693853 +0000 @@ -1 +1 @@ -From c3bbc381477f299eef3078ab7c4ef57165fe3121 Mon Sep 17 00:00:00 2001 +From ae734622835b1e111caeae48b8f69c47f1494ea4 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit c3bbc381477f299eef3078ab7c4ef57165fe3121 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org