From patchwork Thu Dec 22 00:13:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Mogilappagari, Sudheer" X-Patchwork-Id: 13079322 X-Patchwork-Delegate: mkubecek+ethtool@suse.cz 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4E4C9C4332F for ; Thu, 22 Dec 2022 00:17:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234774AbiLVARs (ORCPT ); Wed, 21 Dec 2022 19:17:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45182 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234761AbiLVARp (ORCPT ); Wed, 21 Dec 2022 19:17:45 -0500 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DE99D19035 for ; Wed, 21 Dec 2022 16:17:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1671668264; x=1703204264; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=E5572UmhR2mQ3TfvYt3z2iojIxg2RNneWwjwuQU2P5g=; b=h/9OKPQ1qlhn1TxQaqh/CYzJRCmUFlyXcjC6/1ukTNQ1LNhIwToMtJ99 gw7ilXZIwC08LsK07Be39V5vcfo9mXOVUMyhhXIlhNYsxDqasJFamb68F 1lylQuytclDbyN+vQ2BR3D0/NceBXfbD7AsQlMMgW0Tr0JZ8b5334r+8V VBvkscJ5tJPS5fuIfYNaZ6QnwlcGmUlLmfqULA5kzT8gZW2+S6j4PeAyU cbJrfbZDNF7Hr2zuxujUzWd8hhkwIZSKNx1vwqRKFM4crZjEgzxLCgAdg +Gnxw3ldII85vsMcLgJIoqjIzg7i+Cyubb4X0oEcpaSKdSZHZUrYDYYrn g==; X-IronPort-AV: E=McAfee;i="6500,9779,10568"; a="318701434" X-IronPort-AV: E=Sophos;i="5.96,263,1665471600"; d="scan'208";a="318701434" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Dec 2022 16:17:44 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10568"; a="720117637" X-IronPort-AV: E=Sophos;i="5.96,263,1665471600"; d="scan'208";a="720117637" Received: from msu-dell.jf.intel.com ([10.166.233.5]) by fmsmga004.fm.intel.com with ESMTP; 21 Dec 2022 16:17:43 -0800 From: Sudheer Mogilappagari To: netdev@vger.kernel.org Cc: kuba@kernel.org, mkubecek@suse.cz, andrew@lunn.ch, corbet@lwn.net, sridhar.samudrala@intel.com, anthony.l.nguyen@intel.com Subject: [PATCH ethtool-next v2 1/2] Move code that print rss info into common file Date: Wed, 21 Dec 2022 16:13:42 -0800 Message-Id: <20221222001343.1220090-2-sudheer.mogilappagari@intel.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20221222001343.1220090-1-sudheer.mogilappagari@intel.com> References: <20221222001343.1220090-1-sudheer.mogilappagari@intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: mkubecek+ethtool@suse.cz Move functions that prints rss indirection table and hash key into common file for use by both netlink and ioctl interface. Changed function argument to be ring count instead of structure. Signed-off-by: Sudheer Mogilappagari --- common.c | 43 +++++++++++++++++++++++++++++++++++++++++++ common.h | 7 +++++++ ethtool.c | 44 ++++---------------------------------------- 3 files changed, 54 insertions(+), 40 deletions(-) diff --git a/common.c b/common.c index 2630e73..0f2d8c0 100644 --- a/common.c +++ b/common.c @@ -173,3 +173,46 @@ void dump_mdix(u8 mdix, u8 mdix_ctrl) fprintf(stdout, "\n"); } } + +void print_indir_table(struct cmd_context *ctx, u64 ring_count, + u32 indir_size, u32 *indir) +{ + u32 i; + + printf("RX flow hash indirection table for %s with %llu RX ring(s):\n", + ctx->devname, ring_count); + + if (!indir_size) + printf("Operation not supported\n"); + + for (i = 0; i < indir_size; i++) { + if (i % 8 == 0) + printf("%5u: ", i); + printf(" %5u", indir[i]); + if (i % 8 == 7 || i == indir_size - 1) + fputc('\n', stdout); + } +} + +void print_rss_info(struct cmd_context *ctx, u64 ring_count, + struct ethtool_rxfh *rss) +{ + u32 i, indir_bytes; + char *hkey; + + print_indir_table(ctx, ring_count, rss->indir_size, rss->rss_config); + + indir_bytes = rss->indir_size * sizeof(rss->rss_config[0]); + hkey = ((char *)rss->rss_config + indir_bytes); + + printf("RSS hash key:\n"); + if (!rss->key_size) + printf("Operation not supported\n"); + + for (i = 0; i < rss->key_size; i++) { + if (i == (rss->key_size - 1)) + printf("%02x\n", (u8)hkey[i]); + else + printf("%02x:", (u8)hkey[i]); + } +} diff --git a/common.h b/common.h index b74fdfa..8589714 100644 --- a/common.h +++ b/common.h @@ -8,6 +8,8 @@ #define ETHTOOL_COMMON_H__ #include "internal.h" +#include +#include #define KERNEL_VERSION(a, b, c) (((a) << 16) + ((b) << 8) + (c)) @@ -41,5 +43,10 @@ extern const struct off_flag_def off_flag_def[OFF_FLAG_DEF_SIZE]; void print_flags(const struct flag_info *info, unsigned int n_info, u32 value); int dump_wol(struct ethtool_wolinfo *wol); void dump_mdix(u8 mdix, u8 mdix_ctrl); +void print_indir_table(struct cmd_context *ctx, u64 ring_count, + u32 indir_size, u32 *indir); + +void print_rss_info(struct cmd_context *ctx, u64 ring_count, + struct ethtool_rxfh *rss); #endif /* ETHTOOL_COMMON_H__ */ diff --git a/ethtool.c b/ethtool.c index 60da8af..209dbd1 100644 --- a/ethtool.c +++ b/ethtool.c @@ -3900,27 +3900,6 @@ static int do_grxclass(struct cmd_context *ctx) return err ? 1 : 0; } -static void print_indir_table(struct cmd_context *ctx, - struct ethtool_rxnfc *ring_count, - u32 indir_size, u32 *indir) -{ - u32 i; - - printf("RX flow hash indirection table for %s with %llu RX ring(s):\n", - ctx->devname, ring_count->data); - - if (!indir_size) - printf("Operation not supported\n"); - - for (i = 0; i < indir_size; i++) { - if (i % 8 == 0) - printf("%5u: ", i); - printf(" %5u", indir[i]); - if (i % 8 == 7 || i == indir_size - 1) - fputc('\n', stdout); - } -} - static int do_grxfhindir(struct cmd_context *ctx, struct ethtool_rxnfc *ring_count) { @@ -3952,7 +3931,8 @@ static int do_grxfhindir(struct cmd_context *ctx, return 1; } - print_indir_table(ctx, ring_count, indir->size, indir->ring_index); + print_indir_table(ctx, ring_count->data, indir->size, + indir->ring_index); free(indir); return 0; @@ -3965,9 +3945,7 @@ static int do_grxfh(struct cmd_context *ctx) struct ethtool_rxnfc ring_count; struct ethtool_rxfh *rss; u32 rss_context = 0; - u32 i, indir_bytes; - unsigned int arg_num = 0; - char *hkey; + unsigned int arg_num = 0, i; int err; while (arg_num < ctx->argc) { @@ -4017,21 +3995,7 @@ static int do_grxfh(struct cmd_context *ctx) return 1; } - print_indir_table(ctx, &ring_count, rss->indir_size, rss->rss_config); - - indir_bytes = rss->indir_size * sizeof(rss->rss_config[0]); - hkey = ((char *)rss->rss_config + indir_bytes); - - printf("RSS hash key:\n"); - if (!rss->key_size) - printf("Operation not supported\n"); - - for (i = 0; i < rss->key_size; i++) { - if (i == (rss->key_size - 1)) - printf("%02x\n", (u8) hkey[i]); - else - printf("%02x:", (u8) hkey[i]); - } + print_rss_info(ctx, ring_count.data, rss); printf("RSS hash function:\n"); if (!rss->hfunc) {