From patchwork Sun Apr 23 14:49:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shay Agroskin X-Patchwork-Id: 13221382 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 6CF53C77B60 for ; Sun, 23 Apr 2023 14:51:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230498AbjDWOvL (ORCPT ); Sun, 23 Apr 2023 10:51:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57712 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230467AbjDWOu6 (ORCPT ); Sun, 23 Apr 2023 10:50:58 -0400 Received: from smtp-fw-6001.amazon.com (smtp-fw-6001.amazon.com [52.95.48.154]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D5AF410F6 for ; Sun, 23 Apr 2023 07:50:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1682261438; x=1713797438; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=BzY/r84BdOkLR5Laf3VUtZw1v9+VIlzY1nbaORIv4do=; b=Ft+bz1ZYpTYwc4ZZayec+Y/KR0jzm7Mw90wbGdWcAXregI9OD0zhx9w2 CawEcbQiaPyOHeZmES46Eqwtrd2mEInEY8S2SDoLMKxReOf/vc7TBKpHK v32aTndR7x4kBhCQU33Cai7LiKHmTzLEug6KKjweiKo9JPowdKnHkwi6d 8=; X-IronPort-AV: E=Sophos;i="5.99,220,1677542400"; d="scan'208";a="323881024" Received: from iad12-co-svc-p1-lb1-vlan2.amazon.com (HELO email-inbound-relay-pdx-2c-m6i4x-dc7c3f8b.us-west-2.amazon.com) ([10.43.8.2]) by smtp-border-fw-6001.iad6.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Apr 2023 14:50:34 +0000 Received: from EX19D019EUA002.ant.amazon.com (pdx1-ws-svc-p6-lb9-vlan2.pdx.amazon.com [10.236.137.194]) by email-inbound-relay-pdx-2c-m6i4x-dc7c3f8b.us-west-2.amazon.com (Postfix) with ESMTPS id CD5ACA09C2; Sun, 23 Apr 2023 14:50:32 +0000 (UTC) Received: from EX19D028EUB003.ant.amazon.com (10.252.61.31) by EX19D019EUA002.ant.amazon.com (10.252.50.84) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.26; Sun, 23 Apr 2023 14:50:31 +0000 Received: from u570694869fb251.ant.amazon.com (10.85.143.178) by EX19D028EUB003.ant.amazon.com (10.252.61.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.26; Sun, 23 Apr 2023 14:50:21 +0000 From: Shay Agroskin To: Michal Kubecek , David Miller , Jakub Kicinski , CC: Shay Agroskin , "Woodhouse, David" , "Machulsky, Zorik" , "Matushevsky, Alexander" , Saeed Bshara , "Wilson, Matt" , "Liguori, Anthony" , "Bshara, Nafea" , "Belgazal, Netanel" , "Saidi, Ali" , "Herrenschmidt, Benjamin" , "Kiyanovski, Arthur" , "Dagan, Noam" , "Arinzon, David" , "Itzko, Shahar" , "Abboud, Osama" , Eric Dumazet , Paolo Abeni , Vladimir Oltean , Andrew Lunn , Johannes Berg , Edward Cree , Florian Westphal Subject: [PATCH v2 ethtool-next 1/2] update UAPI header copies Date: Sun, 23 Apr 2023 17:49:47 +0300 Message-ID: <20230423144948.650717-2-shayagr@amazon.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20230423144948.650717-1-shayagr@amazon.com> References: <20230423144948.650717-1-shayagr@amazon.com> MIME-Version: 1.0 X-Originating-IP: [10.85.143.178] X-ClientProxiedBy: EX19D045UWC004.ant.amazon.com (10.13.139.203) To EX19D028EUB003.ant.amazon.com (10.252.61.31) Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: mkubecek+ethtool@suse.cz Update to kernel commit 233eb4e786b5. Signed-off-by: Shay Agroskin --- uapi/linux/ethtool_netlink.h | 2 ++ uapi/linux/rtnetlink.h | 1 + 2 files changed, 3 insertions(+) diff --git a/uapi/linux/ethtool_netlink.h b/uapi/linux/ethtool_netlink.h index 13493c9..cd85de1 100644 --- a/uapi/linux/ethtool_netlink.h +++ b/uapi/linux/ethtool_netlink.h @@ -357,6 +357,8 @@ enum { ETHTOOL_A_RINGS_CQE_SIZE, /* u32 */ ETHTOOL_A_RINGS_TX_PUSH, /* u8 */ ETHTOOL_A_RINGS_RX_PUSH, /* u8 */ + ETHTOOL_A_RINGS_TX_PUSH_BUF_LEN, /* u32 */ + ETHTOOL_A_RINGS_TX_PUSH_BUF_LEN_MAX, /* u32 */ /* add new constants above here */ __ETHTOOL_A_RINGS_CNT, diff --git a/uapi/linux/rtnetlink.h b/uapi/linux/rtnetlink.h index 217b25b..2132e94 100644 --- a/uapi/linux/rtnetlink.h +++ b/uapi/linux/rtnetlink.h @@ -787,6 +787,7 @@ enum { TCA_ROOT_FLAGS, TCA_ROOT_COUNT, TCA_ROOT_TIME_DELTA, /* in msecs */ + TCA_ROOT_EXT_WARN_MSG, __TCA_ROOT_MAX, #define TCA_ROOT_MAX (__TCA_ROOT_MAX - 1) }; From patchwork Sun Apr 23 14:49:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shay Agroskin X-Patchwork-Id: 13221383 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 85688C77B60 for ; Sun, 23 Apr 2023 14:51:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230487AbjDWOvP (ORCPT ); Sun, 23 Apr 2023 10:51:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57780 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230340AbjDWOvK (ORCPT ); Sun, 23 Apr 2023 10:51:10 -0400 Received: from smtp-fw-2101.amazon.com (smtp-fw-2101.amazon.com [72.21.196.25]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 72EBA1700 for ; Sun, 23 Apr 2023 07:50:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1682261449; x=1713797449; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=OsOsTh+zgSAkolWg1uziqSdqMnERI9MyUhCblKCj9os=; b=d7os/PXfy6qXsyWVuQQSi7v50DUZkRT/WmJ4R0/muBvypGXaNrsEa3hE yewLbYDf7OKGSol++TT6AcOzYUMHOV7x8ruCKKGcCsCtOlNv8I5gW79al AEfTvj2wVwq+L9IG3AEifb1+dXL74b54B/DVtYHq6NlX3x1CzduaBBFnk U=; X-IronPort-AV: E=Sophos;i="5.99,220,1677542400"; d="scan'208";a="317383793" Received: from iad12-co-svc-p1-lb1-vlan3.amazon.com (HELO email-inbound-relay-iad-1a-m6i4x-47cc8a4c.us-east-1.amazon.com) ([10.43.8.6]) by smtp-border-fw-2101.iad2.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Apr 2023 14:50:46 +0000 Received: from EX19D017EUA001.ant.amazon.com (iad12-ws-svc-p26-lb9-vlan2.iad.amazon.com [10.40.163.34]) by email-inbound-relay-iad-1a-m6i4x-47cc8a4c.us-east-1.amazon.com (Postfix) with ESMTPS id D886F160CBC; Sun, 23 Apr 2023 14:50:44 +0000 (UTC) Received: from EX19D028EUB003.ant.amazon.com (10.252.61.31) by EX19D017EUA001.ant.amazon.com (10.252.50.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.26; Sun, 23 Apr 2023 14:50:43 +0000 Received: from u570694869fb251.ant.amazon.com (10.85.143.178) by EX19D028EUB003.ant.amazon.com (10.252.61.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.26; Sun, 23 Apr 2023 14:50:33 +0000 From: Shay Agroskin To: Michal Kubecek , David Miller , Jakub Kicinski , CC: Shay Agroskin , "Woodhouse, David" , "Machulsky, Zorik" , "Matushevsky, Alexander" , Saeed Bshara , "Wilson, Matt" , "Liguori, Anthony" , "Bshara, Nafea" , "Belgazal, Netanel" , "Saidi, Ali" , "Herrenschmidt, Benjamin" , "Kiyanovski, Arthur" , "Dagan, Noam" , "Arinzon, David" , "Itzko, Shahar" , "Abboud, Osama" , Eric Dumazet , Paolo Abeni , Vladimir Oltean , Andrew Lunn , Johannes Berg , Edward Cree , Florian Westphal Subject: [PATCH v2 ethtool-next 2/2] ethtool: Add support for configuring tx-push-buf-len Date: Sun, 23 Apr 2023 17:49:48 +0300 Message-ID: <20230423144948.650717-3-shayagr@amazon.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20230423144948.650717-1-shayagr@amazon.com> References: <20230423144948.650717-1-shayagr@amazon.com> MIME-Version: 1.0 X-Originating-IP: [10.85.143.178] X-ClientProxiedBy: EX19D045UWC004.ant.amazon.com (10.13.139.203) To EX19D028EUB003.ant.amazon.com (10.252.61.31) Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: mkubecek+ethtool@suse.cz This attribute, which is part of ethtool's ring param configuration allows the user to specify the maximum number of the packet's payload that can be written directly to the device. Example usage: # ethtool -G [interface] tx-push-buf-len [number of bytes] Signed-off-by: Shay Agroskin --- ethtool.8.in | 5 +++++ ethtool.c | 1 + netlink/desc-ethtool.c | 2 ++ netlink/rings.c | 38 ++++++++++++++++++++++++-------------- 4 files changed, 32 insertions(+), 14 deletions(-) diff --git a/ethtool.8.in b/ethtool.8.in index 3672e44..f068258 100644 --- a/ethtool.8.in +++ b/ethtool.8.in @@ -202,6 +202,7 @@ ethtool \- query or control network driver and hardware settings .BN cqe\-size .BN tx\-push .BN rx\-push +.BN tx\-push\-buf\-len .HP .B ethtool \-i|\-\-driver .I devname @@ -625,6 +626,10 @@ Specifies whether TX push should be enabled. .TP .BI rx\-push \ on|off Specifies whether RX push should be enabled. +.TP +.BI tx\-push\-buf\-len \ N +Specifies the maximum number of bytes of a transmitted packet a driver can push +directly to the underlying device .RE .TP .B \-i \-\-driver diff --git a/ethtool.c b/ethtool.c index 6022a6e..ea79529 100644 --- a/ethtool.c +++ b/ethtool.c @@ -5751,6 +5751,7 @@ static const struct option args[] = { " [ cqe-size N ]\n" " [ tx-push on|off ]\n" " [ rx-push on|off ]\n" + " [ tx-push-buf-len N]\n" }, { .opts = "-k|--show-features|--show-offload", diff --git a/netlink/desc-ethtool.c b/netlink/desc-ethtool.c index 2d8aa39..c79ba3a 100644 --- a/netlink/desc-ethtool.c +++ b/netlink/desc-ethtool.c @@ -159,6 +159,8 @@ static const struct pretty_nla_desc __rings_desc[] = { NLATTR_DESC_U32(ETHTOOL_A_RINGS_CQE_SIZE), NLATTR_DESC_BOOL(ETHTOOL_A_RINGS_TX_PUSH), NLATTR_DESC_BOOL(ETHTOOL_A_RINGS_RX_PUSH), + NLATTR_DESC_U32(ETHTOOL_A_RINGS_TX_PUSH_BUF_LEN), + NLATTR_DESC_U32(ETHTOOL_A_RINGS_TX_PUSH_BUF_LEN_MAX), }; static const struct pretty_nla_desc __channels_desc[] = { diff --git a/netlink/rings.c b/netlink/rings.c index 57bfb36..51d28c2 100644 --- a/netlink/rings.c +++ b/netlink/rings.c @@ -44,22 +44,26 @@ int rings_reply_cb(const struct nlmsghdr *nlhdr, void *data) print_string(PRINT_ANY, "ifname", "Ring parameters for %s:\n", nlctx->devname); print_string(PRINT_FP, NULL, "Pre-set maximums:\n", NULL); - show_u32("rx-max", "RX:\t\t", tb[ETHTOOL_A_RINGS_RX_MAX]); - show_u32("rx-mini-max", "RX Mini:\t", tb[ETHTOOL_A_RINGS_RX_MINI_MAX]); - show_u32("rx-jumbo-max", "RX Jumbo:\t", + show_u32("rx-max", "RX:\t\t\t", tb[ETHTOOL_A_RINGS_RX_MAX]); + show_u32("rx-mini-max", "RX Mini:\t\t", tb[ETHTOOL_A_RINGS_RX_MINI_MAX]); + show_u32("rx-jumbo-max", "RX Jumbo:\t\t", tb[ETHTOOL_A_RINGS_RX_JUMBO_MAX]); - show_u32("tx-max", "TX:\t\t", tb[ETHTOOL_A_RINGS_TX_MAX]); + show_u32("tx-max", "TX:\t\t\t", tb[ETHTOOL_A_RINGS_TX_MAX]); + show_u32("tx-push-buff-max-len", "TX push buff len:\t", + tb[ETHTOOL_A_RINGS_TX_PUSH_BUF_LEN_MAX]); print_string(PRINT_FP, NULL, "Current hardware settings:\n", NULL); - show_u32("rx", "RX:\t\t", tb[ETHTOOL_A_RINGS_RX]); - show_u32("rx-mini", "RX Mini:\t", tb[ETHTOOL_A_RINGS_RX_MINI]); - show_u32("rx-jumbo", "RX Jumbo:\t", tb[ETHTOOL_A_RINGS_RX_JUMBO]); - show_u32("tx", "TX:\t\t", tb[ETHTOOL_A_RINGS_TX]); - show_u32("rx-buf-len", "RX Buf Len:\t", tb[ETHTOOL_A_RINGS_RX_BUF_LEN]); - show_u32("cqe-size", "CQE Size:\t", tb[ETHTOOL_A_RINGS_CQE_SIZE]); - show_bool("tx-push", "TX Push:\t%s\n", tb[ETHTOOL_A_RINGS_TX_PUSH]); - show_bool("rx-push", "RX Push:\t%s\n", tb[ETHTOOL_A_RINGS_RX_PUSH]); - - tcp_hds_fmt = "TCP data split:\t%s\n"; + show_u32("rx", "RX:\t\t\t", tb[ETHTOOL_A_RINGS_RX]); + show_u32("rx-mini", "RX Mini:\t\t", tb[ETHTOOL_A_RINGS_RX_MINI]); + show_u32("rx-jumbo", "RX Jumbo:\t\t", tb[ETHTOOL_A_RINGS_RX_JUMBO]); + show_u32("tx", "TX:\t\t\t", tb[ETHTOOL_A_RINGS_TX]); + show_u32("rx-buf-len", "RX Buf Len:\t\t", tb[ETHTOOL_A_RINGS_RX_BUF_LEN]); + show_u32("cqe-size", "CQE Size:\t\t", tb[ETHTOOL_A_RINGS_CQE_SIZE]); + show_bool("tx-push", "TX Push:\t\t%s\n", tb[ETHTOOL_A_RINGS_TX_PUSH]); + show_bool("rx-push", "RX Push:\t\t%s\n", tb[ETHTOOL_A_RINGS_RX_PUSH]); + show_u32("tx-push-buf-len", "TX push buff len:\t", + tb[ETHTOOL_A_RINGS_TX_PUSH_BUF_LEN]); + + tcp_hds_fmt = "TCP data split:\t\t%s\n"; tcp_hds_key = "tcp-data-split"; tcp_hds = tb[ETHTOOL_A_RINGS_TCP_DATA_SPLIT] ? mnl_attr_get_u8(tb[ETHTOOL_A_RINGS_TCP_DATA_SPLIT]) : 0; @@ -137,6 +141,12 @@ static const struct param_parser sring_params[] = { .handler = nl_parse_direct_u32, .min_argc = 1, }, + { + .arg = "tx-push-buf-len", + .type = ETHTOOL_A_RINGS_TX_PUSH_BUF_LEN, + .handler = nl_parse_direct_u32, + .min_argc = 1, + }, { .arg = "rx-buf-len", .type = ETHTOOL_A_RINGS_RX_BUF_LEN,