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 5FC7DA0093 for ; Tue, 19 May 2020 15:14:00 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 512C91D702; Tue, 19 May 2020 15:14:00 +0200 (CEST) Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by dpdk.org (Postfix) with ESMTP id 6ADFC1D702 for ; Tue, 19 May 2020 15:13:57 +0200 (CEST) Received: by mail-wm1-f67.google.com with SMTP id m185so3504307wme.3 for ; Tue, 19 May 2020 06:13:57 -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=tZkLPEavf03MlGl3F04vO9DBACHOVaWLQyMvlw+/B+k=; b=GDaD7F77aKiiZ/ToyHiSFlpBbbsBrpozgt8hWT6ANvyjHzumFBh6B74A1BszjZkQVx ohZgAWlH02S6LNBjDn5C2UiqhD45w/Ig75OGjTUjPMgDxmTHByJ6PvpWp/3EEQt7zvgx yDNCY02ib5cIwK2jULG8n/1v2t/u/5Q/1vhqBqZlz0uckyj1T5eZiMVh16JWJPMOWSKw ZX3BRmUD8QZPcE3jvpjAtoNLqA/rMo3xrDjZOVsXOD/vyAQ20ls858+O8tpTECEwXyMb zvgBCQpdM3J/SnSBaQQhZ9MzPoK/vuZfgUzt4vxJqqi8sPsf7iJPnxxvxgEjBD9/HKC9 tIfg== 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=tZkLPEavf03MlGl3F04vO9DBACHOVaWLQyMvlw+/B+k=; b=OjWajfmIsMxruaJX6iLccVJzYvJ2voWMzx+AASiownYJrhWBZYVKWyPt8GKh48w0Oz sLGOmn3frm3OZeNvvdMSwQuMBw7e8PT75tZ0U/4WUEXcooM1cQex28F7QWZjKzqH3ZzH zqHUPaYCpOnDsfkzVD2ncpnlujKaBTyj738tmf/nj1UWU1HIOo72TwBvFozoMBjklJcm OULCdU4/YlTwvn3HKrBdpBZyUHntRkxHZUp39DXx7LbGdpl2SY4lsiD5UI2AS3BBh9f5 nbhddY1jFvgzQl/32YbjUxu+04dCupDOWDBaZ8CC20P6xUjt5gXEhAPC8TaRY4CTmDJB PkSw== X-Gm-Message-State: AOAM531bbgyJIoFM8vOXbplnHO6dogEV5VR9wJe8xTxr04GK454DXn0X Ac+a8FOuWYG3MejGhxqMkcXe49ylUuXgg8vK X-Google-Smtp-Source: ABdhPJySMOOCX3alW+LxwxWn9zvkwiH7X4//wSTqX0mKaKT0BrvH19ea2K+O1J1vzBq5YECCItXBGQ== X-Received: by 2002:a05:600c:2dd7:: with SMTP id e23mr5369906wmh.96.1589894037121; Tue, 19 May 2020 06:13:57 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id l12sm23036270wrh.20.2020.05.19.06.13.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 06:13:56 -0700 (PDT) From: luca.boccassi@gmail.com To: Wisam Jaddo Cc: Viacheslav Ovsiienko , dpdk stable Date: Tue, 19 May 2020 14:04:50 +0100 Message-Id: <20200519130549.112823-155-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 VLAN ID check' 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 7e01ad84bf0b9d564ed4d9ff22eeb9552330da15 Mon Sep 17 00:00:00 2001 From: Wisam Jaddo Date: Thu, 30 Apr 2020 08:31:03 +0000 Subject: [PATCH] net/mlx5: fix VLAN ID check [ upstream commit b756f2980718bf2cb1c8f57762f42c656986998d ] All comparison should be done in CPU endianness, otherwise it will not give right results. for example: 255 after converting into RTE_BE16 will be biger than 4096 after converting into RTE_BE16. Fixes: a5f2da0b816b ("net/mlx5: support modify VLAN ID on new VLAN header") Signed-off-by: Wisam Jaddo 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 6cdaa00519..5b6d78c86e 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -1831,7 +1831,7 @@ flow_dv_validate_action_set_vlan_vid(uint64_t item_flags, const struct rte_flow_action *action = actions; const struct rte_flow_action_of_set_vlan_vid *conf = action->conf; - if (conf->vlan_vid > RTE_BE16(0xFFE)) + if (rte_be_to_cpu_16(conf->vlan_vid) > 0xFFE) return rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ACTION, action, "VLAN VID value is too big"); -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-19 14:04:50.775567308 +0100 +++ 0155-net-mlx5-fix-VLAN-ID-check.patch 2020-05-19 14:04:44.492653376 +0100 @@ -1,8 +1,10 @@ -From b756f2980718bf2cb1c8f57762f42c656986998d Mon Sep 17 00:00:00 2001 +From 7e01ad84bf0b9d564ed4d9ff22eeb9552330da15 Mon Sep 17 00:00:00 2001 From: Wisam Jaddo Date: Thu, 30 Apr 2020 08:31:03 +0000 Subject: [PATCH] net/mlx5: fix VLAN ID check +[ upstream commit b756f2980718bf2cb1c8f57762f42c656986998d ] + All comparison should be done in CPU endianness, otherwise it will not give right results. @@ -11,7 +13,6 @@ converting into RTE_BE16. Fixes: a5f2da0b816b ("net/mlx5: support modify VLAN ID on new VLAN header") -Cc: stable@dpdk.org Signed-off-by: Wisam Jaddo Acked-by: Viacheslav Ovsiienko @@ -20,10 +21,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 794afcf18c..8aba5c774a 100644 +index 6cdaa00519..5b6d78c86e 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c -@@ -1965,7 +1965,7 @@ flow_dv_validate_action_set_vlan_vid(uint64_t item_flags, +@@ -1831,7 +1831,7 @@ flow_dv_validate_action_set_vlan_vid(uint64_t item_flags, const struct rte_flow_action *action = actions; const struct rte_flow_action_of_set_vlan_vid *conf = action->conf;