From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 41AE8C7114C for ; Fri, 13 Jun 2025 01:01:41 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 3D42081387; Fri, 13 Jun 2025 01:01:40 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id aOPC69PfPyFG; Fri, 13 Jun 2025 01:01:39 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.142; helo=lists1.osuosl.org; envelope-from=intel-wired-lan-bounces@osuosl.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org AECA981D21 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=osuosl.org; s=default; t=1749776499; bh=Cd/Oe0aXwrMaFUGGocZ4naalSlehfknUBPrtf0Cabhg=; h=From:To:Cc:Date:In-Reply-To:References:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=5ZV869fhOaOqfD5pCm4quYlaAglI+AEKzqZnODm1Y+6tor29tUYjIpvPEx16t6bId H+Yj1VCKkmOtYFai35r4Kg73TvTzL/tZ8BTwQhTRnTF7ftNaXoSoPN+6nVVWf4qsw6 s3Y0Lw6nQDHrcKn25UppyDmhcX2FDHboe8StPmpxgtcRP2HHHY1VntIfVZV015TFVB LlBb/vNxJg8R55V6X/QjDm3MPvl8Z8k+radQbeySTtRBMjMs2pOkxQH1RDvU+DbyG7 WO6ix1s65ZIk3OyzkHexLPI0KeObxZtvSBxfr7wVNrX8OULkKOIBw0JPEeRyEXrJ9h h/F8r/DdZeH+g== Received: from lists1.osuosl.org (lists1.osuosl.org [140.211.166.142]) by smtp1.osuosl.org (Postfix) with ESMTP id AECA981D21; Fri, 13 Jun 2025 01:01:39 +0000 (UTC) Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by lists1.osuosl.org (Postfix) with ESMTP id 10A2B1BD for ; Fri, 13 Jun 2025 01:01:38 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id EB486406CD for ; Fri, 13 Jun 2025 01:01:37 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id 4hgAISHBDK33 for ; Fri, 13 Jun 2025 01:01:37 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=139.178.84.217; helo=dfw.source.kernel.org; envelope-from=kuba@kernel.org; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp4.osuosl.org 62696406B7 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 62696406B7 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by smtp4.osuosl.org (Postfix) with ESMTPS id 62696406B7 for ; Fri, 13 Jun 2025 01:01:37 +0000 (UTC) Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 566935C6A5A; Fri, 13 Jun 2025 00:59:19 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4EEF9C4CEF4; Fri, 13 Jun 2025 01:01:35 +0000 (UTC) From: Jakub Kicinski To: davem@davemloft.net Cc: netdev@vger.kernel.org, edumazet@google.com, pabeni@redhat.com, andrew+netdev@lunn.ch, horms@kernel.org, intel-wired-lan@lists.osuosl.org, anthony.l.nguyen@intel.com, przemyslaw.kitszel@intel.com, jacob.e.keller@intel.com, michal.swiatkowski@linux.intel.com, Jakub Kicinski Date: Thu, 12 Jun 2025 18:01:06 -0700 Message-ID: <20250613010111.3548291-3-kuba@kernel.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250613010111.3548291-1-kuba@kernel.org> References: <20250613010111.3548291-1-kuba@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1749776495; bh=aXp64FVZ8vBC59bZdDKbUAFWuUawl6rAwfae83yygCo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sk5UkXX0JWyh+fdmw6aNtCdpnwUFGXbHKUPRCtfVTkuhvt2cVfUbm13zQuTokL0AY +HewobJ/679t7p4sOb89+yThXjjnoAN6YUK7TzuWWBWabqHqMxKA42wTCGfPkczfev Ij9H9/B1O87m3Kb2bdFl/QKzNcfQzr1wVY6xZW5J0tX2hRbmzrDhbPaOOqG9xthJe9 DjyIvP5fr4mEufG5FPPzAEdcC8pwYaFIhRsajCT8HNjsNu4igdvs1I4p3CtnSTRZn5 TBIxdZFvK8g/YWDuVRxmmLrScpMaMh6Fq3XpgI0yQ4PWGJ6gUrLIU1H1u+6clvheCM MEMtjE17x2gEQ== X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dmarc=pass (p=quarantine dis=none) header.from=kernel.org X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dkim=pass (2048-bit key, unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=sk5UkXX0 Subject: [Intel-wired-lan] [PATCH net-next 2/7] eth: igc: migrate to new RXFH callbacks X-BeenThere: intel-wired-lan@osuosl.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Intel Wired Ethernet Linux Kernel Driver Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-wired-lan-bounces@osuosl.org Sender: "Intel-wired-lan" Migrate to new callbacks added by commit 9bb00786fc61 ("net: ethtool: add dedicated callbacks for getting and setting rxfh fields"). Signed-off-by: Jakub Kicinski --- drivers/net/ethernet/intel/igc/igc_ethtool.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/drivers/net/ethernet/intel/igc/igc_ethtool.c b/drivers/net/ethernet/intel/igc/igc_ethtool.c index 3fc1eded9605..e6cac8d4b862 100644 --- a/drivers/net/ethernet/intel/igc/igc_ethtool.c +++ b/drivers/net/ethernet/intel/igc/igc_ethtool.c @@ -1045,9 +1045,11 @@ static int igc_ethtool_get_nfc_rules(struct igc_adapter *adapter, return 0; } -static int igc_ethtool_get_rss_hash_opts(struct igc_adapter *adapter, - struct ethtool_rxnfc *cmd) +static int igc_ethtool_get_rxfh_fields(struct net_device *dev, + struct ethtool_rxfh_fields *cmd) { + struct igc_adapter *adapter = netdev_priv(dev); + cmd->data = 0; /* Report default options for RSS on igc */ @@ -1103,8 +1105,6 @@ static int igc_ethtool_get_rxnfc(struct net_device *dev, return igc_ethtool_get_nfc_rule(adapter, cmd); case ETHTOOL_GRXCLSRLALL: return igc_ethtool_get_nfc_rules(adapter, cmd, rule_locs); - case ETHTOOL_GRXFH: - return igc_ethtool_get_rss_hash_opts(adapter, cmd); default: return -EOPNOTSUPP; } @@ -1112,9 +1112,11 @@ static int igc_ethtool_get_rxnfc(struct net_device *dev, #define UDP_RSS_FLAGS (IGC_FLAG_RSS_FIELD_IPV4_UDP | \ IGC_FLAG_RSS_FIELD_IPV6_UDP) -static int igc_ethtool_set_rss_hash_opt(struct igc_adapter *adapter, - struct ethtool_rxnfc *nfc) +static int igc_ethtool_set_rxfh_fields(struct net_device *dev, + const struct ethtool_rxfh_fields *nfc, + struct netlink_ext_ack *extack) { + struct igc_adapter *adapter = netdev_priv(dev); u32 flags = adapter->flags; /* RSS does not support anything other than hashing @@ -1425,8 +1427,6 @@ static int igc_ethtool_set_rxnfc(struct net_device *dev, struct igc_adapter *adapter = netdev_priv(dev); switch (cmd->cmd) { - case ETHTOOL_SRXFH: - return igc_ethtool_set_rss_hash_opt(adapter, cmd); case ETHTOOL_SRXCLSRLINS: return igc_ethtool_add_nfc_rule(adapter, cmd); case ETHTOOL_SRXCLSRLDEL: @@ -2144,6 +2144,8 @@ static const struct ethtool_ops igc_ethtool_ops = { .get_rxfh_indir_size = igc_ethtool_get_rxfh_indir_size, .get_rxfh = igc_ethtool_get_rxfh, .set_rxfh = igc_ethtool_set_rxfh, + .get_rxfh_fields = igc_ethtool_get_rxfh_fields, + .set_rxfh_fields = igc_ethtool_set_rxfh_fields, .get_ts_info = igc_ethtool_get_ts_info, .get_channels = igc_ethtool_get_channels, .set_channels = igc_ethtool_set_channels, -- 2.49.0 From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 3BEF71D5175 for ; Fri, 13 Jun 2025 01:01:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749776496; cv=none; b=Lt4Lf1kQQFt/B+Y7o3Tvp9r7HkNV5Me7BhuQQ/VVW/9QPu7DX7b68KXnbR3TQqzGlv6z8d9tkLWDhUaqvpHlE7O6iTAeVOEaQZuHLZKnmOM0TzOaNOymw2rVMcL62A4W3AZC46Rm4rUk5sFd1AhlOZ/5BAETI44MYMas0RFxQSI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749776496; c=relaxed/simple; bh=aXp64FVZ8vBC59bZdDKbUAFWuUawl6rAwfae83yygCo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Ne5gMtXbOLltxRJqV0CYreo/KLylEBQ3pc3WDLiQZ+zNdjF3hKpP/Y65Ls5dW4SUiPCLzk3TMcqic6wiw7hDe6r4NcF8N1I15WW61PVrp2g0ZosQ8hfQ9eQGcOCP+7WbP6/bsDB96/2HjGuaLHEVdgXSNmKnAJFAMgGKNcSb7dk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=sk5UkXX0; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="sk5UkXX0" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4EEF9C4CEF4; Fri, 13 Jun 2025 01:01:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1749776495; bh=aXp64FVZ8vBC59bZdDKbUAFWuUawl6rAwfae83yygCo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sk5UkXX0JWyh+fdmw6aNtCdpnwUFGXbHKUPRCtfVTkuhvt2cVfUbm13zQuTokL0AY +HewobJ/679t7p4sOb89+yThXjjnoAN6YUK7TzuWWBWabqHqMxKA42wTCGfPkczfev Ij9H9/B1O87m3Kb2bdFl/QKzNcfQzr1wVY6xZW5J0tX2hRbmzrDhbPaOOqG9xthJe9 DjyIvP5fr4mEufG5FPPzAEdcC8pwYaFIhRsajCT8HNjsNu4igdvs1I4p3CtnSTRZn5 TBIxdZFvK8g/YWDuVRxmmLrScpMaMh6Fq3XpgI0yQ4PWGJ6gUrLIU1H1u+6clvheCM MEMtjE17x2gEQ== From: Jakub Kicinski To: davem@davemloft.net Cc: netdev@vger.kernel.org, edumazet@google.com, pabeni@redhat.com, andrew+netdev@lunn.ch, horms@kernel.org, intel-wired-lan@lists.osuosl.org, anthony.l.nguyen@intel.com, przemyslaw.kitszel@intel.com, jacob.e.keller@intel.com, michal.swiatkowski@linux.intel.com, Jakub Kicinski Subject: [PATCH net-next 2/7] eth: igc: migrate to new RXFH callbacks Date: Thu, 12 Jun 2025 18:01:06 -0700 Message-ID: <20250613010111.3548291-3-kuba@kernel.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250613010111.3548291-1-kuba@kernel.org> References: <20250613010111.3548291-1-kuba@kernel.org> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Migrate to new callbacks added by commit 9bb00786fc61 ("net: ethtool: add dedicated callbacks for getting and setting rxfh fields"). Signed-off-by: Jakub Kicinski --- drivers/net/ethernet/intel/igc/igc_ethtool.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/drivers/net/ethernet/intel/igc/igc_ethtool.c b/drivers/net/ethernet/intel/igc/igc_ethtool.c index 3fc1eded9605..e6cac8d4b862 100644 --- a/drivers/net/ethernet/intel/igc/igc_ethtool.c +++ b/drivers/net/ethernet/intel/igc/igc_ethtool.c @@ -1045,9 +1045,11 @@ static int igc_ethtool_get_nfc_rules(struct igc_adapter *adapter, return 0; } -static int igc_ethtool_get_rss_hash_opts(struct igc_adapter *adapter, - struct ethtool_rxnfc *cmd) +static int igc_ethtool_get_rxfh_fields(struct net_device *dev, + struct ethtool_rxfh_fields *cmd) { + struct igc_adapter *adapter = netdev_priv(dev); + cmd->data = 0; /* Report default options for RSS on igc */ @@ -1103,8 +1105,6 @@ static int igc_ethtool_get_rxnfc(struct net_device *dev, return igc_ethtool_get_nfc_rule(adapter, cmd); case ETHTOOL_GRXCLSRLALL: return igc_ethtool_get_nfc_rules(adapter, cmd, rule_locs); - case ETHTOOL_GRXFH: - return igc_ethtool_get_rss_hash_opts(adapter, cmd); default: return -EOPNOTSUPP; } @@ -1112,9 +1112,11 @@ static int igc_ethtool_get_rxnfc(struct net_device *dev, #define UDP_RSS_FLAGS (IGC_FLAG_RSS_FIELD_IPV4_UDP | \ IGC_FLAG_RSS_FIELD_IPV6_UDP) -static int igc_ethtool_set_rss_hash_opt(struct igc_adapter *adapter, - struct ethtool_rxnfc *nfc) +static int igc_ethtool_set_rxfh_fields(struct net_device *dev, + const struct ethtool_rxfh_fields *nfc, + struct netlink_ext_ack *extack) { + struct igc_adapter *adapter = netdev_priv(dev); u32 flags = adapter->flags; /* RSS does not support anything other than hashing @@ -1425,8 +1427,6 @@ static int igc_ethtool_set_rxnfc(struct net_device *dev, struct igc_adapter *adapter = netdev_priv(dev); switch (cmd->cmd) { - case ETHTOOL_SRXFH: - return igc_ethtool_set_rss_hash_opt(adapter, cmd); case ETHTOOL_SRXCLSRLINS: return igc_ethtool_add_nfc_rule(adapter, cmd); case ETHTOOL_SRXCLSRLDEL: @@ -2144,6 +2144,8 @@ static const struct ethtool_ops igc_ethtool_ops = { .get_rxfh_indir_size = igc_ethtool_get_rxfh_indir_size, .get_rxfh = igc_ethtool_get_rxfh, .set_rxfh = igc_ethtool_set_rxfh, + .get_rxfh_fields = igc_ethtool_get_rxfh_fields, + .set_rxfh_fields = igc_ethtool_set_rxfh_fields, .get_ts_info = igc_ethtool_get_ts_info, .get_channels = igc_ethtool_get_channels, .set_channels = igc_ethtool_set_channels, -- 2.49.0