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 635BFA051C for ; Tue, 11 Feb 2020 12:31:15 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 5B6C35B3C; Tue, 11 Feb 2020 12:31:15 +0100 (CET) Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by dpdk.org (Postfix) with ESMTP id B166E5B3C for ; Tue, 11 Feb 2020 12:31:14 +0100 (CET) Received: by mail-wr1-f66.google.com with SMTP id z7so11848407wrl.13 for ; Tue, 11 Feb 2020 03:31:14 -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=CQIqFYXB1BoVYedMSeotXm4UWKT8sA+yRJBrI+UacmU=; b=T2dmH9YHHxjoFYjH9x9VfEb4eAMVlxKNCiurltsBQFJk6AfyHSd65GQ7lIP3bu8YeC arda6JJoJpxD1b7poGBOAQ2cUTYwjLL0IpcPNQI1WwCATNvaP6HiaeqFBfv9PSSgySar SL+JA0/wrZr0eIUwFeuqFZX+d8TyIwbVpzSr8mc1J7PIwGzFfY8qJ49lKTlk1xgL3Uhs RJtlg8WkF0SviZxvGYIMW0WwVVfcD9d74aCHZ7aPnZi7uSYEeAyVe3iDLVkY6mPe8mf+ Y1gyVzDZZUTYKqJLep6ojuDP06DhHCzgmLq31UKvCw61/Ecw4ZWCMdmBMGJBRRkTKG8x cNdQ== 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=CQIqFYXB1BoVYedMSeotXm4UWKT8sA+yRJBrI+UacmU=; b=RxX0HjWUKYRyJjam8ljc8R82RmGI+hQQ2KeXfDjYjhja3WbVgwSSao+XtpaYrEIWSv 0XzlUARFo9mLqLxmdFYTJbLNmLabzwwtD0pKB6wNMyS8xIUtT4FxIM13fIyzov8gOaaJ lR3ZSrG+GFjAcgYddWE4bJ4kP1Rodp3kDgt1oG/WVGz6/LsbActI4Yaf7oT44B1g5QkD VGea8o5DEWgz7KIzjSW6YzFwz0glwf9nIDEs0Kqkuq2OXIr0aWOrugNxOReHrHM0AEbS 4zr/5kGaBf2ZixBwi8mci6BFXyABbeSVTDgkRbZeMpWjTd36PfODVsVJtfiD+WFVYqvU 2lqg== X-Gm-Message-State: APjAAAX6f9DFCU/JyTqkEm2BRdo+P+4+TLNNtOy8SKPBPK5dr1V+2sPI iBDl74bHAdW1+ruUKae3tbs= X-Google-Smtp-Source: APXvYqwjGg0L+wxPvbfq/73rr9gtpf9OtUpCFn+k/fSAf34Ww/omyhi3P3ofU7IIyVQNNmIeyiHM4w== X-Received: by 2002:a5d:4d0a:: with SMTP id z10mr8041750wrt.253.1581420674461; Tue, 11 Feb 2020 03:31:14 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id t9sm5055221wrv.63.2020.02.11.03.31.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Feb 2020 03:31:13 -0800 (PST) From: luca.boccassi@gmail.com To: Suanming Mou Cc: Tonghao Zhang , Viacheslav Ovsiienko , dpdk stable Date: Tue, 11 Feb 2020 11:21:07 +0000 Message-Id: <20200211112216.3929-121-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 meter suffix flow' 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 b2ea9821e4f81333fab8b75e82bc818e3316fc95 Mon Sep 17 00:00:00 2001 From: Suanming Mou Date: Wed, 8 Jan 2020 12:41:09 +0200 Subject: [PATCH] net/mlx5: fix meter suffix flow [ upstream commit 64927f72a72fad39898b084e0cf66cc97b40959f ] The meter suffix flow item pointer restore is not correct to decrease a fixed value. The incorrect operation will cause incorrect match to the meter suffix flow, the flow create will fail once the magic number in the wrong offset memory start with RTE_FLOW_ITEM_TYPE_END. The pointer should decrease the real offset it increases. Set the decrease value to the real offset the pointer increases to fix the issue. Fixes: 9ea9b049a960 ("net/mlx5: split meter flow") Reported-by: Tonghao Zhang Signed-off-by: Suanming Mou Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_flow.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index 008716367c..e4c661d7ca 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -4025,7 +4025,7 @@ flow_create_split_meter(struct rte_eth_dev *dev, sfx_items++; } sfx_items->type = RTE_FLOW_ITEM_TYPE_END; - sfx_items -= METER_SUFFIX_ITEM; + sfx_items -= sfx_port_id_item ? 2 : 1; /* Setting the sfx group atrr. */ sfx_attr.group = sfx_attr.transfer ? (MLX5_FLOW_TABLE_LEVEL_SUFFIX - 1) : -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-02-11 11:17:42.963048673 +0000 +++ 0121-net-mlx5-fix-meter-suffix-flow.patch 2020-02-11 11:17:38.604005161 +0000 @@ -1,8 +1,10 @@ -From 64927f72a72fad39898b084e0cf66cc97b40959f Mon Sep 17 00:00:00 2001 +From b2ea9821e4f81333fab8b75e82bc818e3316fc95 Mon Sep 17 00:00:00 2001 From: Suanming Mou Date: Wed, 8 Jan 2020 12:41:09 +0200 Subject: [PATCH] net/mlx5: fix meter suffix flow +[ upstream commit 64927f72a72fad39898b084e0cf66cc97b40959f ] + The meter suffix flow item pointer restore is not correct to decrease a fixed value. The incorrect operation will cause incorrect match to the meter suffix flow, the flow create will fail once the magic number @@ -13,7 +15,6 @@ the issue. Fixes: 9ea9b049a960 ("net/mlx5: split meter flow") -Cc: stable@dpdk.org Reported-by: Tonghao Zhang Signed-off-by: Suanming Mou @@ -23,10 +24,10 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c -index bb1f1f16a1..970123bf11 100644 +index 008716367c..e4c661d7ca 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c -@@ -4042,7 +4042,7 @@ flow_create_split_meter(struct rte_eth_dev *dev, +@@ -4025,7 +4025,7 @@ flow_create_split_meter(struct rte_eth_dev *dev, sfx_items++; } sfx_items->type = RTE_FLOW_ITEM_TYPE_END;