From patchwork Wed May 5 07:19:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bing Zhao X-Patchwork-Id: 92836 X-Patchwork-Delegate: rasland@nvidia.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id F06EDA0524; Wed, 5 May 2021 09:19:56 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1C1FF41106; Wed, 5 May 2021 09:19:43 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2050.outbound.protection.outlook.com [40.107.92.50]) by mails.dpdk.org (Postfix) with ESMTP id 1B32E41103 for ; Wed, 5 May 2021 09:19:42 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QQb9PrRH4UiT7fcdAe8x40WC7WOEcDNPIQNQVU9awsPj/XX0CpFWTx8Gd5HXhwMHDIPkNbrZXdD/Iyt/q1pDzCMHLxBTHablG4OvDZ5rEmsNmx/glXH2bHheU+fpujk9jscGtSPq8pgHEYGYEQa38FQsHqfFzaQSNfSeCwPpz0s1uSLmB6xzOoJMAW6lqrQ8Ebc2gd/iE2hxD87boc3b5dcNZjfa1xXb8PZVn2rvGt6k2lMTq2Dn/HZcvvHIRM03puVw8EKDp/LhQ0d/R/qD/lf9HD2HB3+YMIFiNCV3wXD4u3vjDkO/kOv83VuoPWL3LG9bD9dURbJxMFtMf8c0JQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=2FK0/1KxerV6cw/RCgHB3vba0k9gbpGt1R7p3VOsSr8=; b=VYrIXsPLXbYXNlGJ/dPUujTqDlKNjDuplfCnGZ+8aShD9wIyCDqlOkhIht25w2u2iuAx7CZjX0ED1wneMIPxezbvQ9TKJGJi+wsNsF6/nXbr+JHdqZ1ai9S1SLz6WZLMaephLz7XDrCW+p1zwp23q0l6AVwjKQr7cSzT4LA7BkLlDRo0AizqFYUN7OAFnUEoCed45VJc+tkUcjmryhWQQZNsJtl+MO+5eDbWJ2IKgWgYaZHfj31M5zlGF9cqSyRnfhFdqJGJG/upQAcmnK1ErGRBXsJbT0nQSYG1Nl44LnXEwetyqvixZBzePVwDVUZPXZnHAmbSFYLGkFRZLUnIPQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=2FK0/1KxerV6cw/RCgHB3vba0k9gbpGt1R7p3VOsSr8=; b=Mz3FeD+XHrhpEsqPSFi3ew3OP1zeDc0a4bfbh7jzzccrYA+DVDfrB4xU+KfAlvLyo4723RcVYwN8KXZd0Qseryd0Ivrx1toWALpIyIlToCjTyBJpZA8mfK532Mfs6jiNw0OYkVUj3otcZEZEGOtLU2/pipXXMMidCdf1SpF7Nla3ssjcU0/dhIa0bkRGbKL4XleOelD02/y+EwQzuVq769ZvyqwR25wWgT20IrPwUw6wKPRxyJvuRsdziiDrjUbOrmgDA1kMaA0PCZjWCnespLqtvJAuhEmr5Z3l+sLTEQwATHrqgWNkN+76G+iX7a9Ue262IBWe01hDmdS0yDy6BA== Received: from DM5PR16CA0018.namprd16.prod.outlook.com (2603:10b6:3:c0::28) by DM6PR12MB3049.namprd12.prod.outlook.com (2603:10b6:5:11d::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4087.44; Wed, 5 May 2021 07:19:40 +0000 Received: from DM6NAM11FT023.eop-nam11.prod.protection.outlook.com (2603:10b6:3:c0:cafe::e2) by DM5PR16CA0018.outlook.office365.com (2603:10b6:3:c0::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Wed, 5 May 2021 07:19:40 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; dpdk.org; dkim=none (message not signed) header.d=none;dpdk.org; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by DM6NAM11FT023.mail.protection.outlook.com (10.13.173.96) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4108.25 via Frontend Transport; Wed, 5 May 2021 07:19:40 +0000 Received: from nvidia.com (172.20.145.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Wed, 5 May 2021 07:19:37 +0000 From: Bing Zhao To: , , CC: , , Date: Wed, 5 May 2021 10:19:03 +0300 Message-ID: <20210505071917.31802-4-bingz@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210505071917.31802-1-bingz@nvidia.com> References: <20210427153811.11554-1-bingz@nvidia.com> <20210505071917.31802-1-bingz@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.145.6] X-ClientProxiedBy: HQMAIL105.nvidia.com (172.20.187.12) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: fb7d6cb5-3dc5-4c8b-a4df-08d90f9625ae X-MS-TrafficTypeDiagnostic: DM6PR12MB3049: X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6108; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: c2BsJZE7M+B3sJbBpe+fmgb4N3DJb83RSYaKU8cPLbyESf8xhFHlzOVib8E2Zi7kzLUSi5iUJFCVJIC/r2CLkwjfWuP1JoabKzDBhHnMFfmZ/fQiygkvlv9jCUcn+hGBD5SbWQ9wYWv+9YWCOIfhd/vPULCUXb5A9bIo6ZT4Cp3QV/g8jakX1VGMJYnYkIM3r3vr6UQ+cyawGbUOooJQ9R8ZmHtoyUPhZNo/mq34Z7Gm1Dl8PgTvFok5ruN3J8QedJxfLPY4bSEPtyr17HbhhqflaiBI069iGoQrcHntYbAqrSLKZWMnY4M+cKnbTtB9CPEsN6x3mIusqrUF2WrXU9pUeF0phqALbMwwLrVxMUEX7ONC1Hjnsg5wBiCByw4r3g7ULI9l6OJYB4Npwck/RUo8msDUzNLAbwieixut0QeLfKvL4tbyDVS4vnfthpP/W3YjSwArDIm1KlGm2lnGCZEehUmKXbE7EeO1T8yZLM9sjqYI/FwtCVcPndOZJDzljhAbHyAjdj4QuvEKgeuxD5bTF6brzcp5JKmAf6TTztVTyOWF5qnZf0gfP9H8eYD7H9hZmmvPFHfyiG4PkLyBGGjjh2Y0BQe0GSzAp+mO8m4YXjjnbow1G6o34bNKLVWal4DNmNNkxHOgKdBxZEm8BunSHfijTnH19QyFzc1tm+0= X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(39860400002)(346002)(376002)(136003)(396003)(36840700001)(46966006)(8676002)(426003)(2616005)(36756003)(6666004)(47076005)(16526019)(478600001)(70586007)(336012)(86362001)(2906002)(55016002)(186003)(70206006)(7636003)(5660300002)(54906003)(26005)(6286002)(107886003)(8936002)(316002)(36860700001)(356005)(7696005)(82740400003)(4326008)(82310400003)(36906005)(83380400001)(110136005)(1076003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 May 2021 07:19:40.0299 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: fb7d6cb5-3dc5-4c8b-a4df-08d90f9625ae X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT023.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB3049 Subject: [dpdk-dev] [PATCH v4 03/17] net/mlx5: use meter color reg for CT X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Based on the capacity, 3 registers could be used. Due to the register allocation, only the one REG_C_3 for meter color could be reused right now. Then in the same flow, no more than one ASO action can be supported. Signed-off-by: Bing Zhao --- drivers/net/mlx5/mlx5_flow.c | 4 +++- drivers/net/mlx5/mlx5_flow.h | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index a7ceafe221..edad6007a8 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -760,7 +760,9 @@ mlx5_flow_get_reg_id(struct rte_eth_dev *dev, return priv->mtr_color_reg != REG_C_2 ? REG_C_2 : REG_C_3; case MLX5_MTR_COLOR: - case MLX5_ASO_FLOW_HIT: /* Both features use the same REG_C. */ + case MLX5_ASO_FLOW_HIT: + case MLX5_ASO_CONNTRACK: + /* All features use the same REG_C. */ MLX5_ASSERT(priv->mtr_color_reg != REG_NON); return priv->mtr_color_reg; case MLX5_COPY_MARK: diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h index cc3e79d088..964e13a869 100644 --- a/drivers/net/mlx5/mlx5_flow.h +++ b/drivers/net/mlx5/mlx5_flow.h @@ -84,6 +84,7 @@ enum mlx5_feature_name { MLX5_MTR_COLOR, MLX5_MTR_ID, MLX5_ASO_FLOW_HIT, + MLX5_ASO_CONNTRACK, }; /* Default queue number. */