From patchwork Wed Oct 19 18:40:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Savisko X-Patchwork-Id: 118648 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 CFB36A09EC; Wed, 19 Oct 2022 20:41:30 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EB5AC42C1E; Wed, 19 Oct 2022 20:41:27 +0200 (CEST) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2048.outbound.protection.outlook.com [40.107.243.48]) by mails.dpdk.org (Postfix) with ESMTP id ED42E42BF9 for ; Wed, 19 Oct 2022 20:41:25 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Qg//YhJEbVHbhbrgjO1lRyX7CkiRmsk4eV3tsXSO6JTPksnnlEuR4YhVbSKvDSXdp9P82xcO52eiG4BvMs0SHp7TkGPK5yS9zdXf08sXsE3jcMSbX/oH4qfbB0qhGeOzpx95WfmaUoAI7YVgjUQt5ymvRcQqtg8cZCBIoisB9n0fbFsQunvTaMB/17qo6VTnOUZPqmH6HJz0cz2rcGT7ts8ffr56vlw2+aR7FaXLLWFe80iDbQFbcptR1Nlmdgvq+kGiA0cKNzYl/HC0KLFpni4eQ63w3QJe+s+XEasYaSZhXPjOi3DuRFaTj6OjsNaPKFshhgLF+kjToTwCUfsfoQ== 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=rWQ2tMb8Y3UVzxUakFrgIQmF0CqHUe/vttSDEis0UDM=; b=nLLD2ylMbZFAvvmgdCrH73qWpOBKSrmMiyZGp/zXtD6HaYfNMu9hbNaYdFB+Md4R1eNsIGGIUqUiR9yamWBPqLhYSzCfJFJWyzSwZ3jpc5WPXHx6N80VcPQz+6HuQrXU3egf1tz2Qt8bchARN6DYH3AIVw5I13V4qnj3fAkT8ShZUS5XGdOLt/R/afQOF2ervw3OF1N+HUO6QqSXEdz74qYG5hlc4WSWClS4JE3AT0P0Rq7infv9ouc1RPlxuYAj4QhDflHkba7PVUj7M+sP/8AitW/y6iWktZc91rZ9F39nWrpYCFYWufZ8wQuFdVZJkBNZwaBwopzfD+POsOVwgA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none (sender ip is 216.228.117.161) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com; dmarc=fail (p=reject sp=reject pct=100) action=oreject 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=rWQ2tMb8Y3UVzxUakFrgIQmF0CqHUe/vttSDEis0UDM=; b=IzloorFzV2vckq0BzkSu5yjeD6bozsXQzW2GqcpfeoZkWDKYWY+FVEtcCiFvirl4Y/AXzFwQC8BMwEeei2N0OWLXOyBm6BDIUki9D7cxpiGAS1hFd5UQs8iwmuUEJo+la8YgLc37MRTi2OJI/CFuDjcXVdPDZiUy8c99t1RvF3RqvffA5QBtItssL8PEVWGNRc5mLYxmiypfcrKqgu4aFqNIPjT/qEq4LPYSP6H63pQsYKUOqq4W2AT3XALSj7GbDnIIku4hAtdF0IYGsE44Y+25gGJIqUNPGHU4urriH21aTAwtOJQSeeVThbcLwQlJcQJDxBI4spAYtrAnROdmmg== Received: from MW3PR05CA0003.namprd05.prod.outlook.com (2603:10b6:303:2b::8) by DM4PR12MB6011.namprd12.prod.outlook.com (2603:10b6:8:6b::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.29; Wed, 19 Oct 2022 18:41:24 +0000 Received: from CO1NAM11FT088.eop-nam11.prod.protection.outlook.com (2603:10b6:303:2b:cafe::be) by MW3PR05CA0003.outlook.office365.com (2603:10b6:303:2b::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5746.6 via Frontend Transport; Wed, 19 Oct 2022 18:41:23 +0000 X-MS-Exchange-Authentication-Results: spf=none (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=fail action=oreject header.from=nvidia.com; Received-SPF: None (protection.outlook.com: nvidia.com does not designate permitted sender hosts) Received: from mail.nvidia.com (216.228.117.161) by CO1NAM11FT088.mail.protection.outlook.com (10.13.175.131) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5746.16 via Frontend Transport; Wed, 19 Oct 2022 18:41:23 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.26; Wed, 19 Oct 2022 11:41:10 -0700 Received: from nvidia.com (10.126.230.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.29; Wed, 19 Oct 2022 11:41:08 -0700 From: Michael Savisko To: CC: , , , , Matan Azrad Subject: [PATCH v2 1/4] common/mlx5: new glue callback for send to kernel action Date: Wed, 19 Oct 2022 21:40:04 +0300 Message-ID: <20221019184007.1032874-2-michaelsav@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20221019184007.1032874-1-michaelsav@nvidia.com> References: <20221019184007.1032874-1-michaelsav@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1NAM11FT088:EE_|DM4PR12MB6011:EE_ X-MS-Office365-Filtering-Correlation-Id: a20bec11-2c32-45ad-906f-08dab20185ef X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: RECN+hMkUAbOBjJunNnD28uoX8NAI5jK1fShKglFR/WvH7WvWarf3TImJLWyA90A6xF0iJg51jJPvRs3yoiYoj/EBlWBHJQGZr3FbnWrOoeu82UEDRBMuykIDNaNW4VKdyN0/35yeM4ROYu8nFUloLeXWJeZdYZcV/hLJrti347CIYTUHYCm4NKV3VD/O7C/+CblZ0NXX/nmUaFdMMHxx2l7b2hQWH8nCjN7NBemMX1Khz2C5nIVFA2p1V7BXSyoQ2WpvLjOkRESO9XzWKBlSx199yBNHOfzyOF/0tOqJCu8iDKBgwIrydvXMGzzYU/JLFqlI8J52O2jBxcDXM75BgrSq6Vpn7r9g2VlUIyQ+qbMZILbjMW/tK0OdXGGhYb+54DcXwE9FkgBQSPrqRke9dT05sep2fcvbc6wXKEZJ10z2Zpw7caozQItucGa6X8ir8qZ27VxmYPM5Vm+IZ+dG6SMN0QQ4g2WgZdE8pDnq5pnaF1ZSr4UcP2sPar7+oMQ1SOrvvR99eM3rEyFKbGhMniQV7qzhcXwZKUsdTZGW6G1LGAX8wKifpMNvaeNfQiTs5z4KPpdEWyCCltId/6g2YBLDSn+Ajbej+c2cN9j9ivpZnXkHiewOpawwbFK3eKBdHScD+xLbkoPU3YiF1o4cZgsRDi17JQvKKDjAVdvyylW8UJxLcHwJSneLg56AgmeHo8H0dLNySDjLA0p6Pg6nCPrEQj8gm76TUmBOb+je74Bi5LP+RaQKRBbRzUctnzZoN3+XHQqG0brkc4mrY+xWw== X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230022)(4636009)(39860400002)(136003)(376002)(346002)(396003)(451199015)(36840700001)(40470700004)(46966006)(2616005)(6286002)(36860700001)(40480700001)(107886003)(26005)(6666004)(7696005)(478600001)(83380400001)(336012)(1076003)(16526019)(186003)(5660300002)(40460700003)(55016003)(82310400005)(6916009)(54906003)(4326008)(316002)(70206006)(41300700001)(8936002)(8676002)(70586007)(47076005)(426003)(86362001)(36756003)(7636003)(356005)(82740400003)(2906002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Oct 2022 18:41:23.6252 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a20bec11-2c32-45ad-906f-08dab20185ef X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT088.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB6011 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 Add new glue callback dr_create_flow_action_send_to_kernel. Default callback invokes mlx5dv_dr_action_create_dest_root_table(). Add static inline mlx5_flow_os_create_flow_action_send_to_kernel(), which calls dr_create_flow_action_send_to_kernel glue callback. Define HAVE_MLX5DV_DR_ACTION_CREATE_DEST_ROOT_TABLE macro if function mlx5dv_dr_action_create_dest_root_table exists in infiniband/mlx5dv.h Signed-off-by: Michael Savisko Acked-by: Matan Azrad --- drivers/common/mlx5/linux/meson.build | 2 ++ drivers/common/mlx5/linux/mlx5_glue.c | 17 +++++++++++++++++ drivers/common/mlx5/linux/mlx5_glue.h | 2 ++ drivers/net/mlx5/linux/mlx5_flow_os.h | 22 ++++++++++++++++++++++ drivers/net/mlx5/windows/mlx5_flow_os.h | 24 ++++++++++++++++++++++++ 5 files changed, 67 insertions(+) diff --git a/drivers/common/mlx5/linux/meson.build b/drivers/common/mlx5/linux/meson.build index e77b46d157..b044f95700 100644 --- a/drivers/common/mlx5/linux/meson.build +++ b/drivers/common/mlx5/linux/meson.build @@ -213,6 +213,8 @@ has_sym_args = [ 'ibv_reg_mr_iova' ], [ 'HAVE_MLX5_IBV_IMPORT_CTX_PD_AND_MR', 'infiniband/verbs.h', 'ibv_import_device' ], + [ 'HAVE_MLX5DV_DR_ACTION_CREATE_DEST_ROOT_TABLE', 'infiniband/mlx5dv.h', + 'mlx5dv_dr_action_create_dest_root_table' ], ] if libmtcr_ul_found has_sym_args += [ diff --git a/drivers/common/mlx5/linux/mlx5_glue.c b/drivers/common/mlx5/linux/mlx5_glue.c index 450dd6a06a..b954df0784 100644 --- a/drivers/common/mlx5/linux/mlx5_glue.c +++ b/drivers/common/mlx5/linux/mlx5_glue.c @@ -1434,6 +1434,21 @@ mlx5_glue_dv_free_pp(struct mlx5dv_pp *pp) #endif } +static void * +mlx5_glue_dr_create_flow_action_send_to_kernel(void *tbl, uint16_t priority) +{ +#ifdef HAVE_MLX5DV_DR_ACTION_CREATE_DEST_ROOT_TABLE + struct mlx5dv_dr_table *table = (struct mlx5dv_dr_table *)tbl; + + return mlx5dv_dr_action_create_dest_root_table(table, priority); +#else + RTE_SET_USED(tbl); + RTE_SET_USED(priority); + errno = ENOTSUP; + return NULL; +#endif +} + __rte_cache_aligned const struct mlx5_glue *mlx5_glue = &(const struct mlx5_glue) { .version = MLX5_GLUE_VERSION, @@ -1561,4 +1576,6 @@ const struct mlx5_glue *mlx5_glue = &(const struct mlx5_glue) { .dv_free_var = mlx5_glue_dv_free_var, .dv_alloc_pp = mlx5_glue_dv_alloc_pp, .dv_free_pp = mlx5_glue_dv_free_pp, + .dr_create_flow_action_send_to_kernel = + mlx5_glue_dr_create_flow_action_send_to_kernel, }; diff --git a/drivers/common/mlx5/linux/mlx5_glue.h b/drivers/common/mlx5/linux/mlx5_glue.h index c4903a6dce..9616dfdd06 100644 --- a/drivers/common/mlx5/linux/mlx5_glue.h +++ b/drivers/common/mlx5/linux/mlx5_glue.h @@ -373,6 +373,8 @@ struct mlx5_glue { void *(*dv_create_flow_action_aso) (struct mlx5dv_dr_domain *domain, void *aso_obj, uint32_t offset, uint32_t flags, uint8_t return_reg_c); + void *(*dr_create_flow_action_send_to_kernel)(void *tbl, + uint16_t priority); }; extern const struct mlx5_glue *mlx5_glue; diff --git a/drivers/net/mlx5/linux/mlx5_flow_os.h b/drivers/net/mlx5/linux/mlx5_flow_os.h index bcb48b3e56..ed71289322 100644 --- a/drivers/net/mlx5/linux/mlx5_flow_os.h +++ b/drivers/net/mlx5/linux/mlx5_flow_os.h @@ -368,6 +368,28 @@ mlx5_flow_os_create_flow_action_default_miss(void **action) return (*action) ? 0 : -1; } +/** + * Create flow action: send_to_kernel. + * + * @param[in] tbl + * Pointer to destination root table. + * @param[in] priority + * Priority to which traffic will arrive. + * @param[out] action + * Pointer to a valid action on success, NULL otherwise. + * + * @return + * 0 on success, or -1 on failure and errno is set. + */ +static inline int +mlx5_flow_os_create_flow_action_send_to_kernel(void *tbl, uint16_t priority, + void **action) +{ + *action = mlx5_glue->dr_create_flow_action_send_to_kernel(tbl, + priority); + return (*action) ? 0 : -1; +} + /** * Create flow action: dest_devx_tir * diff --git a/drivers/net/mlx5/windows/mlx5_flow_os.h b/drivers/net/mlx5/windows/mlx5_flow_os.h index 347ec64580..1c1c17fc41 100644 --- a/drivers/net/mlx5/windows/mlx5_flow_os.h +++ b/drivers/net/mlx5/windows/mlx5_flow_os.h @@ -326,6 +326,30 @@ mlx5_flow_os_create_flow_action_default_miss(void **action) return 0; } +/** + * Create flow action: send_to_kernel. + * + * @param[in] tbl + * Pointer to destination root table. + * @param[in] priority + * Priority to which traffic will arrive. + * @param[out] action + * Pointer to a valid action on success, NULL otherwise. + * + * @return + * 0 on success, or -1 on failure and errno is set. + */ +static inline int +mlx5_flow_os_create_flow_action_send_to_kernel(void *tbl, uint16_t priority, + void **action) +{ + RTE_SET_USED(tbl); + RTE_SET_USED(priority); + *action = NULL; + rte_errno = ENOTSUP; + return -rte_errno; +} + /** * Create flow action: sampler * From patchwork Wed Oct 19 18:40:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Savisko X-Patchwork-Id: 118649 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 E81F9A09EC; Wed, 19 Oct 2022 20:41:38 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 39FA442C1A; Wed, 19 Oct 2022 20:41:32 +0200 (CEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2083.outbound.protection.outlook.com [40.107.93.83]) by mails.dpdk.org (Postfix) with ESMTP id 2383E42BFA for ; Wed, 19 Oct 2022 20:41:31 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MctEazQuC/uSqFMt6a4kf91PwSZ15xKZhxsr1RLTPaa5B0Lkzc4tKJKS/02aK/DhQZFY1CoVkU4OzX7Ki+PdRXwVKFLjkcf9DwrJ9vZX3y6S9ZkSWQXwArGCr2kjJbFHn0gtJlYQb3EZqgbXAKiJSYp1vad0B8QUXlL1ws62oYTKyjmvxDZDcWXIP4SPK9XgQkQFiN7FsUQp6uOS7nXo/izbjl6Cw6vv1MldgUgHUCN8hPHJaDVT5gaRmjXOxlwb4Ho0DIQ6temXwM3diLCzAV4yjDquL/ubWjtyPCvLXTAYZZvMqnHb0u7uiAl4Ho6sfa7G743kp8uJfqHK0MdjIg== 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=LnuVPaj2uWWUsGLhX2uhnrWfH0q/0iLExGGqbjs9Wtw=; b=l4vV7iNccP8kYYIv1KnvCS6wdUogpO52IFrV0+aL5W5I0Sg6CRekXS8nOy4Q/cXcVZTsRzxq1rxZd0CQyPdK+Mlh84GL73YAQtG58eMfKjjtCHZN/Iy4CIsbJ6VvR5eEnAE3sVl8MKXBYaVW39/F0FyqfYkgbu86AWdyb2VvwqC/QY3nNNCET2KBRI212xBj5k2FVY1AxUaTQ8J3dq3+oWcXanGCi4W62MJkODgV8j14FAfBwCKPTttyIW9G++71sNsbDkDxq/3xJRjl8NjCmaO1hK35yV3v+1xFELx6PY0Q+3jNfBC7iBkke2SmVcP/8mxpyJZPDpVmLwU2Cp0/zQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none (sender ip is 216.228.117.161) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com; dmarc=fail (p=reject sp=reject pct=100) action=oreject 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=LnuVPaj2uWWUsGLhX2uhnrWfH0q/0iLExGGqbjs9Wtw=; b=QX3FgGFN5+oSX6wK7mu+7WIhGjy4G9JvOII6lygapRKFReTv5oAddA8ox9Py2W0i5Q61UND1/BVLsXsf3wQQj7EgKibKomnN1CT/xItBOstRzdrnx1rQzLeOBRXOk3sQne+RlsOxh9ymkCJxt6h6liCIfeaWaspVYk3z/S8fmqVHowOVHBiS6XYFV2lSiOPgglNuEL6egkaxbojMsO7de9P/JIfcUWAkg7du1gbpwBl14SShF3QN0NjWowK54fmaLab0EwzhSFO2zyggS97DFmvscsWujJtpH0ln/g4SDtD8Drq4nePIvs1QLO5Yc4cOzPmFwjV3HTkGQuVJYKJ0Ow== Received: from MW4PR04CA0334.namprd04.prod.outlook.com (2603:10b6:303:8a::9) by DM6PR12MB4169.namprd12.prod.outlook.com (2603:10b6:5:215::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.29; Wed, 19 Oct 2022 18:41:29 +0000 Received: from CO1NAM11FT073.eop-nam11.prod.protection.outlook.com (2603:10b6:303:8a:cafe::3) by MW4PR04CA0334.outlook.office365.com (2603:10b6:303:8a::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.34 via Frontend Transport; Wed, 19 Oct 2022 18:41:29 +0000 X-MS-Exchange-Authentication-Results: spf=none (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=fail action=oreject header.from=nvidia.com; Received-SPF: None (protection.outlook.com: nvidia.com does not designate permitted sender hosts) Received: from mail.nvidia.com (216.228.117.161) by CO1NAM11FT073.mail.protection.outlook.com (10.13.174.196) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5746.16 via Frontend Transport; Wed, 19 Oct 2022 18:41:29 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.26; Wed, 19 Oct 2022 11:41:13 -0700 Received: from nvidia.com (10.126.230.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.29; Wed, 19 Oct 2022 11:41:11 -0700 From: Michael Savisko To: CC: , , , , Matan Azrad Subject: [PATCH v2 2/4] net/mlx5: introduce new mlx5 action flag Date: Wed, 19 Oct 2022 21:40:05 +0300 Message-ID: <20221019184007.1032874-3-michaelsav@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20221019184007.1032874-1-michaelsav@nvidia.com> References: <20221019184007.1032874-1-michaelsav@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1NAM11FT073:EE_|DM6PR12MB4169:EE_ X-MS-Office365-Filtering-Correlation-Id: 4d96ca97-4b47-4253-4e1e-08dab2018944 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: PZ0yqQ+LWurE5k5Ag766dYdFRFaVT8SiFOSr++K7sEYgz+6J0qwA4WkC2U3lQKEpjxv1yOM5ufaA//4OhepWudSUQmqtNkKchSK97mw1ZcY64j8/JydY6+rCvm2vUL+5rNaezl0bx5O5li42BZpIIYs/L3Pu3zjAVoXcJlwiHuAf6i5UpGmLXketpme1ZaMEUEujbNtlaEXPNOUEO2W9gZjhcJTWNy/05FdoE9Xi59JgbGZ+m14+3dgylKVehu62LGMFnHpRwtPqvYltthqY6ACqygYgpDjywcOZhys2MJXA5/jll50UbpsT+Fuz6lJTAs/SdE00dC8lDx+C//+0AumC8WhjH+bB05vbeojfLYsC76qEchD0bdMrZD5JmdNxhrbkgyI7YW4rS+jx529pmuHPPFcFHFHN5VH7HAJ6cIpyk/Flrb7ECUKwHisQjB9iBbwUMCGqbApO4cBCoVNAMYcljX6G0g5zMmqPBhbZOr9KXtz3OmBSEaS1LUnJvGJMhxtvwVnphBKQThoXkzvTmp0ZDxFVtR2juNhq04VSFu5mGgkXVFcuPlztmLs+IJvCuHuYYT3heU7s2hxKLfB5cl95o8PHlZQZAocpzZHlaekXLK7/RrNcicJUILMKgoRTRCSmgYCf2+pXWKxnsp13QTDCXus3eoGCTFk2IjCgBmun62wvhz1wuABhgHnm8lO7txVPWhv43XzV++P/8OQhYsO2jIUblyBmIyoxsCkO5/y3zXVm9bn7oMN3EFOlEazqezKZ5qnkYnCd5+qDIMMdJg== X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230022)(4636009)(396003)(346002)(376002)(136003)(39860400002)(451199015)(46966006)(40470700004)(36840700001)(316002)(6916009)(4326008)(186003)(7696005)(2616005)(40460700003)(36756003)(54906003)(26005)(8936002)(16526019)(2906002)(86362001)(41300700001)(6286002)(83380400001)(47076005)(6666004)(336012)(107886003)(70206006)(70586007)(426003)(40480700001)(55016003)(8676002)(1076003)(5660300002)(82310400005)(82740400003)(36860700001)(7636003)(356005)(478600001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Oct 2022 18:41:29.2138 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4d96ca97-4b47-4253-4e1e-08dab2018944 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT073.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4169 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 Add new mlx5 action flag MLX5_FLOW_ACTION_SEND_TO_KERNEL. Add element MLX5_FLOW_FATE_SEND_TO_KERNEL in enum mlx5_flow_fate_type. For that purpose field 'fate_action' in structure mlx5_flow_handle must be expanded from 3 bits to 4 bits. Signed-off-by: Michael Savisko Acked-by: Matan Azrad --- drivers/net/mlx5/mlx5_flow.h | 7 +++++-- drivers/net/mlx5/mlx5_flow_dv.c | 17 +++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h index 0fa1735b1a..18a77ec619 100644 --- a/drivers/net/mlx5/mlx5_flow.h +++ b/drivers/net/mlx5/mlx5_flow.h @@ -277,12 +277,14 @@ enum mlx5_feature_name { #define MLX5_FLOW_ACTION_MODIFY_FIELD (1ull << 39) #define MLX5_FLOW_ACTION_METER_WITH_TERMINATED_POLICY (1ull << 40) #define MLX5_FLOW_ACTION_CT (1ull << 41) +#define MLX5_FLOW_ACTION_SEND_TO_KERNEL (1ull << 42) #define MLX5_FLOW_FATE_ACTIONS \ (MLX5_FLOW_ACTION_DROP | MLX5_FLOW_ACTION_QUEUE | \ MLX5_FLOW_ACTION_RSS | MLX5_FLOW_ACTION_JUMP | \ MLX5_FLOW_ACTION_DEFAULT_MISS | \ - MLX5_FLOW_ACTION_METER_WITH_TERMINATED_POLICY) + MLX5_FLOW_ACTION_METER_WITH_TERMINATED_POLICY | \ + MLX5_FLOW_ACTION_SEND_TO_KERNEL) #define MLX5_FLOW_FATE_ESWITCH_ACTIONS \ (MLX5_FLOW_ACTION_DROP | MLX5_FLOW_ACTION_PORT_ID | \ @@ -477,6 +479,7 @@ enum mlx5_flow_fate_type { MLX5_FLOW_FATE_DEFAULT_MISS, MLX5_FLOW_FATE_SHARED_RSS, MLX5_FLOW_FATE_MTR, + MLX5_FLOW_FATE_SEND_TO_KERNEL, MLX5_FLOW_FATE_MAX, }; @@ -709,7 +712,7 @@ struct mlx5_flow_handle { void *drv_flow; /**< pointer to driver flow object. */ uint32_t split_flow_id:27; /**< Sub flow unique match flow id. */ uint32_t is_meter_flow_id:1; /**< Indicate if flow_id is for meter. */ - uint32_t fate_action:3; /**< Fate action type. */ + uint32_t fate_action:4; /**< Fate action type. */ union { uint32_t rix_hrxq; /**< Hash Rx queue object index. */ uint32_t rix_jump; /**< Index to the jump action resource. */ diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 91f287af5c..6c355efed7 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -7970,6 +7970,12 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr, * list it here as a supported type */ break; +#ifdef HAVE_MLX5DV_DR_ACTION_CREATE_DEST_ROOT_TABLE + case RTE_FLOW_ACTION_TYPE_SEND_TO_KERNEL: + action_flags |= MLX5_FLOW_ACTION_SEND_TO_KERNEL; + ++actions_n; + break; +#endif default: return rte_flow_error_set(error, ENOTSUP, RTE_FLOW_ERROR_TYPE_ACTION, @@ -13694,6 +13700,11 @@ flow_dv_translate(struct rte_eth_dev *dev, actions_n++; action_flags |= MLX5_FLOW_ACTION_CT; break; + case RTE_FLOW_ACTION_TYPE_SEND_TO_KERNEL: + return rte_flow_error_set(error, ENOTSUP, + RTE_FLOW_ERROR_TYPE_ACTION, + NULL, "send to kernel action is not supported."); + break; case RTE_FLOW_ACTION_TYPE_END: actions_end = true; if (mhdr_res->actions_num) { @@ -14742,6 +14753,12 @@ flow_dv_fate_resource_release(struct rte_eth_dev *dev, flow_dv_port_id_action_resource_release(dev, handle->rix_port_id_action); break; + case MLX5_FLOW_FATE_SEND_TO_KERNEL: + /* In case of send_to_kernel action the actual release of + * resource is done when all shared DR resources are released + * since this resource is created once and always reused. + */ + break; default: DRV_LOG(DEBUG, "Incorrect fate action:%d", handle->fate_action); break; From patchwork Wed Oct 19 18:40:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Savisko X-Patchwork-Id: 118650 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 EEB3FA09EC; Wed, 19 Oct 2022 20:41:44 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3320842C3A; Wed, 19 Oct 2022 20:41:34 +0200 (CEST) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2049.outbound.protection.outlook.com [40.107.244.49]) by mails.dpdk.org (Postfix) with ESMTP id 6935F42C3A for ; Wed, 19 Oct 2022 20:41:33 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=H1dnwD2HbVqbmw2DhlWa9bz/rXTZUjVLf1xR/agPPQSV1i6wmd3qwy3gOFGEMLAnIzqxTWT50nxW9sb5bl3MXkRCa7CEmi3ENUkCKUwSBQxRiUSGuvAzjId6wJKW+n0Lg2pwJK4HSI0OPIpJFM66E01R8fQ3/5TpH1AXLjM/LdadFC6nl+fRHAv4j/usL/xkMlIbEezRYqbqDuh+jxxHxc/o9+kqWpHPYiqTNz2KrvL9qbeHkrw25CFYT+L2AzeiiVpudkGJVuR/EXHkLVGQFQHivN0v8XqSI8+D0v6MFv+5hq3n7/c3yWwSpsf475FQ0BIJzaCwAcIi2TMRG5BtYQ== 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=dHiSJIS/L79E5hP4ukOV4HNRll7oSsUSn874RISD3Es=; b=nDm4b9F7xWlYUJNhhAIJmAaEs+PVv+T3sgwVeLyj5r59v/xP9K+mXdn/WVqB1xDWfx/p71baN+ViWKzJ6euQcP4PggmGDfL0Zb/tKJwcQZYJQIcIU3i/3GB8PSDqFinvjD1KKLj9Tqm4EwJtFoMQUZPBut/Ep+moZfxeIyTgC7/GBZxqyL7Qudh/MNQi0id4AX294mJ5IVeP/cqK/eOrSNodiXSwYLDmjmLxO8daSmeSyxiAmk2cMj4z4Z6yUlb9GrpSKSyQVK+5rV6ppOFUBEEYC1m8l0uJ/JFVmUm6LvtAobyS+IM5omIzPJGWDRuCGBWwP5zWqXXnQUfjVG8EXw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none (sender ip is 216.228.117.160) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com; dmarc=fail (p=reject sp=reject pct=100) action=oreject 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=dHiSJIS/L79E5hP4ukOV4HNRll7oSsUSn874RISD3Es=; b=qyx4s4VpKQCdI3qqLfFIz6l98N7W9C46dXoD818frOfRBP3IVjr9PF9St4eYX2IE98xwGyUJhHV5fzpAYZfeRO9NJ1KRh6mchvil58KiPpFKaU+WdVwqDTCaUfiwwhI6FPZLGsp0sMLEQIr/ed9m3ATupY25PqcPAGSSvxlo0mD1ZQ6cScRAgNsisqflzZ41XgGQi2BTpqhI8gCbtEZirSRTUpQRMy/ntzvtKQha9gyGYoKAp8D7l9Za+PMvDcGjLU+ZKoD3VxZ3SCKmQI6lKpeC0R/6l3COZd/p0IcBsPrXDAx3X9qctnYoN2LRI8pw4YX7suY4krCDy+h9T6L5DA== Received: from DS7PR05CA0063.namprd05.prod.outlook.com (2603:10b6:8:57::19) by MN2PR12MB4255.namprd12.prod.outlook.com (2603:10b6:208:198::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.29; Wed, 19 Oct 2022 18:41:31 +0000 Received: from DM6NAM11FT081.eop-nam11.prod.protection.outlook.com (2603:10b6:8:57:cafe::d3) by DS7PR05CA0063.outlook.office365.com (2603:10b6:8:57::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5746.11 via Frontend Transport; Wed, 19 Oct 2022 18:41:31 +0000 X-MS-Exchange-Authentication-Results: spf=none (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=fail action=oreject header.from=nvidia.com; Received-SPF: None (protection.outlook.com: nvidia.com does not designate permitted sender hosts) Received: from mail.nvidia.com (216.228.117.160) by DM6NAM11FT081.mail.protection.outlook.com (10.13.172.136) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5746.16 via Frontend Transport; Wed, 19 Oct 2022 18:41:31 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.26; Wed, 19 Oct 2022 11:41:17 -0700 Received: from nvidia.com (10.126.230.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.29; Wed, 19 Oct 2022 11:41:15 -0700 From: Michael Savisko To: CC: , , , , Matan Azrad Subject: [PATCH v2 3/4] net/mlx5: add send to kernel action resource holder Date: Wed, 19 Oct 2022 21:40:06 +0300 Message-ID: <20221019184007.1032874-4-michaelsav@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20221019184007.1032874-1-michaelsav@nvidia.com> References: <20221019184007.1032874-1-michaelsav@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6NAM11FT081:EE_|MN2PR12MB4255:EE_ X-MS-Office365-Filtering-Correlation-Id: a290c0c0-0eee-4d8d-25fc-08dab2018a7a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: sHco2ZMGBa6+DXuvb060fj01pVoLjkC/KR9RINN8r/b4yd4PckDeLtDpQW5Hgw6d0Hwm+ZfrHFppHOS6HymWzDTGuNT6Wgwctw/ck+NHcTTFBXYs8xNc5butE0293ab4/GLVn/E2RgguTSNreRunGiGB0TcznYM0OKGKuBYAbeSCStT8Xerd8zhfRWo/Nhm1LKDdloTc16SsbpAOMAH/87p9XArDhhzQbb1iCbhAq5ISLhFgSDhvYK/nvNgwLPReb4i79UE93FqN0YN3oSNwE9BPFtb+z9V/DqlOx8RlOmhtMfEQKCtTgeHC4zp7Rad+sB1BGzeYrxruUEZ15+MI/fvCdpa6uhdsjTnIz1FGKh6CX+Ttro0W1RPydkpqfEU1KVjRvV3GJXXn8V/AI9CmwllmFFu3G/ZVrgFeUNP879lKK5U29U/G6tsf7bfG6FyymFztqbt9Tk84QagU4TJJ4hS+YgaYTUSBr3Xh28B8EHlQIQkfzwgBeRc3jq2gpnNGlbpwuBYc+59N+/MGSJ7nlKldF34rJB+kQUOadK38JfYnrAiZI/kNcIf3V4I7Eac8eWL384QfK0rNNRkToCIiuXpafQVNolSXKKBAizoEa67dc9dAZGLplP5QRCVAq2wapQCJd+S3mXSRRpl7O8jbvFos2PNLHMI+h3v8UyOIZOukSdqo34JJMoR5Z9zz/OplP7MYrrwPOr2cs0NM8Az/mwA812GjLxiZXo2oxmXixJujMTruhOvlAbBopElHZSjZbdb0WFdW29FfU+kkrGbmAQ== X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230022)(4636009)(346002)(396003)(376002)(39860400002)(136003)(451199015)(40470700004)(46966006)(36840700001)(1076003)(16526019)(186003)(83380400001)(47076005)(7636003)(356005)(426003)(36860700001)(86362001)(336012)(2616005)(82740400003)(5660300002)(2906002)(478600001)(8936002)(82310400005)(8676002)(4326008)(55016003)(40480700001)(107886003)(40460700003)(6286002)(26005)(70586007)(6916009)(7696005)(316002)(41300700001)(70206006)(6666004)(54906003)(36756003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Oct 2022 18:41:31.2912 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a290c0c0-0eee-4d8d-25fc-08dab2018a7a X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT081.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4255 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 Add new structure mlx5_send_to_kernel_action which will hold together allocated action resource and a reference to used table. A new structure member of this type added to struct mlx5_dev_ctx_shared. The member will be initialized upon first created send_to_kernel action and will be reused for all future actions of this type. Release of these resources will be done when all shared DR resources are being released in mlx5_os_free_shared_dr(). Change function flow_dv_tbl_resource_release() from static to external. Signed-off-by: Michael Savisko Acked-by: Matan Azrad --- drivers/net/mlx5/linux/mlx5_os.c | 13 +++++++++++++ drivers/net/mlx5/mlx5.h | 6 ++++++ drivers/net/mlx5/mlx5_flow.h | 2 ++ drivers/net/mlx5/mlx5_flow_dv.c | 6 +----- 4 files changed, 22 insertions(+), 5 deletions(-) diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c index 60677eb8d7..3e505d8f4c 100644 --- a/drivers/net/mlx5/linux/mlx5_os.c +++ b/drivers/net/mlx5/linux/mlx5_os.c @@ -700,6 +700,19 @@ mlx5_os_free_shared_dr(struct mlx5_priv *priv) mlx5_glue->destroy_flow_action(sh->pop_vlan_action); sh->pop_vlan_action = NULL; } + if (sh->send_to_kernel_action.action) { + void *action = sh->send_to_kernel_action.action; + + mlx5_glue->destroy_flow_action(action); + sh->send_to_kernel_action.action = NULL; + } + if (sh->send_to_kernel_action.tbl) { + struct mlx5_flow_tbl_resource *tbl = + sh->send_to_kernel_action.tbl; + + flow_dv_tbl_resource_release(sh, tbl); + sh->send_to_kernel_action.tbl = NULL; + } #endif /* HAVE_MLX5DV_DR */ if (sh->default_miss_action) mlx5_glue->destroy_flow_action diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h index 3c9e6bad53..c2c3ed81fa 100644 --- a/drivers/net/mlx5/mlx5.h +++ b/drivers/net/mlx5/mlx5.h @@ -1180,6 +1180,11 @@ struct mlx5_flex_item { struct mlx5_flex_pattern_field map[MLX5_FLEX_ITEM_MAPPING_NUM]; }; +struct mlx5_send_to_kernel_action { + void *action; + void *tbl; +}; + /* * Shared Infiniband device context for Master/Representors * which belong to same IB device with multiple IB ports. @@ -1231,6 +1236,7 @@ struct mlx5_dev_ctx_shared { /* Direct Rules tables for FDB, NIC TX+RX */ void *dr_drop_action; /* Pointer to DR drop action, any domain. */ void *pop_vlan_action; /* Pointer to DR pop VLAN action. */ + struct mlx5_send_to_kernel_action send_to_kernel_action; struct mlx5_hlist *encaps_decaps; /* Encap/decap action hash list. */ struct mlx5_hlist *modify_cmds; struct mlx5_hlist *tag_table; diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h index 18a77ec619..525db05969 100644 --- a/drivers/net/mlx5/mlx5_flow.h +++ b/drivers/net/mlx5/mlx5_flow.h @@ -1918,6 +1918,8 @@ struct mlx5_flow_tbl_resource *flow_dv_tbl_resource_get(struct rte_eth_dev *dev, bool external, const struct mlx5_flow_tunnel *tunnel, uint32_t group_id, uint8_t dummy, uint32_t table_id, struct rte_flow_error *error); +int flow_dv_tbl_resource_release(struct mlx5_dev_ctx_shared *sh, + struct mlx5_flow_tbl_resource *tbl); struct mlx5_list_entry *flow_dv_tag_create_cb(void *tool_ctx, void *cb_ctx); int flow_dv_tag_match_cb(void *tool_ctx, struct mlx5_list_entry *entry, diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 6c355efed7..bcd9926b81 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -75,10 +75,6 @@ union flow_dv_attr { uint32_t attr; }; -static int -flow_dv_tbl_resource_release(struct mlx5_dev_ctx_shared *sh, - struct mlx5_flow_tbl_resource *tbl); - static int flow_dv_encap_decap_resource_release(struct rte_eth_dev *dev, uint32_t encap_decap_idx); @@ -10928,7 +10924,7 @@ flow_dv_tbl_remove_cb(void *tool_ctx, struct mlx5_list_entry *entry) * @return * Returns 0 if table was released, else return 1; */ -static int +int flow_dv_tbl_resource_release(struct mlx5_dev_ctx_shared *sh, struct mlx5_flow_tbl_resource *tbl) { From patchwork Wed Oct 19 18:40:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Savisko X-Patchwork-Id: 118651 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 5AB4FA09EC; Wed, 19 Oct 2022 20:41:50 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4D29A42C34; Wed, 19 Oct 2022 20:41:41 +0200 (CEST) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2076.outbound.protection.outlook.com [40.107.243.76]) by mails.dpdk.org (Postfix) with ESMTP id 5D03842C2C for ; Wed, 19 Oct 2022 20:41:40 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dCZX5/X+Tg5kEaK2Sq2/pOq5k/aiIz5Yy5zntbdr1lOdL84ZeGZ+K9OmvRVqfoUsDmAza0iDuqmh206hqpGJKxMWxVKy2fvef/pODO+cP+bnJA0N86ae7H4OXLjbQ0qEwsGuwpotyuHrmRzHfdWjZWRp/a4Zb/TAq3DPf1QjnMnThKJsYwDTqlKQkN3AfAnEY6RA5CepoVW+kyxbyBVCpVF/x/C4htKdF58QpP1dfkeu32RaJkXqzkrZyIAypB8QM1UXpaazo/3EmCrj84DlFK6IpR60FtOeGOKGZXs8zcAUnNYVjPvGz32y5hMQQaYd7MlG2zKCaTtdnNqZY8N21w== 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=Sm3/kzVg2bPCn24vIWGCMeh63Q8dQ4RAEMSae8PZ2rg=; b=eoxzFIHrpDaWiLVAikC9xUyywtDOuf26UMAZ6MBhE6Aem/70JncrAbPxTocXkFRiUU1B2RaSnd4pQdpUtcT3b0QdIjByTKHQ/ziI/LgcIs79IuhHBU2wY/jAGwzp/yhIEUmPMYhonR9uRte6OLRveU1QXDFf1lZl9boOI09LzsYiUH5Hy9eQSw6bIxlOFzwOcU5V3o+68fDn4Te0QVYWXRbqvS+YbuwfstLCkGY2RFLHuC5SlabQnCOXDdNWA943NoNWNtKNzvX8EIe7i9qrELK36sHUwmDvR8n7lSeITH4sZ0tg8cfF3FLSWv9duyJmvvSyZtDu5AxAvcVLDNCjaw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none (sender ip is 216.228.117.161) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com; dmarc=fail (p=reject sp=reject pct=100) action=oreject 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=Sm3/kzVg2bPCn24vIWGCMeh63Q8dQ4RAEMSae8PZ2rg=; b=IipFS126kPVb0QbuaQpFSWLjMVplmnZHkp+zVyzbw2TdrkwAyBr9wwB0XuEJsDRaA5dqKMXC23osRcchL9zo3sNAGjBajy+J8al97nCIIabdmgYloe7JiVyKJtie9tWM5gIzeZnvFIhOvM+ysr9w+Qjm8AbeVUU3sSxHtsuaXUvcDEuZ0KoVk9WpIIPn7/GqAiE+BnLcvy7RtdMZ4/ZFyCfkyvOxnVgzkYZt/z7YHfGGB6Cr6m+41AUV61rDgo7kOu8ALUFqCyGaV+hUKy7zTXLeUWcfclH56sVKVpOZ4oTlywvcGFf5MmI/4DXLP2+U7MisQfToFIm3uTqYvEXOUQ== Received: from MW4P221CA0030.NAMP221.PROD.OUTLOOK.COM (2603:10b6:303:8b::35) by MW4PR12MB7239.namprd12.prod.outlook.com (2603:10b6:303:228::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.26; Wed, 19 Oct 2022 18:41:38 +0000 Received: from CO1NAM11FT112.eop-nam11.prod.protection.outlook.com (2603:10b6:303:8b:cafe::38) by MW4P221CA0030.outlook.office365.com (2603:10b6:303:8b::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.34 via Frontend Transport; Wed, 19 Oct 2022 18:41:38 +0000 X-MS-Exchange-Authentication-Results: spf=none (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=fail action=oreject header.from=nvidia.com; Received-SPF: None (protection.outlook.com: nvidia.com does not designate permitted sender hosts) Received: from mail.nvidia.com (216.228.117.161) by CO1NAM11FT112.mail.protection.outlook.com (10.13.174.213) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5746.16 via Frontend Transport; Wed, 19 Oct 2022 18:41:38 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.26; Wed, 19 Oct 2022 11:41:21 -0700 Received: from nvidia.com (10.126.230.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.29; Wed, 19 Oct 2022 11:41:19 -0700 From: Michael Savisko To: CC: , , , , Matan Azrad , Ferruh Yigit Subject: [PATCH v2 4/4] net/mlx5: translation of rte flow send to kernel action Date: Wed, 19 Oct 2022 21:40:07 +0300 Message-ID: <20221019184007.1032874-5-michaelsav@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20221019184007.1032874-1-michaelsav@nvidia.com> References: <20221019184007.1032874-1-michaelsav@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1NAM11FT112:EE_|MW4PR12MB7239:EE_ X-MS-Office365-Filtering-Correlation-Id: cafb5de9-0fe4-474c-4bf0-08dab2018eaf X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: WJMuLpwBDBXlZ2XTgUlvu8nXeLcGIwehTD3Ndw5u/Y8LzyETS4nGVSDBlFNjVjGQCKt7ym2QyRTKLWNIoTVJJ0IjfKfDNsRmZCQFdwpMBvdAAOz1PaqblcbfBpvfIhn6i0e6VEeQJXZ5anHCokwP/EqvE1sVzY6/4zB4RDuMkEItr4/xNf7oxfzbfzk8n5dnF9LAEKQ8jSjPLipbAVpKjCpxelMCzRcmGhTqcEMbmrqpI5tno4ya9eZCWj1Ks+qKH+U6hpImwCKEHJen6jnpHYBW3RPUOC5RTfFvbZk92uJR3laZ2EQtx+2Q0tzyHHP/sBmH7anD9y3mWnH1rnOmGd4OPXAhSCtID5IK72VGD8/RSDtTGjhiqUk1xOpaiY0Uu2gddXu7EtjZ/HAzhK+AL9nzOjJhTi+UmGfNbuZnnxOABNOOibynndNGkj7nOicVJ7/nSFPdt2fwoQiaZiN+BUKEicQRqt2EQ7aJC9+5ifSXgLV6btMDO3F/Rj2MObr0qTGcbvgPJOWMUzEb6gxwoZIDjbY88Zs9L6g5yUdt7kxi8tCzT87sK8RbuBn8FnCiohDxCYrxOdos8piNqTbWwVf49lXoipBLFQRZ1Y7bmaLDXD0qoKz6LPBqweNVBYJ3EWIwYfGwczUy6GM/LMteYEBCWWrwvzVO8+TnwFcDz/32WXCs7SYR2+GWVbdeRLbhD7h3Ybfx7yEPVSdx6TAs8PWmC4ngdpobl47DjeHMqG/QSsvoceZBGsB0FSZii8dvJpicW1odWC53sW2dy8RBug== X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230022)(4636009)(376002)(346002)(136003)(39860400002)(396003)(451199015)(36840700001)(40470700004)(46966006)(41300700001)(26005)(40460700003)(186003)(82310400005)(6286002)(336012)(478600001)(2616005)(1076003)(16526019)(36756003)(6666004)(86362001)(2906002)(8936002)(5660300002)(4326008)(7696005)(82740400003)(36860700001)(6916009)(40480700001)(54906003)(316002)(47076005)(55016003)(8676002)(70586007)(83380400001)(7636003)(426003)(356005)(70206006); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Oct 2022 18:41:38.3035 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: cafb5de9-0fe4-474c-4bf0-08dab2018eaf X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT112.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR12MB7239 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 Introduce mlx5_get_send_to_kernel_priority() function which returns value of priority which must be used to jump back to table 0 in order to send traffic to kernel. This function returns lowest priority. Add flow_dv_translate_action_send_to_kernel() function which will allocate rdma-core send_to_kernel action object. Called from flow_dv_translate(). Fail translation of RTE_FLOW_ACTION_TYPE_SEND_TO_KERNEL action in HW steering. Signed-off-by: Michael Savisko Acked-by: Matan Azrad --- doc/guides/nics/features/default.ini | 1 + doc/guides/nics/features/mlx5.ini | 1 + drivers/net/mlx5/mlx5_flow.c | 32 ++++++++++++++++ drivers/net/mlx5/mlx5_flow.h | 1 + drivers/net/mlx5/mlx5_flow_dv.c | 57 ++++++++++++++++++++++++++-- drivers/net/mlx5/mlx5_flow_hw.c | 3 ++ 6 files changed, 92 insertions(+), 3 deletions(-) diff --git a/doc/guides/nics/features/default.ini b/doc/guides/nics/features/default.ini index b450ef7e1a..5ed2b90843 100644 --- a/doc/guides/nics/features/default.ini +++ b/doc/guides/nics/features/default.ini @@ -198,3 +198,4 @@ set_ttl = vf = vxlan_decap = vxlan_encap = +send_to_kernel = diff --git a/doc/guides/nics/features/mlx5.ini b/doc/guides/nics/features/mlx5.ini index e5974063c8..9f158ef171 100644 --- a/doc/guides/nics/features/mlx5.ini +++ b/doc/guides/nics/features/mlx5.ini @@ -128,3 +128,4 @@ set_tp_src = Y set_ttl = Y vxlan_decap = Y vxlan_encap = Y +send_to_kernel = Y diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index e4744b0a67..de998a9720 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -10967,6 +10967,38 @@ mlx5_flow_adjust_priority(struct rte_eth_dev *dev, int32_t priority, return res; } +/** + * Get the priority for sending traffic to kernel table. + * + * @param[in] dev + * Pointer to the Ethernet device structure. + * + * @return + * On success: the value of priority for sending traffic to kernel table + * On failure: -1 + */ +uint32_t +mlx5_get_send_to_kernel_priority(struct rte_eth_dev *dev) +{ + struct mlx5_priv *priv = dev->data->dev_private; + uint32_t res; + + switch (priv->sh->flow_max_priority) { + case RTE_DIM(priority_map_5): + res = 15; + break; + case RTE_DIM(priority_map_3): + res = 7; + break; + default: + DRV_LOG(ERR, + "port %u maximum priority: %d expected 8/16", + dev->data->port_id, priv->sh->flow_max_priority); + res = (uint32_t)-1; + } + return res; +} + /** * Get the E-Switch Manager vport id. * diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h index 525db05969..8e97fa188a 100644 --- a/drivers/net/mlx5/mlx5_flow.h +++ b/drivers/net/mlx5/mlx5_flow.h @@ -1753,6 +1753,7 @@ uint32_t mlx5_get_lowest_priority(struct rte_eth_dev *dev, uint16_t mlx5_get_matcher_priority(struct rte_eth_dev *dev, const struct rte_flow_attr *attr, uint32_t subpriority, bool external); +uint32_t mlx5_get_send_to_kernel_priority(struct rte_eth_dev *dev); int mlx5_flow_get_reg_id(struct rte_eth_dev *dev, enum mlx5_feature_name feature, uint32_t id, diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index bcd9926b81..4bdcb1815b 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -12192,6 +12192,51 @@ flow_dv_translate_action_sample(struct rte_eth_dev *dev, return 0; } +static void * +flow_dv_translate_action_send_to_kernel(struct rte_eth_dev *dev, + struct rte_flow_error *error) +{ + struct mlx5_flow_tbl_resource *tbl; + struct mlx5_dev_ctx_shared *sh; + uint32_t priority; + void *action; + int ret; + + sh = MLX5_SH(dev); + if (sh->send_to_kernel_action.action) + return sh->send_to_kernel_action.action; + priority = mlx5_get_send_to_kernel_priority(dev); + if (priority == (uint32_t)-1) { + rte_flow_error_set(error, ENOTSUP, + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, + "required priority is not available"); + return NULL; + } + tbl = flow_dv_tbl_resource_get(dev, 0, 0, 0, false, NULL, 0, 0, 0, + error); + if (!tbl) { + rte_flow_error_set(error, ENODATA, + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, + "cannot find destination root table"); + return NULL; + } + ret = mlx5_flow_os_create_flow_action_send_to_kernel(tbl->obj, + priority, &action); + if (ret) { + rte_flow_error_set(error, ENOMEM, + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, + "cannot create action"); + goto err; + } + MLX5_ASSERT(action); + sh->send_to_kernel_action.action = action; + sh->send_to_kernel_action.tbl = tbl; + return action; +err: + flow_dv_tbl_resource_release(sh, tbl); + return NULL; +} + /** * Convert Sample action to DV specification. * @@ -13697,9 +13742,15 @@ flow_dv_translate(struct rte_eth_dev *dev, action_flags |= MLX5_FLOW_ACTION_CT; break; case RTE_FLOW_ACTION_TYPE_SEND_TO_KERNEL: - return rte_flow_error_set(error, ENOTSUP, - RTE_FLOW_ERROR_TYPE_ACTION, - NULL, "send to kernel action is not supported."); + dev_flow->dv.actions[actions_n] = + flow_dv_translate_action_send_to_kernel(dev, + error); + if (!dev_flow->dv.actions[actions_n]) + return -rte_errno; + actions_n++; + action_flags |= MLX5_FLOW_ACTION_SEND_TO_KERNEL; + dev_flow->handle->fate_action = + MLX5_FLOW_FATE_SEND_TO_KERNEL; break; case RTE_FLOW_ACTION_TYPE_END: actions_end = true; diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index 12498794a5..b168ff9e7e 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -707,6 +707,9 @@ flow_hw_actions_translate(struct rte_eth_dev *dev, reformat_pos = i++; refmt_type = MLX5DR_ACTION_REFORMAT_TYPE_TNL_L2_TO_L2; break; + case RTE_FLOW_ACTION_TYPE_SEND_TO_KERNEL: + DRV_LOG(ERR, "send to kernel action is not supported in HW steering."); + goto err; case RTE_FLOW_ACTION_TYPE_END: actions_end = true; break;