From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 45ED4A00C2; Mon, 31 Oct 2022 09:21:16 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D556140151; Mon, 31 Oct 2022 09:21:15 +0100 (CET) Received: from NAM02-DM3-obe.outbound.protection.outlook.com (mail-dm3nam02on2048.outbound.protection.outlook.com [40.107.95.48]) by mails.dpdk.org (Postfix) with ESMTP id C071D400D5 for ; Mon, 31 Oct 2022 09:21:14 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PF+/ccGKMIf7tptDtKG5i6Uybw3y38c8kmFlRB/GQJKfGEyUaOAEWbtjFR/CdO5ulz4PvTQuXpbb8SEsFCd5yhtRKcSBg2tt9n/NznM03GFYsBaw3eZ0lF0wtxxdpXqiSMyb3SiGKJ6G66yehg+MlphXumj3B/hiMF2EYoc3Nz0DZbtg/G8Xuq0yrqZjM56QWQItP7KX8nEwHjxH0g7CrnX9TK6UGE1hW711CUMCpCmEbnvCGipx7+FbENnFOToWL93BXd2nX7gT2/nO9E5CBB7PRruLHJBHg50Ux6GEeIcX7uQKO7NeweXpie3MJRIHZ5QH3Xl4rdDvBYPeIaHLaQ== 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=Z+PyWZsQKlXSCwghhvjB25IjcJh7EEaRLidgDcfC3p8=; b=e0eM4D5feuCuFTfLDjiXoxSMhNDxGNHwkXaLXsw7gglNAB5qiRTh1Z6JmxBgESbOJ7jpvHrE57gpp5RFe2WGXWYU6hdpkSiBZVQCmTP9tNdIj7jNe2FBsL6mdN+1LmL0owY5826OeGNW5y0zOvchnwb5D0Cdrsp5/CvyN0pJ68ga3St6T93vPngOcqBx6Lb0BuTmiV+o76+8pxj/szbkQyFtwa1y3X4WMFultdREx7UcrrFuV07zYojEQxBvCK9TkdWRvQ7HYRc8KhBRxV06gu2wlEqc1yEMu05DCQqPbH5rYrEEJzHFDBtpMUeLbjcdjCy8XgGKz/+ZG1TWr8twmw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) 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=Z+PyWZsQKlXSCwghhvjB25IjcJh7EEaRLidgDcfC3p8=; b=Zr5XrXf8ktHwKR64h2aRv1MXCiahX2lQMCL4HPisPkp1aO/HDxkBlon1+I1ZvTtpXd8KokLXFIRUaGkm1w5aPtj7f0X/orNfxHlzs5LnieaKttuvjlAcAJ9Q/aRe0SexM1s1yfmnA82sQsB+SCzHAWMXs3IGokMCf3E7/QtYSNTNdgvBAilCT3aVGC8mR/jphvMcknx4uTm6bd3VguqLTx8q9V+i0auZV5Qq4/FUZyUVtBYnltUFluoRAz4NaEFqd8aIOBNc42R/JelWg/UxVFILB/pX/D8Vp91TrO45y4pAUJ97hhJtddw0OJP2DiTserDrEU8Jg12SiZWkIHO1wA== Received: from MW4PR04CA0178.namprd04.prod.outlook.com (2603:10b6:303:85::33) by MW3PR12MB4473.namprd12.prod.outlook.com (2603:10b6:303:56::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5769.19; Mon, 31 Oct 2022 08:21:12 +0000 Received: from CO1NAM11FT037.eop-nam11.prod.protection.outlook.com (2603:10b6:303:85:cafe::3d) by MW4PR04CA0178.outlook.office365.com (2603:10b6:303:85::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5769.19 via Frontend Transport; Mon, 31 Oct 2022 08:21:12 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) 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 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by CO1NAM11FT037.mail.protection.outlook.com (10.13.174.91) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5769.14 via Frontend Transport; Mon, 31 Oct 2022 08:21:12 +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; Mon, 31 Oct 2022 01:21:03 -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; Mon, 31 Oct 2022 01:21:01 -0700 From: Suanming Mou To: Matan Azrad , Viacheslav Ovsiienko CC: , Subject: [PATCH] net/mlx5: enable flow aging action Date: Mon, 31 Oct 2022 10:20:44 +0200 Message-ID: <20221031082044.8106-1-suanmingm@nvidia.com> X-Mailer: git-send-email 2.18.1 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1NAM11FT037:EE_|MW3PR12MB4473:EE_ X-MS-Office365-Filtering-Correlation-Id: b63ed98f-8d6a-4c46-f910-08dabb18df6b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Nn/t6Q+fRFFSx6dW2BTSW2QshruZNqQBQzkJtd4Ra0vMSrZcssg/QKk8A4sBIVDBkHJeIjgrMoFhQn6Ok0giXGqaNC3JA9uNZzRXncnsA/EkR0YnspL3U0Go8Ur3gopApshV2HQzNpVgHWw/eu9YJMttZKzY1nHeP+0AoBz8JEiTxh1q2pcG9lAZiJQhusqtnX+v92H3VnAbPL9Ed/w6YVU10IprqdLWrp3sBdJm5kLaKlWdQVDa0r87Te+xTRFu3+iCVigOgYTLfXHLkwvMtpU1uA9slwhHkw4QQo+cuaJiiA2P7Zt2fKMCPqPOYGxqzZaF4+LDjZgh/G/QNgiN70iVKKxZOVO/pR+2sHbmFN1kEdQNKgxJBRalsUz05U9+NFWlgkadPMB+b2RPFKl9NgqqOjASh877jLCTR0ykryQ4MDK6JOgJ77Rv7G0J962hLeVBnJE81Xwbdv5dHECmBL825swiLq/BY6PXUodRlbfNj7DqDCyDLMeaMihFPFn9DErWnOAT4obOooGciY+43ukAm9BrHDl/BguCiGLsxvmX4Jj/BJOYcTS78YAEWTglUb9MtTh5N/kh4+f0tobx3xO4H6MfcmeDjx+gxJNnmcSgTeGkW6BixAxzC/6k5vRsu9HBkpB/cBlb1AvUgcQd7m69zR/3nmIQFfIWDIGy5OgPPqQtHjqOUgVH4ev2Fsb0APwV66MRqjRVU1igtQS6o9tpHxmV8ocDEDcZYzi+EAt0vuYUCTmPaqxxGSsuWtjTWrqeFxrDw1Bnno9D+LVXNFU1cybvIMUt9sdUMSMPqm4rxSBoKigsscmDWT5zq+XZQ1bkmmbv3ILlOzl4iwiorjx/DO6BctZYI3b+Jy+sQW0= 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)(136003)(39860400002)(376002)(346002)(396003)(451199015)(46966006)(40470700004)(36840700001)(8936002)(26005)(107886003)(6666004)(7696005)(6286002)(478600001)(966005)(82310400005)(55016003)(5660300002)(36756003)(356005)(7636003)(82740400003)(47076005)(336012)(16526019)(426003)(2906002)(40460700003)(2616005)(1076003)(36860700001)(86362001)(186003)(83380400001)(316002)(110136005)(6636002)(54906003)(70206006)(70586007)(40480700001)(4326008)(8676002)(41300700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Oct 2022 08:21:12.7413 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b63ed98f-8d6a-4c46-f910-08dabb18df6b 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: CO1NAM11FT037.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW3PR12MB4473 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 As the queue-based aging API has been integrated[1], the flow aging action support in HWS steering code can be enabled now. [1]: https://patchwork.dpdk.org/project/dpdk/cover/20221026214943.3686635-1-michaelba@nvidia.com/ Signed-off-by: Suanming Mou --- drivers/net/mlx5/mlx5_flow.c | 2 -- drivers/net/mlx5/mlx5_flow_hw.c | 2 -- drivers/net/mlx5/mlx5_hws_cnt.c | 11 ----------- 3 files changed, 15 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index 8e7d649d15..e28587da8e 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -1084,9 +1084,7 @@ static const struct rte_flow_ops mlx5_flow_ops = { .isolate = mlx5_flow_isolate, .query = mlx5_flow_query, .dev_dump = mlx5_flow_dev_dump, -#ifdef MLX5_HAVE_RTE_FLOW_Q_AGE .get_q_aged_flows = mlx5_flow_get_q_aged_flows, -#endif .get_aged_flows = mlx5_flow_get_aged_flows, .action_handle_create = mlx5_action_handle_create, .action_handle_destroy = mlx5_action_handle_destroy, diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index 2d275ad111..0e904e4dea 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -7032,10 +7032,8 @@ flow_hw_configure(struct rte_eth_dev *dev, goto err; if (_queue_attr) mlx5_free(_queue_attr); -#ifdef MLX5_HAVE_RTE_FLOW_Q_AGE if (port_attr->flags & RTE_FLOW_PORT_FLAG_STRICT_QUEUE) priv->hws_strict_queue = 1; -#endif return 0; err: if (priv->hws_ctpool) { diff --git a/drivers/net/mlx5/mlx5_hws_cnt.c b/drivers/net/mlx5/mlx5_hws_cnt.c index b8ce69af57..534a4d76ce 100644 --- a/drivers/net/mlx5/mlx5_hws_cnt.c +++ b/drivers/net/mlx5/mlx5_hws_cnt.c @@ -846,7 +846,6 @@ int mlx5_hws_age_action_update(struct mlx5_priv *priv, uint32_t idx, const void *update, struct rte_flow_error *error) { -#ifdef MLX5_HAVE_RTE_FLOW_Q_AGE const struct rte_flow_update_age *update_ade = update; struct mlx5_age_info *age_info = GET_PORT_AGE_INFO(priv); struct mlx5_indexed_pool *ipool = age_info->ages_ipool; @@ -899,14 +898,6 @@ mlx5_hws_age_action_update(struct mlx5_priv *priv, uint32_t idx, __ATOMIC_RELAXED); } return 0; -#else - RTE_SET_USED(priv); - RTE_SET_USED(idx); - RTE_SET_USED(update); - return rte_flow_error_set(error, ENOTSUP, - RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, - "update age action not supported"); -#endif } /** @@ -1193,9 +1184,7 @@ mlx5_hws_age_pool_init(struct rte_eth_dev *dev, uint32_t nb_ages_updated; int ret; -#ifdef MLX5_HAVE_RTE_FLOW_Q_AGE strict_queue = !!(attr->flags & RTE_FLOW_PORT_FLAG_STRICT_QUEUE); -#endif MLX5_ASSERT(priv->hws_cpool); nb_alloc_cnts = mlx5_hws_cnt_pool_get_size(priv->hws_cpool); if (strict_queue) { -- 2.25.1