From patchwork Thu Feb 24 03:10:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suanming Mou X-Patchwork-Id: 108204 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 4D5A4A0353; Thu, 24 Feb 2022 04:11:05 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 14DDC4115D; Thu, 24 Feb 2022 04:10:59 +0100 (CET) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2084.outbound.protection.outlook.com [40.107.93.84]) by mails.dpdk.org (Postfix) with ESMTP id 4BBDE4115B for ; Thu, 24 Feb 2022 04:10:56 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fE2TQcAQ4SQROpmbLtPf1ca04jlSNQHwfjCm9dlwOJglQZTxRRPRrroqXb8YoZLoTTCsW3A/5oqYxSQMytwriKN4uGsaI3T5whGoJ22DGzLNYp+Me0HQ3jiD7tu7t6vTFxf80uwW1ABf+JmoOm9MQQGqL53v9Fk3m0Aw+05lJB5O2hvyQ2JRQnRFYcHfk+AipJrHElzogG4dUJxtEtkSfvjDiWtufZSYVGw06udsN+WvAA+PH2fv4+cvqQZ2ac2kE09O+3Onghx/HW6jOYr2ZsyNqY74IRwgB0LfEqErYTMOa8cH98JQYv1p1PuSD8VHn+/0oQLUIxCx1PphRaIXGA== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ailaKKwwyErfU+12ajlKkVPWZdibHMzvycKJNcFO1UI=; b=PIErcm9VwGiCZOQ3THZvBf8drNcB57Qu0bo07fk/XMZVPWlf+414aVUha/ZMV3d0tLnt1ZMYwcECFhUszNKW2izQqWGJfmxVaLuZ2MI120yX/sdxDO5pk2GhvZZvZIVLTDEQXctEfRKQ+sDULukSpHzQyWzGMQKErBmRL5ULvCY+DioOkeHQbc6IujKWmsmtHbMuD5KuM4LWAMDRtlgulboy3JNKzLUv5FzXt8qZW0MAC4IGOx/NwFVXihDL+uJJAeC+1/Ki/eaiHjFPsNmF7NaxwTRcTNOsxSR/mR/s+posw1HBeyCXWH85sw4vmO6N7z+MdxD1AYmXr7tyCEJvTg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 12.22.5.236) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject 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=ailaKKwwyErfU+12ajlKkVPWZdibHMzvycKJNcFO1UI=; b=e3RuVPvqoUawsQJqTgMyxLjbTTGQXbWPATpbt9zVEIaxrZ2P8qtoGsqGrTngEPYulFS+ukLR8aqPbm6xmMl/kdNPzS1UMlJvfyl88PQmm8xi4rd0bDW3qtMHaY2gtI1d2sFgCkX3Fc3TzObUJh6kGoF3a/Sr1MYCoSYyS2CYAZFAwpCNp4/LB155Q5/6Ihj7XCv6vNVdjNLfXEU+iWIbp5btoKJAK8HIVi0wi6Vd029JNBasUSRGNnblswigbfi105iZfiWU70+mrrh/rL+upyaiz3oEL749FJMCeYICykoZCoHaTn0q0qDROzdGl2LxDwemqF6PYMXN5fLBTf8Umg== Received: from CO2PR04CA0203.namprd04.prod.outlook.com (2603:10b6:104:5::33) by CY4PR12MB1336.namprd12.prod.outlook.com (2603:10b6:903:40::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4995.24; Thu, 24 Feb 2022 03:10:53 +0000 Received: from CO1NAM11FT028.eop-nam11.prod.protection.outlook.com (2603:10b6:104:5:cafe::c2) by CO2PR04CA0203.outlook.office365.com (2603:10b6:104:5::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5017.24 via Frontend Transport; Thu, 24 Feb 2022 03:10:53 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 12.22.5.236) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 12.22.5.236 as permitted sender) receiver=protection.outlook.com; client-ip=12.22.5.236; helo=mail.nvidia.com; Received: from mail.nvidia.com (12.22.5.236) by CO1NAM11FT028.mail.protection.outlook.com (10.13.175.214) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.5017.22 via Frontend Transport; Thu, 24 Feb 2022 03:10:52 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by DRHQMAIL109.nvidia.com (10.27.9.19) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Thu, 24 Feb 2022 03:10:51 +0000 Received: from nvidia.com (10.126.231.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.9; Wed, 23 Feb 2022 19:10:48 -0800 From: Suanming Mou To: , CC: , , Subject: [PATCH v3 03/14] net/mlx5: introduce hardware steering enable routine Date: Thu, 24 Feb 2022 05:10:18 +0200 Message-ID: <20220224031029.14049-4-suanmingm@nvidia.com> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20220224031029.14049-1-suanmingm@nvidia.com> References: <20220210162926.20436-1-suanmingm@nvidia.com> <20220224031029.14049-1-suanmingm@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 567c8689-1467-4acf-7100-08d9f7434458 X-MS-TrafficTypeDiagnostic: CY4PR12MB1336:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8A15JlSGxZpauogOPGKMRB/alE3EXsZYVy5ESNvxSv4E+wA3/fiajHpKMZSBKQATNR3seKNuryhMvhkSU/jxOBfjLxvWgJju4q1ONfRrk6NJoXmsyGNwoJt6w0ku3Mr+oca0cJTWQQ6nlPyucirvYLXyUPvnLMUdhCLd6bss+XLFZkwT2cIBbtL1DHxNW7IfUvYEMBc4J7aaFEJYWc9USTHbvj32YsBiLD3jVJqMKk0CmkTnpf2V8OTWrk9fYc+zGgphePqLxVAn35cFFd/Zuu0jfcDK2rlqOBBiFiXBX3dpzEWyXMAFE5OWI1C+8h0vUaD0TbhIIQ6Hp5+V91LDRDqofpBXlkzlew7b+C3qlfc6+K7N+RloKkFOzmE39d5mbWvjkcfJk7IDIY2Xg9u7D3w8CZcgh99Jj0pd+5+6Xti0NoFP33M40AqeHTgo1FvkudqInFCEmn1MnvpvrIKkJ08KRAhaeTpmYLa+uwO2MxF6k1QQBsNln6E9hkksGYALdrRGrEfQlBxAKONZI9WrnsV+rdYOMrXGlhnnlRFLT5kj3FIG6qYcO07gWCN/pW1GUtTJ8TWGGDWfP6gBbpORtjtaVgKacvv2r6HCHJZuS1qFEdZ7Mtg4iETgcXG7G3Yx3sbZJUJVCopiBbGYRB0I3HxEkl8vdBxJGq6izfkzllj0YsgbChhSedvi9VrB30svZUaRSIrBv7ASdreYZAbKOVjES3JuLzSY2S4IXImp7T4= X-Forefront-Antispam-Report: CIP:12.22.5.236; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:mail.nvidia.com; PTR:InfoNoRecords; CAT:NONE; SFS:(13230001)(4636009)(40470700004)(46966006)(36840700001)(4326008)(36756003)(47076005)(426003)(83380400001)(40460700003)(336012)(5660300002)(55016003)(2906002)(8936002)(7696005)(110136005)(36860700001)(316002)(16526019)(6286002)(186003)(26005)(8676002)(508600001)(81166007)(356005)(82310400004)(70206006)(70586007)(6666004)(86362001)(1076003)(54906003)(6636002)(2616005)(36900700001)(309714004); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Feb 2022 03:10:52.9902 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 567c8689-1467-4acf-7100-08d9f7434458 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[12.22.5.236]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT028.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR12MB1336 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 The new hardware steering engine relies on using dedicated steering WQEs instead of direct writing to the low-level steering table entries directly. In the first introduce implementation the hardware steering engine supports the new queue based Flow API, the existing synchronous non-queue based Flow API is not supported. A new dv_flow_en value 2 is added to manage mlx5 PMD steering engine: dv_flow_en rte_flow API rte_flow_async API ------------------------------------------------ 0 support not support 1 support not support 2 not support support This commit introduces the extra dv_flow_en = 2 to specify the new flow initialize and manage operation routine. Signed-off-by: Suanming Mou Acked-by: Viacheslav Ovsiienko --- doc/guides/nics/mlx5.rst | 13 ++++++++++--- drivers/net/mlx5/linux/mlx5_os.c | 4 ++++ drivers/net/mlx5/mlx5.c | 7 ++++++- drivers/net/mlx5/mlx5.h | 3 ++- drivers/net/mlx5/mlx5_flow.c | 22 ++++++++++++++++++++++ 5 files changed, 44 insertions(+), 5 deletions(-) diff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst index 8956cd1dd8..0e0169c8bb 100644 --- a/doc/guides/nics/mlx5.rst +++ b/doc/guides/nics/mlx5.rst @@ -942,10 +942,17 @@ for an additional list of options shared with other mlx5 drivers. - ``dv_flow_en`` parameter [int] - A nonzero value enables the DV flow steering assuming it is supported - by the driver (RDMA Core library version is rdma-core-24.0 or higher). + Value 0 means legacy Verbs flow offloading. - Enabled by default if supported. + Value 1 enables the DV flow steering assuming it is supported by the + driver (RDMA Core library version is rdma-core-24.0 or higher). + + Value 2 enables the WQE based hardware steering. In this mode only + the queue-based rte_flow_q flow management is supported. + + Configured by default to 1 DV flow steering if the driver(RDMA CORE library) + supported. Otherwise, the value will be 0 which indicates legacy Verbs flow + offloading. - ``dv_esw_en`` parameter [int] diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c index ecf823da56..0faf26f5b8 100644 --- a/drivers/net/mlx5/linux/mlx5_os.c +++ b/drivers/net/mlx5/linux/mlx5_os.c @@ -482,6 +482,8 @@ mlx5_alloc_shared_dr(struct mlx5_priv *priv) err = mlx5_alloc_table_hash_list(priv); if (err) goto error; + if (priv->sh->config.dv_flow_en == 2) + return 0; /* The resources below are only valid with DV support. */ #ifdef HAVE_IBV_FLOW_DV_SUPPORT /* Init port id action list. */ @@ -1519,6 +1521,8 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev, priv->drop_queue.hrxq = mlx5_drop_action_create(eth_dev); if (!priv->drop_queue.hrxq) goto error; + if (priv->sh->config.dv_flow_en == 2) + return eth_dev; /* Port representor shares the same max priority with pf port. */ if (!priv->sh->flow_priority_check_flag) { /* Supported Verbs flow priority number detection. */ diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c index 9f65a8f901..f49d30c05c 100644 --- a/drivers/net/mlx5/mlx5.c +++ b/drivers/net/mlx5/mlx5.c @@ -1199,7 +1199,12 @@ mlx5_dev_args_check_handler(const char *key, const char *val, void *opaque) } else if (strcmp(MLX5_DV_ESW_EN, key) == 0) { config->dv_esw_en = !!tmp; } else if (strcmp(MLX5_DV_FLOW_EN, key) == 0) { - config->dv_flow_en = !!tmp; + if (tmp > 2) { + DRV_LOG(ERR, "Invalid %s parameter.", key); + rte_errno = EINVAL; + return -rte_errno; + } + config->dv_flow_en = tmp; } else if (strcmp(MLX5_DV_XMETA_EN, key) == 0) { if (tmp != MLX5_XMETA_MODE_LEGACY && tmp != MLX5_XMETA_MODE_META16 && diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h index 0f465d0e9e..b2259fc1fb 100644 --- a/drivers/net/mlx5/mlx5.h +++ b/drivers/net/mlx5/mlx5.h @@ -287,7 +287,8 @@ struct mlx5_sh_config { int tx_skew; /* Tx scheduling skew between WQE and data on wire. */ uint32_t reclaim_mode:2; /* Memory reclaim mode. */ uint32_t dv_esw_en:1; /* Enable E-Switch DV flow. */ - uint32_t dv_flow_en:1; /* Enable DV flow. */ + /* Enable DV flow. 1 means SW steering, 2 means HW steering. */ + unsigned int dv_flow_en:2; uint32_t dv_xmeta_en:2; /* Enable extensive flow metadata. */ uint32_t dv_miss_info:1; /* Restore packet after partial hw miss. */ uint32_t l3_vxlan_en:1; /* Enable L3 VXLAN flow creation. */ diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index b289f13fc0..cdb40c0756 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -6840,6 +6840,15 @@ mlx5_flow_create(struct rte_eth_dev *dev, const struct rte_flow_action actions[], struct rte_flow_error *error) { + struct mlx5_priv *priv = dev->data->dev_private; + + if (priv->sh->config.dv_flow_en == 2) { + rte_flow_error_set(error, ENOTSUP, + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, + NULL, + "Flow non-Q creation not supported"); + return NULL; + } /* * If the device is not started yet, it is not allowed to created a * flow from application. PMD default flows and traffic control flows @@ -7336,6 +7345,13 @@ mlx5_flow_destroy(struct rte_eth_dev *dev, struct rte_flow *flow, struct rte_flow_error *error __rte_unused) { + struct mlx5_priv *priv = dev->data->dev_private; + + if (priv->sh->config.dv_flow_en == 2) + return rte_flow_error_set(error, ENOTSUP, + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, + NULL, + "Flow non-Q destruction not supported"); flow_list_destroy(dev, MLX5_FLOW_TYPE_GEN, (uintptr_t)(void *)flow); return 0; @@ -7433,7 +7449,13 @@ mlx5_flow_query(struct rte_eth_dev *dev, struct rte_flow_error *error) { int ret; + struct mlx5_priv *priv = dev->data->dev_private; + if (priv->sh->config.dv_flow_en == 2) + return rte_flow_error_set(error, ENOTSUP, + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, + NULL, + "Flow non-Q query not supported"); ret = flow_drv_query(dev, (uintptr_t)(void *)flow, actions, data, error); if (ret < 0)