From patchwork Mon Feb 24 17:44:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gal Pressman X-Patchwork-Id: 13988626 X-Patchwork-Delegate: kuba@kernel.org Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2057.outbound.protection.outlook.com [40.107.223.57]) (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 EBACD263F3A; Mon, 24 Feb 2025 17:44:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.223.57 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740419093; cv=fail; b=p0QMBoAAIE3bLdG0vGiMlvEI6qyhLvxV2lHhXJSaWGRjQWoIrXmNTOQyAOHySbbHbjLhTH1TIUzEymHPCvpUb3E1q8N8y9/Bj/6Pjvj78k68mwdG9G6TSQdGab+ccaJEfCZU1FxVIqYQ7KX0OHXYnoxQcKU+hYz686BqhImw7yQ= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740419093; c=relaxed/simple; bh=YgEIc3IpXQRikw83X+Gpa6nrPZQK9W1l5rKCJ33Y0aw=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=PA0eOpmlipH3Fzq/Z+lLGTJSE8FFYb0nD6ZoEXZZGDbtM9Pw1JMO7IFBJZlbTE3qNvBsJvovKEzZ2IwCi/M+u63Eo3jEsZZ99AG6Rn/n1DTFVpWCjUD9TkRKKJpr1Cvo9NFxfa8ulGSjyH7lsInImhKxWAeHhw0XHkruXFyCTaA= 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=tY59wFdf; arc=fail smtp.client-ip=40.107.223.57 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="tY59wFdf" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ko8zGZFasWYafxzi7AxeUiSxnxucXXmZUndk4vhhi0vEP0iscEzOfowFri9UxyyivsYLhTltETUxo8OO7l1UZrNKQKQ6DIDAoWXCsU7yZeS+fP4ik2KpHIYB0N3lKecixb8yyTej+KZf9HI+wXxN7tpuiz/95HrTbzqkdMFUcD/EWMbgeFoCQORRqRM0uoYFvfYq+bSkKYRMaazM08pzyh0OcgjYuu+OGbp08oxTlAYYIaxMzTmmxPkBjW3kf9h5kELFJHuGaY0MPRSX4D/hS+uqLx9t9SlcgSFeFnIGQxPHAF7rynp8JQ7rjpZe6u9f52SmcIlhVil3QzZUpHNOig== 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=UxOUnxRy3HkuD2hcEEpoTfaXt/d2K9DzymZd10IbFlg=; b=VtF2tOirxr3Fve7ikx2HzM5nG4+NdLjLKYUSEQECQ1cOHPkdJm18mZqsPxrag9vSCoaN8hDPKwZFdhI4DaDI9PDbXm7KmBSorMj0rlsooXsGpOceE6asGzmcCEpTRNV/S/5bHEmVCjBmgFmvEgWV4gRdsYC7IPXtrUiNAcqbuHXLYK/sHThzrP8BVfzBjOqKoooKyjLhe06xcPbjxw2cHWYtUsPZLMoDNgVk6Zv4bWuqNTfNUfULjJZiv2VW4cuQGGRElLjp0ztqSj1G/ceL3mTX+XCPga/+OSi7nnJzXjVlfO8n9M+8QeqoT7Zk1anOH+DUQWchlC/i3ZTzItVQKw== 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=UxOUnxRy3HkuD2hcEEpoTfaXt/d2K9DzymZd10IbFlg=; b=tY59wFdfGb/mbxvUr1VMoFD8D6ybzty1uZReji6+eho53jaln1ssZ7HuBk6uucPJfF3XZh/EDFiYD3oIIkU/E+bx7ytiqYGIkDZnXneVJYcl5khHqmfl49KR4POWqLY50Vnm6s3RxjRoXqgiQ0HLJvmJ5rJtQnI1gN68PuhBbU3wOSvVVCGu8NqB3jEi0mat1uSm7b5y/Yl7+8z18RXmMG9mi3EmFjtOJ66EeFKrt697QujSxWWGN+c5gjnWqSMorgrPgqvbQlbj6XK1HHD8wp/HxAEWwidBx3Eh8LHVBOxP1yyoF7eSzt/lEXLrSK7rqAqNuwU/uXI1wKYHAE1Jnw== Received: from BL0PR0102CA0027.prod.exchangelabs.com (2603:10b6:207:18::40) by PH7PR12MB7940.namprd12.prod.outlook.com (2603:10b6:510:275::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.21; Mon, 24 Feb 2025 17:44:43 +0000 Received: from BN3PEPF0000B370.namprd21.prod.outlook.com (2603:10b6:207:18:cafe::fc) by BL0PR0102CA0027.outlook.office365.com (2603:10b6:207:18::40) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8466.21 via Frontend Transport; Mon, 24 Feb 2025 17:44:43 +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 BN3PEPF0000B370.mail.protection.outlook.com (10.167.243.167) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8511.0 via Frontend Transport; Mon, 24 Feb 2025 17:44:42 +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; Mon, 24 Feb 2025 09:44:25 -0800 Received: from rnnvmail202.nvidia.com (10.129.68.7) 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; Mon, 24 Feb 2025 09:44:25 -0800 Received: from vdi.nvidia.com (10.127.8.12) by mail.nvidia.com (10.129.68.7) with Microsoft SMTP Server id 15.2.1544.14 via Frontend Transport; Mon, 24 Feb 2025 09:44:21 -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 v5 1/4] ethtool: Symmetric OR-XOR RSS hash Date: Mon, 24 Feb 2025 19:44:13 +0200 Message-ID: <20250224174416.499070-2-gal@nvidia.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20250224174416.499070-1-gal@nvidia.com> References: <20250224174416.499070-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: BN3PEPF0000B370:EE_|PH7PR12MB7940:EE_ X-MS-Office365-Filtering-Correlation-Id: 672d62d0-42af-43a7-3040-08dd54faeb90 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|82310400026|7416014|376014|1800799024; X-Microsoft-Antispam-Message-Info: b7cXcycC9LljpzDxO+NW2sNx5CWgWkaUdyRiI0QpPpnfkiSo/JYCgNHU7WxFBd6v1Tes+y7avgRPqHkT4J21bVAvdJsBZzZodDTUS/dCZbkBy2GO4pLQGlHMlZxlUQCcoxbXkjuoeT314H50efoaXaqU30OFyG8apZsgC//mPI0ASUTmwbcU8XCwxpHXlEe8jw75ODEhQnN1DytrzmM1PPFdYxW4c2RVFiOn8DFjYtLBUtCzghM5+Y6cgb2WZu/Rre77bMqYFXv7MDD/oFzg5QTzJezGXFCRbiPAUi2WPvbRoIF2PtwP+QFFZQtomrcLcfAPe5Hrdkj05I2i4xdkCa3OQ/LSzz9nEXam82mlHRLmK1SGMoa3V+nUDJZwsXaUmimYP8G7ejzcGMXlTXsks7BYZ0wXFcqav9lvbZzTVsoRHaXUEAGzfhDHGY/7ocsPbpm8RdL1CYfAhp6Ipt/a2fZQGi6gw03G53g71eRR8RIPytdclzfJQ5lNVkezzd02Kpz3nC2UvZcmwUWOSr/xyEMdyAHr5sTlorTAKRJtADV4YXerSop95heLG1yEBVodBQ476TVp+Z1Q6qc8jnkcjEfgUmJduaxlsXUz2nyzwa8qtYtnTvWx/W4779f+fMUn+KRwKSlHERDyS83QA2FqkGHb3B5y/8bL0NDZDAP+FARsCIKAXwN8jpp12ztL3TJubVmRat4RjaIIxRL5dPbz35WlxCKfWbmDpyCjMy8t7Zk7kdeEbq03Pu6hSUmiVJmDb4fGD05GKgX9mClOy8k2xtWCMu8E0R2w+pwDDbtji9Z/0l760uywuty1g3GAuY8AKA/slYlC0Lm2IOQN7t1Z/D8WCvcWWL5SXY3TW2ZEjN7+tKixBDLMeXylChuaEuCrHz2qrHChrT04oGXW4RL9magzGPv4ZNu1m6v/1RFjnh3BZYpAXSpc/9deuHg/L/oDk0EJ0u/Xcs/zfc8fQSMA6HoLbhR5Kfs1O/Hw84fA8KDlz0MpFFWnVvN5PjxvvrKxi9ar3pR+cwvbXbIc/BjJiTohc5AQbrleoRpCOnNvK7kxFXLOsG77/ObwNsoIi1yBEGx1/q8fechW2Ke3om4GkUl8TLZtWI0xuvIxc2K39iPLe31aVy4VoGDC6NY5+Wcz2bAhOKa2h/rpAjnlv6erTdzfeRMjaIcSW/4Rug2sZLlHI+CqA5hXFUW7VZ2GpHC5wlMg3W+TcI1T0Iy4Z4KO2rIADBWqBTBPnRoHMmS49dolIexguUuK2ylhvlnBXFUgubGcMvIf1n9WHnge+hmcz+tH/G7aTCdXiI/XWANpP/7p0sbEylVX+WzlS1bvBtQmNcSOoyW4/ZR80EF2NvUdWKZUMYSMKxyWaV1KxmHRy+FsgNHl4Y703OQJYMtNcuVB/UQu9lQBlXbbDEJER2pQQm1P7Tl0IspeuecZrtieNqzoxhJz1aPn7ZdMg5MpSsxpup6gkcSASC9+LOUCxZGKLySN/DclSKUwe5tkFYpbDr8= 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)(82310400026)(7416014)(376014)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Feb 2025 17:44:42.4943 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 672d62d0-42af-43a7-3040-08dd54faeb90 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: BN3PEPF0000B370.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB7940 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 | 15 +++++++++++---- 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, 24 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..6984700cec6a 100644 --- a/Documentation/networking/scaling.rst +++ b/Documentation/networking/scaling.rst @@ -49,14 +49,21 @@ 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, on the other hand, 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 Mon Feb 24 17:44:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gal Pressman X-Patchwork-Id: 13988627 X-Patchwork-Delegate: kuba@kernel.org Received: from NAM04-DM6-obe.outbound.protection.outlook.com (mail-dm6nam04on2069.outbound.protection.outlook.com [40.107.102.69]) (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 A5EF5264FA0; Mon, 24 Feb 2025 17:44:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.102.69 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740419097; cv=fail; b=JIC+ZF9O80davIU7KRerqUndu8QYy3r7kDnQpPJmZnQGwPFD9LIrYu9d7YF/VriStgb3WZRU1iXcXyDNo0pp5ulsPrzc0Xb2jqlgzeQGV8Fi+67jFFhHfVwluYISVRHp+RltopwbLUy8Rs00toCSAAICAiHdQIQwYqUto4kR1JY= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740419097; c=relaxed/simple; bh=i53gDZaNNBhDgM14WBvkvFN1JuAH6UWz/UCQgovu54A=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=ROJgizFsFEpyDpLwS8XYE9JVckdkD78/4WaJ+zT41EJdVtiF6CvGr4WrTvc9SI0bRRfSe9JsSSbVdYXiBUXPV50rNfd3gNlIpaHpl5OMu1wDcWj7XN3QW1ut5plp2dmAU/Y6aI/hLg8Kr+qh5dtXLRphGb4kWcF83Wptp9NOD2Y= 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=TjkcDRgf; arc=fail smtp.client-ip=40.107.102.69 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="TjkcDRgf" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=hzYUwu4B/KyIWYWMx+oXVsJJU2yDBjVnn4Mzier8ETasfSr3HuDFlfmAaKlEXj7bsQOxb9rr895/3rIUR2bw2I+SV02T/FuI/iR9mXb6BtYi2E81H0pee7AzJybdxkfBsMjU4QkFBaD1txZ2a1W2wtByPKzV2882J7r35pdCm5FFQPE1wloV5yQa2mM2DsRhQQD4LHUimJfqlIAKH1B2BPNK94FG+sVKscs6H97KFb2wdri7UtYzQ4Zzsd6k2jSl8hzgiEPIhHbNfEJleB/JqLWKi7ag3NDNSyEkBM65mT5pFxSxCN4raoIVcb9IcvzChhZW/13ZnHoWzFfbw3Vbmg== 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=upByaCtG670hZH+stIbNprrOjJTeeyTu5qcxb9F8oUo=; b=hjvsWQocb+erZ5WNVLP1p7CxXC73DJf7RGK3TTXH0YlVzFjW/NRLFyi94mTlg3+RwtZVvRqmPeXMK/TNJZxFj9qWfFTy4RXosW239hV1H/lnApbTLef1XxZSB9RYY7H1dqD2f0zIOy+HAD+fQuoxUWo+Wl2MrnbmhCiOOmcupGCw4/CyFC1aumqs4FkIfwCOWPLgRSYA65TTLYXL9T5JrbE9Um1vuVBS5pLw6yE0Bfxk05RnqJElXwhcJFH2Tfykfs8FOAvwXUvIDR2N7HDlAmW6eNRXghLBFLuNxR1TSXHcEmJ/md/OFIu1/m9h2RgAK2BSf17J2Upv4ZzvH0Lkug== 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=upByaCtG670hZH+stIbNprrOjJTeeyTu5qcxb9F8oUo=; b=TjkcDRgfsFIbRSsmZxI4Ne5AIv4fP8NG1wD8kZTMWkpYKu7gvPQVNb0taDp94Crqy1zSSgsVzchwdWLcTjGuWe1lXf0gDNZTYvlzq42gOeKluvxYP7Mu5PVbBNpr5VHACoz5CgTxRLmCgAW+Sn6qO/GYlYkMoKWj3W9opRSIm6OHrSdArFKBQFrvBETY48UiI4e0I3dTphqbKeG/CbG3y8wWFZ2Qpo0erx60X2LZYED3OP4BEoSB0ycSvRT1hFI2G8rSmW8NVxZe5IFhb/M8pbpkcvb1pEY4ZBURf60rKsG8zbHGoA9UwDnz+S1M3PuZJxipS06CYvx+zrTRuqnejA== Received: from MN2PR20CA0066.namprd20.prod.outlook.com (2603:10b6:208:235::35) by SJ2PR12MB7964.namprd12.prod.outlook.com (2603:10b6:a03:4cf::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.19; Mon, 24 Feb 2025 17:44:45 +0000 Received: from BN3PEPF0000B36D.namprd21.prod.outlook.com (2603:10b6:208:235:cafe::40) by MN2PR20CA0066.outlook.office365.com (2603:10b6:208:235::35) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8466.21 via Frontend Transport; Mon, 24 Feb 2025 17:44:45 +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 BN3PEPF0000B36D.mail.protection.outlook.com (10.167.243.164) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8511.0 via Frontend Transport; Mon, 24 Feb 2025 17:44:44 +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; Mon, 24 Feb 2025 09:44:29 -0800 Received: from rnnvmail202.nvidia.com (10.129.68.7) 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; Mon, 24 Feb 2025 09:44:29 -0800 Received: from vdi.nvidia.com (10.127.8.12) by mail.nvidia.com (10.129.68.7) with Microsoft SMTP Server id 15.2.1544.14 via Frontend Transport; Mon, 24 Feb 2025 09:44:25 -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 v5 2/4] net/mlx5e: Symmetric OR-XOR RSS hash control Date: Mon, 24 Feb 2025 19:44:14 +0200 Message-ID: <20250224174416.499070-3-gal@nvidia.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20250224174416.499070-1-gal@nvidia.com> References: <20250224174416.499070-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: BN3PEPF0000B36D:EE_|SJ2PR12MB7964:EE_ X-MS-Office365-Filtering-Correlation-Id: 32a8ef77-3a17-473a-b4ac-08dd54faecc4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|7416014|82310400026|1800799024|36860700013; X-Microsoft-Antispam-Message-Info: ynq2iN5SBOm3gROsz5leYaHsLOWsJw8cCulKU42/AvrWIdgsUxcsP8AqRL5Yn0AEPkDWMTNEak6p/zvTe75P57Yq9vj61yXZ/5iT+sCDIkfkfC5CU//j+ACs5hZL+L9EOYTIOdjd+aOXgwhb62lICFog2LxpUSyL5K46a51mkXLpL82nd5VEhfT7GXa2yhe/8RgSPkvhIBZJaKK0I69hLc08oYnYDLgkBohJatc62hr/AwGVnOc6SGPVz023fheqNCdTZe29oBF+GiXwiztsSTu/+OxZ3bqOvwO3CUr/KBQCBH+iCRepMgvN8/m5XWmo6oVBkKCjQW5NqCSt6lVomxwrfkqdrOR2HuBBA6c3Y+yn22wCDS+92pYV/1yFNzDpEXhx9UlNMCZzrYwunNV9HpG7JVGt1sDC2/0SzKloyKf/0QIn6frqL1LVKeh44g6/O/Eam9Cgw7qV1vxSjjgj0WwKljWjDZHXWGmCamNcBIjBa6ogIvi4w16PpwXVFMRL11F1Lh7ICtrOTw9eWuU+R+onHqrEphKUvfWc83yg4XyOW14WstJHDXdiTbakJLgrnrc3y9ofi/EgT9jvD657HVHv9ei/DpOlsfxoqxw9C40FDJkjJipHSwit27TYZPMNcyntKTXTeHxQhuiyp9BxAC7KvVBY6sx2QTOlHE3riWfIza92yEKxibqD5uXaSKH9IjkKkhSS9Ttgj09/gPmCYSfe5tifsyZiUMUAHU51xoI6+4ZK37vDeYJFtgsZco0wv1Q4QVnKJprBtW02wiH+dK+WTc1XJ1sCX40geZfj82bqbewtuO5wpSqyLXOBdRWp4Yh8kJdu+66IYdk7/kIn85GlF+3exrmC4wMs1akthSAISyW2ITj0KqIrWkSZjl+RSPn8UkbkQq0vRtr3ggali6hUSUZYERIYtXj0bR/6RQxjIn2UIkL3uaqR01rUMYxL7ZAuA56yEkpyV+fxdqCT1M5ZPO87hrKceqRHIHqe8oMaecKwrQYwrLaK8j1Rw+y8KCCYn4L9PDy8i3EP7x4GNYpsEHWl6/Cek4uY8UorT0tlCbTMcpTHHR4vnRtXrYDy166rYxlYCAhxUAk37IPHGlhiF5k1gkma2IHN1iP17zqF55fJ28CfS/wQC2vP8pRmPlgdHGzOePPKOE+EBry73TfUINQClDOtB02pPyfgLVJkJrlpqbXDORLckqXsvRmm8hASSE7yPrgJNkhE05ANOt415ijTeclPFRZWvR3lhF+dsu/kyoVHzfdaiyHXDLRtOOWP52rMvYsu2snRopZxz9X56t0VQgsjP5bIB9Zg6ckEPKxl3U1S42XcLVAJgqqdxdmqc5lcQtMF4PcmJ0O/MAOi+N3MNjKwn8qXftZdayf8PBKli2Wrz4LaSKljqH3oW0RzRo+LvyUNvwBZqqsDroTXIzmRElHCX3BzZGdjhrLzVChagFFLTbWRKuhSKStSWhtt/VgmXcB8Q86DnpOgQh+7gqNh8tIz1x6+iQYtUAc= 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)(1800799024)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Feb 2025 17:44:44.5318 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 32a8ef77-3a17-473a-b4ac-08dd54faecc4 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: BN3PEPF0000B36D.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR12MB7964 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 1bf2212a0bb6..0cb515fa179f 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c @@ -1456,18 +1456,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; @@ -1502,7 +1511,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); @@ -2611,6 +2621,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 Mon Feb 24 17:44:15 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gal Pressman X-Patchwork-Id: 13988628 X-Patchwork-Delegate: kuba@kernel.org Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2065.outbound.protection.outlook.com [40.107.244.65]) (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 D3E94264FBA; Mon, 24 Feb 2025 17:44:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.244.65 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740419098; cv=fail; b=r0LTiyRMlegoQvvB9AYzk79eX4iUYgeFGyg9ReZnDcIuJdORWOKrFyv0jG3kIw8f80mdWkow5ovEWPbKhdqubLup8PCpbuGESItkm1cEVKadpGt77I8+lHjve1xdsgC+K63jYtJrpZqWFwMcl2I1IDB+PevOBrNucDVjHJn2AvQ= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740419098; c=relaxed/simple; bh=hx76Jj2/kPDcJk7mJOpUBY+TFUa3pTQ4U1a8hy6t9t8=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=iSDPTEB3dctIDLULu0mFC/16TOXCXV6Z1dTpmFjf66OP441fc6YfQhYeN/MCtkvJ5kFYMAeJmEWUGCFCZge38JDtVc2oIvkc4Gc7wRq94m4AA6iZfavH8pTqdcx/qgviAHkzbkPMLjSPumIjmeultfI+d9GYHc9iTW1XxEjXwa4= 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=KWeZEaPn; arc=fail smtp.client-ip=40.107.244.65 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="KWeZEaPn" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=FKPM4ww2XFzBYUb9mF6YhH64HEKmiZ27JGL8YBAV+CzYqkPYAjnqczChJSNXJAizLFZ4BvNKdtaJfdBAkgTUx/2Eg157QF5yBOvK0n9t7JMxiaGq0sjX+sBijDJW9kzKY1jjwRAMt8vtzSlz/XeBRCfmPx9in32rLHR+OplOHjvzISBmKQ+A0R/HFNKWK+w+paJOle3fpN+uq6zSrBBNHzR6kvSAgcrFGlqDfxwlgn+Visup1Ysl/v6ROOK4KxeFSKeJvWFz5PzWQnjzhWrEbHv7nfGusnfkLoMzVQowhMSoLLg2z5vJ5StG9Rexi0Fjx4+zdlk5FBB2Gpv1PiPYoQ== 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=Nju8gstTTZ/hXAzlRxyaJP/Elq4Jqk/3xXFuoFtWeiA=; b=a4BpvsYF+H5lgKej8V0mweNdXc3PWr2LOMr+flhRhfYU5dFIvTisaF2RjM5hRKYkWEoZXySD7GZhqv2gqBgvZHezHqdh2aG8XemLjJdE6HZrANFI2lAErnCWzUjxAM294J0CtNkMn1aotHYz0gIQEI9z12VO9OAMrJmuQG6OlF4GnsUL+JPV3jY2cmZMnH5RK4fnhUPZj4TbHEza9CK/h4t9seuuahf6Dxxd3folhQVC24CGosnAOTESzhgtvkMdSQ7i4Rj3d6YiyyS0tvc9D2vEQpeGjlvv+jrr6Ww3+rdOqQ8910HuhZOxPsAOmGtbjc6xaw0U6ttO9T6yPBUSmA== 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=Nju8gstTTZ/hXAzlRxyaJP/Elq4Jqk/3xXFuoFtWeiA=; b=KWeZEaPngFvxp4omw0swOMK3H4Htc6P4Rh5uoUUN4lReE3IkRjgwwrkYdfpLjDuIjQPV5cBB3UyeZSTmSy23TWfZ8EVGKn8moMoh0LbTlLuI7R/EYGUYdNMWGW0xmmUlHaTMbp/ve+qNym6arLboh0K0Hb7iVHlPsyHnSvK7F7W7WkKYRnCOCUhU537rq9ObQipt/HHmvfKlyAUBO+dj9FY6xBd0lW1c0AdNnT9skP6fBDQ9t29qCZwOM/h9T/vErWZSuh39T0U+Om8XNpKvkIATs0xoTAMpfuIqaiNWYnEgBnJA5KgVhW6dGPkKmWJLBnLWlUfvkIGsHyhADLNMgQ== Received: from MN2PR18CA0006.namprd18.prod.outlook.com (2603:10b6:208:23c::11) by SA1PR12MB7367.namprd12.prod.outlook.com (2603:10b6:806:2b5::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.19; Mon, 24 Feb 2025 17:44:48 +0000 Received: from BN3PEPF0000B371.namprd21.prod.outlook.com (2603:10b6:208:23c:cafe::bf) by MN2PR18CA0006.outlook.office365.com (2603:10b6:208:23c::11) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8466.20 via Frontend Transport; Mon, 24 Feb 2025 17:44:48 +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 BN3PEPF0000B371.mail.protection.outlook.com (10.167.243.168) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8511.0 via Frontend Transport; Mon, 24 Feb 2025 17:44:47 +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; Mon, 24 Feb 2025 09:44:33 -0800 Received: from rnnvmail202.nvidia.com (10.129.68.7) 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; Mon, 24 Feb 2025 09:44:33 -0800 Received: from vdi.nvidia.com (10.127.8.12) by mail.nvidia.com (10.129.68.7) with Microsoft SMTP Server id 15.2.1544.14 via Frontend Transport; Mon, 24 Feb 2025 09:44:29 -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 v5 3/4] selftests: drv-net: Make rand_port() get a port more reliably Date: Mon, 24 Feb 2025 19:44:15 +0200 Message-ID: <20250224174416.499070-4-gal@nvidia.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20250224174416.499070-1-gal@nvidia.com> References: <20250224174416.499070-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: BN3PEPF0000B371:EE_|SA1PR12MB7367:EE_ X-MS-Office365-Filtering-Correlation-Id: 50c2ab8d-a81f-4601-b86f-08dd54faeeab X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|7416014|82310400026|1800799024|36860700013; X-Microsoft-Antispam-Message-Info: Hhs1VB7x1M75UXPfot9/jA2MfLVQs/v2xmhBPsCRtcBRdgljRcwwn0ikTZ03UMzEvFBBWDmo6psAMuY8SwYyNLBAdBU6XnKvq5SA/oiTn1RYNwsaJ8OfVrYjJtZZAT5xySeQQVE8IO460HIXYZFPJCQ8MEMOIODCY7jKwGiVrHxTZws2LawpPEFNSS/6c5ofJ/iWl8JhddWUhavD/QomzuFU8h85PiWNKuW6zL+DeUyerIzQZd+5hcyLBZlH4+qBfVQYIX3a3zQbH+Z/d4ira74R3wRWOgxK6k01lYTPWGwYSEc8QZLzl8fg+FUHt6xtOXhAJSgeMSUGWR0IdGu7TFkrPLAH1QOlBn8QaxgUHO4nWQoaIIwKVbF1UP5yvUonS0iDbEJyslDOrziowoT8PXdusBTrlJDPoNeO4kR5VCmHV29AGx8bScA/dKhTz7kenT9xzngDGyj9DTq1LL9640GIluay1uwNEMWQ8dHVIiRK94E7SOjJa7JQ3kXLYNbkH4NZcbWVKlBVVt5OMJPsbuChZVebputR6avvQsE3bNxs+SCoOomi/KLmoIj9F7mNzY3WLKn2efZmDPvVdw8u1dPgMJYwm7BGxpG2bWASQJ/CicDflhzUlIkBGReyLP8wfbl5nmOVM7bs0Un2R823JZVaCphW1ZqP1ibU77lhxXG0hvoSYqhH6s00e6SZNth0hdhTeXjmuU+tCnOcUIzZ5P+9ZxYMhtHcIN0rY2NEv6fAU2a9azr/fXpJ3xArpPGH8bZeP8nINntoYIO7gJ73ukPYnIPuvB+D1MFmFG0xycUzfvgZM0QZPj6CRXLEADW/IuLP7/KYCxiyImFZABkVIYGmuSW2D9p0Dr8KWdeVjFK3EufW5+t9PkfKUHGg/q9xfAALSodxGbSN7PEEOWvoQqcCnABpXLAByIMUOGpTmBKiaxMqH+278uuSv0ORDS0MHgRb1lAoOqulTh8smbkP5FUFVmtQ+YxHXR+LheHuiH1OY7iiHAPUd556IWFbyR2NcVN0jyEHGRGHra/v4S/k3x0jxghByHdfjV3liSb25c1doB/VX3juE2A/+bY+BpDlJd/Z2Mg7QA1Y4/xgn36i8eja7Pqn2NtIE3vaK343lOUBeaGTO9h3PL5g+IIuEo4E+b93L3qQV370zwCY291bTHkysMndKicJq/7SrroRNrtUGftRLYj+QA5bZLkU7vmVSNowOCHuTDhidBwwrAaVwHOsKGvv6Xcc0KcK2EHDgE79wiQc60hYRroEikvwTI/nKPHbGpYzSE9GSF0BVewDHvg4v0BO5DG95gFTrypb17/N0b4AKAK2wczF4MERiz+Rk6yGfOchmq6EEhlpjhQTm7XzoKXxpiqlzGKF8XJEREBdr7wMSuklhqkco/UmRPWWWtFNKuJSc7ZSVDERAGsfxQwjdH1+ugV/wtLBYKxyt0bJrLpzyu/aiU1SO3g69SMyRUSG8mMYkfp5TB4ZnbS/x29HKvv9EA/iHEDeUgCCzmc= 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)(1800799024)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Feb 2025 17:44:47.7391 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 50c2ab8d-a81f-4601-b86f-08dd54faeeab 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: BN3PEPF0000B371.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB7367 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 d879700ef2b9..a6af97c7e283 100644 --- a/tools/testing/selftests/net/lib/py/utils.py +++ b/tools/testing/selftests/net/lib/py/utils.py @@ -187,18 +187,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 Mon Feb 24 17:44:16 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gal Pressman X-Patchwork-Id: 13988629 X-Patchwork-Delegate: kuba@kernel.org Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2067.outbound.protection.outlook.com [40.107.244.67]) (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 C9F0E264A92; Mon, 24 Feb 2025 17:45:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.244.67 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740419104; cv=fail; b=j0+ExFdci1dlulgNHwK0RcNR5eb5Dq0o2k8lrPd52L7fmu9UZihj+3IeNbZH1E9C6R5DcEOJJzbojyGtfkBfwxi+znOq3pL7mnz5oj6hM2iTKmUILVTP0BkQ3mvNL6xejQGbe230PurHOB+TvyuwA+CljFV1tcMBaaY0EGRvpbc= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740419104; c=relaxed/simple; bh=xGq92Mu+/vSg1P4lor7rQfhrIgEmuS9tub1yrI/vEVQ=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=dqLrg0mptiXgyf4QTrdj9WFpYQStP6V4VGWNImrbvYlCUiExdDAhOzipBhHg+8jWFIdro8f8UYC1oDOuJms2bBiMHilaNJwRzOU1HLsCWbaf1qWZphTAv9w2sT2fSm1zWCdGjUR65u6hTrCEGTpzjbHw189q7xMHKy8UBrPCb64= 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=MmeiSniP; arc=fail smtp.client-ip=40.107.244.67 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="MmeiSniP" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=K+/P8zOLuoCjSne0l673BJrno1+Sxu2+qp8CTQf5esrRZwquCggO6mN3TC8QYWnJaixdHcBMEKyrQRbFHJs8NTQdlqfHpaAt/L6nCtGnvO5dbgVHCVa9a2lchpYJd74cNdN5+x221XzR0jQvj+CnJiB0SM88f7/mv128eFFzYhyv3bUXiHKS3hWdPs4dDLzQvqefZfZkq8NCHB7c4SqjkATUX4lU02AlfFyTtbcZbUgBTJPMMKFW80iX2YBQu7JNYXhBVx9mvL5x7M3dZCuJoWvx7BCjNaS0pekNZHQmSU/bInfU8Z2lJ64Ihngv7KeHNMwyxedPSUJgorSab7k4pA== 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=TZseUKxTOpe3hZZqHE8ThX8bdEcUrDh2kgS5SWwXbtw=; b=qwBzrYcNoWav28UX18DO1fIyb1+bjdULczT/zq/YV4TgyBVCd4qh2zROkRLjrK2Mxf+2S8QOPwrsLCTxfGT3YhcRcSQ01EV9Pp02hCCNGAQM/y2tsFOLzmuJ4lEnrqoNP7dc6YMLFB1VFxDpb6QhUgAzaGJIIxbRzsEAF/PKSFen302mjx9SvW4t98hGFGjiL2OxwevYBJNoGASAEgglZt+dGJMk26zXXOjp2GLKlZFhVNQYoWh753MxlVJyVonOXwmqPNXbppOiY/oBUdOI6ZrgUgU2KISQLHHo3rE5YwQjQCepwmAHIYEQC8LAjZd3uUjJYSFJn3hYssdP4E/npQ== 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=TZseUKxTOpe3hZZqHE8ThX8bdEcUrDh2kgS5SWwXbtw=; b=MmeiSniP6F4M5K2RFOpXfDg6KzaBO65oeYvPmG5k/MHFFyYYsojWKljTOf+n80/OwgCf4Pn0i2VqdKEbmosBZbgAsl96hGBETzcDv4RlGHIsJhF3/LCjM8Ue5mlC28QIYB9cKifkp9vxC3cL0i+D3Dp8cagqxHBL8un7HifJ7nZsCQN7+t/Ur9h7VQdJBXmJCx3gp3da+VFEB+bOLg6JonOYmzznkQCWi/kS8r6yYLRp2piBm/s9brx5DMWSfqbsZACdOB1D+CSDr6YI7iWa6xsAbsL8jEj0oP7zdTCqPAg0aDUbvmSPqR57LuHJZ7RUQBvCrEzwXEMyTwO25hj+hQ== Received: from BL1PR13CA0258.namprd13.prod.outlook.com (2603:10b6:208:2ba::23) by MN0PR12MB6245.namprd12.prod.outlook.com (2603:10b6:208:3c3::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.19; Mon, 24 Feb 2025 17:44:52 +0000 Received: from BN3PEPF0000B36E.namprd21.prod.outlook.com (2603:10b6:208:2ba:cafe::76) by BL1PR13CA0258.outlook.office365.com (2603:10b6:208:2ba::23) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8489.15 via Frontend Transport; Mon, 24 Feb 2025 17:44:52 +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 BN3PEPF0000B36E.mail.protection.outlook.com (10.167.243.165) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8511.0 via Frontend Transport; Mon, 24 Feb 2025 17:44:52 +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; Mon, 24 Feb 2025 09:44:38 -0800 Received: from rnnvmail202.nvidia.com (10.129.68.7) 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; Mon, 24 Feb 2025 09:44:37 -0800 Received: from vdi.nvidia.com (10.127.8.12) by mail.nvidia.com (10.129.68.7) with Microsoft SMTP Server id 15.2.1544.14 via Frontend Transport; Mon, 24 Feb 2025 09:44:33 -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 v5 4/4] selftests: drv-net-hw: Add a test for symmetric RSS hash Date: Mon, 24 Feb 2025 19:44:16 +0200 Message-ID: <20250224174416.499070-5-gal@nvidia.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20250224174416.499070-1-gal@nvidia.com> References: <20250224174416.499070-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: BN3PEPF0000B36E:EE_|MN0PR12MB6245:EE_ X-MS-Office365-Filtering-Correlation-Id: 55ee584e-6caa-440d-88c4-08dd54faf151 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|7416014|82310400026|1800799024|36860700013; X-Microsoft-Antispam-Message-Info: +bgG7BWK6NPMWW3yAdLteyYBDpxDBEZ2Xo+YDX3+HJMMW3dZznZuXZb6Pnp5ftTeKc/Ddgdw1UvjRbcX2OtLj+qjdbZpksRHtkIr30ZVxFZXSkV/x7CNp4f/5Tgrc2uXsWisgFz/JWzSbMYtRbWekkz0mNZYHxXxD/fvnkPbIbi29PaJAY2Zu4zwUmQAmxdlNdJWk8p/aad6kwCMO1JV519A9dO9K5qQ6SeKGfzd1Z+9OdiQYW5mXa0MZKBJqEdiqmB2pE+NIeXs9zS3PALRvAfyYsR0hhGMOqqyoRswqnRrblW6YpSLznB2UzpnEMTxl2QwWqgXw0ClIkqhzdP8pOFu02aZdFlMeSxST/Odu076dTUjAZwaU2ZELpe6cfc5ps7NZXkkm0AmZyfTHNdWgFWeblnT9xh5a6S2PZTCSaTET0CFhC+GAGwBCVDqZXvl2mAnzAEkCbPlqxuOsoHOERy+BP8RBfTWgkB32XKAofELEtXrY28iq11mbqrs8bjMevVrvGDvBuf7oZE8evhxflWweyoK/h+p37QSgRVKB0er6SmYkEtgVGxT5IsxNiCBhXC0Mu3Tok4LrggaKMmlkBqONGr/HcrN+h0vM1BK8r+I39d8TWf1YSEBXIvPXN9mL4sCfsAEhen+5p2GrXthwT6sr5M3Z1MBMz6Odlo52X5domCl4xFTC15n9o20VpV4Iua5+Sd3etxGq/Uy/WtMLmXXEh2lsjwv9M5AWVW9KlbX30aOorM2HaNNvEUmsShd3rLB3KJEEGegA/r6atdcxdFvFcUllyGPjr6kipUY4TA6XIS3bQ0tLy2eRJF2KWMmMN6JAqIfpaSuOI8cH8y70NieIfW7EoJzz9/5i55o2TiCU2B7HVwVgqmLigHwrSFJpyzGsSpriN0PkF4kVhEZwGaei+gsyJ80ITbI8WsMdIL8MhwU/CP0EYeSu9DonSuLX2kn/R4zPsweguXAwZ7Do6YZLq/4fwI+A2HOCeEYXavIfZMCrxE7v7G4D2Gj9t+IryYtoAWXpV7FSKpDJ29E2/jNva/85h81m29liSnpP7qs/LiFcMSSEts95qBuhuMGItlUKWaWUyAMxH+COI8lpnDjGMMnIzzwepAvpW0+y3djxhWmvxTx0WRmeY3p9LBlxIfnLqcfPLXZAp5Lwl0HDKKvLp8Bfv8nGmED98hCIh2AufVQb663ZZdHYPA2bVfUVoBV3ijOk/raEK1tclgE5Ax7fpGFcrfx1lDl6TkFuKQtTcS34VEZ7BkbvI07tmvJKDXzz+FWGrdKLJKGHUZlWS3AimgJYJYqmEfCmZX0UAgLDaT8eVLxEOC4chFQ18HxQCVjs4Fsd9iJL7KbreYE2wVXiL4OAiFDP8t7niGE/jD3taPkm67dWjSjnaMpmzCO2hQdv0fueqdQkaIqR9rtbLynEAnIsmBhOwwqeoyrxoZPPHtkdOAD2rq6X9a+lX3F98LHoRPdMiwBx4ttVrVCIg== 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)(1800799024)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Feb 2025 17:44:52.1969 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 55ee584e-6caa-440d-88c4-08dd54faf151 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: BN3PEPF0000B36E.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN0PR12MB6245 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 | 87 +++++++++++++++++++ tools/testing/selftests/net/lib/py/utils.py | 4 +- 3 files changed, 90 insertions(+), 2 deletions(-) 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..b2be14d0cc56 100644 --- a/tools/testing/selftests/drivers/net/hw/Makefile +++ b/tools/testing/selftests/drivers/net/hw/Makefile @@ -15,6 +15,7 @@ TEST_PROGS = \ nic_performance.py \ pp_alloc_fail.py \ rss_ctx.py \ + rss_input_xfrm.py \ tso.py \ # 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..53bb08cc29ec --- /dev/null +++ b/tools/testing/selftests/drivers/net/hw/rss_input_xfrm.py @@ -0,0 +1,87 @@ +#!/usr/bin/env python3 +# SPDX-License-Identifier: GPL-2.0 + +import multiprocessing +import socket +from lib.py import ksft_run, ksft_exit, ksft_eq, ksft_ge, cmd, fd_read_timeout +from lib.py import NetDrvEpEnv +from lib.py import EthtoolFamily, NetdevFamily +from lib.py import KsftSkipEx, KsftFailEx +from lib.py import rand_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) + fd_read_timeout(sock.fileno(), 5) + 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). + """ + + if multiprocessing.cpu_count() < 2: + raise KsftSkipEx("Need at least two CPUs to test symmetric RSS hash") + + input_xfrm = cfg.ethnl.rss_get( + {'header': {'dev-name': cfg.ifname}}).get('input_xfrm') + + # Check for symmetric xor/or-xor + if not input_xfrm or (input_xfrm != 1 and input_xfrm != 2): + raise KsftSkipEx("Symmetric RSS hash not requested") + + cpus = set() + successful = 0 + for _ in range(100): + try: + port1 = rand_port(socket.SOCK_DGRAM) + port2 = rand_port(socket.SOCK_DGRAM) + 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 with ports ({port1 = }, {port2 = }) while symmetric hash is configured") + + successful += 1 + if successful == 10: + break + except: + continue + else: + raise KsftFailEx("Failed to run traffic") + + ksft_ge(len(cpus), 2, + comment=f"Received traffic on less than two cpus {cpus = }") + + +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() diff --git a/tools/testing/selftests/net/lib/py/utils.py b/tools/testing/selftests/net/lib/py/utils.py index a6af97c7e283..34470d65d871 100644 --- a/tools/testing/selftests/net/lib/py/utils.py +++ b/tools/testing/selftests/net/lib/py/utils.py @@ -185,11 +185,11 @@ def ethtool(args, json=None, ns=None, host=None): return tool('ethtool', args, json=json, ns=ns, host=host) -def rand_port(): +def rand_port(type=socket.SOCK_STREAM): """ Get a random unprivileged port. """ - with socket.socket(socket.AF_INET6, socket.SOCK_STREAM) as s: + with socket.socket(socket.AF_INET6, type) as s: s.bind(("", 0)) return s.getsockname()[1]