From patchwork Wed May 5 12:23:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bing Zhao X-Patchwork-Id: 92918 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 378BDA0524; Wed, 5 May 2021 14:24:08 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E0C384111D; Wed, 5 May 2021 14:23:57 +0200 (CEST) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2063.outbound.protection.outlook.com [40.107.243.63]) by mails.dpdk.org (Postfix) with ESMTP id 0F3EA4110D for ; Wed, 5 May 2021 14:23:56 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YNJz0M3SpQQ8zXzrF/sYht4z5GLL5TELUgxzi1/fEGa4B1ChIWalQuQkLlfl8X8KMqliZXJq7YIPslTvdI1nPVlTwg0MyTYI5NiyHYIGJcO/EcUcyfuzhktQPwCuafLixvGK+DZkvy9y5N3oTvu1ehQ9TbddjzMoJ1KO+UL7d50YwgXBmThNkaJMQbLIPm+9KI3i0l0rBRJ/O5WZR6YqBwtLom7EyAcYqXo07pN6KeSLwmVaBa/BREZm76/blwkAXMBVv5pVpzhHoLiHMvhN77jyVtXsmoN93BagS/aLkTRg2fpRvvhOZrO049LEyglurIIa7nvz7qPtyb88Rsy9Eg== 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=+gk1nVDax2w47lIPGJGwgzkAOPkF2za5WTb0fHiwARY=; b=Jy/+JxVGYnkyLtOIk4zsF/Rv89GQ0VgLz1M4ieSyi5PxZVcCVEVsVkCvMdrXuspdht2zQ3c/UgAvrsMEoDnKpprGNhbiDTFQjHTqTcr3TMR+Gbly3apAMnd8qmoK8AFYAyoBL0KFt5r3asMZckuT+MTVCVhRnbbVJ/gmOIGiepzB73hxUVZ672zXlI2g3tuOPMvfL8CN+lMyzMsrRLmCxll6mDEjrfJt+8BkBwiWKfm5ZOFivR7E/Rh6+5TUv5CnXVKnhD8YwoMxwU6OtS9OHFf18KKoBZVaqLFJITNSSM/zuZlljxt89VLSrPEMPcQlUoyhdnni751PnkkNm4rVNg== 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=+gk1nVDax2w47lIPGJGwgzkAOPkF2za5WTb0fHiwARY=; b=LKmiOh3TWdfoFncm01Hvvb0Si7L9ShRuvxc0jJBXn/Ag1I0/RQZeOpGLUembBfqHGRq40wMyp2NK38YpZNA1Guu76b9OOiS7OG77GxaqB3+RUG3KC27UbdSQ+xwIU14jziPM993wx3c90BApUfgmK05VYXVQXjJNxD9uSEiCC4RMHdbV6BPi45b4USteuEicWkH+3vi2wUWVsdAWhopTkXzDh5gjwHs1h033xhLcmGSWHFrjfUxvlvzBcpJNYM8ECUkG/wjCUFi4P79W5/qe1lO2QxeYvo7u4h1q4dT39sSLvT0H08CEz8a6uCW+bMPt0uVxxPH1eWHSyBgyiF1w0A== Received: from DM6PR07CA0055.namprd07.prod.outlook.com (2603:10b6:5:74::32) by MWHPR12MB1486.namprd12.prod.outlook.com (2603:10b6:301:10::15) 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 12:23:53 +0000 Received: from DM6NAM11FT065.eop-nam11.prod.protection.outlook.com (2603:10b6:5:74:cafe::87) by DM6PR07CA0055.outlook.office365.com (2603:10b6:5:74::32) 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 12:23:53 +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 DM6NAM11FT065.mail.protection.outlook.com (10.13.172.109) 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 12:23:53 +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 12:23:51 +0000 From: Bing Zhao To: , , CC: , , Date: Wed, 5 May 2021 15:23:14 +0300 Message-ID: <20210505122328.51129-4-bingz@nvidia.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210505122328.51129-1-bingz@nvidia.com> References: <20210427153811.11554-1-bingz@nvidia.com> <20210505122328.51129-1-bingz@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.145.6] X-ClientProxiedBy: HQMAIL101.nvidia.com (172.20.187.10) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f72accfa-1585-4c60-5eeb-08d90fc0a5ab X-MS-TrafficTypeDiagnostic: MWHPR12MB1486: 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: 8hyYVv6vJMY5dFgIOxH12AqPgL3j0D9Q1szr0jrp4X4CmR94erGbXjEZqxJAAw1FKud6DOhrPtyVqLJEKO9vvV6AgSUj0JZD3Fgz4Xa4zJP5GIk3B4rSBieL3LXWNejdVYDIZNQVE8Ra4HYS9VKwl+otnDhnq2rKioBbMEpyRld8qm3Sxe8ckQsai9E8LtkkLd5Jd0/VipPZSHs9QfeS9P9bQOqq6R3Vz157Y02IOmQR2gYBfZhogqUzheAukXCE8XOvJv/eXVEX0IijY1RJUmlbHubAD8XzrBxnrG8UhxyOMDX7r9rKwO7ieFLeU2a38WJIXGsgh4hdtrHf/vk73fe6ryuyRnte21SYbqf3zt8o8tJ3sgLjNU42FfEZ2f8azUIhxvWJsYg4W2xqh/Pu9erZ+MNvbazsiZ4rlIYPssW1haYyUaMt+kHik40W9c7FhvkuIf1aqtvMU7sNmMbklwATaJAN8i6lz96zmE1DskzDeSmHw6NzKWLBT6F3W0se7s4G7wBuq3k7zWdo0zG22JajyZhkFwGJBSeBr6CtJzxQWprmVBH3yxgDBxIG807JDNWbMjmsxMsWdg6WJ+pBevPP1Mp7kHCMXkMMAIQZK61G8tusgh2JeSxxxxbzTXDdXGqrtREDWkdxwXLTyNPTJ/WHuo3jj83JHuKAiDAMozY= 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)(376002)(346002)(396003)(136003)(39860400002)(46966006)(36840700001)(1076003)(4326008)(36756003)(70206006)(83380400001)(47076005)(2616005)(8936002)(7696005)(186003)(7636003)(26005)(356005)(70586007)(316002)(8676002)(86362001)(6666004)(54906003)(478600001)(82310400003)(55016002)(110136005)(2906002)(5660300002)(36860700001)(16526019)(36906005)(6286002)(107886003)(336012)(82740400003)(426003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 May 2021 12:23:53.6105 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f72accfa-1585-4c60-5eeb-08d90fc0a5ab 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: DM6NAM11FT065.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR12MB1486 Subject: [dpdk-dev] [PATCH v7 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 Acked-by: Viacheslav Ovsiienko --- 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 a9c0108ee3..65399cd452 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 0fb8f64474..402c829843 100644 --- a/drivers/net/mlx5/mlx5_flow.h +++ b/drivers/net/mlx5/mlx5_flow.h @@ -85,6 +85,7 @@ enum mlx5_feature_name { MLX5_MTR_COLOR, MLX5_MTR_ID, MLX5_ASO_FLOW_HIT, + MLX5_ASO_CONNTRACK, }; /* Default queue number. */