[openwrt/openwrt] kernel: backport ethtool_puts
LEDE Commits
lede-commits at lists.infradead.org
Wed Jan 31 02:59:43 PST 2024
rmilecki pushed a commit to openwrt/openwrt.git, branch openwrt-23.05:
https://git.openwrt.org/6d962cabba812edcc7fed7124b902898eb495bc2
commit 6d962cabba812edcc7fed7124b902898eb495bc2
Author: Rosen Penev <rosenp at gmail.com>
AuthorDate: Sat Dec 16 17:12:33 2023 -0800
kernel: backport ethtool_puts
Will be used for conversions in later commits and is a requirement for
PHY backports.
Signed-off-by: Rosen Penev <rosenp at gmail.com>
[rmilecki: update commit message for 23.05]
Signed-off-by: Rafał Miłecki <rafal at milecki.pl>
(cherry picked from commit 511c7ff03231752ea2adbdf7cc1af4be962c9b65)
---
...4-v6.8-net-ethtool-implement-ethtool_puts.patch | 139 +++++++++++++++++++++
1 file changed, 139 insertions(+)
diff --git a/target/linux/generic/backport-5.15/894-v6.8-net-ethtool-implement-ethtool_puts.patch b/target/linux/generic/backport-5.15/894-v6.8-net-ethtool-implement-ethtool_puts.patch
new file mode 100644
index 0000000000..ef9e706cb4
--- /dev/null
+++ b/target/linux/generic/backport-5.15/894-v6.8-net-ethtool-implement-ethtool_puts.patch
@@ -0,0 +1,139 @@
+From mboxrd at z Thu Jan 1 00:00:00 1970
+Authentication-Results: smtp.subspace.kernel.org;
+ dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="sMUeie/T"
+Received: from mail-yb1-xb49.google.com (mail-yb1-xb49.google.com [IPv6:2607:f8b0:4864:20::b49])
+ by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 84BB8D6D
+ for <bpf at vger.kernel.org>; Wed, 6 Dec 2023 15:16:16 -0800 (PST)
+Received: by mail-yb1-xb49.google.com with SMTP id 3f1490d57ef6-db5416d0fccso403298276.1
+ for <bpf at vger.kernel.org>; Wed, 06 Dec 2023 15:16:16 -0800 (PST)
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
+ d=google.com; s=20230601; t=1701904575; x=1702509375; darn=vger.kernel.org;
+ h=cc:to:from:subject:message-id:references:mime-version:in-reply-to
+ :date:from:to:cc:subject:date:message-id:reply-to;
+ bh=/7eYcPC4ZNNyPcPPs0B5tDplF0arxw3r0vINNNou0rY=;
+ b=sMUeie/TxdytzC0EyT11QWi1TqTtiv7KCTs1F2vLmUUvPKNA3+1MHFo8ECW+0gQuDE
+ FGrgdZKGK5mXQgkF0N3JiSLvKO8tpQOIB57JLCG5IVy5dr2vVv0ExU3Dag2Cc4oBIBIO
+ w/cH95O1oPlvluIpATmAsxenVr7mFomU63BqYiRGLaEhWeb2hJ636GO8lubtsDfdFFoi
+ GPOL2tQwV93VnqmywBBpFaNAULN0UoCFhfkKv5prvpkXq19sWI7zyorVZ+rdTYem5m4T
+ dXsDaLXPtC3Dh2JOad1duSQIah/wCHYYUcV3IoFhwj2y0Uk/TTCrnZPORweSADcEy6Ho
+ vDrA==
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
+ d=1e100.net; s=20230601; t=1701904575; x=1702509375;
+ h=cc:to:from:subject:message-id:references:mime-version:in-reply-to
+ :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to;
+ bh=/7eYcPC4ZNNyPcPPs0B5tDplF0arxw3r0vINNNou0rY=;
+ b=Dmc6aSntxPlxAk72zVO1G9WoZnFtLolxENlLscYYAHG3VE+PQ8gGN2rPzcGoKb2Btb
+ 4b0PvjOzSlPQyghahdhdlz04RtAeeGG/MkfNiYjFql5OifIoovb51kroiPYrVsa7Ps7Y
+ +Pxug0+NPdTm5s9TNz940ZKl3GRME8UTmVxpWJRX03XMOqb6Wgsh2SK9ahXKc4yRsi62
+ 3a3J72WmmSgvimxwM/99fXwvoUQpiv2J1xCoqc1Ng4q4qSuZvzmHN7ZTGaUhLxOqLeLK
+ 3W4RKHW6rZ7UjppuB6I3NXW+D344By2rdKp1sRXpjdQ0GS3YUcvlRETcJBXJudHfQP5Y
+ CLOw==
+X-Gm-Message-State: AOJu0YzdCTLdwny+N99zeMgyKqFsEZhfIhL2cbgKA6zC1U/OLkxxRLoM
+ XrYVBC9DmxCGmP4o+M/Z/kHUew/9faHlCiLGxw==
+X-Google-Smtp-Source: AGHT+IFRXxBV6JuX5Cl/k2o1+WKkCwkR8j20MJSkmoGCedPAtqFttH8OVh1/6vdfnq8MPN++A2h89peZQhyG8OsJ8A==
+X-Received: from jstitt-linux1.c.googlers.com ([fda3:e722:ac3:cc00:2b:ff92:c0a8:23b5])
+ (user=justinstitt job=sendgmr) by 2002:a25:dac7:0:b0:da0:3117:f35 with SMTP
+ id n190-20020a25dac7000000b00da031170f35mr28652ybf.3.1701904575576; Wed, 06
+ Dec 2023 15:16:15 -0800 (PST)
+Date: Wed, 06 Dec 2023 23:16:10 +0000
+In-Reply-To: <20231206-ethtool_puts_impl-v5-0-5a2528e17bf8 at google.com>
+Precedence: bulk
+X-Mailing-List: bpf at vger.kernel.org
+List-Id: <bpf.vger.kernel.org>
+List-Subscribe: <mailto:bpf+subscribe at vger.kernel.org>
+List-Unsubscribe: <mailto:bpf+unsubscribe at vger.kernel.org>
+Mime-Version: 1.0
+References: <20231206-ethtool_puts_impl-v5-0-5a2528e17bf8 at google.com>
+X-Developer-Key: i=justinstitt at google.com; a=ed25519; pk=tC3hNkJQTpNX/gLKxTNQKDmiQl6QjBNCGKJINqAdJsE=
+X-Developer-Signature: v=1; a=ed25519-sha256; t=1701904573; l=1840;
+ i=justinstitt at google.com; s=20230717; h=from:subject:message-id;
+ bh=UMdetIL2ZsPIkSodqhw2fM21NHJVjCu0lRImFuNhVoM=; b=a8rMnXfVVQ5gsxHWG4WRMwOLxZgflqXZtNuKx26vv4DwYvvCtCiYjl3f1frOjV/Ul2kaxq5g/
+ b/UOv678JKCDASVokxG5GJifAnU7/kqRxdhcwfRkrD8RUfcsmiZOfyF
+X-Mailer: b4 0.12.3
+Message-ID: <20231206-ethtool_puts_impl-v5-1-5a2528e17bf8 at google.com>
+Subject: [PATCH net-next v5 1/3] ethtool: Implement ethtool_puts()
+From: justinstitt at google.com
+To: "David S. Miller" <davem at davemloft.net>, Eric Dumazet <edumazet at google.com>,
+ Jakub Kicinski <kuba at kernel.org>, Paolo Abeni <pabeni at redhat.com>, Shay Agroskin <shayagr at amazon.com>,
+ Arthur Kiyanovski <akiyano at amazon.com>, David Arinzon <darinzon at amazon.com>, Noam Dagan <ndagan at amazon.com>,
+ Saeed Bishara <saeedb at amazon.com>, Rasesh Mody <rmody at marvell.com>,
+ Sudarsana Kalluru <skalluru at marvell.com>, GR-Linux-NIC-Dev at marvell.com,
+ Dimitris Michailidis <dmichail at fungible.com>, Yisen Zhuang <yisen.zhuang at huawei.com>,
+ Salil Mehta <salil.mehta at huawei.com>, Jesse Brandeburg <jesse.brandeburg at intel.com>,
+ Tony Nguyen <anthony.l.nguyen at intel.com>, Louis Peens <louis.peens at corigine.com>,
+ Shannon Nelson <shannon.nelson at amd.com>, Brett Creeley <brett.creeley at amd.com>, drivers at pensando.io,
+ "K. Y. Srinivasan" <kys at microsoft.com>, Haiyang Zhang <haiyangz at microsoft.com>, Wei Liu <wei.liu at kernel.org>,
+ Dexuan Cui <decui at microsoft.com>, Ronak Doshi <doshir at vmware.com>,
+ VMware PV-Drivers Reviewers <pv-drivers at vmware.com>, Andy Whitcroft <apw at canonical.com>, Joe Perches <joe at perches.com>,
+ Dwaipayan Ray <dwaipayanray1 at gmail.com>, Lukas Bulwahn <lukas.bulwahn at gmail.com>,
+ Hauke Mehrtens <hauke at hauke-m.de>, Andrew Lunn <andrew at lunn.ch>,
+ Florian Fainelli <f.fainelli at gmail.com>, Vladimir Oltean <olteanv at gmail.com>,
+ "=?utf-8?q?Ar=C4=B1n=C3=A7_=C3=9CNAL?=" <arinc.unal at arinc9.com>, Daniel Golle <daniel at makrotopia.org>,
+ Landen Chao <Landen.Chao at mediatek.com>, DENG Qingfang <dqfext at gmail.com>,
+ Sean Wang <sean.wang at mediatek.com>, Matthias Brugger <matthias.bgg at gmail.com>,
+ AngeloGioacchino Del Regno <angelogioacchino.delregno at collabora.com>,
+ Linus Walleij <linus.walleij at linaro.org>,
+ "=?utf-8?q?Alvin_=C5=A0ipraga?=" <alsi at bang-olufsen.dk>, Wei Fang <wei.fang at nxp.com>,
+ Shenwei Wang <shenwei.wang at nxp.com>, Clark Wang <xiaoning.wang at nxp.com>,
+ NXP Linux Team <linux-imx at nxp.com>, Lars Povlsen <lars.povlsen at microchip.com>,
+ Steen Hegelund <Steen.Hegelund at microchip.com>, Daniel Machon <daniel.machon at microchip.com>,
+ UNGLinuxDriver at microchip.com, Jiawen Wu <jiawenwu at trustnetic.com>,
+ Mengyuan Lou <mengyuanlou at net-swift.com>, Heiner Kallweit <hkallweit1 at gmail.com>,
+ Russell King <linux at armlinux.org.uk>, Alexei Starovoitov <ast at kernel.org>,
+ Daniel Borkmann <daniel at iogearbox.net>, Jesper Dangaard Brouer <hawk at kernel.org>,
+ John Fastabend <john.fastabend at gmail.com>
+Cc: linux-kernel at vger.kernel.org, netdev at vger.kernel.org,
+ Nick Desaulniers <ndesaulniers at google.com>, Nathan Chancellor <nathan at kernel.org>,
+ Kees Cook <keescook at chromium.org>, intel-wired-lan at lists.osuosl.org,
+ oss-drivers at corigine.com, linux-hyperv at vger.kernel.org,
+ linux-arm-kernel at lists.infradead.org, linux-mediatek at lists.infradead.org,
+ bpf at vger.kernel.org, Justin Stitt <justinstitt at google.com>
+Content-Type: text/plain; charset="utf-8"
+
+Use strscpy() to implement ethtool_puts().
+
+Functionally the same as ethtool_sprintf() when it's used with two
+arguments or with just "%s" format specifier.
+
+Signed-off-by: Justin Stitt <justinstitt at google.com>
+---
+ include/linux/ethtool.h | 13 +++++++++++++
+ net/ethtool/ioctl.c | 7 +++++++
+ 2 files changed, 20 insertions(+)
+
+--- a/include/linux/ethtool.h
++++ b/include/linux/ethtool.h
+@@ -788,4 +788,17 @@ int ethtool_get_phc_vclocks(struct net_d
+ * next string.
+ */
+ extern __printf(2, 3) void ethtool_sprintf(u8 **data, const char *fmt, ...);
++
++/**
++ * ethtool_puts - Write string to ethtool string data
++ * @data: Pointer to a pointer to the start of string to update
++ * @str: String to write
++ *
++ * Write string to *data without a trailing newline. Update *data
++ * to point at start of next string.
++ *
++ * Prefer this function to ethtool_sprintf() when given only
++ * two arguments or if @fmt is just "%s".
++ */
++extern void ethtool_puts(u8 **data, const char *str);
+ #endif /* _LINUX_ETHTOOL_H */
+--- a/net/ethtool/ioctl.c
++++ b/net/ethtool/ioctl.c
+@@ -1953,6 +1953,13 @@ __printf(2, 3) void ethtool_sprintf(u8 *
+ }
+ EXPORT_SYMBOL(ethtool_sprintf);
+
++void ethtool_puts(u8 **data, const char *str)
++{
++ strscpy(*data, str, ETH_GSTRING_LEN);
++ *data += ETH_GSTRING_LEN;
++}
++EXPORT_SYMBOL(ethtool_puts);
++
+ static int ethtool_phys_id(struct net_device *dev, void __user *useraddr)
+ {
+ struct ethtool_value id;
More information about the lede-commits
mailing list