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 EECAAA0093 for ; Tue, 19 May 2020 14:59:00 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E6EC61C1E4; Tue, 19 May 2020 14:59:00 +0200 (CEST) Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by dpdk.org (Postfix) with ESMTP id AD47E1C1E4 for ; Tue, 19 May 2020 14:58:59 +0200 (CEST) Received: by mail-wr1-f67.google.com with SMTP id y3so15838416wrt.1 for ; Tue, 19 May 2020 05:58:59 -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=5DxJOK9LVfyuwu+N2i5CwD0P2vBCe1lPoKf2yISQBq4=; b=exMMW9ymK7XNFheBfwsRdIBjj0fAKRYxU/PIewSRuQfzHYyF3VAIotUv6OV57RFrse 0KIboHNM2WKXlRK0Xh1HwYT2WF1jSaRMaHgaRtrI3G6wzVEbdFOKB5pArA0R+JF27Rsr 82LN3K0+B5/h5coKTYzedrNKixovNx/Afj550aFZ4jVeS2Kwgz43/dbrnrtG3tmyDQ9p KTR6Dc8+A9sE/5z3xIfn4G0scv+WF12ZwYrWFr0Lw43Z/1a44hBaYVDxcP3qyrg5OOd0 TlOB81h9MknOAjOeYSS/zscm1WUJRxJMXTO4UGD/Ub6dNQRX3ZUTFojaE9WDSGhw8+wo 5D5w== 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=5DxJOK9LVfyuwu+N2i5CwD0P2vBCe1lPoKf2yISQBq4=; b=jcSlZRwcWWBxcCWtu9Yi4lDLnGSImlX4tgSQVw7id5cGHu+yM2LdyQZxCHbS4MOH4S vQkfRoey7YSd2V5y+1HjDOC9gYPai5yWtsSOK2lACimVwoOvlc3SN1GRDZMhM0HAEJix T8E/AFMGqVoJ3qwPfLH9aoeD1REKF1BepVApgMDKJSKvAPpXpxRNYl5VhI1T8qMB0ASf o2W/IFAyOtZOj7q6HIhgiO6A5pUnaXvsHKKAk5VQcojKjXcmuqYnaQHa5r9unIV6Q6vI 0dIqDgK8C0XzLBwlyI8d3k2QrWkSPovXOx9p64Onl36RZ5qjnl6NvFbVB6e+vHIC8pv1 XTZA== X-Gm-Message-State: AOAM530O/ICW433Kz0PwATH0H5WoffuXdH4I7WXczxr4qncxv0fOPY8n eyAViRYIRvCUIpa8cuGFi2U= X-Google-Smtp-Source: ABdhPJw+m/TvXHGGPvQzQupuQxxwd4K7Etf3vKDDlT4kM+eVlZNAsVhGMNdTKR8LokmD4+h1Z/XAVA== X-Received: by 2002:adf:afe9:: with SMTP id y41mr27749142wrd.56.1589893139398; Tue, 19 May 2020 05:58:59 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id r14sm4349655wmb.2.2020.05.19.05.58.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 05:58:58 -0700 (PDT) From: luca.boccassi@gmail.com To: Ophir Munk Cc: Viacheslav Ovsiienko , dpdk stable Date: Tue, 19 May 2020 13:53:30 +0100 Message-Id: <20200519125804.104349-20-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519125804.104349-1-luca.boccassi@gmail.com> References: <20200519125804.104349-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/mlx5: fix VLAN PCP item calculation' 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 64a38788d1c3c7c7e30ef2b4cce7c32ed8d4af6f Mon Sep 17 00:00:00 2001 From: Ophir Munk Date: Wed, 26 Feb 2020 08:27:48 +0000 Subject: [PATCH] net/mlx5: fix VLAN PCP item calculation [ upstream commit 3c3f27e905792670933fabe577f9653336780688 ] The VLAN 16 bits tci field contains both values of PCP and VID. When extracting any one of them - it is required not to affect the other one. Previous to this commit in routine flow_dev_get_vlan_info_from_items() we calculated the PCP as follows: (1) vlan->vlan_tci &= MLX5DV_FLOW_VLAN_PCP_MASK; (2) vlan->vlan_tci |= <3 bits value of PCP> In line (1) we should have used the negated mask ('~' operator) such that only the PCP bits will be nullified before ORing them with the updated PCP value. Fixes: 9aee7a8418d4 ("net/mlx5: support push flow action on VLAN header") Signed-off-by: Ophir Munk Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_flow_dv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 3694d6dd94..69b17f104e 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -1640,7 +1640,7 @@ flow_dev_get_vlan_info_from_items(const struct rte_flow_item *items, /* Only full match values are accepted */ if ((vlan_m->tci & MLX5DV_FLOW_VLAN_PCP_MASK_BE) == MLX5DV_FLOW_VLAN_PCP_MASK_BE) { - vlan->vlan_tci &= MLX5DV_FLOW_VLAN_PCP_MASK; + vlan->vlan_tci &= ~MLX5DV_FLOW_VLAN_PCP_MASK; vlan->vlan_tci |= rte_be_to_cpu_16(vlan_v->tci & MLX5DV_FLOW_VLAN_PCP_MASK_BE); -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-19 13:56:19.602724239 +0100 +++ 0020-net-mlx5-fix-VLAN-PCP-item-calculation.patch 2020-05-19 13:56:18.191501315 +0100 @@ -1,8 +1,10 @@ -From 3c3f27e905792670933fabe577f9653336780688 Mon Sep 17 00:00:00 2001 +From 64a38788d1c3c7c7e30ef2b4cce7c32ed8d4af6f Mon Sep 17 00:00:00 2001 From: Ophir Munk Date: Wed, 26 Feb 2020 08:27:48 +0000 Subject: [PATCH] net/mlx5: fix VLAN PCP item calculation +[ upstream commit 3c3f27e905792670933fabe577f9653336780688 ] + The VLAN 16 bits tci field contains both values of PCP and VID. When extracting any one of them - it is required not to affect the other one. Previous to this commit in routine flow_dev_get_vlan_info_from_items() @@ -14,7 +16,6 @@ updated PCP value. Fixes: 9aee7a8418d4 ("net/mlx5: support push flow action on VLAN header") -Cc: stable@dpdk.org Signed-off-by: Ophir Munk Acked-by: Viacheslav Ovsiienko @@ -23,10 +24,10 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c -index 06592b5340..2414a97716 100644 +index 3694d6dd94..69b17f104e 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c -@@ -1771,7 +1771,7 @@ flow_dev_get_vlan_info_from_items(const struct rte_flow_item *items, +@@ -1640,7 +1640,7 @@ flow_dev_get_vlan_info_from_items(const struct rte_flow_item *items, /* Only full match values are accepted */ if ((vlan_m->tci & MLX5DV_FLOW_VLAN_PCP_MASK_BE) == MLX5DV_FLOW_VLAN_PCP_MASK_BE) {