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 991AEA04DD for ; Wed, 28 Oct 2020 11:52:42 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 8BED3C9DA; Wed, 28 Oct 2020 11:52:41 +0100 (CET) Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by dpdk.org (Postfix) with ESMTP id 8B725C9F0 for ; Wed, 28 Oct 2020 11:52:40 +0100 (CET) Received: by mail-wm1-f43.google.com with SMTP id l20so3006442wme.0 for ; Wed, 28 Oct 2020 03:52:40 -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=uk1CzbTtpqmoutplrL+blOcCyUT3pV66dtawKukiWkk=; b=HG9bpKzBVo/5sEdKlaOPypFbJHajfxm/e++vN0QYFfY6gLERY8WCZwQMpMSScsDhOq kNKCfj3y532XcKs7gMTAnMUWba4v0xwPwzHbJxxsyXTFZoi3LNW2moTatKxTizbQYOOB vVuWgRhtzE3KTzj+ZatJY38K29nJe2AoSQOzjMHxwzX3PQ6ipAJ7hMkG38UAxWOWadGQ N1VfLj5luslj+NzNUjCb5iV2fmFFeId7qEfZo1Wvh/SjlqlMaudOkdRbSlXcRjvvLkSc jx64p+uatgrXYWTzaO/VHvblrag8tq1JblwIDLtzdRnc5VO7XcT/cl7zfYF8jpCQV11t 6iQQ== 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=uk1CzbTtpqmoutplrL+blOcCyUT3pV66dtawKukiWkk=; b=LggMXVDVyMbLkubLnw3HkVQMBJTEKAMdTFj9Sz38Gwx7afm5FgJlAX/26iCNozAt6P Za8ULcnUIL+CpnCQpsLP5YF67SgwwphM4tvqrCNpihkTzQm7a1TS2SV2uuVuLuLEgxM3 dHLVEEeGufqH3AVXU3w8alzcLr1SythyYrYYA6KCDMybFQLzQ3D4O8sDGdXjWsFx2XIt DDLFCyMnxnVZ7rZgizVHRPYu+9KMf++yl+AbfExVVomxyd83HnltSmrerMPCsLEXOSuT kUdjQt3SsRmXImFlMXdcax9yf8j91rSEsG5SUsIaPnGK1jYwnca07NxrRwQcAnGkT/pN zxzQ== X-Gm-Message-State: AOAM532Ih/LBxBHURQhWg6hCbemtRJ08TLD2KzHtD+rmfdz+/9XUJKqh ROYPiQ1VGa/25X0N3HpBI60qUhsbnXEqMd58 X-Google-Smtp-Source: ABdhPJx+bx4b+u3NMneJKJjF6kaK5gGheoNGwR4ggkRgdRXxW13vBQL0v0zDA/ZwbYvrXTOoxCqDHg== X-Received: by 2002:a7b:c841:: with SMTP id c1mr5269645wml.31.1603882359291; Wed, 28 Oct 2020 03:52:39 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id d3sm5865127wre.91.2020.10.28.03.52.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Oct 2020 03:52:38 -0700 (PDT) From: luca.boccassi@gmail.com To: Suanming Mou Cc: Viacheslav Ovsiienko , dpdk stable Date: Wed, 28 Oct 2020 10:44:41 +0000 Message-Id: <20201028104606.3504127-122-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201028104606.3504127-1-luca.boccassi@gmail.com> References: <20201028104606.3504127-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/mlx5: fix meter table definitions' 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 10/30/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 1015860cae9b0cc9e57bcc9941f2b00ab815116b Mon Sep 17 00:00:00 2001 From: Suanming Mou Date: Wed, 30 Sep 2020 14:47:01 +0800 Subject: [PATCH] net/mlx5: fix meter table definitions [ upstream commit 3e8f3e51fd930674b5b0a481f35a4914a1a3accb ] As metering and metadata features were developed at the same time. The metering and metadata tables are defined conflicted. This cause the meter suffix flow jump to the same metadata table and cause flow deadloop. Adjust the metering table define to fix that issue. Fixes: 46a5e6bc6a85 ("net/mlx5: prepare meter flow tables") Signed-off-by: Suanming Mou Acked-by: Viacheslav Ovsiienko --- 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 07be509f65..fd66aaf318 100644 --- a/drivers/net/mlx5/mlx5.h +++ b/drivers/net/mlx5/mlx5.h @@ -602,14 +602,14 @@ struct mlx5_flow_tbl_resource { }; #define MLX5_MAX_TABLES UINT16_MAX -#define MLX5_FLOW_TABLE_LEVEL_METER (UINT16_MAX - 3) -#define MLX5_FLOW_TABLE_LEVEL_SUFFIX (UINT16_MAX - 2) #define MLX5_HAIRPIN_TX_TABLE (UINT16_MAX - 1) /* Reserve the last two tables for metadata register copy. */ #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_MAX_TABLES_FDB UINT16_MAX #define MLX5_DBR_SIZE RTE_CACHE_LINE_SIZE -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-10-28 10:35:15.536307889 +0000 +++ 0122-net-mlx5-fix-meter-table-definitions.patch 2020-10-28 10:35:11.680832615 +0000 @@ -1,8 +1,10 @@ -From 3e8f3e51fd930674b5b0a481f35a4914a1a3accb Mon Sep 17 00:00:00 2001 +From 1015860cae9b0cc9e57bcc9941f2b00ab815116b Mon Sep 17 00:00:00 2001 From: Suanming Mou Date: Wed, 30 Sep 2020 14:47:01 +0800 Subject: [PATCH] net/mlx5: fix meter table definitions +[ upstream commit 3e8f3e51fd930674b5b0a481f35a4914a1a3accb ] + As metering and metadata features were developed at the same time. The metering and metadata tables are defined conflicted. @@ -12,7 +14,6 @@ Adjust the metering table define to fix that issue. Fixes: 46a5e6bc6a85 ("net/mlx5: prepare meter flow tables") -Cc: stable@dpdk.org Signed-off-by: Suanming Mou Acked-by: Viacheslav Ovsiienko @@ -21,10 +22,10 @@ 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h -index 43da9a1fb4..bd91e167e0 100644 +index 07be509f65..fd66aaf318 100644 --- a/drivers/net/mlx5/mlx5.h +++ b/drivers/net/mlx5/mlx5.h -@@ -503,14 +503,14 @@ struct mlx5_flow_tbl_resource { +@@ -602,14 +602,14 @@ struct mlx5_flow_tbl_resource { }; #define MLX5_MAX_TABLES UINT16_MAX @@ -40,7 +41,7 @@ +#define MLX5_FLOW_TABLE_LEVEL_SUFFIX (MLX5_MAX_TABLES - 3) #define MLX5_MAX_TABLES_FDB UINT16_MAX - /* ID generation structure. */ + #define MLX5_DBR_SIZE RTE_CACHE_LINE_SIZE -- 2.20.1