From patchwork Thu Nov 4 17:59: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: 103782 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 11B1AA0C57; Thu, 4 Nov 2021 18:59:36 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5235642771; Thu, 4 Nov 2021 18:59:34 +0100 (CET) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2047.outbound.protection.outlook.com [40.107.220.47]) by mails.dpdk.org (Postfix) with ESMTP id 1D89142766 for ; Thu, 4 Nov 2021 18:59:33 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TlhtE/MEMrHRfEaJwb8rdS9mEgRrkUCQHc7fkm491UJr9QEd5CN3Z14vF9PVP9uHHraHcVLdWlhYCziIT1GDzCzVmhDnatdz//oCP+Ig1wRrWbzc7oAXKHwhmxnRzwwRIRl2vFFo3x3ZteU57w99FzCIlF1zi0ReeXxQDPm7Rpzea7PygrfMwKjtGpyTkurbkPNDJqQ13pN2cVVQISO/4QVCGcZO+mWwzqPeKSvIdAvICqP87+enUfwu7ze86NcwiYiYRVCHOxCyqlX4+vzw5TSXY/Qpixgyb6I/fZlNThlVTI5taDa5YGk2gaQC6xe4Tnw7xnlYafD5wR07CnBCVQ== 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=Q1uQUdj9ywda9C4+YndJcu0OHggR0KhwM9v/phGEDKk=; b=KTVyLPzO5goX43L3WJyC9FVHj8ATlMZrvshUFzreTiMKFZRr07CFm4EZ0sMXOChILPnNVr8GsP4pzgn2SZcw+peNlmpEPnucw9Z6Y8bsMV+TOgJCpwpBcS/PWPp7BelAA5Ea15e1kPkcPhoAxTM/IGga8HM7NFen5zo1DduX1Vh+gOkkz6H65BFTHxnnWTWk0mjb/SfoZx1OZuGvQdFKTvOgQ9pHH1FZvOxfXv3YQeXO+qud7Yj3F0PArcnW4ivc4i3epUcjtunWP3Lh0nQf9qWmZOdF/Q2ydRm6dIAo49oMBSTW/Dz5jjhITCNS/x4SCkqKM6uZGx8eSWDP8PIonA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=monjalon.net smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=quarantine 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=Q1uQUdj9ywda9C4+YndJcu0OHggR0KhwM9v/phGEDKk=; b=qrTM9Rb9tWeYXDyE4OFBQWJowKJrgd8eqAv4gJnSRIjJKTym7+GV3iU155AyM4PWSqb4Vzvwk8kL8XF52JjYsqNlpnxd2mlx0yWNGN0HJcEVwfmqOD3tuCd5dy3Tm3zR69S7cuz6kXExLPiKVMtMKEqbgeDrH2279YFbBlhL+qtVw7IjI0QA24CiO7+zU8LIMHidi3PBsynMnlsQz6GqGuVbEN5GOj9ScQ6SEVDkIKSVlw9l0Mnzf2ex86ISJNn9ZnkD6Ke6eMpSFtP9/z03OhSyXqv2Aq7ZUWIIT02KCFX0U3TmyG0ci/9hiP6mfHf/WbFZirY6qhc0oq6QwiauSw== Received: from BN8PR15CA0024.namprd15.prod.outlook.com (2603:10b6:408:c0::37) by CH2PR12MB3928.namprd12.prod.outlook.com (2603:10b6:610:23::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.11; Thu, 4 Nov 2021 17:59:30 +0000 Received: from BN8NAM11FT010.eop-nam11.prod.protection.outlook.com (2603:10b6:408:c0:cafe::63) by BN8PR15CA0024.outlook.office365.com (2603:10b6:408:c0::37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.11 via Frontend Transport; Thu, 4 Nov 2021 17:59:30 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; monjalon.net; dkim=none (message not signed) header.d=none;monjalon.net; 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 BN8NAM11FT010.mail.protection.outlook.com (10.13.177.53) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4669.10 via Frontend Transport; Thu, 4 Nov 2021 17:59:30 +0000 Received: from nvidia.com (172.20.187.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Thu, 4 Nov 2021 17:59:22 +0000 From: Bing Zhao To: , CC: , , , Date: Thu, 4 Nov 2021 19:59:03 +0200 Message-ID: <20211104175904.60696-2-bingz@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20211104175904.60696-1-bingz@nvidia.com> References: <20211104112644.17278-1-bingz@nvidia.com> <20211104175904.60696-1-bingz@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.187.5] X-ClientProxiedBy: HQMAIL107.nvidia.com (172.20.187.13) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8156f2f8-be80-43ac-584f-08d99fbcd9a5 X-MS-TrafficTypeDiagnostic: CH2PR12MB3928: X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6790; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NuBTwVGXqKXhQ20z64nGO5D+2j3hAqERVZFtvInPqR9gK8A/ITdu6yl2WIDtaIobADanYoOlZMiBkwBFidZUMh/2PjwhCCUMYN/CwGPUlNSZfH1zL0kZK5HrjRsQ6z45PnuW4qKpJ/VIJDuIbsulhSRsYoBV2zL/zBe2EBtDbVIDTcOe7gIkXmyaFu3PXDBNQjEdcTAs4tPkhRNqX50YTEwYzQspivLWC7+Oba+IQ04uloo4ifVO5gCOyY4qRijAWYvG0HPXWec90QJNn6DnZkQQchwSLjp42EwtdvaDNLUstJkbUnZHzlTDnlrc9ykLtuo2tWkDTBEApgBU816ntuUi2itOfhth2NdKF/3jhcmY7ppMM0outX3RY9LEtUKU8ct+eOwPDEBCKYlOry8Socki/nwMPK7uP34x7YECjJu5wege81VTBX7W9vEtpP7e4FIU6uYPQK3M1WuLWt+NuLurAQ3/uNqSp4yPJRkkVSTgJHZu3s5/mpNBvtghmR/FpJa7TC5YqeBkb0H1YvYe0CYD2/Y0fKBJrR7OyUz1XJjubhs9HKw9YEYXrI90t7k8oc0jnxMZuzokLH/+Ox6/dEQdnObJrRo6QBCdS8cHcvJbFKAONUpYyWW3ZLbn1Do/7espl5fzu/hu72nFrQigWWQYqIYPwhDSJqMjAhZBmEZOKgiCjnKKD6Q1w2ixyABlqPe7qCMbX+vJx3XSD9VWi6aTHTzsQOWEhCmFfahqfq0= 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)(36840700001)(46966006)(110136005)(316002)(7636003)(54906003)(4326008)(356005)(55016002)(2906002)(36756003)(6636002)(8676002)(5660300002)(1076003)(70586007)(70206006)(16526019)(83380400001)(107886003)(336012)(86362001)(426003)(26005)(82310400003)(36860700001)(8936002)(508600001)(7696005)(186003)(6666004)(6286002)(2616005)(47076005)(309714004); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Nov 2021 17:59:30.1587 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8156f2f8-be80-43ac-584f-08d99fbcd9a5 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: BN8NAM11FT010.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB3928 Subject: [dpdk-dev] [PATCH v4 1/2] net/mlx5: add support for Rx queue delay drop 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" For the Ethernet RQs, if there all receiving descriptors are exhausted, the packets being received will be dropped. This behavior prevents slow or malicious software entities at the host from affecting the network. While for hairpin cases, even if there is no software involved during the packet forwarding from Rx to Tx side, some hiccup in the hardware or back pressure from Tx side may still cause the descriptors to be exhausted. In certain scenarios it may be preferred to configure the device to avoid such packet drops, assuming the posting of descriptors will resume shortly. To support this, a new devarg "delay_drop_en" is introduced, by default, the delay drop is enabled for hairpin Rx queues and disabled for standard Rx queues. This value is used as a bit mask: - bit 0: enablement of standard Rx queue - bit 1: enablement of hairpin Rx queue And this attribute will be applied to all Rx queues of a device. The "rq_delay_drop" capability in the HCA_CAP is checked before creating any queue. If the hardware capabilities do not support this delay drop, all the Rx queues will still be created without this attribute, and the devarg setting will be ignored even if it is specified explicitly. Signed-off-by: Bing Zhao Acked-by: Viacheslav Ovsiienko --- drivers/common/mlx5/mlx5_devx_cmds.c | 1 + drivers/common/mlx5/mlx5_devx_cmds.h | 1 + drivers/net/mlx5/linux/mlx5_os.c | 11 +++++++++++ drivers/net/mlx5/mlx5.c | 7 +++++++ drivers/net/mlx5/mlx5.h | 9 +++++++++ drivers/net/mlx5/mlx5_devx.c | 5 +++++ drivers/net/mlx5/mlx5_rx.h | 1 + 7 files changed, 35 insertions(+) diff --git a/drivers/common/mlx5/mlx5_devx_cmds.c b/drivers/common/mlx5/mlx5_devx_cmds.c index 4ab3070da0..3748e54b22 100644 --- a/drivers/common/mlx5/mlx5_devx_cmds.c +++ b/drivers/common/mlx5/mlx5_devx_cmds.c @@ -964,6 +964,7 @@ mlx5_devx_cmd_query_hca_attr(void *ctx, attr->ct_offload = !!(MLX5_GET64(cmd_hca_cap, hcattr, general_obj_types) & MLX5_GENERAL_OBJ_TYPES_CAP_CONN_TRACK_OFFLOAD); + attr->rq_delay_drop = MLX5_GET(cmd_hca_cap, hcattr, rq_delay_drop); if (attr->qos.sup) { hcattr = mlx5_devx_get_hca_cap(ctx, in, out, &rc, MLX5_GET_HCA_CAP_OP_MOD_QOS_CAP | diff --git a/drivers/common/mlx5/mlx5_devx_cmds.h b/drivers/common/mlx5/mlx5_devx_cmds.h index 86ee4f7b78..50d3264b46 100644 --- a/drivers/common/mlx5/mlx5_devx_cmds.h +++ b/drivers/common/mlx5/mlx5_devx_cmds.h @@ -178,6 +178,7 @@ struct mlx5_hca_attr { uint32_t swp_csum:1; uint32_t swp_lso:1; uint32_t lro_max_msg_sz_mode:2; + uint32_t rq_delay_drop:1; uint32_t lro_timer_supported_periods[MLX5_LRO_NUM_SUPP_PERIODS]; uint16_t lro_min_mss_size; uint32_t flex_parser_protocols; diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c index e0304b685e..de880ee4c9 100644 --- a/drivers/net/mlx5/linux/mlx5_os.c +++ b/drivers/net/mlx5/linux/mlx5_os.c @@ -1508,6 +1508,15 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev, goto error; #endif } + if (config->std_delay_drop || config->hp_delay_drop) { + if (!config->hca_attr.rq_delay_drop) { + config->std_delay_drop = 0; + config->hp_delay_drop = 0; + DRV_LOG(WARNING, + "dev_port-%u: Rxq delay drop is not supported", + priv->dev_port); + } + } if (sh->devx) { uint32_t reg[MLX5_ST_SZ_DW(register_mtutc)]; @@ -2077,6 +2086,8 @@ mlx5_os_config_default(struct mlx5_dev_config *config) config->decap_en = 1; config->log_hp_size = MLX5_ARG_UNSET; config->allow_duplicate_pattern = 1; + config->std_delay_drop = 0; + config->hp_delay_drop = 0; } /** diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c index 8614b8ffdd..a961cce430 100644 --- a/drivers/net/mlx5/mlx5.c +++ b/drivers/net/mlx5/mlx5.c @@ -183,6 +183,9 @@ /* Device parameter to configure implicit registration of mempool memory. */ #define MLX5_MR_MEMPOOL_REG_EN "mr_mempool_reg_en" +/* Device parameter to configure the delay drop when creating Rxqs. */ +#define MLX5_DELAY_DROP_EN "delay_drop_en" + /* Shared memory between primary and secondary processes. */ struct mlx5_shared_data *mlx5_shared_data; @@ -2091,6 +2094,9 @@ mlx5_args_check(const char *key, const char *val, void *opaque) config->decap_en = !!tmp; } else if (strcmp(MLX5_ALLOW_DUPLICATE_PATTERN, key) == 0) { config->allow_duplicate_pattern = !!tmp; + } else if (strcmp(MLX5_DELAY_DROP_EN, key) == 0) { + config->std_delay_drop = tmp & MLX5_DELAY_DROP_STANDARD; + config->hp_delay_drop = tmp & MLX5_DELAY_DROP_HAIRPIN; } else { DRV_LOG(WARNING, "%s: unknown parameter", key); rte_errno = EINVAL; @@ -2153,6 +2159,7 @@ mlx5_args(struct mlx5_dev_config *config, struct rte_devargs *devargs) MLX5_DECAP_EN, MLX5_ALLOW_DUPLICATE_PATTERN, MLX5_MR_MEMPOOL_REG_EN, + MLX5_DELAY_DROP_EN, NULL, }; struct rte_kvargs *kvlist; diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h index 51f4578838..b2022f3300 100644 --- a/drivers/net/mlx5/mlx5.h +++ b/drivers/net/mlx5/mlx5.h @@ -99,6 +99,13 @@ enum mlx5_flow_type { MLX5_FLOW_TYPE_MAXI, }; +/* The mode of delay drop for Rx queues. */ +enum mlx5_delay_drop_mode { + MLX5_DELAY_DROP_NONE = 0, /* All disabled. */ + MLX5_DELAY_DROP_STANDARD = RTE_BIT32(0), /* Standard queues enable. */ + MLX5_DELAY_DROP_HAIRPIN = RTE_BIT32(1), /* Hairpin queues enable. */ +}; + /* Hlist and list callback context. */ struct mlx5_flow_cb_ctx { struct rte_eth_dev *dev; @@ -264,6 +271,8 @@ struct mlx5_dev_config { unsigned int dv_miss_info:1; /* restore packet after partial hw miss */ unsigned int allow_duplicate_pattern:1; /* Allow/Prevent the duplicate rules pattern. */ + unsigned int std_delay_drop:1; /* Enable standard Rxq delay drop. */ + unsigned int hp_delay_drop:1; /* Enable hairpin Rxq delay drop. */ struct { unsigned int enabled:1; /* Whether MPRQ is enabled. */ unsigned int stride_num_n; /* Number of strides. */ diff --git a/drivers/net/mlx5/mlx5_devx.c b/drivers/net/mlx5/mlx5_devx.c index a9f9f4af70..e46f79124d 100644 --- a/drivers/net/mlx5/mlx5_devx.c +++ b/drivers/net/mlx5/mlx5_devx.c @@ -277,6 +277,7 @@ mlx5_rxq_create_devx_rq_resources(struct mlx5_rxq_priv *rxq) MLX5_WQ_END_PAD_MODE_NONE; rq_attr.wq_attr.pd = cdev->pdn; rq_attr.counter_set_id = priv->counter_set_id; + rq_attr.delay_drop_en = rxq_data->delay_drop; rq_attr.user_index = rte_cpu_to_be_16(priv->dev_data->port_id); if (rxq_data->shared) /* Create RMP based RQ. */ rxq->devx_rq.rmp = &rxq_ctrl->obj->devx_rmp; @@ -439,6 +440,8 @@ mlx5_rxq_obj_hairpin_new(struct mlx5_rxq_priv *rxq) attr.wq_attr.log_hairpin_data_sz - MLX5_HAIRPIN_QUEUE_STRIDE; attr.counter_set_id = priv->counter_set_id; + rxq_ctrl->rxq.delay_drop = priv->config.hp_delay_drop; + attr.delay_drop_en = priv->config.hp_delay_drop; tmpl->rq = mlx5_devx_cmd_create_rq(priv->sh->cdev->ctx, &attr, rxq_ctrl->socket); if (!tmpl->rq) { @@ -496,6 +499,7 @@ mlx5_rxq_devx_obj_new(struct mlx5_rxq_priv *rxq) DRV_LOG(ERR, "Failed to create CQ."); goto error; } + rxq_data->delay_drop = priv->config.std_delay_drop; /* Create RQ using DevX API. */ ret = mlx5_rxq_create_devx_rq_resources(rxq); if (ret) { @@ -941,6 +945,7 @@ mlx5_rxq_devx_obj_drop_create(struct rte_eth_dev *dev) dev->data->port_id); goto error; } + rxq_ctrl->rxq.delay_drop = 0; /* Create RQ using DevX API. */ ret = mlx5_rxq_create_devx_rq_resources(rxq); if (ret != 0) { diff --git a/drivers/net/mlx5/mlx5_rx.h b/drivers/net/mlx5/mlx5_rx.h index eda6eca8de..3b797e577a 100644 --- a/drivers/net/mlx5/mlx5_rx.h +++ b/drivers/net/mlx5/mlx5_rx.h @@ -97,6 +97,7 @@ struct mlx5_rxq_data { unsigned int dynf_meta:1; /* Dynamic metadata is configured. */ unsigned int mcqe_format:3; /* CQE compression format. */ unsigned int shared:1; /* Shared RXQ. */ + unsigned int delay_drop:1; /* Enable delay drop. */ volatile uint32_t *rq_db; volatile uint32_t *cq_db; uint16_t port_id; From patchwork Thu Nov 4 17:59:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bing Zhao X-Patchwork-Id: 103783 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 369F0A0C57; Thu, 4 Nov 2021 18:59:45 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9FDB74278D; Thu, 4 Nov 2021 18:59:35 +0100 (CET) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2052.outbound.protection.outlook.com [40.107.94.52]) by mails.dpdk.org (Postfix) with ESMTP id 9942042766 for ; Thu, 4 Nov 2021 18:59:33 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XvjFqsfcYQIFV2Sffnlz5iLJapjcpct1DZIwvwHjcyFOkgtdCItLEFkcUMTr3QXj5XN/pJLgNPIKAueiCldX7NFklERklxUKoBOPT2g4AIeZhBpyzu+CXN6gruww5gP3GMhQSJQJcQceMz3oNo8WxXafSu4uO7EX1M/XNPEnoUdTr41LRM99MytAu6ECXIaFX8yIC3hXdp1NJ30LFiwsHYD265BhEolMOZp6y3HQvZG6upmzhncgJIMyAdiRucwglzT9VzLiyv4LVPK8QnwdJwjas1mYTRsLOBuv72YiQdGnQ7lll01ep8IsgeUHHONoxkgZMgP0QfnOX+Z5zcztHQ== 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=LHi4SdQfYunVRilSYfmLpvGLQxslg7SsBnhhmujGp50=; b=Y/633vklG/62jUT2hME5gtiO5bTUALzox1acUaBxtvahST/cAAg5Wmpu/UBekIxCID1v24EXebA+g/4RvM321D6gbwN3R1iXtSHf3MhkUqaM93InmVhusnn8kmA5UhtAvVy1ZMV3nuPpl0V6l7TbRCO75Vt9M1j2DOilOqAdoZXyI4z9Lji+kvN3VaPuFyOFPJ/TxrKFJfNePQbVbGWQJg8SvoDQRiDRNIaMg0kXvu20FdAVbJwlqZf47RbSaKs7vR3DCbSQPEd1g+dt34MB6TtZOPCojvIhwHvvU6zhSxP3jBjaFt4i5Xd9ArbWOaZLp85ctB7MGFFnYAHXVbzNbA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=monjalon.net smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=quarantine 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=LHi4SdQfYunVRilSYfmLpvGLQxslg7SsBnhhmujGp50=; b=m31sDd5aSjuBEzAwVCM8EFyM+MILbR4mKnyGZP7E9VSyfbNayl+vwOLt+wPdKO/gRt7w75Te+dcD6K9fIZq7nd3zuAV8PiiDWSmnNJQGtdADooMDoeLVkU9zS9UA5lJUn5+CyVhvs/BzSH/nbCEmyPH7h9dHXttQc9dKplJw248ZNsiENTF8iQNNY06iPT3ThQihv95bkkxgLF3hD+R6PUDFtWOVo3YNCcHed9OjuNCTsIbje+uuEPtCHJlHnMX3qBNxHLUWIhDvJMS8Y6wrN46Br4O6c4sxPFAemoQyo7ti+2Gz1j0uYMXkBZfI54BLWV/VYmGGVze4yZtPGxtIWg== Received: from BN8PR15CA0029.namprd15.prod.outlook.com (2603:10b6:408:c0::42) by SN1PR12MB2590.namprd12.prod.outlook.com (2603:10b6:802:2e::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4649.17; Thu, 4 Nov 2021 17:59:31 +0000 Received: from BN8NAM11FT010.eop-nam11.prod.protection.outlook.com (2603:10b6:408:c0:cafe::5) by BN8PR15CA0029.outlook.office365.com (2603:10b6:408:c0::42) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.11 via Frontend Transport; Thu, 4 Nov 2021 17:59:31 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; monjalon.net; dkim=none (message not signed) header.d=none;monjalon.net; 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 BN8NAM11FT010.mail.protection.outlook.com (10.13.177.53) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4669.10 via Frontend Transport; Thu, 4 Nov 2021 17:59:31 +0000 Received: from nvidia.com (172.20.187.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Thu, 4 Nov 2021 17:59:24 +0000 From: Bing Zhao To: , CC: , , , Date: Thu, 4 Nov 2021 19:59:04 +0200 Message-ID: <20211104175904.60696-3-bingz@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20211104175904.60696-1-bingz@nvidia.com> References: <20211104112644.17278-1-bingz@nvidia.com> <20211104175904.60696-1-bingz@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.187.5] X-ClientProxiedBy: HQMAIL107.nvidia.com (172.20.187.13) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9e29270a-ab13-48e7-1a2f-08d99fbcda3b X-MS-TrafficTypeDiagnostic: SN1PR12MB2590: X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1360; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: x3HBFE2mRCxjAbM9goxu0rfcCXvm8feax59ozGOQ8obt4ywoyqsRWcBSZqPMW9riIAHooU26jscdVhWkv+Fy9ZyXi2BS+/Ycm1U27g74MaDVjEGl3wqdnEaPFd9OZn7J3SCTphM84uY8pt8+qN/TyHMWXoYRc5SJUG+InxQ5edQLHqw2wtdZes5JJjhS4rPW8sG1MIRFdXWHWDlXNCJ3u8VEtsVtArCbeKhOXU3/cwpGQVwsFITa9nfxVjWzQi4L/vda5SnNgt62w2sT73FwJMOtZay9k9mhGuoH27z6HHAJH+V+6I9v8LPUnKw9Z29ritnk7d1SfejrGI/P+4tNKThDfwJ4Ik5tPKhNUylDbxf/xtJb29l9BmxdWP8H9a2SovFGm6G0zITf4VtE7Y7PxL43oZFcHt1kDZsGfiEu7zoN2b2j3rfX7Qe6VgwEwipcYPv1ugfUwC3wUYcOE9ddfTt4O/SEkSWlJzqziWhGgyvi+MJxAadY6OMu6zCALJmgTJvnC4XZx9YBPC/YDREgnuWlVTu6Nc4OEu1NuxYbOwD+kowIRKt+l1iRujmrtO8Rh1fx1S7BSyuLh19PH8oSeepo4t2FZ9idf7/am2scxQwpLs5UfW5PnKtkxDA2Z+xTX/75tgDsTgh6OMgIz9qT/P2O1gGuPyUDpuRO3IGtHctXcY6GuA8wl6ZlVCXS6ziowEkofmilIEE88G/6vJp/bA== 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)(46966006)(36840700001)(2906002)(47076005)(82310400003)(86362001)(54906003)(36860700001)(316002)(110136005)(7696005)(4326008)(7636003)(70206006)(70586007)(8676002)(16526019)(186003)(426003)(26005)(8936002)(55016002)(6666004)(83380400001)(5660300002)(1076003)(356005)(508600001)(2616005)(36756003)(336012)(107886003)(6286002)(6636002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Nov 2021 17:59:31.0811 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9e29270a-ab13-48e7-1a2f-08d99fbcda3b 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: BN8NAM11FT010.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR12MB2590 Subject: [dpdk-dev] [PATCH v4 2/2] net/mlx5: check delay drop settings in kernel driver 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" The delay drop is the common feature managed on per device basis and the kernel driver is responsible one for the initialization and rearming. By default, the timeout value is set to activate the delay drop when the driver is loaded. A private flag "dropless_rq" is used to control the rearming. Only when it is on, the rearming will be handled once received a timeout event. Or else, the delay drop will be deactivated after the first timeout occurs and all the Rx queues won't have this feature. The PMD is trying to query this flag and warn the application when some queues are created with delay drop but the flag is off. The documents are also updated in this commit. Signed-off-by: Bing Zhao Acked-by: Viacheslav Ovsiienko --- doc/guides/nics/mlx5.rst | 26 +++++ doc/guides/rel_notes/release_21_11.rst | 1 + drivers/net/mlx5/linux/mlx5_ethdev_os.c | 111 ++++++++++++++++++++++ drivers/net/mlx5/mlx5.h | 1 + drivers/net/mlx5/mlx5_trigger.c | 18 ++++ drivers/net/mlx5/windows/mlx5_ethdev_os.c | 17 ++++ 6 files changed, 174 insertions(+) diff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst index 824971d89a..006896375f 100644 --- a/doc/guides/nics/mlx5.rst +++ b/doc/guides/nics/mlx5.rst @@ -1129,6 +1129,27 @@ Driver options By default, the PMD will set this value to 1. +- ``delay_drop_en`` parameter [int] + + Bitmask value for the Rx queue delay drop attribute. Bit 0 is used for standard + Rx queue and bit 1 is used for hairpin Rx queue. + By default, the delay drop will be enabled for all hairpin Rx queues (if any) + and disabled for all standard Rx queues. It will be ignored if the NIC does + not support the attribute. + A timeout value is set in the driver to control the waiting time before dropping + a packet when there is no WQE available on a delay drop Rx queue. Once the timer + is expired, the delay drop will be deactivated for all queues. To re-activeate it, + a rearming is needed and now it is part of the kernel driver. + + To enable / disable the delay drop rearming, the private flag ``dropless_rq`` can + be set and queried via ethtool: + + - ethtool --set-priv-flags dropless_rq on (/ off) + - ethtool --show-priv-flags + + The configuration flag is global per PF and can only be set on the PF, once it is on, + all the VFs', SFs' and representors' Rx queues will share the timer and rearming. + .. _mlx5_firmware_config: Firmware configuration @@ -1803,6 +1824,11 @@ Supported hardware offloads | | | | | rdma-core 35 | | | | | | ConnectX-6 Dx | +-----------------------+-----------------+-----------------+ + | Rxq Delay drop | | DPDK 21.11 | | DPDK 21.11 | + | | | OFED 5.5 | | OFED 5.5 | + | | | N/A | | N/A | + | | | ConnectX-5 | | ConnectX-5 | + +-----------------------+-----------------+-----------------+ .. table:: Minimal SW/HW versions for shared action offload :name: sact diff --git a/doc/guides/rel_notes/release_21_11.rst b/doc/guides/rel_notes/release_21_11.rst index 13d8330873..76d18aeb6b 100644 --- a/doc/guides/rel_notes/release_21_11.rst +++ b/doc/guides/rel_notes/release_21_11.rst @@ -191,6 +191,7 @@ New Features * Added implicit mempool registration to avoid data path hiccups (opt-out). * Added NIC offloads for the PMD on Windows (TSO, VLAN strip, CRC keep). * Added socket direct mode bonding support. + * Added delay drop support for Rx queue. * **Updated Solarflare network PMD.** diff --git a/drivers/net/mlx5/linux/mlx5_ethdev_os.c b/drivers/net/mlx5/linux/mlx5_ethdev_os.c index 9d0e491d0c..c19825ee52 100644 --- a/drivers/net/mlx5/linux/mlx5_ethdev_os.c +++ b/drivers/net/mlx5/linux/mlx5_ethdev_os.c @@ -1630,3 +1630,114 @@ mlx5_get_mac(struct rte_eth_dev *dev, uint8_t (*mac)[RTE_ETHER_ADDR_LEN]) memcpy(mac, request.ifr_hwaddr.sa_data, RTE_ETHER_ADDR_LEN); return 0; } + +/* + * Query dropless_rq private flag value provided by ETHTOOL. + * + * @param dev + * Pointer to Ethernet device. + * + * @return + * - 0 on success, flag is not set. + * - 1 on success, flag is set. + * - negative errno value otherwise and rte_errno is set. + */ +int mlx5_get_flag_dropless_rq(struct rte_eth_dev *dev) +{ + struct { + struct ethtool_sset_info hdr; + uint32_t buf[1]; + } sset_info; + struct ethtool_drvinfo drvinfo; + struct ifreq ifr; + struct ethtool_gstrings *strings = NULL; + struct ethtool_value flags; + const int32_t flag_len = sizeof(flags.data) * CHAR_BIT; + int32_t str_sz; + int32_t len; + int32_t i; + int ret; + + sset_info.hdr.cmd = ETHTOOL_GSSET_INFO; + sset_info.hdr.reserved = 0; + sset_info.hdr.sset_mask = 1ULL << ETH_SS_PRIV_FLAGS; + ifr.ifr_data = (caddr_t)&sset_info; + ret = mlx5_ifreq(dev, SIOCETHTOOL, &ifr); + if (!ret) { + const uint32_t *sset_lengths = sset_info.hdr.data; + + len = sset_info.hdr.sset_mask ? sset_lengths[0] : 0; + } else if (ret == -EOPNOTSUPP) { + drvinfo.cmd = ETHTOOL_GDRVINFO; + ifr.ifr_data = (caddr_t)&drvinfo; + ret = mlx5_ifreq(dev, SIOCETHTOOL, &ifr); + if (ret) { + DRV_LOG(WARNING, "port %u cannot get the driver info", + dev->data->port_id); + goto exit; + } + len = *(uint32_t *)((char *)&drvinfo + + offsetof(struct ethtool_drvinfo, n_priv_flags)); + } else { + DRV_LOG(WARNING, "port %u cannot get the sset info", + dev->data->port_id); + goto exit; + } + if (!len) { + DRV_LOG(WARNING, "port %u does not have private flag", + dev->data->port_id); + rte_errno = EOPNOTSUPP; + ret = -rte_errno; + goto exit; + } else if (len > flag_len) { + DRV_LOG(WARNING, "port %u maximal private flags number is %d", + dev->data->port_id, flag_len); + len = flag_len; + } + str_sz = ETH_GSTRING_LEN * len; + strings = (struct ethtool_gstrings *) + mlx5_malloc(0, str_sz + sizeof(struct ethtool_gstrings), 0, + SOCKET_ID_ANY); + if (!strings) { + DRV_LOG(WARNING, "port %u unable to allocate memory for" + " private flags", dev->data->port_id); + rte_errno = ENOMEM; + ret = -rte_errno; + goto exit; + } + strings->cmd = ETHTOOL_GSTRINGS; + strings->string_set = ETH_SS_PRIV_FLAGS; + strings->len = len; + ifr.ifr_data = (caddr_t)strings; + ret = mlx5_ifreq(dev, SIOCETHTOOL, &ifr); + if (ret) { + DRV_LOG(WARNING, "port %u unable to get private flags strings", + dev->data->port_id); + goto exit; + } + for (i = 0; i < len; i++) { + strings->data[(i + 1) * ETH_GSTRING_LEN - 1] = 0; + if (!strcmp((const char *)strings->data + i * ETH_GSTRING_LEN, + "dropless_rq")) + break; + } + if (i == len) { + DRV_LOG(WARNING, "port %u does not support dropless_rq", + dev->data->port_id); + rte_errno = EOPNOTSUPP; + ret = -rte_errno; + goto exit; + } + flags.cmd = ETHTOOL_GPFLAGS; + ifr.ifr_data = (caddr_t)&flags; + ret = mlx5_ifreq(dev, SIOCETHTOOL, &ifr); + if (ret) { + DRV_LOG(WARNING, "port %u unable to get private flags status", + dev->data->port_id); + goto exit; + } + ret = !!(flags.data & (1U << i)); +exit: + mlx5_free(strings); + return ret; +} diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h index b2022f3300..9307a4f95b 100644 --- a/drivers/net/mlx5/mlx5.h +++ b/drivers/net/mlx5/mlx5.h @@ -1602,6 +1602,7 @@ int mlx5_os_read_dev_stat(struct mlx5_priv *priv, int mlx5_os_read_dev_counters(struct rte_eth_dev *dev, uint64_t *stats); int mlx5_os_get_stats_n(struct rte_eth_dev *dev); void mlx5_os_stats_init(struct rte_eth_dev *dev); +int mlx5_get_flag_dropless_rq(struct rte_eth_dev *dev); /* mlx5_mac.c */ diff --git a/drivers/net/mlx5/mlx5_trigger.c b/drivers/net/mlx5/mlx5_trigger.c index a3e62e9533..0ecc530043 100644 --- a/drivers/net/mlx5/mlx5_trigger.c +++ b/drivers/net/mlx5/mlx5_trigger.c @@ -1129,6 +1129,24 @@ mlx5_dev_start(struct rte_eth_dev *dev) dev->data->port_id, strerror(rte_errno)); goto error; } + if (priv->config.std_delay_drop || priv->config.hp_delay_drop) { + if (!priv->config.vf && !priv->config.sf && + !priv->representor) { + ret = mlx5_get_flag_dropless_rq(dev); + if (ret < 0) + DRV_LOG(WARNING, + "port %u cannot query dropless flag", + dev->data->port_id); + else if (!ret) + DRV_LOG(WARNING, + "port %u dropless_rq OFF, no rearming", + dev->data->port_id); + } else { + DRV_LOG(DEBUG, + "port %u doesn't support dropless_rq flag", + dev->data->port_id); + } + } ret = mlx5_rxq_start(dev); if (ret) { DRV_LOG(ERR, "port %u Rx queue allocation failed: %s", diff --git a/drivers/net/mlx5/windows/mlx5_ethdev_os.c b/drivers/net/mlx5/windows/mlx5_ethdev_os.c index fddc7a6b12..359f73df7c 100644 --- a/drivers/net/mlx5/windows/mlx5_ethdev_os.c +++ b/drivers/net/mlx5/windows/mlx5_ethdev_os.c @@ -389,3 +389,20 @@ mlx5_is_removed(struct rte_eth_dev *dev) return 1; return 0; } + +/* + * Query dropless_rq private flag value provided by ETHTOOL. + * + * @param dev + * Pointer to Ethernet device. + * + * @return + * - 0 on success, flag is not set. + * - 1 on success, flag is set. + * - negative errno value otherwise and rte_errno is set. + */ +int mlx5_get_flag_dropless_rq(struct rte_eth_dev *dev) +{ + RTE_SET_USED(dev); + return -ENOTSUP; +}