From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pdx-out-011.esa.us-west-2.outbound.mail-perimeter.amazon.com (pdx-out-011.esa.us-west-2.outbound.mail-perimeter.amazon.com [52.35.192.45]) (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 0B07C3D1CD0 for ; Tue, 20 Jan 2026 09:36:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=52.35.192.45 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768901791; cv=none; b=ctYWtYXwkUdwQrdxulGOegeLqvAVSGwqY+WqhkhCHodWumLH2KlxmLlMow5RchEhvOT5vyQNT95KV7wlw2ZWTGy3gegnNtZePx+vhAR032zj2y+Hu/Mu/65S31hjEAVU/FAJrjUu3pORFz/6h9q0u720WCnEtU/4qm+J4hxqvyU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768901791; c=relaxed/simple; bh=w/hLvsT7/gKult86m58ZJpZrv3tPPk856Wa69Tyl7Oc=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=se1m+lmSKEks9bgzi/KxY826wgteppAOefJ/QbosqVQeGeYFxlYkQYDPp8OG3ulDAcJlXVurt8zEoBDOQEuIXcDvoS7auZLUyJl9ZGQIcfqm86sAcBLZ6xP9/cb5Q57/5B8CKsMBWaNeZ6UCNL1Be9Vj7rc/r/gwpq9zJcFAf3I= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amazon.com; spf=pass smtp.mailfrom=amazon.co.jp; dkim=pass (2048-bit key) header.d=amazon.com header.i=@amazon.com header.b=o3XaqGeP; arc=none smtp.client-ip=52.35.192.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amazon.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=amazon.co.jp Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=amazon.com header.i=@amazon.com header.b="o3XaqGeP" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazoncorp2; t=1768901789; x=1800437789; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=B+zWsKIkm2UpBCBjFQial8/cDGCyaERvk1cHwwohaao=; b=o3XaqGePnXBch6Fea1mWVmGLW+ymnmOOF7duNaMZ0fb04uT9YyF8VXtO uyLUe7oR0uXKDacSZVv4EASf/sohGxZ7EGiDbwjmy24zSnMuxEFyHSi/K GOcDBp5456Rap0fWObUuxQSflsiSXEtv7sV/6xkvt/DLL3DGz9NN9OdR4 prVJqRYQKwMrzeacxG+O/E2IFN0DoaU4Za7uxlyjxm86V4ULHD7knPNZ3 E2GWRK3y9V1Sn5mFzDqwYvdiJTRkDczoPpU9zHgKdhf/himxXlFCjUOtz ZeIjLAsjIuy9GSJCV3pwLDaJDTLD+hdLjFmvebuZy7tn5QA50aXZnjggR Q==; X-CSE-ConnectionGUID: ti7Ys/BWR4OVzhpb6UW+HA== X-CSE-MsgGUID: D/gfeL7HS8CAuDRrX30PFA== X-IronPort-AV: E=Sophos;i="6.21,240,1763424000"; d="scan'208";a="10974104" Received: from ip-10-5-12-219.us-west-2.compute.internal (HELO smtpout.naws.us-west-2.prod.farcaster.email.amazon.dev) ([10.5.12.219]) by internal-pdx-out-011.esa.us-west-2.outbound.mail-perimeter.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Jan 2026 09:36:26 +0000 Received: from EX19MTAUWB001.ant.amazon.com [205.251.233.51:21823] by smtpin.naws.us-west-2.prod.farcaster.email.amazon.dev [10.0.41.221:2525] with esmtp (Farcaster) id dadfcc83-7584-4b57-bd33-52d985543c72; Tue, 20 Jan 2026 09:36:26 +0000 (UTC) X-Farcaster-Flow-ID: dadfcc83-7584-4b57-bd33-52d985543c72 Received: from EX19D001UWA001.ant.amazon.com (10.13.138.214) by EX19MTAUWB001.ant.amazon.com (10.250.64.248) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.2562.35; Tue, 20 Jan 2026 09:36:25 +0000 Received: from 603e5f7bc1fe.amazon.com (10.37.244.13) by EX19D001UWA001.ant.amazon.com (10.13.138.214) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.2562.35; Tue, 20 Jan 2026 09:36:23 +0000 From: Takashi Kozu To: CC: , , , , , , , , , , , , Takashi Kozu Subject: [PATCH iwl-next v4 3/3] igb: allow configuring RSS key via ethtool set_rxfh Date: Tue, 20 Jan 2026 18:34:40 +0900 Message-ID: <20260120093441.70075-8-takkozu@amazon.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20260120093441.70075-5-takkozu@amazon.com> References: <20260120093441.70075-5-takkozu@amazon.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: EX19D035UWB004.ant.amazon.com (10.13.138.104) To EX19D001UWA001.ant.amazon.com (10.13.138.214) Change igc_set_rxfh() to accept and save a userspace-provided RSS key. When a key is provided, store it in the adapter and write the E1000 registers accordingly. This can be tested using `ethtool -X hkey `. Signed-off-by: Takashi Kozu --- drivers/net/ethernet/intel/igb/igb.h | 1 + drivers/net/ethernet/intel/igb/igb_ethtool.c | 49 +++++++++++--------- drivers/net/ethernet/intel/igb/igb_main.c | 3 +- 3 files changed, 30 insertions(+), 23 deletions(-) diff --git a/drivers/net/ethernet/intel/igb/igb.h b/drivers/net/ethernet/intel/igb/igb.h index 8c9b02058cec..2509ec30acf3 100644 --- a/drivers/net/ethernet/intel/igb/igb.h +++ b/drivers/net/ethernet/intel/igb/igb.h @@ -657,6 +657,7 @@ struct igb_adapter { u32 rss_indir_tbl_init; u8 rss_indir_tbl[IGB_RETA_SIZE]; u8 rss_key[IGB_RSS_KEY_SIZE]; + bool has_user_rss_key; unsigned long link_check_timeout; int copper_tries; diff --git a/drivers/net/ethernet/intel/igb/igb_ethtool.c b/drivers/net/ethernet/intel/igb/igb_ethtool.c index b387121f0ea7..1db9c2447c91 100644 --- a/drivers/net/ethernet/intel/igb/igb_ethtool.c +++ b/drivers/net/ethernet/intel/igb/igb_ethtool.c @@ -3357,35 +3357,40 @@ static int igb_set_rxfh(struct net_device *netdev, u32 num_queues; /* We do not allow change in unsupported parameters */ - if (rxfh->key || - (rxfh->hfunc != ETH_RSS_HASH_NO_CHANGE && - rxfh->hfunc != ETH_RSS_HASH_TOP)) + if (rxfh->hfunc != ETH_RSS_HASH_NO_CHANGE && + rxfh->hfunc != ETH_RSS_HASH_TOP) return -EOPNOTSUPP; - if (!rxfh->indir) - return 0; - num_queues = adapter->rss_queues; + if (rxfh->indir) { + num_queues = adapter->rss_queues; - switch (hw->mac.type) { - case e1000_82576: - /* 82576 supports 2 RSS queues for SR-IOV */ - if (adapter->vfs_allocated_count) - num_queues = 2; - break; - default: - break; - } + switch (hw->mac.type) { + case e1000_82576: + /* 82576 supports 2 RSS queues for SR-IOV */ + if (adapter->vfs_allocated_count) + num_queues = 2; + break; + default: + break; + } - /* Verify user input. */ - for (i = 0; i < IGB_RETA_SIZE; i++) - if (rxfh->indir[i] >= num_queues) - return -EINVAL; + /* Verify user input. */ + for (i = 0; i < IGB_RETA_SIZE; i++) + if (rxfh->indir[i] >= num_queues) + return -EINVAL; - for (i = 0; i < IGB_RETA_SIZE; i++) - adapter->rss_indir_tbl[i] = rxfh->indir[i]; + for (i = 0; i < IGB_RETA_SIZE; i++) + adapter->rss_indir_tbl[i] = rxfh->indir[i]; + + igb_write_rss_indir_tbl(adapter); + } - igb_write_rss_indir_tbl(adapter); + if (rxfh->key) { + adapter->has_user_rss_key = true; + memcpy(adapter->rss_key, rxfh->key, sizeof(adapter->rss_key)); + igb_write_rss_key(adapter); + } return 0; } diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c index c703011b19ec..8dab133296ca 100644 --- a/drivers/net/ethernet/intel/igb/igb_main.c +++ b/drivers/net/ethernet/intel/igb/igb_main.c @@ -4051,7 +4051,8 @@ static int igb_sw_init(struct igb_adapter *adapter) pci_read_config_word(pdev, PCI_COMMAND, &hw->bus.pci_cmd_word); /* init RSS key */ - netdev_rss_key_fill(adapter->rss_key, sizeof(adapter->rss_key)); + if (!adapter->has_user_rss_key) + netdev_rss_key_fill(adapter->rss_key, sizeof(adapter->rss_key)); /* set default ring sizes */ adapter->tx_ring_count = IGB_DEFAULT_TXD; -- 2.52.0