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 smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (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 18223E77173 for ; Sat, 7 Dec 2024 00:47:45 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id A4623605AA; Sat, 7 Dec 2024 00:47:45 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id ZqEQaGzVByK2; Sat, 7 Dec 2024 00:47:44 +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 smtp3.osuosl.org 70B68606B4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=osuosl.org; s=default; t=1733532464; bh=E84fDpFKmeEOI7rSMcS7qYzn6qrZ42lbUTz5EZVjbDU=; h=From:To:Cc:Date:Subject:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From; b=4lkSSy7H1XtRkNQ4MKYrXQ81e4WrNOZHDCg8b7KcGwaLGfyR/hVJMJPaVZ5OXAmz4 qgGmBPAb1/o5vVZA6O4Ax7gCtzaxT5y6+bT0qn7n/dT3c2L7YRrSitkgrGd2Jua+iZ tdpujkki0v0zUGuQxrgNsjpZUdu3HdZHJufwVcg80zxMwv4+SHmMCPO9OHFk2u72c4 cNyYI/8mzqOO6FkZ//j4o/9SyiBJUP02vzAvvdzEh3eAhmi7aPp/RJYp07Tj4GXl1C fQtH2HsfJMdfChpQk2WRi+7Co5g7ds0IUsRzfwGGi9HBdviTzV5RwElgsFJwph1mzY Kg4IRDF9Rc6/Q== Received: from lists1.osuosl.org (lists1.osuosl.org [140.211.166.142]) by smtp3.osuosl.org (Postfix) with ESMTP id 70B68606B4; Sat, 7 Dec 2024 00:47:44 +0000 (UTC) Received: from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133]) by lists1.osuosl.org (Postfix) with ESMTP id C54D8ED7 for ; Sat, 7 Dec 2024 00:47:42 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 9041A4028E for ; Sat, 7 Dec 2024 00:47:42 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id rJq8Hb8hlzej for ; Sat, 7 Dec 2024 00:47:41 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2607:f8b0:4864:20::436; helo=mail-pf1-x436.google.com; envelope-from=rosenp@gmail.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp2.osuosl.org CD6F9400D6 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org CD6F9400D6 Received: from mail-pf1-x436.google.com (mail-pf1-x436.google.com [IPv6:2607:f8b0:4864:20::436]) by smtp2.osuosl.org (Postfix) with ESMTPS id CD6F9400D6 for ; Sat, 7 Dec 2024 00:47:40 +0000 (UTC) Received: by mail-pf1-x436.google.com with SMTP id d2e1a72fcca58-7250c199602so2916894b3a.1 for ; Fri, 06 Dec 2024 16:47:40 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733532460; x=1734137260; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=E84fDpFKmeEOI7rSMcS7qYzn6qrZ42lbUTz5EZVjbDU=; b=XD16cZQbH9lQEN3AX//lroEdGYR5g6g6G8BTtIZ9QcEjZm/YFdX/xtQjxTrcH2iuEO MiDJIhAvaM2j1dvErTTyFTspmsJJfyyO8gbuLSfai9M8xo4oAKxwmIuc1OzLjZGiHjNw VyTtoOwQVjfG+9HtxXOlICtzDDtBsBk4UvAFWRex1hgYZq1jRDY3e9ru8YpZ8elpEqfe FcyBDnx0n17uXmTnMvl7InLOJnwTifcOZrAo2SX4kRKfAJa51ru8nIuBerLq/gNpq4gN zsmkeJOrYBYEL0QpKnj6/4FDlAprqTSnuRRLwlbTAUCGxHnwl8lQAfq0dIr6KT3QFIEE KPyQ== X-Forwarded-Encrypted: i=1; AJvYcCWQmafBSvfVBL2HP0Gu+L/8r1Xiw74HImN8NkEkqk4OAGpmMIW3n57HmsTPOpH01aYwWhbAD6kBIbQuRXMyJeQ=@lists.osuosl.org X-Gm-Message-State: AOJu0YzFnd++4TG8ND6CawM6mvqly99tuiaHprLaxERSEHY+oOUsV0hF NCGVpG49rN0bovLPkVFym01n2VGEFCQ1O2TZ6uZkS4+bmQegd9Nm X-Gm-Gg: ASbGncvkNqsri71I6W9VDIHu54ZUBDIq9sKjE2tGr4VtK3sLYym2kj7SSxr2MVwHsod q6FdJgJ4o/KVzuEL27zyqyjpO0Pbx2roUrYVlZU30AVqV4GTaAD0rPhaTHE9hIDzpIGjerZWCWr JondDjtVd7Pue39BclJ8oEelRP4+P90jz/FhfMiDWk2cua6PkF9PMRYTAr8jwpoeHl4h6Lp1eST atiTVqugNg2GuwHQWS+c9s3VQ== X-Google-Smtp-Source: AGHT+IFm2A5sAnM7q31TLIQo4rY7sQap0MvV+rENKXkaVha9hZdDa7e3zwnwiNb5o2bboGDu2d4a/w== X-Received: by 2002:a17:902:c948:b0:215:b468:1a48 with SMTP id d9443c01a7336-21614dadfa3mr80120455ad.26.1733532459842; Fri, 06 Dec 2024 16:47:39 -0800 (PST) Received: from ryzen.lan ([2601:644:8200:dab8::a86]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-215f8e3f0cbsm34318875ad.53.2024.12.06.16.47.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Dec 2024 16:47:39 -0800 (PST) From: Rosen Penev To: netdev@vger.kernel.org Cc: Tony Nguyen , Przemek Kitszel , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , intel-wired-lan@lists.osuosl.org (moderated list:INTEL ETHERNET DRIVERS), linux-kernel@vger.kernel.org (open list) Date: Fri, 6 Dec 2024 16:47:37 -0800 Message-ID: <20241207004737.33936-1-rosenp@gmail.com> X-Mailer: git-send-email 2.47.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1733532460; x=1734137260; darn=lists.osuosl.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=E84fDpFKmeEOI7rSMcS7qYzn6qrZ42lbUTz5EZVjbDU=; b=TDy08jN5Z1bW7cVvrhN+c+rvVEbpmfSZ3hFydw754w/KC2VsTWQOYctf7GxWqz1m0V doRVHB25RKGirqE5bpqrDezvvhIpzMOT2qPuJqFsbHOqZy05msc47beMV+E51/IuFyWH sJJ+ebuRMEqdZV1Ot4TgYkzDhcNFWp77vqRWRzoe1XQmf7e2xlAKL64tHYweAT94fUlx oTqu+V/Btmj2wFAg5e0z8hkw1BejLvDWnE3fzKEfC+uaRsDmOqdPjYAHcb34bT+Yo6sb U02IG59oIwUf9CNM4G77PJU/FnWMwxRV7BbNBhMnEl33NfkPp107YSYWUMvsgGlZIP7B W8tg== X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dmarc=pass (p=none dis=none) header.from=gmail.com X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=TDy08jN5 Subject: [Intel-wired-lan] [PATCHv4 net-next iwl-next] net: intel: use ethtool string helpers 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" The latter is the preferred way to copy ethtool strings. Avoids manually incrementing the pointer. Cleans up the code quite well. Signed-off-by: Rosen Penev --- v4: avoid variable renames in established locations. v3: change custom get_strings to u8** to make sure pointer increments get propagated. v2: add iwl-next tag. use inline int in for loops. drivers/net/ethernet/intel/e100.c | 6 ++-- .../net/ethernet/intel/e1000/e1000_ethtool.c | 10 +++--- drivers/net/ethernet/intel/e1000e/ethtool.c | 14 ++++---- .../net/ethernet/intel/fm10k/fm10k_ethtool.c | 10 +++--- .../net/ethernet/intel/i40e/i40e_ethtool.c | 6 ++-- drivers/net/ethernet/intel/ice/ice_ethtool.c | 5 +-- drivers/net/ethernet/intel/igb/igb_ethtool.c | 9 ++--- drivers/net/ethernet/intel/igbvf/ethtool.c | 10 +++--- drivers/net/ethernet/intel/igc/igc_ethtool.c | 17 +++++---- .../net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 6 ++-- drivers/net/ethernet/intel/ixgbevf/ethtool.c | 36 ++++++++----------- 11 files changed, 64 insertions(+), 65 deletions(-) diff --git a/drivers/net/ethernet/intel/e100.c b/drivers/net/ethernet/intel/e100.c index 3a5bbda235cb..15bb637ac1dd 100644 --- a/drivers/net/ethernet/intel/e100.c +++ b/drivers/net/ethernet/intel/e100.c @@ -2722,10 +2722,12 @@ static void e100_get_strings(struct net_device *netdev, u32 stringset, u8 *data) { switch (stringset) { case ETH_SS_TEST: - memcpy(data, e100_gstrings_test, sizeof(e100_gstrings_test)); + for (int i = 0; i < E100_TEST_LEN; i++) + ethtool_puts(&data, e100_gstrings_test[i]); break; case ETH_SS_STATS: - memcpy(data, e100_gstrings_stats, sizeof(e100_gstrings_stats)); + for (int i = 0; i < E100_STATS_LEN; i++) + ethtool_puts(&data, e100_gstrings_stats[i]); break; } } diff --git a/drivers/net/ethernet/intel/e1000/e1000_ethtool.c b/drivers/net/ethernet/intel/e1000/e1000_ethtool.c index d06d29c6c037..33222fadb3b9 100644 --- a/drivers/net/ethernet/intel/e1000/e1000_ethtool.c +++ b/drivers/net/ethernet/intel/e1000/e1000_ethtool.c @@ -1839,18 +1839,18 @@ static void e1000_get_ethtool_stats(struct net_device *netdev, static void e1000_get_strings(struct net_device *netdev, u32 stringset, u8 *data) { - u8 *p = data; + const char *str; int i; switch (stringset) { case ETH_SS_TEST: - memcpy(data, e1000_gstrings_test, sizeof(e1000_gstrings_test)); + for (i = 0; i < E1000_TEST_LEN; i++) + ethtool_puts(&data, e1000_gstrings_test[i]); break; case ETH_SS_STATS: for (i = 0; i < E1000_GLOBAL_STATS_LEN; i++) { - memcpy(p, e1000_gstrings_stats[i].stat_string, - ETH_GSTRING_LEN); - p += ETH_GSTRING_LEN; + str = e1000_gstrings_stats[i].stat_string; + ethtool_puts(&data, str); } /* BUG_ON(p - data != E1000_STATS_LEN * ETH_GSTRING_LEN); */ break; diff --git a/drivers/net/ethernet/intel/e1000e/ethtool.c b/drivers/net/ethernet/intel/e1000e/ethtool.c index 9364bc2b4eb1..ab590b69c14f 100644 --- a/drivers/net/ethernet/intel/e1000e/ethtool.c +++ b/drivers/net/ethernet/intel/e1000e/ethtool.c @@ -2075,23 +2075,23 @@ static void e1000_get_ethtool_stats(struct net_device *netdev, static void e1000_get_strings(struct net_device __always_unused *netdev, u32 stringset, u8 *data) { - u8 *p = data; + const char *str; int i; switch (stringset) { case ETH_SS_TEST: - memcpy(data, e1000_gstrings_test, sizeof(e1000_gstrings_test)); + for (i = 0; i < E1000_TEST_LEN; i++) + ethtool_puts(&data, e1000_gstrings_test[i]); break; case ETH_SS_STATS: for (i = 0; i < E1000_GLOBAL_STATS_LEN; i++) { - memcpy(p, e1000_gstrings_stats[i].stat_string, - ETH_GSTRING_LEN); - p += ETH_GSTRING_LEN; + str = e1000_gstrings_stats[i].stat_string; + ethtool_puts(&data, str); } break; case ETH_SS_PRIV_FLAGS: - memcpy(data, e1000e_priv_flags_strings, - E1000E_PRIV_FLAGS_STR_LEN * ETH_GSTRING_LEN); + for (i = 0; i < E1000E_PRIV_FLAGS_STR_LEN; i++) + ethtool_puts(&data, e1000e_priv_flags_strings[i]); break; } } diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c b/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c index 1bc5b6c0b897..fb03bb30154a 100644 --- a/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c +++ b/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c @@ -122,7 +122,7 @@ static const char fm10k_gstrings_test[][ETH_GSTRING_LEN] = { "Mailbox test (on/offline)" }; -#define FM10K_TEST_LEN (sizeof(fm10k_gstrings_test) / ETH_GSTRING_LEN) +#define FM10K_TEST_LEN ARRAY_SIZE(fm10k_gstrings_test) enum fm10k_self_test_types { FM10K_TEST_MBX, @@ -182,15 +182,15 @@ static void fm10k_get_strings(struct net_device *dev, { switch (stringset) { case ETH_SS_TEST: - memcpy(data, fm10k_gstrings_test, - FM10K_TEST_LEN * ETH_GSTRING_LEN); + for (int i = 0; i < FM10K_TEST_LEN; i++) + ethtool_puts(&data, fm10k_gstrings_test[i]); break; case ETH_SS_STATS: fm10k_get_stat_strings(dev, data); break; case ETH_SS_PRIV_FLAGS: - memcpy(data, fm10k_prv_flags, - FM10K_PRV_FLAG_LEN * ETH_GSTRING_LEN); + for (int i = 0; i < FM10K_PRV_FLAG_LEN; i++) + ethtool_puts(&data, fm10k_prv_flags[i]); break; } } diff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c index bce5b76f1e7a..753b559a2fc5 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c +++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c @@ -426,7 +426,7 @@ static const char i40e_gstrings_test[][ETH_GSTRING_LEN] = { "Link test (on/offline)" }; -#define I40E_TEST_LEN (sizeof(i40e_gstrings_test) / ETH_GSTRING_LEN) +#define I40E_TEST_LEN ARRAY_SIZE(i40e_gstrings_test) struct i40e_priv_flags { char flag_string[ETH_GSTRING_LEN]; @@ -2531,8 +2531,8 @@ static void i40e_get_strings(struct net_device *netdev, u32 stringset, { switch (stringset) { case ETH_SS_TEST: - memcpy(data, i40e_gstrings_test, - I40E_TEST_LEN * ETH_GSTRING_LEN); + for (int i = 0; i < I40E_TEST_LEN; i++) + ethtool_puts(&data, i40e_gstrings_test[i]); break; case ETH_SS_STATS: i40e_get_stat_strings(netdev, data); diff --git a/drivers/net/ethernet/intel/ice/ice_ethtool.c b/drivers/net/ethernet/intel/ice/ice_ethtool.c index 3072634bf049..04194efe8b49 100644 --- a/drivers/net/ethernet/intel/ice/ice_ethtool.c +++ b/drivers/net/ethernet/intel/ice/ice_ethtool.c @@ -83,7 +83,7 @@ static const char ice_gstrings_test[][ETH_GSTRING_LEN] = { "Link test (on/offline)", }; -#define ICE_TEST_LEN (sizeof(ice_gstrings_test) / ETH_GSTRING_LEN) +#define ICE_TEST_LEN ARRAY_SIZE(ice_gstrings_test) /* These PF_STATs might look like duplicates of some NETDEV_STATs, * but they aren't. This device is capable of supporting multiple @@ -1496,7 +1496,8 @@ __ice_get_strings(struct net_device *netdev, u32 stringset, u8 *data, } break; case ETH_SS_TEST: - memcpy(data, ice_gstrings_test, ICE_TEST_LEN * ETH_GSTRING_LEN); + for (i = 0; i < ICE_VSI_STATS_LEN; i++) + ethtool_puts(&p, ice_gstrings_test[i]); break; case ETH_SS_PRIV_FLAGS: for (i = 0; i < ICE_PRIV_FLAG_ARRAY_SIZE; i++) diff --git a/drivers/net/ethernet/intel/igb/igb_ethtool.c b/drivers/net/ethernet/intel/igb/igb_ethtool.c index ca6ccbc13954..7a44a735eac5 100644 --- a/drivers/net/ethernet/intel/igb/igb_ethtool.c +++ b/drivers/net/ethernet/intel/igb/igb_ethtool.c @@ -123,7 +123,7 @@ static const char igb_gstrings_test[][ETH_GSTRING_LEN] = { [TEST_LOOP] = "Loopback test (offline)", [TEST_LINK] = "Link test (on/offline)" }; -#define IGB_TEST_LEN (sizeof(igb_gstrings_test) / ETH_GSTRING_LEN) +#define IGB_TEST_LEN ARRAY_SIZE(igb_gstrings_test) static const char igb_priv_flags_strings[][ETH_GSTRING_LEN] = { #define IGB_PRIV_FLAGS_LEGACY_RX BIT(0) @@ -2352,7 +2352,8 @@ static void igb_get_strings(struct net_device *netdev, u32 stringset, u8 *data) switch (stringset) { case ETH_SS_TEST: - memcpy(data, igb_gstrings_test, sizeof(igb_gstrings_test)); + for (i = 0; i < IGB_TEST_LEN; i++) + ethtool_puts(&p, igb_gstrings_test[i]); break; case ETH_SS_STATS: for (i = 0; i < IGB_GLOBAL_STATS_LEN; i++) @@ -2374,8 +2375,8 @@ static void igb_get_strings(struct net_device *netdev, u32 stringset, u8 *data) /* BUG_ON(p - data != IGB_STATS_LEN * ETH_GSTRING_LEN); */ break; case ETH_SS_PRIV_FLAGS: - memcpy(data, igb_priv_flags_strings, - IGB_PRIV_FLAGS_STR_LEN * ETH_GSTRING_LEN); + for (i = 0; i < IGB_PRIV_FLAGS_STR_LEN; i++) + ethtool_puts(&p, igb_priv_flags_strings[i]); break; } } diff --git a/drivers/net/ethernet/intel/igbvf/ethtool.c b/drivers/net/ethernet/intel/igbvf/ethtool.c index 83b97989a6bd..2da95ea66718 100644 --- a/drivers/net/ethernet/intel/igbvf/ethtool.c +++ b/drivers/net/ethernet/intel/igbvf/ethtool.c @@ -412,18 +412,18 @@ static int igbvf_get_sset_count(struct net_device *dev, int stringset) static void igbvf_get_strings(struct net_device *netdev, u32 stringset, u8 *data) { - u8 *p = data; + const char *str; int i; switch (stringset) { case ETH_SS_TEST: - memcpy(data, *igbvf_gstrings_test, sizeof(igbvf_gstrings_test)); + for (i = 0; i < IGBVF_TEST_LEN; i++) + ethtool_puts(&data, igbvf_gstrings_test[i]); break; case ETH_SS_STATS: for (i = 0; i < IGBVF_GLOBAL_STATS_LEN; i++) { - memcpy(p, igbvf_gstrings_stats[i].stat_string, - ETH_GSTRING_LEN); - p += ETH_GSTRING_LEN; + str = igbvf_gstrings_stats[i].stat_string; + ethtool_puts(&data, str); } break; } diff --git a/drivers/net/ethernet/intel/igc/igc_ethtool.c b/drivers/net/ethernet/intel/igc/igc_ethtool.c index 817838677817..2db80aaa7920 100644 --- a/drivers/net/ethernet/intel/igc/igc_ethtool.c +++ b/drivers/net/ethernet/intel/igc/igc_ethtool.c @@ -104,7 +104,7 @@ static const char igc_gstrings_test[][ETH_GSTRING_LEN] = { [TEST_LINK] = "Link test (on/offline)" }; -#define IGC_TEST_LEN (sizeof(igc_gstrings_test) / ETH_GSTRING_LEN) +#define IGC_TEST_LEN ARRAY_SIZE(igc_gstrings_test) #define IGC_GLOBAL_STATS_LEN \ (sizeof(igc_gstrings_stats) / sizeof(struct igc_stats)) @@ -763,19 +763,22 @@ static void igc_ethtool_get_strings(struct net_device *netdev, u32 stringset, u8 *data) { struct igc_adapter *adapter = netdev_priv(netdev); + const char *str; u8 *p = data; int i; switch (stringset) { case ETH_SS_TEST: - memcpy(data, *igc_gstrings_test, - IGC_TEST_LEN * ETH_GSTRING_LEN); + for (i = 0; i < IGC_TEST_LEN; i++) + ethtool_puts(&p, igc_gstrings_test[i]); break; case ETH_SS_STATS: for (i = 0; i < IGC_GLOBAL_STATS_LEN; i++) ethtool_puts(&p, igc_gstrings_stats[i].stat_string); - for (i = 0; i < IGC_NETDEV_STATS_LEN; i++) - ethtool_puts(&p, igc_gstrings_net_stats[i].stat_string); + for (i = 0; i < IGC_NETDEV_STATS_LEN; i++) { + str = igc_gstrings_net_stats[i].stat_string; + ethtool_puts(&p, str); + } for (i = 0; i < adapter->num_tx_queues; i++) { ethtool_sprintf(&p, "tx_queue_%u_packets", i); ethtool_sprintf(&p, "tx_queue_%u_bytes", i); @@ -791,8 +794,8 @@ static void igc_ethtool_get_strings(struct net_device *netdev, u32 stringset, /* BUG_ON(p - data != IGC_STATS_LEN * ETH_GSTRING_LEN); */ break; case ETH_SS_PRIV_FLAGS: - memcpy(data, igc_priv_flags_strings, - IGC_PRIV_FLAGS_STR_LEN * ETH_GSTRING_LEN); + for (i = 0; i < IGC_PRIV_FLAGS_STR_LEN; i++) + ethtool_puts(&p, igc_priv_flags_strings[i]); break; } } diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c index 9482e0cca8b7..91d67a341edc 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c @@ -129,7 +129,7 @@ static const char ixgbe_gstrings_test[][ETH_GSTRING_LEN] = { "Interrupt test (offline)", "Loopback test (offline)", "Link test (on/offline)" }; -#define IXGBE_TEST_LEN sizeof(ixgbe_gstrings_test) / ETH_GSTRING_LEN +#define IXGBE_TEST_LEN ARRAY_SIZE(ixgbe_gstrings_test) static const char ixgbe_priv_flags_strings[][ETH_GSTRING_LEN] = { #define IXGBE_PRIV_FLAGS_LEGACY_RX BIT(0) @@ -1439,8 +1439,8 @@ static void ixgbe_get_strings(struct net_device *netdev, u32 stringset, /* BUG_ON(p - data != IXGBE_STATS_LEN * ETH_GSTRING_LEN); */ break; case ETH_SS_PRIV_FLAGS: - memcpy(data, ixgbe_priv_flags_strings, - IXGBE_PRIV_FLAGS_STR_LEN * ETH_GSTRING_LEN); + for (i = 0; i < IXGBE_PRIV_FLAGS_STR_LEN; i++) + ethtool_puts(&p, ixgbe_priv_flags_strings[i]); } } diff --git a/drivers/net/ethernet/intel/ixgbevf/ethtool.c b/drivers/net/ethernet/intel/ixgbevf/ethtool.c index 7ac53171b041..f63a9f683e20 100644 --- a/drivers/net/ethernet/intel/ixgbevf/ethtool.c +++ b/drivers/net/ethernet/intel/ixgbevf/ethtool.c @@ -70,7 +70,7 @@ static const char ixgbe_gstrings_test[][ETH_GSTRING_LEN] = { "Link test (on/offline)" }; -#define IXGBEVF_TEST_LEN (sizeof(ixgbe_gstrings_test) / ETH_GSTRING_LEN) +#define IXGBEVF_TEST_LEN ARRAY_SIZE(ixgbe_gstrings_test) static const char ixgbevf_priv_flags_strings[][ETH_GSTRING_LEN] = { #define IXGBEVF_PRIV_FLAGS_LEGACY_RX BIT(0) @@ -504,43 +504,35 @@ static void ixgbevf_get_strings(struct net_device *netdev, u32 stringset, u8 *data) { struct ixgbevf_adapter *adapter = netdev_priv(netdev); - char *p = (char *)data; + const char *str; int i; switch (stringset) { case ETH_SS_TEST: - memcpy(data, *ixgbe_gstrings_test, - IXGBEVF_TEST_LEN * ETH_GSTRING_LEN); + for (i = 0; i < IXGBEVF_TEST_LEN; i++) + ethtool_puts(&data, ixgbe_gstrings_test[i]); break; case ETH_SS_STATS: for (i = 0; i < IXGBEVF_GLOBAL_STATS_LEN; i++) { - memcpy(p, ixgbevf_gstrings_stats[i].stat_string, - ETH_GSTRING_LEN); - p += ETH_GSTRING_LEN; + str = ixgbevf_gstrings_stats[i].stat_string; + ethtool_puts(&data, str); } - for (i = 0; i < adapter->num_tx_queues; i++) { - sprintf(p, "tx_queue_%u_packets", i); - p += ETH_GSTRING_LEN; - sprintf(p, "tx_queue_%u_bytes", i); - p += ETH_GSTRING_LEN; + ethtool_sprintf(&data, "tx_queue_%u_packets", i); + ethtool_sprintf(&data, "tx_queue_%u_bytes", i); } for (i = 0; i < adapter->num_xdp_queues; i++) { - sprintf(p, "xdp_queue_%u_packets", i); - p += ETH_GSTRING_LEN; - sprintf(p, "xdp_queue_%u_bytes", i); - p += ETH_GSTRING_LEN; + ethtool_sprintf(&data, "xdp_queue_%u_packets", i); + ethtool_sprintf(&data, "xdp_queue_%u_bytes", i); } for (i = 0; i < adapter->num_rx_queues; i++) { - sprintf(p, "rx_queue_%u_packets", i); - p += ETH_GSTRING_LEN; - sprintf(p, "rx_queue_%u_bytes", i); - p += ETH_GSTRING_LEN; + ethtool_sprintf(&data, "rx_queue_%u_packets", i); + ethtool_sprintf(&data, "rx_queue_%u_bytes", i); } break; case ETH_SS_PRIV_FLAGS: - memcpy(data, ixgbevf_priv_flags_strings, - IXGBEVF_PRIV_FLAGS_STR_LEN * ETH_GSTRING_LEN); + for (i = 0; i < IXGBEVF_PRIV_FLAGS_STR_LEN; i++) + ethtool_puts(&data, ixgbevf_priv_flags_strings[i]); break; } } -- 2.47.0