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 00E3AA0C57; Thu, 4 Nov 2021 17:56:29 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A103E42782; Thu, 4 Nov 2021 17:56:20 +0100 (CET) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2045.outbound.protection.outlook.com [40.107.94.45]) by mails.dpdk.org (Postfix) with ESMTP id 371B142780 for ; Thu, 4 Nov 2021 17:56:19 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QeREfyDBqQH0+9jRslDTNyfV1QqWfsgOU8+sV7CTY0540aEilr2ZJdvhlAbGSiG/GqVZjIWDuk+sNnHIv7XMvIgIF7Yb9CiW0f4kNEl5qi3BPojTN97YiHKR6oqcObeE6mvcOeunw+r5ByUsZzAXghGCqLeKsbkHfJepg2pHYjf/HSWs5rPW32dwMpSxY4ouOHNLGUXrPArRgLjc23ahIpGqMZHIcW/PUtNEkeylRF104k8BaxhOQovfi+8AKoKCB7PA+qH6qfmSui8TJ3abtAJWVLiKWapb6EEP/Pp98Rr2iXU5v47+JI4sGskbDjIISVYvxJXBvJzcH8YxV96OrQ== 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=iudxIyRHOAvhdLC4UvT2mAkR6E2BCWDJ8Ipn0E8r6z4=; b=HoNiUwv2R30ntmyNC7SUrMbV4vUzBbfV+BW0ieXBE3DXl+nIJG5rreXWR4+v8urP8q1i31pgESgabj5+3epc87Zl3Oe8Zdph80GBGNwEFzSjbYzdr6b9cR9Vaeg16L0jBn8JnnQWX0KlVc33OD1T+IVKEcObMN4ZgVHJHeegFmcuLgOsFj03RXwjHM20cNrVSnjdDcrx8mjXvT0LGD2smlNycciA983C5KUsPddLp/1kuiXvGU52cYsa6FPvU+5O9z2Ly5phnMwOiURVI5mXVmRWumgR7G/hWh1wZyM0mL08AH7zxKaYoz614S8qOIy5ih9EWTgnH3Wldc3v3mAnmQ== 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=iudxIyRHOAvhdLC4UvT2mAkR6E2BCWDJ8Ipn0E8r6z4=; b=ANlZt+/bLpuM1TA7CoQwa5quupjNjbi53OQZzcXVskt1xEiF8s838AloTRtQaNlRQDE01f3eB5vuHYMCIDkP+maAERfWEBnsfaIP/0IcKZzna7ybrBtsWYlDmXivel0z06Q0sd/Rclqz8FYbr1gU76Qwn9KyhihKKgBl0b/bvN04WQNb2tA1wZEW1uuO3uzRgM+SOZIYyTSjBF+hDnisx+ZcYaDxHaryRaHEo7iBt/TwmSMIFEcC0Xqmcw9cHM3eigwzoRklPFKERibxsHzA1uAPjjxQVVGNGgCgxLZGyBar5m9ja416E94XlUWdtzuoQLjpCHZ0MbAZ9dO4QC+COQ== Received: from MWHPR04CA0061.namprd04.prod.outlook.com (2603:10b6:300:6c::23) by BYAPR12MB3574.namprd12.prod.outlook.com (2603:10b6:a03:ae::16) 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 16:56:15 +0000 Received: from CO1NAM11FT028.eop-nam11.prod.protection.outlook.com (2603:10b6:300:6c:cafe::29) by MWHPR04CA0061.outlook.office365.com (2603:10b6:300:6c::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.10 via Frontend Transport; Thu, 4 Nov 2021 16:56:14 +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 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.4669.10 via Frontend Transport; Thu, 4 Nov 2021 16:56:14 +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 16:56:12 +0000 From: Bing Zhao To: , CC: , , , Date: Thu, 4 Nov 2021 18:55:52 +0200 Message-ID: <20211104165552.57663-3-bingz@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20211104165552.57663-1-bingz@nvidia.com> References: <20211104112644.17278-1-bingz@nvidia.com> <20211104165552.57663-1-bingz@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain 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: 65291d85-46aa-4e79-fb20-08d99fb4032d X-MS-TrafficTypeDiagnostic: BYAPR12MB3574: 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: FE6KHfaWC5U2mzbn9CV49jsOrzMxVO8RQcM/ssL5OMbpu3ynHqxlnn05mB16p9E0rugwWXzTkCyrN2VAtcn4BtO0lIyU5gAEqzxmnTJoPnY7ILr48fghFEjm7Zub8Pjgt8gTn408ePUhv7qwHMIeTJHCKgqUDfhoA0QxrvvKvBHyB2xu2TG3VJ8ViYQo/iTCyv0FY5jdH+nSCjJXcrJv80oGUaayUol/ZjQ43J6pM2TM7dRzpuKBqgCOMr9K1TRBj125Y1x6XKVDy7wu0tbNM+wDXkP/dcYMng/67TzLidLPATuHxagv0iFBIJysORNK0ReH7qBg0R4UXVLkj0DjvKPKB9FcpN/01EO+R/NDSIj7GYZ9vdSJFn9u6XeaIuzr/RId/miNc+TFARaQgD89yvbb+fLLyvhK4dWZmbUC4U2vutTyqYNeKUSIrfhy/+5eRArHcBmQDNhDBWDZKof+Fv/ydBN3paOo5CdgvKMLoKyO6INt4RiMhzebcd+hW7hiDaAjlzEihmdKdNilVs2QRk51vnyH1d0iKPRxV+UCYMKiCByJL91uXKBMEPtxYggP7kpEKpuj46yATC9yi47ZLQVvqj6+nT68IjCSVqc5Cx4ifaqld5VdRam11jCRbljzY7gkVoPxMIboZUfRR/kUMhF6MUgcFvdmSkJqve/BrGqgEUd/bHxmVXq5hoGyQFfrSRuBSs/vkIEEbv0GoLBqbg== 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)(6636002)(36860700001)(55016002)(7636003)(83380400001)(336012)(8936002)(36756003)(4326008)(426003)(26005)(70206006)(86362001)(107886003)(316002)(47076005)(7696005)(6666004)(70586007)(1076003)(54906003)(8676002)(5660300002)(508600001)(2906002)(82310400003)(356005)(2616005)(16526019)(6286002)(110136005)(186003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Nov 2021 16:56:14.4701 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 65291d85-46aa-4e79-fb20-08d99fb4032d 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: CO1NAM11FT028.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR12MB3574 Subject: [dpdk-dev] [PATCH v3 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 --- doc/guides/nics/mlx5.rst | 26 +++++ doc/guides/rel_notes/release_21_11.rst | 1 + drivers/net/mlx5/linux/mlx5_ethdev_os.c | 114 ++++++++++++++++++++++ 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, 177 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..1dd2d74c77 100644 --- a/drivers/net/mlx5/linux/mlx5_ethdev_os.c +++ b/drivers/net/mlx5/linux/mlx5_ethdev_os.c @@ -1630,3 +1630,117 @@ 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; + } + if (!(flags.data & (1U << i))) + ret = 0; + else + ret = 1; +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; +} -- 2.27.0