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 F12A8A051C for ; Tue, 11 Feb 2020 12:40:45 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E90151BFA7; Tue, 11 Feb 2020 12:40:45 +0100 (CET) Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by dpdk.org (Postfix) with ESMTP id 824071BFE4 for ; Tue, 11 Feb 2020 12:40:44 +0100 (CET) Received: by mail-wm1-f65.google.com with SMTP id p9so3097761wmc.2 for ; Tue, 11 Feb 2020 03:40:44 -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=+LeHmt5rZyFd+rrYor61yzoPb/Y5yBzflOvcnYFKdr8=; b=HAwJmKIF6yVNbXzQ/l/tfNqdtP4aifopOukJ9xTFcZPUR0mGi5FHkOQQLytx3qys/u 5YAJqyyIknq4YpebR4UUtSLrEKWBY0O0HfwZ7LmCxybdxM8NvtJpDEmfycwTkoDz0yH3 NsJ7GP5kWq8thtmNZndP24ha1GXsErhJPd4L4tcDJ1yuXyPggncdqbPu48xtzJnfBCDm i4FVDmg+ygAKzMKw9ZRdwUwo5v2lVl4VbErK5eINxQbuveTZ/y2NQaXty4OcEc5+jQ5t TjQqXOBxYHvfsV5MwWM0hwOkcA7XTaDTVRCWagLXRmxTK4QAWgQ6OBg9DlE40dZv6aii b57g== 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=+LeHmt5rZyFd+rrYor61yzoPb/Y5yBzflOvcnYFKdr8=; b=XkfGsgqEgxE1Zo9cV49AO4ZokGkJkXXCnhXLMA/Wbt+r8KQqZnLeAetrnK+0VfeTH8 sDaMv2TfHepykBMzMcKo2dZ0UnISMIvlv+Zq53BDgHKVqse+e2r88lBSm/3Gvar7CxNk LB7S7FvYJ/x2DBsRsHB3VvUSVYYJ/7Wdioj7PKvGwjjOO3V/a+EVY0/Zo+qcpQh9m5Fc ecTCrxM2/QbElhkAX4amJ7MAdRfKxVMDFhPCNGtTKWOynI+TpEPpYoJ90pZX0AK+UvbY X4VJD0vtTkwTFgaU9bLwnrI4EU1aqMviL/EtCoWDrrvsZ0b8I5/ua4XatacBO91qRA8g DcNQ== X-Gm-Message-State: APjAAAW8uQQHOF14iFYeGqMkOx2tFBYwf7iXqsDE2XZXETVoGT+U2q7i 3viy9TZPexjNBmEk7DpH9G/TDG72vQU= X-Google-Smtp-Source: APXvYqyGVZbW3zskbH8iSXaslm8neOS8kksHmU1U4MwX5/q0ZJK58FuhkRcw6uwu59G4EKLqRmX7IQ== X-Received: by 2002:a1c:770e:: with SMTP id t14mr5180830wmi.101.1581421243243; Tue, 11 Feb 2020 03:40:43 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id n10sm5001088wrt.14.2020.02.11.03.40.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Feb 2020 03:40:42 -0800 (PST) From: luca.boccassi@gmail.com To: Dekel Peled Cc: Ori Kam , Viacheslav Ovsiienko , dpdk stable Date: Tue, 11 Feb 2020 11:21:34 +0000 Message-Id: <20200211112216.3929-148-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: block push VLAN action on Rx' 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 155b81d550e03c0fd785083d6e959887d2c882f0 Mon Sep 17 00:00:00 2001 From: Dekel Peled Date: Wed, 22 Jan 2020 16:27:18 +0200 Subject: [PATCH] net/mlx5: block push VLAN action on Rx [ upstream commit 55060e62e4d2802b963fb00a45efc31ae1f8aca0 ] Add missing check in validation function of 'push VLAN' action. Action is not allowed for ingress flow rules. 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 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 7aedfa903b..c189a4d919 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -1612,6 +1612,12 @@ flow_dv_validate_action_push_vlan(uint64_t action_flags, { const struct rte_flow_action_of_push_vlan *push_vlan = action->conf; + if (attr->ingress) + return rte_flow_error_set(error, ENOTSUP, + RTE_FLOW_ERROR_TYPE_ATTR_INGRESS, + NULL, + "push VLAN action not supported for " + "ingress"); if (push_vlan->ethertype != RTE_BE16(RTE_ETHER_TYPE_VLAN) && push_vlan->ethertype != RTE_BE16(RTE_ETHER_TYPE_QINQ)) return rte_flow_error_set(error, EINVAL, -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-02-11 11:17:43.779025848 +0000 +++ 0148-net-mlx5-block-push-VLAN-action-on-Rx.patch 2020-02-11 11:17:38.684006657 +0000 @@ -1,13 +1,14 @@ -From 55060e62e4d2802b963fb00a45efc31ae1f8aca0 Mon Sep 17 00:00:00 2001 +From 155b81d550e03c0fd785083d6e959887d2c882f0 Mon Sep 17 00:00:00 2001 From: Dekel Peled Date: Wed, 22 Jan 2020 16:27:18 +0200 Subject: [PATCH] net/mlx5: block push VLAN action on Rx +[ upstream commit 55060e62e4d2802b963fb00a45efc31ae1f8aca0 ] + Add missing check in validation function of 'push VLAN' action. Action is not allowed for ingress flow rules. Fixes: 9aee7a8418d4 ("net/mlx5: support push flow action on VLAN header") -Cc: stable@dpdk.org Signed-off-by: Dekel Peled Acked-by: Ori Kam @@ -17,10 +18,10 @@ 1 file changed, 6 insertions(+) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c -index b0d5688b29..1ed677ff21 100644 +index 7aedfa903b..c189a4d919 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c -@@ -1741,6 +1741,12 @@ flow_dv_validate_action_push_vlan(uint64_t action_flags, +@@ -1612,6 +1612,12 @@ flow_dv_validate_action_push_vlan(uint64_t action_flags, { const struct rte_flow_action_of_push_vlan *push_vlan = action->conf;