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 743E0A0093 for ; Tue, 19 May 2020 15:10:45 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 6B6231D6DD; Tue, 19 May 2020 15:10:45 +0200 (CEST) Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by dpdk.org (Postfix) with ESMTP id 4E4EF1D6A4 for ; Tue, 19 May 2020 15:10:44 +0200 (CEST) Received: by mail-wr1-f66.google.com with SMTP id j5so15899892wrq.2 for ; Tue, 19 May 2020 06:10:44 -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=kA3SlCo4wxJeCHMvVq2+BKb8xZwUi8Fqy1b9VxowCgs=; b=Pqo0L9NkboHyEn9L8J+vOmaFaLTZccV25dGuA4RY/iXZ8WE9vRIaAajSfrDJv+ZcvO e8Oym9l40W6/OdbyQX6OmweiTK0VHZxwZGgNlAItMdqWfwRo+Fd1NuAulU/UrQa1cHXw 9nywhkMbZl6ScO5oLeDgsl9kREWv75vKexvO8jX7rnnpZgUGm+RMOyhT4iRIsbpRxBEO 6FwZBjts5aT34et6eFQlkNoQ8PbisJDefCMtPymNjgXpMFpIDvuy8/DHWuRF6LuxmQ9b m+fAGLBk08WGMTkfhg+MKbjuLehj6C/Dcd3APkefNQEDG+kGF8lQ88RU2aFJA3fMDXh5 4KqA== 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=kA3SlCo4wxJeCHMvVq2+BKb8xZwUi8Fqy1b9VxowCgs=; b=mMgO4CYtVdxKOxoDWVCXcDEVvy2GlDtIBLpEEa8msMTeQhVnnUxbK0ZoljdIYxWjYU n51I0JoW5F2//GAHvfLLQYIEm5UGsnc9FY4YUpFHe4UmXm+x/GdwujikHUgVcAh3gVgm LXdEEDvLmfSe0L9W2WIhVmrQqOGuvB6niw2FdDgpuigPvGTt+ABSe4T9NzySYEcvSGra PLQGI0BiAG6wW8xrp3aL/psbSX7P/0TtUVxYPHcLFvMwgyuoPto3qs8Vw9ZxUDZZ8k9R 1OQF9Iojs0TETikCL6YyBPQ2+r3gLgq/qh9HFt0L7GEcHgS8AlQdo7nS/wI76e6iaSI1 hV0A== X-Gm-Message-State: AOAM532rUToUzQcrdlXug7lYJzh9GrHi2I5L1WvpGH6MYEcw8MYNS4LZ f6SMT8aE6JDeljgH7fZEclUsv0PcLPV0JI2g X-Google-Smtp-Source: ABdhPJzkIXDPF+aoND1LDVx6APF7Xz+IxRSBQW6rIlFRNAEWbVuw0md41xsL7pE3hP4JMgyl6j+sDA== X-Received: by 2002:adf:e752:: with SMTP id c18mr25308019wrn.353.1589893843997; Tue, 19 May 2020 06:10:43 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id r9sm3806262wmg.47.2020.05.19.06.10.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 06:10:43 -0700 (PDT) From: luca.boccassi@gmail.com To: Xiaoyu Min Cc: Dekel Peled , Viacheslav Ovsiienko , dpdk stable Date: Tue, 19 May 2020 14:03:46 +0100 Message-Id: <20200519130549.112823-91-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519130549.112823-1-luca.boccassi@gmail.com> References: <20200519125804.104349-1-luca.boccassi@gmail.com> <20200519130549.112823-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/mlx5: fix push VLAN action to use item info' 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/21/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 d2f4d1ae3d66e9f54788f21552d5c30e18828b79 Mon Sep 17 00:00:00 2001 From: Xiaoyu Min Date: Mon, 13 Apr 2020 06:29:03 +0300 Subject: [PATCH] net/mlx5: fix push VLAN action to use item info [ upstream commit 7162c02d7bf700312f644ca3e598ab6e034e180c ] Currently when PMD create push VLAN action it need to provide VID to HW and PMD get VID value from item VLAN in pattern if there is no of_set_vlan_vid action following. When user create rule like [1], which has of_set_vlan_vid action before of_push_vlan, the intention is to modify VID on existing VLAN header and push a new VLAN header with VID _inherit_ from the previous of_set_vlan_vid. Currently the above is not covered by PMD, PMD always fetch the VLAN information from item for of_push_vlan action. Fix it by only fetch VLAN information from item when there is no previous of_set_vlan_vid action. [1]: testpmd> flow create 2 ingress transfer group 1 priority 3 pattern eth / vlan vid is 2731 / ipv4 / end actions of_set_vlan_vid vlan_vid 3209 / of_push_vlan ethertype 0x88A8 / port_id id 1 / end Fixes: b8c0372bc5ac ("net/mlx5: fix set VLAN ID/PCP in new header") Signed-off-by: Xiaoyu Min Reviewed-by: Dekel Peled Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_flow_dv.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 0f438bfc3b..8c3748f13c 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -7119,7 +7119,9 @@ cnt_err: action_flags |= MLX5_FLOW_ACTION_OF_POP_VLAN; break; case RTE_FLOW_ACTION_TYPE_OF_PUSH_VLAN: - flow_dev_get_vlan_info_from_items(items, &vlan); + if (!(action_flags & + MLX5_FLOW_ACTION_OF_SET_VLAN_VID)) + flow_dev_get_vlan_info_from_items(items, &vlan); vlan.eth_proto = rte_be_to_cpu_16 ((((const struct rte_flow_action_of_push_vlan *) actions->conf)->ethertype)); -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-19 14:04:48.177747609 +0100 +++ 0091-net-mlx5-fix-push-VLAN-action-to-use-item-info.patch 2020-05-19 14:04:44.296649823 +0100 @@ -1,8 +1,10 @@ -From 7162c02d7bf700312f644ca3e598ab6e034e180c Mon Sep 17 00:00:00 2001 +From d2f4d1ae3d66e9f54788f21552d5c30e18828b79 Mon Sep 17 00:00:00 2001 From: Xiaoyu Min Date: Mon, 13 Apr 2020 06:29:03 +0300 Subject: [PATCH] net/mlx5: fix push VLAN action to use item info +[ upstream commit 7162c02d7bf700312f644ca3e598ab6e034e180c ] + Currently when PMD create push VLAN action it need to provide VID to HW and PMD get VID value from item VLAN in pattern if there is no of_set_vlan_vid action following. @@ -24,7 +26,6 @@ 0x88A8 / port_id id 1 / end Fixes: b8c0372bc5ac ("net/mlx5: fix set VLAN ID/PCP in new header") -Cc: stable@dpdk.org Signed-off-by: Xiaoyu Min Reviewed-by: Dekel Peled @@ -34,10 +35,10 @@ 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c -index e87e30f65f..5f093bedd3 100644 +index 0f438bfc3b..8c3748f13c 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c -@@ -7517,7 +7517,9 @@ cnt_err: +@@ -7119,7 +7119,9 @@ cnt_err: action_flags |= MLX5_FLOW_ACTION_OF_POP_VLAN; break; case RTE_FLOW_ACTION_TYPE_OF_PUSH_VLAN: