| Message ID | 20231102-ethtool_puts_impl-v4-1-14e1e9278496@google.com (mailing list archive) |
|---|---|
| State | Deferred |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | ethtool: Add ethtool_puts() | expand |
On Thu, Nov 02, 2023 at 06:55:42PM +0000, Justin Stitt wrote: > +/** > + * 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. Update *data to point at start of > + * next string. A minor nit... Sorry to jump in a bit late in this, but... concerning the use of "puts" the userspace stdio version adds a trailing newline. Thus, to avoid any confusion, I think the kerneldoc for this should explicitly state that this does not add a newline. * Write string to *data without a trailing newline. Update *data to * point at the start of the next string. This shouldn't be an issue, but it makes the behaviour of it plainly obvious to the reader.
diff --git a/include/linux/ethtool.h b/include/linux/ethtool.h index 226a36ed5aa1..7fc0826d443f 100644 --- a/include/linux/ethtool.h +++ b/include/linux/ethtool.h @@ -1053,6 +1053,19 @@ static inline int ethtool_mm_frag_size_min_to_add(u32 val_min, u32 *val_add, */ 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. 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); + /* Link mode to forced speed capabilities maps */ struct ethtool_forced_speed_map { u32 speed; diff --git a/net/ethtool/ioctl.c b/net/ethtool/ioctl.c index 0b0ce4f81c01..abdf05edf804 100644 --- a/net/ethtool/ioctl.c +++ b/net/ethtool/ioctl.c @@ -1991,6 +1991,13 @@ __printf(2, 3) void ethtool_sprintf(u8 **data, const char *fmt, ...) } 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;
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@google.com> --- include/linux/ethtool.h | 13 +++++++++++++ net/ethtool/ioctl.c | 7 +++++++ 2 files changed, 20 insertions(+)