From patchwork Thu Feb 20 11:34:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gal Pressman X-Patchwork-Id: 13983847 X-Patchwork-Delegate: kuba@kernel.org Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2061.outbound.protection.outlook.com [40.107.236.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C9A461F2B83; Thu, 20 Feb 2025 11:35:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.236.61 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740051318; cv=fail; b=PsrJJbmHSSyOB/bYqUXdV91juQP8ZrfU1aLjdIZKOLDQMFCmni2yV2/etz7xtJqEuACVk3rJO52f5sz730qDo9RrkXn63n6+FcD4FTglBBbtP8jDFRBTPEzGD41xwHXXKUhMzud1GcKv/pVmn0ijma1rcWkDfp59PkdmayIBfBc= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740051318; c=relaxed/simple; bh=I8Apxcw69Gtc0uI6hx7CUFAqg2SiGCLYt8jgjy/rqX8=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=U+X+yBJPi2rMqk9Yu+WyXBGnwiF1j+dHHsI1V/YtnDPpPLHhy0ZyuZE5apn8Jp61DoZmnn8hJJ/XiEWaZ+W6gcO8U5aU/IvB6Wmw41NKlmtAJf+oJ2K7G2voI6N2mJZs7FDhig+XCnF9neppzS9BLEmE7hs4VIoRl3irQZOT4BQ= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com; spf=fail smtp.mailfrom=nvidia.com; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b=YfibOgxm; arc=fail smtp.client-ip=40.107.236.61 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nvidia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b="YfibOgxm" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Zy6YkaZRy9ZN3XSF2GzUImgqdKxWyY8XbzgoyN4+V4qgEarHtfnFJYyHOxj65TMRkCz3MvL/7GjsLTo8FbdTnEYt4jSD29C315Xj50Ym8EtbzLf/iUucBM3JP8Iof4iQ8QjYT87+a1ZGs8elmViNTWXTeZr5+bzlgnNt7t+VYqOk2cuIejXEzAEfzsRrjnXWvFRBCtgf48/CdhKnLfw7QZxyeat+m3X69TeKoUTl6ZTcNXCRZFfW/GJy4aXCbHZHivy8MARI8gV7alQQAeHoKpsrirU4HZtiHSzQjXmFWR1zqeHVxjydVLHo8i+dMKCxDUTjFe25xXWzIdP8woyjwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=IBTFi+Fi8wT3ecbvsPQ2Fyns+ZWDDAzUUZBcHGXdFlY=; b=Zq5IeXIc1MPi4M9iOTF8daujJQ9EulvEcgjH3oBvfVGxJD5SS3PKfYr+FfqV6Rzn64e18fFyTga8hKM6DvEB0/5TYZIlTSyMcWhyO3jPpqhDWfqQRHG2O2JnHW4/jiJ/vE2L6VKEpPrVLqJVnDI57B/xSHFWQqUdxfQQ++NvJRMq2VbNiDU1YoaiyVBDmje8xjCwSauxmgEnil5c18EZRritkTHdOXNjhJnOvp1lS5xktm9qwbOtVGHkYVA1fNt7ITDdZrmeOJ1vNfUvXTGJB5fplR969sg0wTScAdNkN1f7fYEGL5ZpVjP9eS6xyVSq1vbpZ7cwcmdGm4NbKHaFBA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=davemloft.net 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 (0) 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=IBTFi+Fi8wT3ecbvsPQ2Fyns+ZWDDAzUUZBcHGXdFlY=; b=YfibOgxmjlvkL1IaDUS1lgKpTJmhJiGQK2ccsGxNm4xHRWWqd0k8+oiPSVKIZ3XnkuxvKDTETYWDt9/gCX+onAxBZBq8SljRmg5n5ZlQmXXYst0IO7W7gUdM3NSnUNQ+EuswuodDghQvspzY2/wxBmEwr6qcnCDfjiLTo/CmoFBxe9B8qzLlMSjcxxvbovX94t3rQJaUo+Ooe1yN0Hli2Dsl6JXw7MeyxDAFeHCeY/SdYo/L4SnMiEqHkEb1DolNmA9AGiWGUcCmK81QNuap164Dd+eOc8Txzi7DPhwUAKReRYHNieymbauuXnHdXr7IecqCGO/DNlpFD+O4oPfj4w== Received: from MN2PR04CA0031.namprd04.prod.outlook.com (2603:10b6:208:d4::44) by DS0PR12MB8480.namprd12.prod.outlook.com (2603:10b6:8:159::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.16; Thu, 20 Feb 2025 11:35:12 +0000 Received: from BN3PEPF0000B06A.namprd21.prod.outlook.com (2603:10b6:208:d4:cafe::7d) by MN2PR04CA0031.outlook.office365.com (2603:10b6:208:d4::44) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8466.15 via Frontend Transport; Thu, 20 Feb 2025 11:35:11 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) 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.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by BN3PEPF0000B06A.mail.protection.outlook.com (10.167.243.69) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8489.2 via Frontend Transport; Thu, 20 Feb 2025 11:35:11 +0000 Received: from rnnvmail203.nvidia.com (10.129.68.9) 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.1544.4; Thu, 20 Feb 2025 03:34:53 -0800 Received: from rnnvmail205.nvidia.com (10.129.68.10) by rnnvmail203.nvidia.com (10.129.68.9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14; Thu, 20 Feb 2025 03:34:52 -0800 Received: from vdi.nvidia.com (10.127.8.12) by mail.nvidia.com (10.129.68.10) with Microsoft SMTP Server id 15.2.1544.14 via Frontend Transport; Thu, 20 Feb 2025 03:34:48 -0800 From: Gal Pressman To: "David S. Miller" , Jakub Kicinski CC: , Eric Dumazet , Paolo Abeni , Simon Horman , Jonathan Corbet , Tony Nguyen , Przemek Kitszel , Andrew Lunn , "Tariq Toukan" , Edward Cree , Ahmed Zaki , , Gal Pressman , Cosmin Ratiu Subject: [PATCH net-next v4 1/5] ethtool: Symmetric OR-XOR RSS hash Date: Thu, 20 Feb 2025 13:34:31 +0200 Message-ID: <20250220113435.417487-2-gal@nvidia.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20250220113435.417487-1-gal@nvidia.com> References: <20250220113435.417487-1-gal@nvidia.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-NV-OnPremToCloud: AnonymousSubmission X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN3PEPF0000B06A:EE_|DS0PR12MB8480:EE_ X-MS-Office365-Filtering-Correlation-Id: 6a024396-66f1-478d-2aa9-08dd51a2a30c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|7416014|82310400026|36860700013|1800799024; X-Microsoft-Antispam-Message-Info: XoRKNS0FgCIy1poV0FgkvG1+n7IBNQZCk5WX3kjX1IXpA+6LYBhZj/+0Ek7wVfppZS/p5uAFEfLHdAlzincWn6NGuF4ING/EyTiIAgjbP1hZXnk5eiBACyyvp3S43RsGr2VyQ9SF4eTWNpMLcGzH9JoLCURsF9mLcyA63XqQD9Ju2QphEtRCt5BHCMVa+3JI5kNQFaQg5Sqgs4HaeXc+C0nwtUcQ9AlDjyDrqiB1mEdnsmVAaP/oqvdpCazS6IWOqyB/FJiSum6yeZmmsL7ioANUtBZGh8YnBmUji1Y+RDKvyL/LlFlPtCtkP1Qn1IZS8pSejSXfXaPWpN62px1TTWphJoG8Un+qiZcyH/sBN1/2Z06QPaIXVqp2Tcz9b+skN4BeX96sijR2K/q3Lt8iac5PutjzN9BBA2jZO/2HNVlvHEIkVx1YWLA9NXEdzT3IwsBrlu1ezO0/96hDFyHX/8GVt1946MQkox6m7il3NAqkEojmw1ey9E/Yh2OlYVkMvY/5X2Rn9vsLKQsiVvxJLubjPP9wuldumnAEQxYdrQAcJzani2v4pFiMXwtsvGhLvFA7XUwnd0e927aEmZxh2U7PRUdcSemU+emV4TdE4M7ujZGOrZkhSbe01Q7EHrux+dIs3/rVW+aPSRGA9bnWcXKuVe+mhOH4yZop+LDBLST98RTc8s49AjLZDtzmgztxi3bYphMdxVjlerQ+uP/Mv0NotRvq5hQH1jaHjGU8lch1oOD+Ky2gU7XErCua9iXYXJ4pWCGNmgQEyP4MUon3cAs/U39kA5zm8PmuRmZYkS6D8csHa4M/rF92DuT+COBbvsNNLpBBS31vqc+vcXWQVWcBgtE2xohZdgvIPS9X4Sy2G6gFXWIvkC5h7jK4up2maDvB88J1eoGn4tYQONv5JGqvDuMGHzqGedpZYRZZKzFsAikl2t/isH5ETZ6iXWip3TIaENZum+1H7MnqN7gUv+X96+KyivxVfmfn78l+cGBiHgweERNZT80jZ9vv6kOeJdURvSmwOpKHJf81G5wYwgLTSkqh9DQWGN+RX6NzjqYCu+18pL41RWMIoyq9BoSkXN/qUt8+DJG5QBJ6GH9BxTNyeve/KY8f7vsE+/6m8ovLzowOsnyYXJjMUX78ZO5uKlTKsCK10IvnU8ih6agzIiN68cFLBTu97NDvKcEXWKZLsb/nN7mIWCZ1o181EzmSVIgM8AGiVOyC+LQEC/NqeiaN3EWVFFS67HpTcjIrzECMoMn4VxBtybZNqf1py5HdY4ceoaQDIH/b7kZiu7sGbKgbDFOn69g/+zpPOcM7koPRohgR7O0ST3Bpp5QAw2M72k92ZuqGlGxfrF7liRt3TSVWomkgB0K8elgR9sexZoP0dtUNDOc/xj5fURQ2Nj+roBeJ+EZ+tCF9NABOeqUABsDwRmy7Jirf4CuBTNYJWvu+JBPPnIg8/V9uuszbdlQrZi6Lkm3TAJy1bLJCc2rdSIUjno9FUUTuXmnz4639C5U= 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:(13230040)(376014)(7416014)(82310400026)(36860700013)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Feb 2025 11:35:11.6013 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6a024396-66f1-478d-2aa9-08dd51a2a30c 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: BN3PEPF0000B06A.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB8480 X-Patchwork-Delegate: kuba@kernel.org Add an additional type of symmetric RSS hash type: OR-XOR. The "Symmetric-OR-XOR" algorithm transforms the input as follows: (SRC_IP | DST_IP, SRC_IP ^ DST_IP, SRC_PORT | DST_PORT, SRC_PORT ^ DST_PORT) Change 'cap_rss_sym_xor_supported' to 'supported_input_xfrm', a bitmap of supported RXH_XFRM_* types. Reviewed-by: Cosmin Ratiu Reviewed-by: Tariq Toukan Signed-off-by: Gal Pressman Reviewed-by: Edward Cree --- Documentation/networking/ethtool-netlink.rst | 2 +- Documentation/networking/scaling.rst | 14 ++++++++++---- drivers/net/ethernet/intel/iavf/iavf_ethtool.c | 2 +- drivers/net/ethernet/intel/ice/ice_ethtool.c | 2 +- include/linux/ethtool.h | 5 ++--- include/uapi/linux/ethtool.h | 4 ++++ net/ethtool/ioctl.c | 8 ++++---- 7 files changed, 23 insertions(+), 14 deletions(-) diff --git a/Documentation/networking/ethtool-netlink.rst b/Documentation/networking/ethtool-netlink.rst index 3770a2294509..b6e9af4d0f1b 100644 --- a/Documentation/networking/ethtool-netlink.rst +++ b/Documentation/networking/ethtool-netlink.rst @@ -1934,7 +1934,7 @@ ETHTOOL_A_RSS_INDIR attribute returns RSS indirection table where each byte indicates queue number. ETHTOOL_A_RSS_INPUT_XFRM attribute is a bitmap indicating the type of transformation applied to the input protocol fields before given to the RSS -hfunc. Current supported option is symmetric-xor. +hfunc. Current supported options are symmetric-xor and symmetric-or-xor. PLCA_GET_CFG ============ diff --git a/Documentation/networking/scaling.rst b/Documentation/networking/scaling.rst index 4eb50bcb9d42..d8971ce07628 100644 --- a/Documentation/networking/scaling.rst +++ b/Documentation/networking/scaling.rst @@ -49,14 +49,20 @@ destination address) and TCP/UDP (source port, destination port) tuples are swapped, the computed hash is the same. This is beneficial in some applications that monitor TCP/IP flows (IDS, firewalls, ...etc) and need both directions of the flow to land on the same Rx queue (and CPU). The -"Symmetric-XOR" is a type of RSS algorithms that achieves this hash -symmetry by XORing the input source and destination fields of the IP -and/or L4 protocols. This, however, results in reduced input entropy and -could potentially be exploited. Specifically, the algorithm XORs the input +"Symmetric-XOR" and "Symmetric-OR-XOR" are types of RSS algorithms that +achieve this hash symmetry by XOR/ORing the input source and destination +fields of the IP and/or L4 protocols. This, however, results in reduced +input entropy and could potentially be exploited. + +Specifically, the "Symmetric-XOR" algorithm XORs the input as follows:: # (SRC_IP ^ DST_IP, SRC_IP ^ DST_IP, SRC_PORT ^ DST_PORT, SRC_PORT ^ DST_PORT) +The "Symmetric-OR-XOR" algorithm transforms the input as follows:: + + # (SRC_IP | DST_IP, SRC_IP ^ DST_IP, SRC_PORT | DST_PORT, SRC_PORT ^ DST_PORT) + The result is then fed to the underlying RSS algorithm. Some advanced NICs allow steering packets to queues based on diff --git a/drivers/net/ethernet/intel/iavf/iavf_ethtool.c b/drivers/net/ethernet/intel/iavf/iavf_ethtool.c index 74a1e9fe1821..288bb5b2e72e 100644 --- a/drivers/net/ethernet/intel/iavf/iavf_ethtool.c +++ b/drivers/net/ethernet/intel/iavf/iavf_ethtool.c @@ -1808,7 +1808,7 @@ static int iavf_set_rxfh(struct net_device *netdev, static const struct ethtool_ops iavf_ethtool_ops = { .supported_coalesce_params = ETHTOOL_COALESCE_USECS | ETHTOOL_COALESCE_USE_ADAPTIVE, - .cap_rss_sym_xor_supported = true, + .supported_input_xfrm = RXH_XFRM_SYM_XOR, .get_drvinfo = iavf_get_drvinfo, .get_link = ethtool_op_get_link, .get_ringparam = iavf_get_ringparam, diff --git a/drivers/net/ethernet/intel/ice/ice_ethtool.c b/drivers/net/ethernet/intel/ice/ice_ethtool.c index b0805704834d..7c2dc347e4e5 100644 --- a/drivers/net/ethernet/intel/ice/ice_ethtool.c +++ b/drivers/net/ethernet/intel/ice/ice_ethtool.c @@ -4770,7 +4770,7 @@ static const struct ethtool_ops ice_ethtool_ops = { .supported_coalesce_params = ETHTOOL_COALESCE_USECS | ETHTOOL_COALESCE_USE_ADAPTIVE | ETHTOOL_COALESCE_RX_USECS_HIGH, - .cap_rss_sym_xor_supported = true, + .supported_input_xfrm = RXH_XFRM_SYM_XOR, .rxfh_per_ctx_key = true, .get_link_ksettings = ice_get_link_ksettings, .set_link_ksettings = ice_set_link_ksettings, diff --git a/include/linux/ethtool.h b/include/linux/ethtool.h index 870994cc3ef7..7f222dccc7d1 100644 --- a/include/linux/ethtool.h +++ b/include/linux/ethtool.h @@ -763,13 +763,12 @@ struct kernel_ethtool_ts_info { /** * struct ethtool_ops - optional netdev operations + * @supported_input_xfrm: supported types of input xfrm from %RXH_XFRM_*. * @cap_link_lanes_supported: indicates if the driver supports lanes * parameter. * @cap_rss_ctx_supported: indicates if the driver supports RSS * contexts via legacy API, drivers implementing @create_rxfh_context * do not have to set this bit. - * @cap_rss_sym_xor_supported: indicates if the driver supports symmetric-xor - * RSS. * @rxfh_per_ctx_key: device supports setting different RSS key for each * additional context. Netlink API should report hfunc, key, and input_xfrm * for every context, not just context 0. @@ -995,9 +994,9 @@ struct kernel_ethtool_ts_info { * of the generic netdev features interface. */ struct ethtool_ops { + u32 supported_input_xfrm:8; u32 cap_link_lanes_supported:1; u32 cap_rss_ctx_supported:1; - u32 cap_rss_sym_xor_supported:1; u32 rxfh_per_ctx_key:1; u32 cap_rss_rxnfc_adds:1; u32 rxfh_indir_space; diff --git a/include/uapi/linux/ethtool.h b/include/uapi/linux/ethtool.h index 2feba0929a8a..84833cca29fe 100644 --- a/include/uapi/linux/ethtool.h +++ b/include/uapi/linux/ethtool.h @@ -2289,6 +2289,10 @@ static inline int ethtool_validate_duplex(__u8 duplex) * be exploited to reduce the RSS queue spread. */ #define RXH_XFRM_SYM_XOR (1 << 0) +/* Similar to SYM_XOR, except that one copy of the XOR'ed fields is replaced by + * an OR of the same fields + */ +#define RXH_XFRM_SYM_OR_XOR (1 << 1) #define RXH_XFRM_NO_CHANGE 0xff /* L2-L4 network traffic flow types */ diff --git a/net/ethtool/ioctl.c b/net/ethtool/ioctl.c index 271c7cef9ef3..77d714874eca 100644 --- a/net/ethtool/ioctl.c +++ b/net/ethtool/ioctl.c @@ -1011,11 +1011,11 @@ static noinline_for_stack int ethtool_set_rxnfc(struct net_device *dev, if (rc) return rc; - /* Sanity check: if symmetric-xor is set, then: + /* Sanity check: if symmetric-xor/symmetric-or-xor is set, then: * 1 - no other fields besides IP src/dst and/or L4 src/dst * 2 - If src is set, dst must also be set */ - if ((rxfh.input_xfrm & RXH_XFRM_SYM_XOR) && + if ((rxfh.input_xfrm & (RXH_XFRM_SYM_XOR | RXH_XFRM_SYM_OR_XOR)) && ((info.data & ~(RXH_IP_SRC | RXH_IP_DST | RXH_L4_B_0_1 | RXH_L4_B_2_3)) || (!!(info.data & RXH_IP_SRC) ^ !!(info.data & RXH_IP_DST)) || @@ -1388,11 +1388,11 @@ static noinline_for_stack int ethtool_set_rxfh(struct net_device *dev, return -EOPNOTSUPP; /* Check input data transformation capabilities */ if (rxfh.input_xfrm && rxfh.input_xfrm != RXH_XFRM_SYM_XOR && + rxfh.input_xfrm != RXH_XFRM_SYM_OR_XOR && rxfh.input_xfrm != RXH_XFRM_NO_CHANGE) return -EINVAL; if (rxfh.input_xfrm != RXH_XFRM_NO_CHANGE && - (rxfh.input_xfrm & RXH_XFRM_SYM_XOR) && - !ops->cap_rss_sym_xor_supported) + rxfh.input_xfrm & ~ops->supported_input_xfrm) return -EOPNOTSUPP; create = rxfh.rss_context == ETH_RXFH_CONTEXT_ALLOC; From patchwork Thu Feb 20 11:34:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gal Pressman X-Patchwork-Id: 13983849 X-Patchwork-Delegate: kuba@kernel.org Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2058.outbound.protection.outlook.com [40.107.243.58]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 81D231F150A; Thu, 20 Feb 2025 11:35:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.243.58 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740051323; cv=fail; b=ggIrTA0hZX+WKcspCBblAKVZZ4k1W3pc7mwysHCgkOZpCyN1oFW+2rcnVw6Uk1h3cVK7ucp7sPw1Rdqx0B0z+sN3kImt5TG/tZdzAWKqzUkI4q4k6YpRmJbpk6fqlKH+QxUD3Egzyxv60ap4jxMs1enPsGxDPWALC5tEVKmrmPo= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740051323; c=relaxed/simple; bh=QCFQ7q4G2O177g5dr2V1Xhgwv0hsd7LxmfIKmfPOAds=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=oAGOCM1gDPGfuga9YAchAJB5Kf5NV07wTuEGbpkoFfZhezyE9yTizdAoUzfkjA3kSwe+LZWtsPUrJAa3C47UAiROSP+wpvvXwBu70E9S/hEmo3JMrkn4fCD1KbhZ9jIi6rxrUHerwivlocGCaGA3C0dp9ZOwXmRbiwsrFC+0Q4k= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com; spf=fail smtp.mailfrom=nvidia.com; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b=eaGdU/qg; arc=fail smtp.client-ip=40.107.243.58 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nvidia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b="eaGdU/qg" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=NXQrR2Or3yuQrJP7q4NqRpRws1Jf560MmL/knRiN9TpKumkYj5QW/QLR9lHjQWcytozxfTvSRQ+EfFCqRDfmBtdy4umnbwznPRfFSQUnlGc6DkXHbeNFu4hWFP/bX7S05HDXcu/BPuGenmJKJUY2YIByMj2ebUlHagFduQ8jBLEE651QYUCqvs7UiG/ytOddhyTRcgWu0ALePauQIlYGUtC+devYfmpMgsy1lBwPqcGUG2FkEyNZiaxIN5zGuazIwBDxcJFrlse0rZVhh6f0iuKHkSK7hu7BNJIejgueRSqiy75jmm1xU1Votv4kGEnAagz0p1EpE+IMnVsGfuwq3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=Qx5dco9QkZibDDsE3q+7FXfwBxonytieuoQqubrMwS4=; b=DqtndKzUogdbS7gM+Td4+87hUcY/v8f6JTdc+7NeuLYWLSjUuRdb9OK73s9UGc/4w5c6U6/zoCSmvsrX7zsCMwexvkA8h3y0ZNUNtV34gKXIWp18SzvAFZrPCGrBbA1j0fTorGBwt1udznO9IByPzEbfOZiNtv9aTdF5sgrmf/1acAtRd/rBKbOByr3gbxLOP6EheE5sVivHMBakewLd+l2iftCQ26gYi88VCQS645JxpYWFmaygd8M0fiRkEv2yU9LIfF5qd8j/3hHToKurwRJzGDBYRl//ZIGdc//+HaQT5gI9zAeZf+HIkmkGPUYnBrLx6QXaLVdoXK6Dl82mxA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=davemloft.net 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 (0) 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=Qx5dco9QkZibDDsE3q+7FXfwBxonytieuoQqubrMwS4=; b=eaGdU/qgwxKz1n4EqychbOjD7AGXirbbqzoLXqgscM/ym+xGUnIt0J7o+2jjaLM3aDYECVEgdYjHIprPr1dA5fJc6xVKJV6kWqox6uYkxwMg3ZcO+lDZTeOsK8elP9vAtWntky5HZ1g1CXNYYH71C2zVQltEZsW0WeajquNC7u7zOXZTKZ0n7tnYT2vLDVBhupmLT9fA3oOufkKuOJjG5QOz06POrZjihmEn8dOI1sw179qqtK6sb3Ouvl3Jz2Wma9VsQNX39Hpnphqz7yuUvho5H8GRnzxLDo6chrTGJ1l01k/lop2I2BpsXM8k8dY6NcOfeLriIj4p2uU7D/MVKQ== Received: from BL1PR13CA0163.namprd13.prod.outlook.com (2603:10b6:208:2bd::18) by IA0PR12MB9046.namprd12.prod.outlook.com (2603:10b6:208:405::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.20; Thu, 20 Feb 2025 11:35:15 +0000 Received: from BN3PEPF0000B06F.namprd21.prod.outlook.com (2603:10b6:208:2bd:cafe::9e) by BL1PR13CA0163.outlook.office365.com (2603:10b6:208:2bd::18) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8466.14 via Frontend Transport; Thu, 20 Feb 2025 11:35:15 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) 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.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by BN3PEPF0000B06F.mail.protection.outlook.com (10.167.243.74) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8489.2 via Frontend Transport; Thu, 20 Feb 2025 11:35:14 +0000 Received: from rnnvmail203.nvidia.com (10.129.68.9) 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.1544.4; Thu, 20 Feb 2025 03:34:57 -0800 Received: from rnnvmail205.nvidia.com (10.129.68.10) by rnnvmail203.nvidia.com (10.129.68.9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14; Thu, 20 Feb 2025 03:34:57 -0800 Received: from vdi.nvidia.com (10.127.8.12) by mail.nvidia.com (10.129.68.10) with Microsoft SMTP Server id 15.2.1544.14 via Frontend Transport; Thu, 20 Feb 2025 03:34:53 -0800 From: Gal Pressman To: "David S. Miller" , Jakub Kicinski CC: , Eric Dumazet , Paolo Abeni , Simon Horman , Jonathan Corbet , Tony Nguyen , Przemek Kitszel , Andrew Lunn , "Tariq Toukan" , Edward Cree , Ahmed Zaki , , Gal Pressman , Cosmin Ratiu Subject: [PATCH net-next v4 2/5] net/mlx5e: Symmetric OR-XOR RSS hash control Date: Thu, 20 Feb 2025 13:34:32 +0200 Message-ID: <20250220113435.417487-3-gal@nvidia.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20250220113435.417487-1-gal@nvidia.com> References: <20250220113435.417487-1-gal@nvidia.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-NV-OnPremToCloud: AnonymousSubmission X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN3PEPF0000B06F:EE_|IA0PR12MB9046:EE_ X-MS-Office365-Filtering-Correlation-Id: 1f98acb1-96f7-421c-bdd1-08dd51a2a4e5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|1800799024|7416014|376014|82310400026; X-Microsoft-Antispam-Message-Info: R/prbDjh6hat4EuHbhfVfptDYhBgN1mnnG17AxDAQbBjT/Tw1ZiK/bDpWzeoRSe/saj6HDM5Ts83O+1K7bYtHOFxVkinCBqCz23luUrUqJOLIAwY9YsofiS3sq+ZsuTaHoO+7trdv6WDF6jC9lUBLVi7mOGcufwEqBCNMk0E3+lxb4KnOYtiSe+Zq58cLqXB0gU3JyIDJi0U047OCRdWKAT0Fxdcvj57C7BD21m85vnkn38HlE7kdxpNWukm9LN0oFulNtyIBYWegWIsniDbXuV923kfmDbFxJ/mHFkMxSy0ZQqtn9yY9zKn9J4sXFDUjRGBEVmX+nZULt0L93bo6TG+wyNnE1X4VGkqYf9GaJDDhGvm4niEmE41Sqm6nDDXG4U80qP+bWziQA8vrIJIoedx9kHlwqtTthutcbYwszsIQbrY4j9LaJmB9R6/RRTJvKwGbtGp/Gqk3hK+9u/4PnrwkTVOAYLNJ473+20UI2ISx1iX+ORy5i9bHYm0ve/y0zlibsjpPfnUfocbtFNILs3CYKCqlgQhZwvp+/iJxPCd0ugvprQHYKDPWOp+ZxjwQ3AhVQeZY49ymJiKtMEdkEj2pYd8TIvgFYGE9+A3Gva4D1TZxZEYszBMxD5dFzcRXeW6joa8gPdewCXe2M5DpBnt4yk+OGbaSX8tqXwIiIR7+JU+u6Qn3O1wggnu8wwWIzKeq2A9aDw0mCjBfgrpr5smkZcOAt5bZyoIj+ljiEn7u0nfLpE5gL4FbI//fkdiAtoHlTSpcpnQP2ac0KEvWMLKxKFHAxD0GxDlrNpMFaPZM4mJeFuqa3xb6n8WmGdSsvXlVtI9gDezFY3YLpU/o4qdTGCyy8wWsE6oTnTMln/InuxG4m2r2lkvfzz16b7JgguSJyFONyNoS+q2T2PkrX2hZkDbQs4RZb39iwzb5R1gxXd+r1D6oh1Fj84Xd59FiA8pEe8psTPatX0xPHO9PX856BX+gROzqLVkERS05B8NussEgDmCbXtvHXoUiqAYbTqKNqT3kPvn5i5TlwZAHQ2Kh2HsKkeY9ozOUgtwZKoi8HN44lRHV12otL/zWOZFkdU+XSfnA1IMewmMQIUEjnead7xv+8XqgZerlQhtwKR4IX+Oots/25nw+8dOLRiUp53uvkjyro1GVsNDTsVvnGY+dEjLhIyDZmSlIg1aAoV0Owfij4E5qMss6BWJEmp+6243Hdz+60/47KVVZPG+8RVd+LYROKH7L8WnUTZceP53pE3acsJirFJ5WGy2L5UNYo5V+KOG6VVfdyyPxOVtlepFjSWlaG78IG3YB/PMgg0eZET2YZxVVIEPHEcm3PFh8RrTvzdt1qPE0P/PYmKlGwLwdaAkHcueCFcCqFOJsF/yudtEFS414xNnofVX6uiiCB+sNeECTqy/4kjLjea92vIdJg8NZehxv+fojM7SKYrEZrtpIEbx28KwzwiYpN/cY5LIUrUOf65xNnGkhJnIse/KLjapjuf4yIxzjoCmqKE= 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:(13230040)(36860700013)(1800799024)(7416014)(376014)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Feb 2025 11:35:14.7518 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1f98acb1-96f7-421c-bdd1-08dd51a2a4e5 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: BN3PEPF0000B06F.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR12MB9046 X-Patchwork-Delegate: kuba@kernel.org Allow control over the symmetric RSS hash, which was previously set to enabled by default by the driver. Symmetric OR-XOR RSS can now be queried and controlled using the 'ethtool -x/X' command. Reviewed-by: Cosmin Ratiu Reviewed-by: Tariq Toukan Signed-off-by: Gal Pressman --- .../net/ethernet/mellanox/mlx5/core/en/rss.c | 13 +++++++++++-- .../net/ethernet/mellanox/mlx5/core/en/rss.h | 4 ++-- .../net/ethernet/mellanox/mlx5/core/en/rx_res.c | 11 ++++++----- .../net/ethernet/mellanox/mlx5/core/en/rx_res.h | 5 +++-- .../net/ethernet/mellanox/mlx5/core/en/tir.c | 2 +- .../net/ethernet/mellanox/mlx5/core/en/tir.h | 1 + .../ethernet/mellanox/mlx5/core/en_ethtool.c | 17 ++++++++++++++--- 7 files changed, 38 insertions(+), 15 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/rss.c b/drivers/net/ethernet/mellanox/mlx5/core/en/rss.c index 0d8ccc7b6c11..74cd111ee320 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/rss.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/rss.c @@ -161,6 +161,7 @@ static void mlx5e_rss_params_init(struct mlx5e_rss *rss) { enum mlx5_traffic_types tt; + rss->hash.symmetric = true; rss->hash.hfunc = ETH_RSS_HASH_TOP; netdev_rss_key_fill(rss->hash.toeplitz_hash_key, sizeof(rss->hash.toeplitz_hash_key)); @@ -566,7 +567,7 @@ int mlx5e_rss_packet_merge_set_param(struct mlx5e_rss *rss, return final_err; } -int mlx5e_rss_get_rxfh(struct mlx5e_rss *rss, u32 *indir, u8 *key, u8 *hfunc) +int mlx5e_rss_get_rxfh(struct mlx5e_rss *rss, u32 *indir, u8 *key, u8 *hfunc, bool *symmetric) { if (indir) memcpy(indir, rss->indir.table, @@ -579,11 +580,14 @@ int mlx5e_rss_get_rxfh(struct mlx5e_rss *rss, u32 *indir, u8 *key, u8 *hfunc) if (hfunc) *hfunc = rss->hash.hfunc; + if (symmetric) + *symmetric = rss->hash.symmetric; + return 0; } int mlx5e_rss_set_rxfh(struct mlx5e_rss *rss, const u32 *indir, - const u8 *key, const u8 *hfunc, + const u8 *key, const u8 *hfunc, const bool *symmetric, u32 *rqns, u32 *vhca_ids, unsigned int num_rqns) { bool changed_indir = false; @@ -623,6 +627,11 @@ int mlx5e_rss_set_rxfh(struct mlx5e_rss *rss, const u32 *indir, rss->indir.actual_table_size * sizeof(*rss->indir.table)); } + if (symmetric) { + rss->hash.symmetric = *symmetric; + changed_hash = true; + } + if (changed_indir && rss->enabled) { err = mlx5e_rss_apply(rss, rqns, vhca_ids, num_rqns); if (err) { diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/rss.h b/drivers/net/ethernet/mellanox/mlx5/core/en/rss.h index 72089f5f473c..8ac902190010 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/rss.h +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/rss.h @@ -47,9 +47,9 @@ void mlx5e_rss_disable(struct mlx5e_rss *rss); int mlx5e_rss_packet_merge_set_param(struct mlx5e_rss *rss, struct mlx5e_packet_merge_param *pkt_merge_param); -int mlx5e_rss_get_rxfh(struct mlx5e_rss *rss, u32 *indir, u8 *key, u8 *hfunc); +int mlx5e_rss_get_rxfh(struct mlx5e_rss *rss, u32 *indir, u8 *key, u8 *hfunc, bool *symmetric); int mlx5e_rss_set_rxfh(struct mlx5e_rss *rss, const u32 *indir, - const u8 *key, const u8 *hfunc, + const u8 *key, const u8 *hfunc, const bool *symmetric, u32 *rqns, u32 *vhca_ids, unsigned int num_rqns); struct mlx5e_rss_params_hash mlx5e_rss_get_hash(struct mlx5e_rss *rss); u8 mlx5e_rss_get_hash_fields(struct mlx5e_rss *rss, enum mlx5_traffic_types tt); diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/rx_res.c b/drivers/net/ethernet/mellanox/mlx5/core/en/rx_res.c index 9d8b2f5f6c96..5fcbe47337b0 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/rx_res.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/rx_res.c @@ -194,7 +194,7 @@ void mlx5e_rx_res_rss_set_indir_uniform(struct mlx5e_rx_res *res, unsigned int n } int mlx5e_rx_res_rss_get_rxfh(struct mlx5e_rx_res *res, u32 rss_idx, - u32 *indir, u8 *key, u8 *hfunc) + u32 *indir, u8 *key, u8 *hfunc, bool *symmetric) { struct mlx5e_rss *rss; @@ -205,11 +205,12 @@ int mlx5e_rx_res_rss_get_rxfh(struct mlx5e_rx_res *res, u32 rss_idx, if (!rss) return -ENOENT; - return mlx5e_rss_get_rxfh(rss, indir, key, hfunc); + return mlx5e_rss_get_rxfh(rss, indir, key, hfunc, symmetric); } int mlx5e_rx_res_rss_set_rxfh(struct mlx5e_rx_res *res, u32 rss_idx, - const u32 *indir, const u8 *key, const u8 *hfunc) + const u32 *indir, const u8 *key, const u8 *hfunc, + const bool *symmetric) { u32 *vhca_ids = get_vhca_ids(res, 0); struct mlx5e_rss *rss; @@ -221,8 +222,8 @@ int mlx5e_rx_res_rss_set_rxfh(struct mlx5e_rx_res *res, u32 rss_idx, if (!rss) return -ENOENT; - return mlx5e_rss_set_rxfh(rss, indir, key, hfunc, res->rss_rqns, vhca_ids, - res->rss_nch); + return mlx5e_rss_set_rxfh(rss, indir, key, hfunc, symmetric, + res->rss_rqns, vhca_ids, res->rss_nch); } int mlx5e_rx_res_rss_get_hash_fields(struct mlx5e_rx_res *res, u32 rss_idx, diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/rx_res.h b/drivers/net/ethernet/mellanox/mlx5/core/en/rx_res.h index 05b438043bcb..3e09d91281af 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/rx_res.h +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/rx_res.h @@ -49,9 +49,10 @@ void mlx5e_rx_res_xsk_update(struct mlx5e_rx_res *res, struct mlx5e_channels *ch /* Configuration API */ void mlx5e_rx_res_rss_set_indir_uniform(struct mlx5e_rx_res *res, unsigned int nch); int mlx5e_rx_res_rss_get_rxfh(struct mlx5e_rx_res *res, u32 rss_idx, - u32 *indir, u8 *key, u8 *hfunc); + u32 *indir, u8 *key, u8 *hfunc, bool *symmetric); int mlx5e_rx_res_rss_set_rxfh(struct mlx5e_rx_res *res, u32 rss_idx, - const u32 *indir, const u8 *key, const u8 *hfunc); + const u32 *indir, const u8 *key, const u8 *hfunc, + const bool *symmetric); int mlx5e_rx_res_rss_get_hash_fields(struct mlx5e_rx_res *res, u32 rss_idx, enum mlx5_traffic_types tt); diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tir.c b/drivers/net/ethernet/mellanox/mlx5/core/en/tir.c index 11f724ad90db..19499072f67f 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/tir.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tir.c @@ -124,7 +124,7 @@ void mlx5e_tir_builder_build_rss(struct mlx5e_tir_builder *builder, const size_t len = MLX5_FLD_SZ_BYTES(tirc, rx_hash_toeplitz_key); void *rss_key = MLX5_ADDR_OF(tirc, tirc, rx_hash_toeplitz_key); - MLX5_SET(tirc, tirc, rx_hash_symmetric, 1); + MLX5_SET(tirc, tirc, rx_hash_symmetric, rss_hash->symmetric); memcpy(rss_key, rss_hash->toeplitz_hash_key, len); } diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tir.h b/drivers/net/ethernet/mellanox/mlx5/core/en/tir.h index 857a84bcd53a..e8df3aaf6562 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/tir.h +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tir.h @@ -9,6 +9,7 @@ struct mlx5e_rss_params_hash { u8 hfunc; u8 toeplitz_hash_key[40]; + bool symmetric; }; struct mlx5e_rss_params_traffic_type { diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c b/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c index f9113cb13a0c..75faf15fdd64 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c @@ -1480,18 +1480,27 @@ static int mlx5e_get_rxfh(struct net_device *netdev, struct ethtool_rxfh_param * { struct mlx5e_priv *priv = netdev_priv(netdev); u32 rss_context = rxfh->rss_context; + bool symmetric; int err; mutex_lock(&priv->state_lock); err = mlx5e_rx_res_rss_get_rxfh(priv->rx_res, rss_context, - rxfh->indir, rxfh->key, &rxfh->hfunc); + rxfh->indir, rxfh->key, &rxfh->hfunc, &symmetric); mutex_unlock(&priv->state_lock); - return err; + + if (err) + return err; + + if (symmetric) + rxfh->input_xfrm = RXH_XFRM_SYM_OR_XOR; + + return 0; } static int mlx5e_set_rxfh(struct net_device *dev, struct ethtool_rxfh_param *rxfh, struct netlink_ext_ack *extack) { + bool symmetric = rxfh->input_xfrm == RXH_XFRM_SYM_OR_XOR; struct mlx5e_priv *priv = netdev_priv(dev); u32 *rss_context = &rxfh->rss_context; u8 hfunc = rxfh->hfunc; @@ -1526,7 +1535,8 @@ static int mlx5e_set_rxfh(struct net_device *dev, struct ethtool_rxfh_param *rxf err = mlx5e_rx_res_rss_set_rxfh(priv->rx_res, *rss_context, rxfh->indir, rxfh->key, - hfunc == ETH_RSS_HASH_NO_CHANGE ? NULL : &hfunc); + hfunc == ETH_RSS_HASH_NO_CHANGE ? NULL : &hfunc, + rxfh->input_xfrm == RXH_XFRM_NO_CHANGE ? NULL : &symmetric); unlock: mutex_unlock(&priv->state_lock); @@ -2635,6 +2645,7 @@ const struct ethtool_ops mlx5e_ethtool_ops = { ETHTOOL_COALESCE_MAX_FRAMES | ETHTOOL_COALESCE_USE_ADAPTIVE | ETHTOOL_COALESCE_USE_CQE, + .supported_input_xfrm = RXH_XFRM_SYM_OR_XOR, .get_drvinfo = mlx5e_get_drvinfo, .get_link = ethtool_op_get_link, .get_link_ext_state = mlx5e_get_link_ext_state, From patchwork Thu Feb 20 11:34:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gal Pressman X-Patchwork-Id: 13983848 X-Patchwork-Delegate: kuba@kernel.org Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2084.outbound.protection.outlook.com [40.107.94.84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BC6361F12F6; Thu, 20 Feb 2025 11:35:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.94.84 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740051322; cv=fail; b=FkcCy2jLCIbvOHk+RT6P2qXPR23GqnDMCWCiGabgyhfVdHBHlB/95MMSqySPFUalAivNbJyp43QXEIZYtYq8Re1QsQ6cMH2SRyLbke4r96vvJulidomVUYzxfXmmmpHyLHr03ylTqwgMWPDvaQyWmEI5OW6BmJEiy+/x5i7Z0iA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740051322; c=relaxed/simple; bh=dHo5wDkTuWGHpqrsh6vBnHjjsA2O+LOlevIFJAKqJng=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=PF5s53lol1UTeuSxBylWeosZTGDLlr0tZmS7spDq56p5CA7b3qk+WD26qcLaRPSOUwsPrGtR+pyMmGabgtOZdhK5e6gd3iqAyV/R9a9+4JpoLiZMdWCxHfxedOM7bIGnHTRbX7/w7UI9ZKHpzMCq5MJFvSwz3MACl/0HX4wFwBY= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com; spf=fail smtp.mailfrom=nvidia.com; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b=JRaw3wqA; arc=fail smtp.client-ip=40.107.94.84 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nvidia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b="JRaw3wqA" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=kaXRMRCo+Wnh2aGVwJ2ZeKcvgWbexqWCEKBuFXZkZidR6cCigPtIOfZW8Ekg3J0KZgy3yMIeoCqOPW0kDJkzkhaCCKpHVg0eW7E7apVJjRJKcUzGeOXHn22DfXSilE8HbVj2i2Tcs6ZGESM3Ul+4bfI+UILEne7DaNyjT4CVmQEcHfVAvkQDPNx3TR4M7HpogkW+4er/B6vrXBPf0hY0kIdCq/bgKggOyt6RCK7WAoHFledirJW0tY5GgHCYoeYmOheJpMAUOH4bITKtfEu7zRe3hv6Q5d61DGkoVfODkrku1tK1MUYmgTPQEPB1X7lNKr4fsBFlAnfIAmynvWPfsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=dVgyejacV35cUoJDUj3z9CeeOKJm0gPJ4zoro5cRN14=; b=zHwYO5b/huao7jp9sgfvG6U0w0Hiwj3JJR3fGYDpDFLzYiQ2zIHmKQGJx5RJehhxRxz0quSg4KHYRWKsdAJDtwJHxyyR3SltDD+n8C0XvB0FhPEH9hrdy7tlu6a5FfbbuN1lPTXOx/AUDot3Pd98jMHZMXSZSgZ7Tht8R3hG1ZfWdwcHA7i9rOyrqNga1xZzsYlhbKG0VJ5tebju9oEBpPgboQ6IkcdlDUP/LSUzL6+Za0LzPsWHSl4nNWBAHS0i8++nfghwA/QOa9+qeXsjaPoU3yB3LQjOA99X2ChZ/4RQCo/XLbZEzJ+ycdeP9jSxpBB6rfLP+Z+4SNm68ld4zQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=davemloft.net 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 (0) 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=dVgyejacV35cUoJDUj3z9CeeOKJm0gPJ4zoro5cRN14=; b=JRaw3wqAnh0iCXXJ4t/0YZe5nJmKoSQpXdOBv/Tf43MFnHywyYUMoPunBoI3940Tbq6KoOMQpLOqlEqVh4rMQgwHKDNpCU++zftV06/q3xbQCiqwuuPJBQzCFOr9YW1AkCUpiXM/xEWUUfxV/rmLvHMB8HwS0mvCNEQrY0JVcz+hE3pNQXgg7rBu4FqHm0fhwQz9oFG57+EsPaHqSQVnnJ3FBbfwXx06pU4kKL2HlwVg0rvdTsCxbuhpEOm0kkq3LMFQjldtsi+ecxqUq63ok1xRzn7fvh5ljlnoBFZtQpgZZTwqImioVzPz9S0hvpf9bzphV1SC6B4OSrGsqeSX1g== Received: from SA1P222CA0180.NAMP222.PROD.OUTLOOK.COM (2603:10b6:806:3c4::17) by BY5PR12MB4163.namprd12.prod.outlook.com (2603:10b6:a03:202::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.16; Thu, 20 Feb 2025 11:35:16 +0000 Received: from SN1PEPF0002BA50.namprd03.prod.outlook.com (2603:10b6:806:3c4:cafe::2f) by SA1P222CA0180.outlook.office365.com (2603:10b6:806:3c4::17) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8466.15 via Frontend Transport; Thu, 20 Feb 2025 11:35:16 +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 SN1PEPF0002BA50.mail.protection.outlook.com (10.167.242.73) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.11 via Frontend Transport; Thu, 20 Feb 2025 11:35:15 +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.1544.4; Thu, 20 Feb 2025 03:35:02 -0800 Received: from rnnvmail205.nvidia.com (10.129.68.10) 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.1544.14; Thu, 20 Feb 2025 03:35:01 -0800 Received: from vdi.nvidia.com (10.127.8.12) by mail.nvidia.com (10.129.68.10) with Microsoft SMTP Server id 15.2.1544.14 via Frontend Transport; Thu, 20 Feb 2025 03:34:57 -0800 From: Gal Pressman To: "David S. Miller" , Jakub Kicinski CC: , Eric Dumazet , Paolo Abeni , Simon Horman , Jonathan Corbet , Tony Nguyen , Przemek Kitszel , Andrew Lunn , "Tariq Toukan" , Edward Cree , Ahmed Zaki , , Gal Pressman , Nimrod Oren Subject: [PATCH net-next v4 3/5] selftests: drv-net: Make rand_port() get a port more reliably Date: Thu, 20 Feb 2025 13:34:33 +0200 Message-ID: <20250220113435.417487-4-gal@nvidia.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20250220113435.417487-1-gal@nvidia.com> References: <20250220113435.417487-1-gal@nvidia.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-NV-OnPremToCloud: AnonymousSubmission X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF0002BA50:EE_|BY5PR12MB4163:EE_ X-MS-Office365-Filtering-Correlation-Id: 406a219f-bf06-4010-7148-08dd51a2a584 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|82310400026|36860700013|376014|7416014; X-Microsoft-Antispam-Message-Info: tzL32l3aDLUoiFPpMCEAV96xBkhesuDKiz2YAEBo63XFMrO8gAyr9pBhibvIgIWQUPnI2Rt5rVTjj9jMcQzVurDhMvGH0NJ5FwBgzKu/kCfhWYmScjFls6SpKm3ZRBc6tzlYUGw0bknjzAtvMcO/HRGwQgO9AiqMr6PdXiMzy+kHaeIqlJnEtG5DPJfdqNkE0gXPHUo8mN3/btDJc1MuEd12LRDf/nuwFtYUE80WbM/Vz4+8B0UD0gjVzF991kWm2jl4C/lVV/TraCl9bsQF+Q8Ncfc8DSj8iRZLvRimJpVzS8cj4stqiNBnvcNrlkQnASWtd6EB7oIy4rDAtmjwUa9rCioms3WGheZRLYhlbtvDV6xfcixTruL6LqQlYvpMRhzvwkrRCAER2zhBetGYUsSByimfpkDbGtDjK9vehYzfcMLEnANVGcBodysk510Rf/aLQ2XhqmVhqUdJz4D1y3q0zasMaKeAEG0B0qPz2ixPHIiI/9fUquUZeHQ5ucOTHy8o6OXmipgBqclUMJbbehHCSrDqunEdB98/kBp6fOz2SVRwnqC1Lt1Fy4Bh/SjVXp8VszhX3URUobxV4VmqHBpWBbYP9UfW2p2ZtAP4RBuJtB0hsb9hw+fAEx5p3Zi8OpS8oOFTtWwiuoh3n1z+FsTo/63R0okyUfekoOU5o7l0Pxo3fk0mWh+HBuSqdAtwsBf4kZ7yiYKv6iuhXGW40hNYhL88DPYVZ3NqDxEQRb2ogBRiVcT4ML2e8D4WlGVKDxuOKUX5UpZUEw110OyJtjHJ5Tabb+yogjBpFQILoFg2J6rOtBN6SbfjowPKhLBOPAS6lsEa4pT+ZPyCbeh6/dtFP204ZcpKuDDSlI8ZhjwmWf2ozVps/vkzt9x1XR09pXQX6CzAqMtf4K+3fUkXW3Z0EvZvLU/p9ZF06uGWihmcXj41xfirHmc0XmxhRYDVBpJgtyzBHLAfjgDb2TVLDFsVY81Qlb2yCS3PngvtkYKUigfWsuWIWZaJeG0S9vw/WtutyU8Dbeh3IZ5sVrq9zuu72mpQgduMipnOCHLCiJllUNZi9p5MaNB0ILgwsGvrvmhxJpoLFBZl7/coNE2lQLdSB8Pyt9bEiuiA+rj8pbxr6kwFRrjPjJEy7f5ZsEQmkOHtXk1++FV1F+C2I9UwgMm2BUxZbjUsCDw3Tdprj5trD+qDo9JJbVHA/QE4rUWHuuGXR9F05Jo8xss20C5Pjize1dcND5Wirxbm7iDupl8cL/hNeSqGxnnxHC2f4r3gxG68cFheeWQDdK7BNUJMa5EGCxOw29t9kVoHk1hUsac92Bf8stFfLMLbMxFl6PEafVWR0s01VfT3dGn0Z1U9QrOP+ljJUPFopS4LwiB62t8OawYs/a1rOiwHaEw8rKN37britZoJOFBeXBoEPgHEXpdtOVlqJ7ifbs/I3/n1ZowUi/GSoGxCi1czEIBBHka5sHQZLFKSTfG2zXRV+bWfWVOLmFBf8EJ4lFFcmEOsE+Y= 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:(13230040)(1800799024)(82310400026)(36860700013)(376014)(7416014);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Feb 2025 11:35:15.8700 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 406a219f-bf06-4010-7148-08dd51a2a584 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: SN1PEPF0002BA50.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB4163 X-Patchwork-Delegate: kuba@kernel.org Instead of guessing a port and checking whether it's available, get an available port from the OS. Reviewed-by: Nimrod Oren Signed-off-by: Gal Pressman --- tools/testing/selftests/net/lib/py/utils.py | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/tools/testing/selftests/net/lib/py/utils.py b/tools/testing/selftests/net/lib/py/utils.py index 9e3bcddcf3e8..5a13f4fd3784 100644 --- a/tools/testing/selftests/net/lib/py/utils.py +++ b/tools/testing/selftests/net/lib/py/utils.py @@ -125,18 +125,11 @@ def ethtool(args, json=None, ns=None, host=None): def rand_port(): """ - Get a random unprivileged port, try to make sure it's not already used. + Get a random unprivileged port. """ - for _ in range(1000): - port = random.randint(10000, 65535) - try: - with socket.socket(socket.AF_INET6, socket.SOCK_STREAM) as s: - s.bind(("", port)) - return port - except OSError as e: - if e.errno != errno.EADDRINUSE: - raise - raise Exception("Can't find any free unprivileged port") + with socket.socket(socket.AF_INET6, socket.SOCK_STREAM) as s: + s.bind(("", 0)) + return s.getsockname()[1] def wait_port_listen(port, proto="tcp", ns=None, host=None, sleep=0.005, deadline=5): From patchwork Thu Feb 20 11:34:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gal Pressman X-Patchwork-Id: 13983850 X-Patchwork-Delegate: kuba@kernel.org Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1nam02on2088.outbound.protection.outlook.com [40.107.96.88]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 578321D5CC6; Thu, 20 Feb 2025 11:35:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.96.88 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740051329; cv=fail; b=hhIYZufiLLN28zIiLTLohqc1vvsmhmGimXVHBJTKkronpDmdSiAJZPIUAnrFXQEDnddCUsfHKBFi3//Gq+XksapMMiAZkkpKaDrdN+UNDp5oKIlLXSwv0FZvtPLTYlqfW84jOTmk6nZ/ILWhBptx3jejgvzsZsDUINPtRs2GLHo= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740051329; c=relaxed/simple; bh=NLkYE5HOT7xJwAeeFKTm4J+gC1LcB3xmVMoNtrE9KJM=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=OvrPpZ+YQJvcAZWS6y2+X1rWKNxheR3llxKbwSborjDaQ2L2/puKbBBSrmrr7aDLpv6AF+meq+TI2JIGiP1elTSDpeJIbCZT2GUN+xCLRMzd3wDlFXZCXm47vXniBeVI3cWmQJ2tXIGcco2sOO2eHHpeKOgk/sKSvn68mQGcTEY= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com; spf=fail smtp.mailfrom=nvidia.com; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b=kZUhx3xO; arc=fail smtp.client-ip=40.107.96.88 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nvidia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b="kZUhx3xO" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=uq8BhUMpX5HgfkvQ3yPyF1hYjE7frQakkciWxS3WmgyOoH5mPpKEFDXDUyizivBk7vikXNp69mYrs41qLCaoUTMz7IQ4nG/I0fR6XMWXAG13Lme2vLXSZSTi39c+pTI7BP7NnE39eS0xRhs59zSlA7geyusruIgPW6tmRQDL899ZRwLuiYVWiAdmctny3YImIpUJdS0amXjiF7fNdK5ukzWFpB8Onc6zWfyJCKovAyE/aSq8oG6gxSACHyYgSUvJShxTteFXXZ0caKxcE0gj0yuC3Rwy9lxfAYHILUN9CXdyNlpqZIPXDPsxyUF8I/pcBk0hhRUvU6uza0UJe5FeCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=zs2x7GsY+Q8mv45wh/hP8xsKfiBJPgQpO0a3QQd5LRY=; b=k9wQXSDF42ggxHzSVKkneKUyaher3brtASBLGqokl8P49B0aIEnIn+gPo8DNTLnOzxgnz/77/wjAyogMCHBVWnEr5ENc1+V3sGu37+tKYwdPYGBWdoHpPS8MRiLqrUUb9KnJOtH2oQuOl4jKFquxlcawPfolSkAHDomciFg6xezO9pG10RhJKNMXesLfhkIO+63Y+rj76BOxmZB8zgiaRnhtyllwqBJdPtelJG0wNYCXeA9XOuQwR+RSDLO555gZ3uYeLGflavjOGg+W3ocwKLFxzZSkMuD+x9bcOM7j6G5XGFtCan6FaDgZpLf+omxAlZ0rBF5ngFvMNCqd5UWUAw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=davemloft.net 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 (0) 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=zs2x7GsY+Q8mv45wh/hP8xsKfiBJPgQpO0a3QQd5LRY=; b=kZUhx3xOOSgoxuRIQzbuWk+JzNPoE8bF0u6fZjZN/OXGYyoohyRcbABYKdpJBNQNj+0NdjQZ3gVyTvOjcTKalGliMR3WPZ0IpLZibZnm9bxPBUHd3dJkqADgoIV2hrAtE7dKUagk/BWVcn11GlQlaYb5wvF1sVmzkb8CDkccxWKYgqrsAY/rwx/1MSXF+IoKNY8o2XetNOqTB8nKunpnV/Fa9q1I0Uw2EbXZuO51q0oxCDc96qOncvifOMu3kttw+h+op2l15jIEWhGChLJX3eEhCUrbtYw5iNiyVeZn3ViOc3Syt6+mH3MDC/SzPhwrzSfEelJAf/1OWYN5cRWZAQ== Received: from BL1PR13CA0177.namprd13.prod.outlook.com (2603:10b6:208:2bd::32) by SN7PR12MB8603.namprd12.prod.outlook.com (2603:10b6:806:260::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.15; Thu, 20 Feb 2025 11:35:25 +0000 Received: from BN3PEPF0000B069.namprd21.prod.outlook.com (2603:10b6:208:2bd:cafe::c6) by BL1PR13CA0177.outlook.office365.com (2603:10b6:208:2bd::32) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8466.15 via Frontend Transport; Thu, 20 Feb 2025 11:35:24 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) 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.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by BN3PEPF0000B069.mail.protection.outlook.com (10.167.243.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8489.2 via Frontend Transport; Thu, 20 Feb 2025 11:35:24 +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.1544.4; Thu, 20 Feb 2025 03:35:06 -0800 Received: from rnnvmail205.nvidia.com (10.129.68.10) 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.1544.14; Thu, 20 Feb 2025 03:35:06 -0800 Received: from vdi.nvidia.com (10.127.8.12) by mail.nvidia.com (10.129.68.10) with Microsoft SMTP Server id 15.2.1544.14 via Frontend Transport; Thu, 20 Feb 2025 03:35:02 -0800 From: Gal Pressman To: "David S. Miller" , Jakub Kicinski CC: , Eric Dumazet , Paolo Abeni , Simon Horman , Jonathan Corbet , Tony Nguyen , Przemek Kitszel , Andrew Lunn , "Tariq Toukan" , Edward Cree , Ahmed Zaki , , Gal Pressman , Nimrod Oren Subject: [PATCH net-next v4 4/5] selftests: drv-net: Introduce a function that checks whether a port is available on remote host Date: Thu, 20 Feb 2025 13:34:34 +0200 Message-ID: <20250220113435.417487-5-gal@nvidia.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20250220113435.417487-1-gal@nvidia.com> References: <20250220113435.417487-1-gal@nvidia.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-NV-OnPremToCloud: AnonymousSubmission X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN3PEPF0000B069:EE_|SN7PR12MB8603:EE_ X-MS-Office365-Filtering-Correlation-Id: e8789825-2057-4cf5-1d06-08dd51a2aa87 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|7416014|376014|1800799024|36860700013; X-Microsoft-Antispam-Message-Info: 04fqBDnhIEyIQo5HPKh0d8akyqJNRvv7rGfGc2K3o6ybwPcq0JAyZqStuNXqqTzPYeRlyTfG9ReCozkCQTMVr6RmrSBEeY5GEmvIU+gM0Y7LZO2D1XUgfjDak9Lr4CnIWU1Dq7/va02ObW3fU1twFiPVDKqrqbXaOBqdU3tM9w6jHORoS4n4fc8mcHhA3LILwiyqT2jBOQ6RkBy5C0L9v86SDWoNqJyuAjW/+iCWKLKERviikJgIv72ygRh2//O4hD10t3pixZFzKUEasdfX3R2EpeUYcJIZQ1Ew38PGbF2mQo0Wrwlighwy5YCci+/4kT2eZvi/pmGpHLwaYV/Kg+hJXPp4ZAsrT0k5nVJSYOR/Z+b3yWKYgPXWyaccK9wThKAIXQl89mRI0pjB036sLKQPBS1myCR/6P7UbGRFvOa593ofPHUeYmlGlkT1Wo91kkjHS2DZGd+l8c5VeFL85POT6KiEt3B14NlXV0xMlrBMii3xQgPsgGb17tCUsOGPr0m7dVcVkP4yqsoF4h9gkmdKayb+urjoOhwOzO3r6ZPlPZos3XXyIFxQxU+f8XM73fHqS6sBUr7mZV+qsqzBQ0X4a0Bk7ksJNsP4tidpI+XqjOs9MySC4DdhizlipbbzEBueAj0OsrAHpd5DClES5bEOKgkdR9q1ZOCeAw/Djl3qqxUAukUNMMLHx9F3vb8X6udT6phJxE4+Rbn7lkOeI4KhTZDnpuloV5BpcPQj3NnmNLZpuf3SH7NbuPa+wUeF1mUPFTNirEefwKQfTWW4DP9xgS+NNozR6tZvn7z+B2uoQoDITuoL54gaO8F08PBjzjDcRrcuZ9lEZFkj+O4Ha050ZwH7QfhX6aJvrt8+BN9WNIDhNz09J0K28cQ6cBiu7CPKiSndS1OLgk+CxRBa7ZRSvakOqgfHNy0AN2vLqDna7hzucVwkL4oXKcYmCqog2ynk0/vxHllRENVaA+h+bRej98KAOFyGuEi/TMobUlskkleFzztcAhoiEtbUlGlS9nBeAndzSfcnTK1w2O//NZrgudpGrDY3N0YdFouzI60PXknByZAEs2yPeUqQja2fNtGeia5lkmM5+OOwbZ8/XFiyrDI4NWgmwbPcHRQtMYojABD21ChAcI0P3czm+A6CtodNs2VWXRM9nvA08xOzB6mJkJTlwwQSaxmvprstkvT+fmFAwrhmOrph0Xh6rCmohH2TK9U/ALGNP3MjjnHkodSwLVJ4mxOYpV+t6DsoH4xgJl8MnXGelsiOgblY9JFFJ+UElBt/wZ67uaViwzeZH2PPbCzwaGnw+06zlji/yU2pNWaiBUn7Xg1dzQY0i+TsVSYct2Q9IQ0jeOXE7eLdgUp5omN87DCc8yLYWfv/VWR18f9aGgDhTvNC4DRe+dspS/Qbv8ru1AHmBD49XsNY4rZmYANMLFKm/oaxVlGSFjgLm6oQS5LqwEKzNP+C6mJ1DIeW7Od1SFAJx3SrkQUVmOxcWf8oFxY0KDzzCcE/x40= 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:(13230040)(82310400026)(7416014)(376014)(1800799024)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Feb 2025 11:35:24.1980 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e8789825-2057-4cf5-1d06-08dd51a2aa87 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: BN3PEPF0000B069.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB8603 X-Patchwork-Delegate: kuba@kernel.org Add a function that checks whether a port is available on the remote host, this will be used downstream to verify that ports that were allocated locally are also available on the remote side. Reviewed-by: Nimrod Oren Signed-off-by: Gal Pressman --- tools/testing/selftests/net/lib/py/utils.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tools/testing/selftests/net/lib/py/utils.py b/tools/testing/selftests/net/lib/py/utils.py index 5a13f4fd3784..903cc042ed0e 100644 --- a/tools/testing/selftests/net/lib/py/utils.py +++ b/tools/testing/selftests/net/lib/py/utils.py @@ -123,6 +123,13 @@ def ethtool(args, json=None, ns=None, host=None): return tool('ethtool', args, json=json, ns=ns, host=host) +def check_port_available_remote(port, host): + """ + Check if a port is available on remote host. + Raise exception if not available. + """ + cmd(f"python3 -c 'import socket; s=socket.socket(socket.AF_INET6, socket.SOCK_STREAM); s.bind((\"\", {port}))'", host=host) + def rand_port(): """ Get a random unprivileged port. From patchwork Thu Feb 20 11:34:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gal Pressman X-Patchwork-Id: 13983851 X-Patchwork-Delegate: kuba@kernel.org Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2053.outbound.protection.outlook.com [40.107.243.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 81D9D1D5CC6; Thu, 20 Feb 2025 11:35:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.243.53 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740051337; cv=fail; b=I03On97RFTFm/w64hybUwoV676Pfl7IUigLaj2kDQzbed1aYcQc1ks0vxb+l4xs0m9E98EB4AprtUd2aNFk8uAfFWUPSFF1aJr8oascGewHjJTZEOPAhfwbYFyJ2aLuLQI/RcS8VLeKgE+eqDtdD9Hug53rVsCoQRnYWZ0stpU4= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740051337; c=relaxed/simple; bh=AMy162SznCZVWwrem/lLFcB+eLDAPwaIOQOlAxLnGBs=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=tE5LJTIIDohzjJYmdcRL3PkP079A7MZZJDTj7F9tDQ03zVG9RKLQBiuCVcL0BCufToFK4+NgyIO3lgyPKE1w1cG/zigURfE1D9mTxbwuGj2aHjte8Q1OJFwMbrgRiagAvqSAPmEDxatiO7vlUvSQ9KK9j6EEMN0y7+MWWU3zx+Q= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com; spf=fail smtp.mailfrom=nvidia.com; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b=M9FYmktN; arc=fail smtp.client-ip=40.107.243.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nvidia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b="M9FYmktN" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Pgla8A3I1kgnpuBiZhVX3PoxiJ8nft+RcOOIlkNx2ZnJUrd/kT0Eyz8o88yKk3dxS+gmS3+dDpJ9U7bAx/lLosF6nUVvycWny28R0/e1ZzDtM5IgHC8BRFXAf/ar6nNWwwJns1H1tGPBCDkylQCEuw33W0YrL51folbfcLb/gkOUaZ/PmOOiDLTPiyA9dQ5bqAVQXsFSuWrIUTvmbseZtSuX0+eyGyxTLQX04iMm1SxYYp9IehzpyrINLtTntmaQKsrJlSSFeWW+88ceCs6Z74toUSgVpGau9cea6BW4y73++AEUY8SqMReFGuARdYARHjUuswMf6yfAeW1qNrLkMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=8WSY7sBXHvlvAOWM36uraykLeea0n0bk4lAqeETelec=; b=LnNCsgShRX4LacXA+G2yo+gwiu0rSB+xNZgCigXvIW294t2OjrT90zqXH0ecBGGwyqPMr4IzBKVoLAcnOBar0nxnHefNUMQlakPqT7Bpald79hkXPAf8r/vcz32oP7DVt2FrX61nmJAwsrJvi7ykcKtbSVmTc35zIk7KxtxLyMTLrcD9vTXfS4+c1qIG4/NqyMfzuIPjeoyyGiRAx2JBy1WF1qVUPzSAwe9UxVqZe+33rmEQfC+EaEYkkWke+kvectSdDDbacsCjd67dLi6YSooCV26E2bF1jxhMIQ5v7aI1rEAaSPKbu1mXL0fd/RZGQe6kdOQuIkNHJ4WQo00B9A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=davemloft.net 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 (0) 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=8WSY7sBXHvlvAOWM36uraykLeea0n0bk4lAqeETelec=; b=M9FYmktNVu8lYQn9Eo7QpE0clrDCwzZPRFoL0fegblHqtuwj7AhxlPCCD9EGyXsQ/PG/9RBSqHkJtO7c1cj353mWBzLmg7gI0Zh8WlX5/9RvB0PKmZqPqT++hqRzBgE+UUjParWWRN8EFxlf1OU3BV/7goJBqQGoV3DrxrluMIoV5IksOoMQL1rcFUOA4PkhZCAD01AOGd3K2Y9q4NPugw0Wzs4MGne57ySAE9xZPEFNwA6pvXXPYf1T0ik3m7qjerUPltbmGhZK8E62MMnqs62GRRmDV2SPwKR69tO3HaDZhV2LFkl+rEhnPXY130rYFIZrJp+HkkZDorxCfo/RSg== Received: from BN9PR03CA0418.namprd03.prod.outlook.com (2603:10b6:408:111::33) by SJ2PR12MB8652.namprd12.prod.outlook.com (2603:10b6:a03:53a::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.16; Thu, 20 Feb 2025 11:35:31 +0000 Received: from BN3PEPF0000B06E.namprd21.prod.outlook.com (2603:10b6:408:111:cafe::7) by BN9PR03CA0418.outlook.office365.com (2603:10b6:408:111::33) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8466.15 via Frontend Transport; Thu, 20 Feb 2025 11:35:31 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) 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.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by BN3PEPF0000B06E.mail.protection.outlook.com (10.167.243.73) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8489.2 via Frontend Transport; Thu, 20 Feb 2025 11:35:30 +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.1544.4; Thu, 20 Feb 2025 03:35:10 -0800 Received: from rnnvmail205.nvidia.com (10.129.68.10) 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.1544.14; Thu, 20 Feb 2025 03:35:10 -0800 Received: from vdi.nvidia.com (10.127.8.12) by mail.nvidia.com (10.129.68.10) with Microsoft SMTP Server id 15.2.1544.14 via Frontend Transport; Thu, 20 Feb 2025 03:35:06 -0800 From: Gal Pressman To: "David S. Miller" , Jakub Kicinski CC: , Eric Dumazet , Paolo Abeni , Simon Horman , Jonathan Corbet , Tony Nguyen , Przemek Kitszel , Andrew Lunn , "Tariq Toukan" , Edward Cree , Ahmed Zaki , , Gal Pressman , Nimrod Oren Subject: [PATCH net-next v4 5/5] selftests: drv-net-hw: Add a test for symmetric RSS hash Date: Thu, 20 Feb 2025 13:34:35 +0200 Message-ID: <20250220113435.417487-6-gal@nvidia.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20250220113435.417487-1-gal@nvidia.com> References: <20250220113435.417487-1-gal@nvidia.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-NV-OnPremToCloud: AnonymousSubmission X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN3PEPF0000B06E:EE_|SJ2PR12MB8652:EE_ X-MS-Office365-Filtering-Correlation-Id: fb19d21e-5572-4060-792b-08dd51a2ae4c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|1800799024|376014|7416014|82310400026; X-Microsoft-Antispam-Message-Info: 1/gKhaL6ijdb04kzERnbAfp/qNyLfuMmqnGyCQwhfUOfC2NTNaYFER31xTWZmeb4BPs0KiZq5BzK2qAnSuTKDs2DYpkNeuEHCC2ZOA8TmRuJnW5wK4kT/mafcAMwCuYjKlfkFYYJDgjiv7T2mE5L7eCH8HNElioiwbO87R/cnXlBEaWikQYP1FjFS66JN9Yp9nTePrX7mkvRegoYAHcQIWGUpNnRyLyys0pTRFdAQosP6fPNq1IW1rUoZ5D1Gzk8rAl2GXG1oRR7uFnqZCuq8z7uySuGhu5gkuWCFls0X41oap3QXVougoFhUN1rwKGrakz2cnQoMWKEE3kWEOIlvKQAhPokn499Td1JfLnwkNb4J+ZChZDsQzKgNhihZZPtARYNstNklH2dsZZWuxc41ejv3omzD7lPDRyE2fY8ccAGnU0zjOaMrTVS9qZ/NRodt8oqIBCHJoUm2fRDyV6jTrqJgcMI96QM+7Mu0q8En9ZIAexA1q1mEt50TETTHuWkydlc3QzR5TGLpkKPU2w7qVd36DFoKXv/MQt/mPevvlwShl6r1yIXcTS3+VApaG1bsjHGW4YR4KLi1gnJDaYdPPPaPYkoraUbWOT51V6wocYWK4jbsilfg2UP8BTo6MBgye3e6D8x7Rmg5Zqf9+OxtvmAaR2sF0eRGEAruTC05Qek08M149FvsVSwDb0waQFxFzGOkB9lohRQg6jXXihcS4K2D8e0f/lpaJzNmgxO8SVjt6UtV1X5ubZn6t5rvyZfWAPF9/rT+oZIadJzY2x0kHsa1hmCChOsnzJd0ZNYWnxR7Vne1BCcdVM1Iiu6MQzES7JOfDTs8ivEVuqx8zDw517aBLbtpGWnTQGXMXk5kPwswl9/7RKQKnouiJU0duWaGyIlgzyB6j4atLQvQ/aIeCvu7XfqobdgFAihI5IcnmhxQP95yHmBK/HKovNevfYd5tqIX+l0X9+3VgNpk7s4XXB+KHyoKKI3b8IvZVavzXn1e4KGqEoa1vuh/OPhzuxnZbvFEYXRJ2Xi9wuNyyYK5/5cxOXiVxrzyR278fouWXOS2NeRz3iqed+Pp3G1xptdIgUG1zt48fDiE4LorX9x6agYYWRzyWm4sBk9ZLGJgZ24RXbSzlIHJNh1uUl63N3KA+C4KculsC+lL3ZuhDu3EcCw4VI0NMn6k0a9J4QSZtOAuxUxJRSUpuOIdgvw/QNLJziafD/kPxDxcQVm4awoO/VS8Kn4zk+5TlGD3lvOjjTE0V3VO0DiZoo/o88fZTMEAykimcxJv4PH3VwSSd7VfE5Z63JtecWOtaRhjqzW99bmNaAs+92H/MlbAuLntCeAW9nsMWcx4qf2q20X4ficysXW5VtjMzm7neFq6/ZhfPO1BZeMCG/seXx4erE3AifMpQ95c5ETWo2aREcnE/fWnrd3HBpdJsCK1JmKZc8kA8czWDe9GExicl4E2k5uwzUo X-Forefront-Antispam-Report: CIP:216.228.117.161;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc6edge2.nvidia.com;CAT:NONE;SFS:(13230040)(36860700013)(1800799024)(376014)(7416014)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Feb 2025 11:35:30.3996 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: fb19d21e-5572-4060-792b-08dd51a2ae4c 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: BN3PEPF0000B06E.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR12MB8652 X-Patchwork-Delegate: kuba@kernel.org Add a selftest that verifies symmetric RSS hash is working as intended. The test runs iterations of traffic, swapping the src/dst UDP ports, and verifies that the same RX queue is receiving the traffic in both cases. Reviewed-by: Nimrod Oren Signed-off-by: Gal Pressman --- .../testing/selftests/drivers/net/hw/Makefile | 1 + .../drivers/net/hw/rss_input_xfrm.py | 85 +++++++++++++++++++ 2 files changed, 86 insertions(+) create mode 100755 tools/testing/selftests/drivers/net/hw/rss_input_xfrm.py diff --git a/tools/testing/selftests/drivers/net/hw/Makefile b/tools/testing/selftests/drivers/net/hw/Makefile index ae783e18be83..fb1b655b4939 100644 --- a/tools/testing/selftests/drivers/net/hw/Makefile +++ b/tools/testing/selftests/drivers/net/hw/Makefile @@ -16,6 +16,7 @@ TEST_PROGS = \ pp_alloc_fail.py \ rss_ctx.py \ tso.py \ + rss_input_xfrm.py \ # TEST_FILES := \ diff --git a/tools/testing/selftests/drivers/net/hw/rss_input_xfrm.py b/tools/testing/selftests/drivers/net/hw/rss_input_xfrm.py new file mode 100755 index 000000000000..c0e7eb87533f --- /dev/null +++ b/tools/testing/selftests/drivers/net/hw/rss_input_xfrm.py @@ -0,0 +1,85 @@ +#!/usr/bin/env python3 +# SPDX-License-Identifier: GPL-2.0 + +import socket +from lib.py import ksft_run, ksft_exit, ksft_eq, ksft_ge, cmd +from lib.py import NetDrvEpEnv +from lib.py import EthtoolFamily, NetdevFamily +from lib.py import KsftSkipEx +from lib.py import rand_port, check_port_available_remote + + +def _get_rand_port(remote): + for _ in range(1000): + port = rand_port() + try: + check_port_available_remote(port, remote) + return port + except: + continue + + raise Exception("Can't find any free unprivileged port") + + +def traffic(cfg, local_port, remote_port, ipver): + af_inet = socket.AF_INET if ipver == "4" else socket.AF_INET6 + sock = socket.socket(af_inet, socket.SOCK_DGRAM) + sock.bind(('', local_port)) + sock.connect((cfg.remote_addr_v[ipver], remote_port)) + tgt = f"{ipver}:[{cfg.addr_v[ipver]}]:{local_port},sourceport={remote_port}" + cmd("echo a | socat - UDP" + tgt, host=cfg.remote) + sock.recvmsg(100) + return sock.getsockopt(socket.SOL_SOCKET, socket.SO_INCOMING_CPU) + + +def test_rss_input_xfrm(cfg, ipver): + """ + Test symmetric input_xfrm. + If symmetric RSS hash is configured, send traffic twice, swapping the + src/dst UDP ports, and verify that the same queue is receiving the traffic + in both cases (IPs are constant). + """ + + input_xfrm = cfg.ethnl.rss_get( + {'header': {'dev-name': cfg.ifname}}).get('input_xfrm') + + # Check for symmetric xor/or-xor + if input_xfrm and (input_xfrm == 1 or input_xfrm == 2): + cpus = set() + for _ in range(8): + port1 = _get_rand_port(cfg.remote) + port2 = _get_rand_port(cfg.remote) + cpu1 = traffic(cfg, port1, port2, ipver) + cpu2 = traffic(cfg, port2, port1, ipver) + cpus.update([cpu1, cpu2]) + + ksft_eq( + cpu1, cpu2, comment=f"Received traffic on different cpus ({cpu1} != {cpu2}) with ports ({port1 = }, {port2 = }) while symmetric hash is configured") + + ksft_ge(len(cpus), 2, comment=f"Received traffic on less than two cpus") + else: + raise KsftSkipEx("Symmetric RSS hash not requested") + + +def test_rss_input_xfrm_ipv4(cfg): + cfg.require_ipver("4") + test_rss_input_xfrm(cfg, "4") + + +def test_rss_input_xfrm_ipv6(cfg): + cfg.require_ipver("6") + test_rss_input_xfrm(cfg, "6") + + +def main() -> None: + with NetDrvEpEnv(__file__, nsim_test=False) as cfg: + cfg.ethnl = EthtoolFamily() + cfg.netdevnl = NetdevFamily() + + ksft_run([test_rss_input_xfrm_ipv4, test_rss_input_xfrm_ipv6], + args=(cfg, )) + ksft_exit() + + +if __name__ == "__main__": + main()