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 E63FBA04DB for ; Tue, 17 Nov 2020 12:15:35 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E056958C4; Tue, 17 Nov 2020 12:15:34 +0100 (CET) Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by dpdk.org (Postfix) with ESMTP id 7C34758C4 for ; Tue, 17 Nov 2020 12:15:34 +0100 (CET) Received: by mail-wr1-f49.google.com with SMTP id m6so5582462wrg.7 for ; Tue, 17 Nov 2020 03:15:34 -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=3p7leqa5HeKAR2xF1LsnUMyASOrs7n+c1qTU803dxRw=; b=ro527ybm9JQ73v10CP/d+yVGM0RDRpJjriumIYy7t89OdNq+dzvkLwcLm833MrJke8 HS0Qzxnv7aDJUTLophCCdhyvh6kTCEna1+QuTnk/P/3DaZG+gf9fIBEYCiXzGvUewyvb 5buOjrPKU4jN7h2eKf0Rhd4lQaCgCdVybhnaWkiFMS2GnAoU1CypLmsFJ901/L9gDV0z ngQGlpn41PnDxMLO1+AitoIcC0n/kk5PNMr/XEVvkxYHpl+WBKH8aCj4fQHGLgTTR1Pz FSeEaDsuPTTqV04BQUxZp6QfJK3Zp8laRjR5f6j35g1nYNXHvpAu35Ivyz1qtDng22XC ZdAg== 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=3p7leqa5HeKAR2xF1LsnUMyASOrs7n+c1qTU803dxRw=; b=lZNjYy6SSTF0C/tmpZzy7fAOxK4wFwCUl+EM1iOWo3BCP8fwuWarMNt2JlTVoxFLp+ hiJHvh7RO44sF02PGORuYtH8m2UySaf+ZSaDOeimIOd89UW6+GQLtY8zVitql+ZNit1p y8FZGwd4x473h5UqSA8sHqaoDSmVoU4yqQRyB7R/J+LeTmrVXs2zPuUQNHes4gPxBrDz t7DB9e5y23tB73mmOQSsfxREUzQI5NuLEh38VKnnkWg9TVm/g12Oo06/pF14QWTHHpkA jWZ5uDNuB9PdJ+nTC9xulDAmzlHZCBjopcgHtxEi80Ng4IwyyJ6WbLcgjSyM200NSJgx JlAQ== X-Gm-Message-State: AOAM531gKjxNaFcyVME5OHkGBqaaRxw6YW6YO6+B0JSsOJ5L21uNJe5B 6nebz7/3mEkvhNjoAs8BBnDF8MFfhrR8VHY+ X-Google-Smtp-Source: ABdhPJzHKe6MBrUKnknA1LWWLY0qWCJQ/dpF4D8w0zjx4UoDal2LsawBG4snuOgvaHZidPBdQcJITA== X-Received: by 2002:a5d:6411:: with SMTP id z17mr24882394wru.112.1605611733290; Tue, 17 Nov 2020 03:15:33 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id i10sm27242053wrs.22.2020.11.17.03.15.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Nov 2020 03:15:32 -0800 (PST) From: luca.boccassi@gmail.com To: Xueming Li Cc: Suanming Mou , Matan Azrad , dpdk stable Date: Tue, 17 Nov 2020 11:13:57 +0000 Message-Id: <20201117111416.1961049-23-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201117111416.1961049-1-luca.boccassi@gmail.com> References: <20201109185030.3478760-2-luca.boccassi@gmail.com> <20201117111416.1961049-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/mlx5: fix missing meter packet' has been queued to stable release 19.11.6 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.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/19/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. Queued patches are on a temporary branch at: https://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/bfaad169296d556ef4b46e96f92c68e4755b16c4 Thanks. Luca Boccassi --- >From bfaad169296d556ef4b46e96f92c68e4755b16c4 Mon Sep 17 00:00:00 2001 From: Xueming Li Date: Tue, 3 Nov 2020 11:01:39 +0000 Subject: [PATCH] net/mlx5: fix missing meter packet [ upstream commit c3ba8ecb767f0d34c792c82a92c378195f3530b4 ] For transfer flow with meter, packet was passed without applying flow action. The group level was multiplied by 10 for group level 65531. This patch fixes this issue by correcting suffix table group level calculation. Fixes: 3e8f3e51fd93 ("net/mlx5: fix meter table definitions") Signed-off-by: Xueming Li Reviewed-by: Suanming Mou Acked-by: Matan Azrad --- drivers/net/mlx5/mlx5.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h index 2f76d162cf..d2e4f446f4 100644 --- a/drivers/net/mlx5/mlx5.h +++ b/drivers/net/mlx5/mlx5.h @@ -607,9 +607,9 @@ struct mlx5_flow_tbl_resource { #define MLX5_FLOW_MREG_ACT_TABLE_GROUP (MLX5_MAX_TABLES - 1) #define MLX5_FLOW_MREG_CP_TABLE_GROUP (MLX5_MAX_TABLES - 2) /* Tables for metering splits should be added here. */ -#define MLX5_MAX_TABLES_EXTERNAL (MLX5_MAX_TABLES - 3) -#define MLX5_FLOW_TABLE_LEVEL_METER (MLX5_MAX_TABLES - 4) #define MLX5_FLOW_TABLE_LEVEL_SUFFIX (MLX5_MAX_TABLES - 3) +#define MLX5_FLOW_TABLE_LEVEL_METER (MLX5_MAX_TABLES - 4) +#define MLX5_MAX_TABLES_EXTERNAL MLX5_FLOW_TABLE_LEVEL_METER #define MLX5_MAX_TABLES_FDB UINT16_MAX #define MLX5_DBR_SIZE RTE_CACHE_LINE_SIZE -- 2.27.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-17 11:13:13.959413587 +0000 +++ 0023-net-mlx5-fix-missing-meter-packet.patch 2020-11-17 11:13:12.917116528 +0000 @@ -1 +1 @@ -From c3ba8ecb767f0d34c792c82a92c378195f3530b4 Mon Sep 17 00:00:00 2001 +From bfaad169296d556ef4b46e96f92c68e4755b16c4 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit c3ba8ecb767f0d34c792c82a92c378195f3530b4 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index 9a87800112..ed791c8565 100644 +index 2f76d162cf..d2e4f446f4 100644 @@ -26 +27 @@ -@@ -611,9 +611,9 @@ struct mlx5_flow_tbl_resource { +@@ -607,9 +607,9 @@ struct mlx5_flow_tbl_resource { @@ -36 +36,0 @@ - #define MLX5_FLOW_TABLE_FACTOR 10 @@ -37,0 +38 @@ + #define MLX5_DBR_SIZE RTE_CACHE_LINE_SIZE