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 CF255A051C for ; Tue, 11 Feb 2020 12:40:40 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id C57F71BFA7; Tue, 11 Feb 2020 12:40:40 +0100 (CET) Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by dpdk.org (Postfix) with ESMTP id 82C451BFAE for ; Tue, 11 Feb 2020 12:40:39 +0100 (CET) Received: by mail-wr1-f65.google.com with SMTP id m16so11907242wrx.11 for ; Tue, 11 Feb 2020 03:40:39 -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=eiygp7p4LD7kXKoHR/ugeI289pzSvyVmAnTwFf2GEcw=; b=VK3PUMqxIzqSvPasIpvdbEl48dRu8TSkfgkBwAjbQQlwSZCw9N2cJxSdxF/jfvkt+/ 5RHRs12JC2n7vaIk4yz2F9ruFxoumfISuRc6bj5vjrFbUTSNjpJhbAeY+bOpkCoSlm4c 88CcfYycz7BAjRCj1whdcsL/1g6HavqT4EB4NQGVE/0KZdgPX8Qa45fm4gK//CiuM5Sb HWKJ4mMmRho2X1Wo5eshaL/fUV5NHLECFIbJ9llFAPoLHC3ENwmziSjYFsUs9AXNHyW3 5FCDnSqP2GwzsvaS3Hc/oDuf9iha7qbYo072quL9hfZlVKvoVOA9MlB87H2jJ3Scl8go Xvrg== 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=eiygp7p4LD7kXKoHR/ugeI289pzSvyVmAnTwFf2GEcw=; b=i1M+2qRLoRxItlW3GVpuNErXUkVMsqdPMCNMfu2Jo93WG+kZhIG4QadGvglUIDhVcV 4ftXOuqYnfPm0nwEveOQWrAMohP+i/F4QSIA/VlHfFOsYAX91Bsq9fhvPFzDr5p/brYy IqW2crtyoPF7n9egX31SKyu7ozvNMvntnDv1AYZcoQ1WdjHSqtQkV1+DUBaYfsDOO+bb 3cKLKDAX0Qx3NsHwBbn/d1V2wz+eOLk2ebz8ICAcQ5iyDwp6AxcmPOm1267hQiXBspzx Pl/fTmUv4Btm9ZbDuPOeC6X6km3b4k0/C3Pr9Di/uLAfIkkTRLz/ZLJSyWwBiCE1Uy/R A9sw== X-Gm-Message-State: APjAAAVPOrWF6WxcKjN9BdhrzF/gOTvXS1ifEb7vEVU5kiAQ0mjICbnq pV8IOV3pv7iG+XUd6VqP5jw= X-Google-Smtp-Source: APXvYqyGHUZl1mwg5kBcf3GaSYcjmJcew+OqiVjG0hepG258c+4jpceoSGRQWn5liMZAA6HEpDx97g== X-Received: by 2002:adf:f707:: with SMTP id r7mr7923134wrp.194.1581421239171; Tue, 11 Feb 2020 03:40:39 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id b10sm5117360wrt.90.2020.02.11.03.40.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Feb 2020 03:40:38 -0800 (PST) From: luca.boccassi@gmail.com To: Dekel Peled Cc: Ori Kam , Viacheslav Ovsiienko , dpdk stable Date: Tue, 11 Feb 2020 11:21:32 +0000 Message-Id: <20200211112216.3929-146-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200211112216.3929-1-luca.boccassi@gmail.com> References: <20200211112216.3929-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/mlx5: fix bit mask to validate push VLAN' has been queued to stable release 19.11.1 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.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/13/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 4808455f2a4652a52e32526e4c251c88843535d2 Mon Sep 17 00:00:00 2001 From: Dekel Peled Date: Wed, 22 Jan 2020 16:27:15 +0200 Subject: [PATCH] net/mlx5: fix bit mask to validate push VLAN [ upstream commit 82e4aca2caa011c85911615dc38e17da86c5a184 ] Validation function of 'push VLAN' action uses (POP_VLAN or PUSH_VLAN) actions flags, instead of using a mask of both flags. This patch replaces it to use existing VLAN_ACTIONS mask. Fixes: 9aee7a8418d4 ("net/mlx5: support push flow action on VLAN header") Signed-off-by: Dekel Peled Acked-by: Ori Kam Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_flow_dv.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 8a5aea0603..155e12b534 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -1617,8 +1617,7 @@ flow_dv_validate_action_push_vlan(uint64_t action_flags, return rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ACTION, action, "invalid vlan ethertype"); - if (action_flags & - (MLX5_FLOW_ACTION_OF_POP_VLAN | MLX5_FLOW_ACTION_OF_PUSH_VLAN)) + if (action_flags & MLX5_FLOW_VLAN_ACTIONS) return rte_flow_error_set(error, ENOTSUP, RTE_FLOW_ERROR_TYPE_ACTION, action, "no support for multiple VLAN " -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-02-11 11:17:43.710337999 +0000 +++ 0146-net-mlx5-fix-bit-mask-to-validate-push-VLAN.patch 2020-02-11 11:17:38.672006433 +0000 @@ -1,15 +1,16 @@ -From 82e4aca2caa011c85911615dc38e17da86c5a184 Mon Sep 17 00:00:00 2001 +From 4808455f2a4652a52e32526e4c251c88843535d2 Mon Sep 17 00:00:00 2001 From: Dekel Peled Date: Wed, 22 Jan 2020 16:27:15 +0200 Subject: [PATCH] net/mlx5: fix bit mask to validate push VLAN +[ upstream commit 82e4aca2caa011c85911615dc38e17da86c5a184 ] + Validation function of 'push VLAN' action uses (POP_VLAN or PUSH_VLAN) actions flags, instead of using a mask of both flags. This patch replaces it to use existing VLAN_ACTIONS mask. Fixes: 9aee7a8418d4 ("net/mlx5: support push flow action on VLAN header") -Cc: stable@dpdk.org Signed-off-by: Dekel Peled Acked-by: Ori Kam @@ -19,10 +20,10 @@ 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c -index afa3d0e1ce..d7176c80ef 100644 +index 8a5aea0603..155e12b534 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c -@@ -1746,8 +1746,7 @@ flow_dv_validate_action_push_vlan(uint64_t action_flags, +@@ -1617,8 +1617,7 @@ flow_dv_validate_action_push_vlan(uint64_t action_flags, return rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ACTION, action, "invalid vlan ethertype");