From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pdx-out-001.esa.us-west-2.outbound.mail-perimeter.amazon.com (pdx-out-001.esa.us-west-2.outbound.mail-perimeter.amazon.com [44.245.243.92]) (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 F26ED2D7DF3 for ; Thu, 8 Jan 2026 05:24:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=44.245.243.92 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767849843; cv=none; b=CI2EjIKkPKEsWl0U8vvsabcWVZdexE353Fckb3Q8Xw2HVUsEbj2tdPkYDWY1CXSuOmHOuXHvHww9hypplmsubVqv1Ewi+S/7lNlcEL7/mLkKZLXbB4b/ozOhMHJNcZDfHSxAufEgcp2b0HkD7UVHjqqz8wr2KO2QwEAT1uag+UY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767849843; c=relaxed/simple; bh=SPzTNgKvdZvn+VsX2ICTSRzZitP0vWdEwLUdAQzbJ4I=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=hXsYbLKsj1nJoFpuzIH0tX95tmkF23bY5wZ6tBPCxwqSe1DwK/+1/jeuyawFUFU2xRLLpcPU+jpuA4AB0e2DIsAndlIKv4AsEb05M6FCPCAouNfe9DmCkzSffzpV7r7SzXyTsFQthrJvnYYpT88K412cmQ7hS3hYUjOmzO8fNAk= 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=JwY7Rr9T; arc=none smtp.client-ip=44.245.243.92 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="JwY7Rr9T" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazoncorp2; t=1767849841; x=1799385841; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=W/1kijzv3fwdwNTg/hBCS2Ugt4JWs6+1SMoV5xeto64=; b=JwY7Rr9TXtutd/Z0+b0PIWo3ULEnNxK2LthcxdU/WzbY4jAGqeVsRTzY Bqf/Gk4fIIF4qb3V13AXqbPmjAyByKO6AdrOvE7aP9+3enMYhTk+pjxSl JuKyW9C9pCWyHzPuAef8vzKA0eYripscJZzELVG1BV7gMR/a47KoSIxaB FKDWc/8Urk6+yJsbnMeujeEQ/3Bd0Hp2VyEDG9WmBS4HYjj0uoyWSUsxf C5t3jpipIA6rbhIIJlpDE0JlQsXzJOmL8QIj7/ew2gyg10Yml8F5BwWlS 1/6DUzk3puZjwMNtKE+RbMvSnMpK+L1+6FVEMoKK4NFM0YGAXlkU91MbF w==; X-CSE-ConnectionGUID: 3659SLhkQKisjy61CLUXTQ== X-CSE-MsgGUID: giJpBupnRoKUGA+VZH6SDQ== X-IronPort-AV: E=Sophos;i="6.21,209,1763424000"; d="scan'208";a="9992318" Received: from ip-10-5-6-203.us-west-2.compute.internal (HELO smtpout.naws.us-west-2.prod.farcaster.email.amazon.dev) ([10.5.6.203]) by internal-pdx-out-001.esa.us-west-2.outbound.mail-perimeter.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jan 2026 05:22:52 +0000 Received: from EX19MTAUWA001.ant.amazon.com [205.251.233.236:1873] by smtpin.naws.us-west-2.prod.farcaster.email.amazon.dev [10.0.62.78:2525] with esmtp (Farcaster) id 9a897238-47f9-4faa-a11f-f469ed79a941; Thu, 8 Jan 2026 05:22:52 +0000 (UTC) X-Farcaster-Flow-ID: 9a897238-47f9-4faa-a11f-f469ed79a941 Received: from EX19D001UWA001.ant.amazon.com (10.13.138.214) by EX19MTAUWA001.ant.amazon.com (10.250.64.204) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.2562.35; Thu, 8 Jan 2026 05:22:52 +0000 Received: from 603e5f7bc1fe.amazon.com (10.37.244.10) 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; Thu, 8 Jan 2026 05:22:50 +0000 From: Takashi Kozu To: CC: , , , , , , , , Takashi Kozu , Kohei Enju Subject: [PATCH iwl-next v2 3/3] igb: allow configuring RSS key via ethtool set_rxfh Date: Thu, 8 Jan 2026 14:20:15 +0900 Message-ID: <20260108052020.84218-8-takkozu@amazon.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20260108052020.84218-5-takkozu@amazon.com> References: <20260108052020.84218-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: EX19D046UWA002.ant.amazon.com (10.13.139.39) To EX19D001UWA001.ant.amazon.com (10.13.138.214) Change igb_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 `. Tested-by: Kohei Enju 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 2953d079ebae..ac045fbebade 100644 --- a/drivers/net/ethernet/intel/igb/igb_ethtool.c +++ b/drivers/net/ethernet/intel/igb/igb_ethtool.c @@ -3345,35 +3345,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 da0f550de605..d42b3750f0b1 100644 --- a/drivers/net/ethernet/intel/igb/igb_main.c +++ b/drivers/net/ethernet/intel/igb/igb_main.c @@ -4526,7 +4526,8 @@ static void igb_setup_mrqc(struct igb_adapter *adapter) u32 mrqc, rxcsum; u32 j, num_rx_queues; - 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)); igb_write_rss_key(adapter); num_rx_queues = adapter->rss_queues; -- 2.52.0