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 0A1B2A0093 for ; Tue, 19 May 2020 14:59:46 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id F28DD1D61F; Tue, 19 May 2020 14:59:45 +0200 (CEST) Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by dpdk.org (Postfix) with ESMTP id 9A2841D5DE for ; Tue, 19 May 2020 14:59:44 +0200 (CEST) Received: by mail-wr1-f65.google.com with SMTP id k13so13718438wrx.3 for ; Tue, 19 May 2020 05:59: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=Vvt1U/jPx3hg/balXVukhvKQqoSL40r2W4kD4y2yqEA=; b=UZQkknlIEH9ygHv2Kec9Ghntj48f33EooUmO8P6P2wCYVEzuDf50S8rpglxjNDGtwm C7X2xkM9Mbf5d1Delx9EOgWFZLYBcSLJfYfED6lQRpDxdJqeCun+LdsFZ/ii42K37uSU KdXbIQkqiptUCN51wUZ6HC8oRdD7AwZwWE3e55bByXNnS9vI9P6qw1cuIlWH+vL4jQV6 1CrJZ9gYQtxzkWdfGu802k3DNSjlpwNpqZUjZal2ez0VazTJ+stSDifKeIriUoYA9YLw PDPBlY6xcFAZG7cfBxBf+hHSg6LaaSqznZcrv9/+B9Az2YGCe49fcZFEV967dpUonnmV JT9g== 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=Vvt1U/jPx3hg/balXVukhvKQqoSL40r2W4kD4y2yqEA=; b=fm4too/Gnus7kRezICYcSZr9t1TDwde3IJuQonON0e6gFnAVeVj8LjTIZzZKxLD+Pj SczV5s07cZ+aM9aBHUpSGINEd4hRmnRoQbpx7vYtacbK6xudsyXzgMg0cJ6/DrB3o7WD +ZG3EG91k+Las4Zx5OBtNdBGIPKdW73Ohq9IUhyaZCCMwLrJvgVaVJxLT3T3G1BHkhFT +fNy15/XvT5xjrD2ssZmSgcSkg+ZJHsz4M/8Tf3EHtEn7qCE8/9SwTK6SqMTQFX8ynPd gm+p702gjRrYJ7SeWxefcOSyIurYbZ39dcB23LgeYjYi9JxF+M2aqFO2HsfYLUfSVf6x YDGg== X-Gm-Message-State: AOAM533HZBvmZVegCd7KtOmT9hS2EKslftRG1OgajiBKIB1jvsWOoaaY gfr2LnL/7F35/vHcxSuqQ0yApff932bqCDbB X-Google-Smtp-Source: ABdhPJxtOYgSQNTDe7XZ/ckjV04jYkyNFmE7wwK2bouIIfhfog1f3mEU8mbQofddRe0Q+hN0ZuhqOQ== X-Received: by 2002:a5d:684f:: with SMTP id o15mr25080815wrw.89.1589893184275; Tue, 19 May 2020 05:59:44 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id m23sm3933094wmg.45.2020.05.19.05.59.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 05:59:43 -0700 (PDT) From: luca.boccassi@gmail.com To: Wisam Jaddo Cc: Viacheslav Ovsiienko , dpdk stable Date: Tue, 19 May 2020 13:53:54 +0100 Message-Id: <20200519125804.104349-44-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 zero metadata action' 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 75457cff3fc1dd00e29f44c37ef3d24a8fc149b3 Mon Sep 17 00:00:00 2001 From: Wisam Jaddo Date: Thu, 12 Mar 2020 11:24:40 +0200 Subject: [PATCH] net/mlx5: fix zero metadata action [ upstream commit 85e26044cb8da437428dcf3a0755ceb1cdd38426 ] There is no reason to prevent the user from using zero metadata, it indeed means no metadata, but sometimes the user may need to report to datapath that there is no metadata anymore, which is valid case. Fixes: fcc8d2f716fd ("net/mlx5: extend flow metadata support") Signed-off-by: Wisam Jaddo Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_flow_dv.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 69b17f104e..868d01438d 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -1978,10 +1978,6 @@ flow_dv_validate_action_set_meta(struct rte_eth_dev *dev, return rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ACTION, action, "meta data must be within reg C0"); - if (!(conf->data & conf->mask)) - return rte_flow_error_set(error, EINVAL, - RTE_FLOW_ERROR_TYPE_ACTION, action, - "zero value has no effect"); return 0; } -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-19 13:56:20.631901907 +0100 +++ 0044-net-mlx5-fix-zero-metadata-action.patch 2020-05-19 13:56:18.259502539 +0100 @@ -1,15 +1,16 @@ -From 85e26044cb8da437428dcf3a0755ceb1cdd38426 Mon Sep 17 00:00:00 2001 +From 75457cff3fc1dd00e29f44c37ef3d24a8fc149b3 Mon Sep 17 00:00:00 2001 From: Wisam Jaddo Date: Thu, 12 Mar 2020 11:24:40 +0200 Subject: [PATCH] net/mlx5: fix zero metadata action +[ upstream commit 85e26044cb8da437428dcf3a0755ceb1cdd38426 ] + There is no reason to prevent the user from using zero metadata, it indeed means no metadata, but sometimes the user may need to report to datapath that there is no metadata anymore, which is valid case. Fixes: fcc8d2f716fd ("net/mlx5: extend flow metadata support") -Cc: stable@dpdk.org Signed-off-by: Wisam Jaddo Acked-by: Viacheslav Ovsiienko @@ -18,10 +19,10 @@ 1 file changed, 4 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c -index e7278f0b3f..e2d6690fa8 100644 +index 69b17f104e..868d01438d 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c -@@ -2109,10 +2109,6 @@ flow_dv_validate_action_set_meta(struct rte_eth_dev *dev, +@@ -1978,10 +1978,6 @@ flow_dv_validate_action_set_meta(struct rte_eth_dev *dev, return rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ACTION, action, "meta data must be within reg C0");