From patchwork Tue Jan 10 04:52:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Mogilappagari, Sudheer" X-Patchwork-Id: 13094663 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 B40E0C46467 for ; Tue, 10 Jan 2023 04:59:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229526AbjAJE7M (ORCPT ); Mon, 9 Jan 2023 23:59:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42096 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229540AbjAJE7K (ORCPT ); Mon, 9 Jan 2023 23:59:10 -0500 Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CDA7B4086A for ; Mon, 9 Jan 2023 20:59:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1673326749; x=1704862749; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=5B/DF/7tPlC8XzJnDANrIsgaqYeH4buvRMHcycAWCts=; b=OqCaZsOKZ+Kl1jk7cNbWJz6qus5K2cWjVJSAs2Y7IVdkgO/utVzjMcnb C6uCwUeg3cDPbOcUB7vQK6Tf5c3LZPqpSOJFcUWzUGQnzRaY9Si3cJ0B8 XhwQO+we730MsGdpy8OTeAsqcb17cRReyhyYxmwdpcfeEej5KxfCbGJnV Dn78IR//qEdQ+yv+g4m6jyFsFJZOGRv9n05U9Dxlzb3kAOZ5lsiCrugak abYH+INPlCLZ74N9DHsL4oREgEr+7L20EgqPiGaCXo+YDbglsOHGCcBWc UlOpuB8rnkoEg8B7BFgQQaxv0UMUbN69xOdYwLWrDXVzpTrKUNiniZHSg g==; X-IronPort-AV: E=McAfee;i="6500,9779,10585"; a="306574984" X-IronPort-AV: E=Sophos;i="5.96,314,1665471600"; d="scan'208";a="306574984" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jan 2023 20:59:07 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10585"; a="985636154" X-IronPort-AV: E=Sophos;i="5.96,314,1665471600"; d="scan'208";a="985636154" Received: from msu-dell.jf.intel.com ([10.166.233.5]) by fmsmga005.fm.intel.com with ESMTP; 09 Jan 2023 20:59:06 -0800 From: Sudheer Mogilappagari To: netdev@vger.kernel.org Cc: kuba@kernel.org, mkubecek@suse.cz, andrew@lunn.ch, sridhar.samudrala@intel.com, anthony.l.nguyen@intel.com Subject: [PATCH ethtool-next v5 1/2] Move code that print rss info into common file Date: Mon, 9 Jan 2023 20:52:44 -0800 Message-Id: <20230110045245.3571556-2-sudheer.mogilappagari@intel.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20230110045245.3571556-1-sudheer.mogilappagari@intel.com> References: <20230110045245.3571556-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 function 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 | 36 ++++++++++++++++++++++++++++++++++++ common.h | 6 +++++- ethtool.c | 42 +++++++----------------------------------- 3 files changed, 48 insertions(+), 36 deletions(-) diff --git a/common.c b/common.c index 2630e73..b8fd4d5 100644 --- a/common.c +++ b/common.c @@ -173,3 +173,39 @@ 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_hkey(u8 *hkey, u32 hkey_size) +{ + u32 i; + + printf("RSS hash key:\n"); + if (!hkey_size || !hkey) + printf("Operation not supported\n"); + + for (i = 0; i < hkey_size; i++) { + if (i == (hkey_size - 1)) + printf("%02x\n", hkey[i]); + else + printf("%02x:", hkey[i]); + } +} diff --git a/common.h b/common.h index b74fdfa..f975407 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,7 @@ 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_hkey(u8 *hkey, u32 hkey_size); #endif /* ETHTOOL_COMMON_H__ */ diff --git a/ethtool.c b/ethtool.c index 60da8af..ea74684 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; @@ -3967,7 +3947,7 @@ static int do_grxfh(struct cmd_context *ctx) u32 rss_context = 0; u32 i, indir_bytes; unsigned int arg_num = 0; - char *hkey; + u8 *hkey; int err; while (arg_num < ctx->argc) { @@ -4017,21 +3997,13 @@ static int do_grxfh(struct cmd_context *ctx) return 1; } - print_indir_table(ctx, &ring_count, rss->indir_size, rss->rss_config); + print_indir_table(ctx, ring_count.data, 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"); + hkey = ((u8 *)rss->rss_config + indir_bytes); - 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_hkey(hkey, rss->key_size); printf("RSS hash function:\n"); if (!rss->hfunc) {