From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 2F24BA0093 for ; Fri, 22 May 2020 11:41:08 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 13DBE1D975; Fri, 22 May 2020 11:41:08 +0200 (CEST) Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by dpdk.org (Postfix) with ESMTP id 614C21D974 for ; Fri, 22 May 2020 11:41:06 +0200 (CEST) Received: by mail-wm1-f66.google.com with SMTP id f134so8078054wmf.1 for ; Fri, 22 May 2020 02:41:06 -0700 (PDT) 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=0caU/oAvzdohike4hvL1QAx7v0NUfZ7lcXi1WjrYbdA=; b=CZvwIu+InlDhyp+DsZWrIC4V/TlfPFWKFxEuZSlPPm1iPcJ7Yf80OgRR/Xwz1rZmVG X4RGce4nig0u1VC5wA/a3sfE3/x610PNvLRxKBHkvtwyh6CI73LZRlt3TZoBPRCyzmUj Hte2S1RqTbAkjl5WKw1y0GlPrAidfk0IR+DHCkHFGtnheRJe/1V5SqSrRK2Au9w/msym ERNc/b2dTZnpiY6cZ9nnUMlV1TGs0yM3lR3EtelaxD1FkXstaJOrH43N/tUN+vhU3r6j ZNstw/ivbcPgJUE/+EaKoh88yx+/qNcHiBZsdM3DY/6MlG0IG6uGOntNPoALQve4IVi7 foqQ== 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=0caU/oAvzdohike4hvL1QAx7v0NUfZ7lcXi1WjrYbdA=; b=dteT2k/70YeQnbagsmAJVIpqj1Zs7F9no/BfifdL3yye0B4ZKXLlAio1VHrxj5HnGY m55oSNZKw4MkfsfpXV11UdH8Bw+AHwsLcdTLqw/nOv+dlgyxR8CUDrz0kI7H42arTcfR avZGNeLp/FpIkYMJ4n+TlHTw3c1bCf8E735qB3JZXwORGfkW6vWn6ZjluNF5KNlqRPk2 uURkJrRzyqUkNRWvrqk4591+uKtRhjQo6qOQnPFxVFmw/IkvMnxRnQv+VMHzhO16XCIq TmKzTNROquNlL/SjLiMEVuRbo2jSgMEFyqhJcfN1lf2YZH6Fv11Y2qwQ67CG+B8l+JIx ObKA== X-Gm-Message-State: AOAM533zScEdMtRQVAuqCNkI8aCjX22tlZp/yAMwCunAScmA8uUkAv1e wCs8No//ymG+mcijF/O0hQvOZmCJWwk= X-Google-Smtp-Source: ABdhPJymPtFr1XA5skb3smXGr5wjL+SBKtxR87Np8qbC29vrFRFBTwJtp00fiEq5bi3RxyF4Web9JQ== X-Received: by 2002:a7b:cf2c:: with SMTP id m12mr753083wmg.70.1590140466154; Fri, 22 May 2020 02:41:06 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id w82sm8979099wmg.28.2020.05.22.02.41.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 May 2020 02:41:05 -0700 (PDT) From: luca.boccassi@gmail.com To: Dekel Peled Cc: Viacheslav Ovsiienko , dpdk stable Date: Fri, 22 May 2020 10:39:54 +0100 Message-Id: <20200522094022.1025696-15-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200522094022.1025696-1-luca.boccassi@gmail.com> References: <20200519130549.112823-214-luca.boccassi@gmail.com> <20200522094022.1025696-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/mlx5: fix VLAN flow action with wildcard VLAN item' has been queued to stable release 19.11.3 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 19.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/24/20. 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. Thanks. Luca Boccassi --- >From a15ee3e4a71265479439da08a2880a50ae6fd634 Mon Sep 17 00:00:00 2001 From: Dekel Peled Date: Wed, 13 May 2020 22:49:19 +0300 Subject: [PATCH] net/mlx5: fix VLAN flow action with wildcard VLAN item [ upstream commit ff55182ce3f04c8f8851dc52f1719c26e3f3a40f ] Previous patch added support of VLAN item without VLAN ID value, i.e. using wildcard VLAN item, to match VLAN with any VLAN ID. The implication on VLAN actions was not taken into consideration. VLAN actions (e.g. push vlan) use the VLAN ID value in the VLAN item, and expect it to be valid. This patch updates function flow_dev_get_vlan_info_from_items() to check the VLAN item contents before trying to use it. Fixes: 92818d839e8e ("net/mlx5: fix match on empty VLAN item in DV mode") Signed-off-by: Dekel Peled Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_flow_dv.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 9233853e1d..d83e49f954 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -1728,6 +1728,9 @@ flow_dev_get_vlan_info_from_items(const struct rte_flow_item *items, const struct rte_flow_item_vlan *vlan_m = items->mask; const struct rte_flow_item_vlan *vlan_v = items->spec; + /* If VLAN item in pattern doesn't contain data, return here. */ + if (!vlan_v) + return; if (!vlan_m) vlan_m = &nic_mask; /* Only full match values are accepted */ -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-22 10:37:39.802053062 +0100 +++ 0015-net-mlx5-fix-VLAN-flow-action-with-wildcard-VLAN-ite.patch 2020-05-22 10:37:39.100412212 +0100 @@ -1,8 +1,10 @@ -From ff55182ce3f04c8f8851dc52f1719c26e3f3a40f Mon Sep 17 00:00:00 2001 +From a15ee3e4a71265479439da08a2880a50ae6fd634 Mon Sep 17 00:00:00 2001 From: Dekel Peled Date: Wed, 13 May 2020 22:49:19 +0300 Subject: [PATCH] net/mlx5: fix VLAN flow action with wildcard VLAN item +[ upstream commit ff55182ce3f04c8f8851dc52f1719c26e3f3a40f ] + Previous patch added support of VLAN item without VLAN ID value, i.e. using wildcard VLAN item, to match VLAN with any VLAN ID. The implication on VLAN actions was not taken into consideration. @@ -13,7 +15,6 @@ check the VLAN item contents before trying to use it. Fixes: 92818d839e8e ("net/mlx5: fix match on empty VLAN item in DV mode") -Cc: stable@dpdk.org Signed-off-by: Dekel Peled Acked-by: Viacheslav Ovsiienko @@ -22,10 +23,10 @@ 1 file changed, 3 insertions(+) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c -index fd002f3c57..71da5fbefe 100644 +index 9233853e1d..d83e49f954 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c -@@ -1881,6 +1881,9 @@ flow_dev_get_vlan_info_from_items(const struct rte_flow_item *items, +@@ -1728,6 +1728,9 @@ flow_dev_get_vlan_info_from_items(const struct rte_flow_item *items, const struct rte_flow_item_vlan *vlan_m = items->mask; const struct rte_flow_item_vlan *vlan_v = items->spec;