ethtool: provide pause parameters with PAUSE_GET request (7f59fb32) · Commits · 戴 / test

Documentation/networking/ethtool-netlink.rst

+39 −1

Original line number	Diff line number	Diff line
		@@ -199,6 +199,7 @@ Userspace to kernel:
		``ETHTOOL_MSG_CHANNELS_SET`` set channel counts
		``ETHTOOL_MSG_COALESCE_GET`` get coalescing parameters
		``ETHTOOL_MSG_COALESCE_SET`` set coalescing parameters
		``ETHTOOL_MSG_PAUSE_GET`` get pause parameters
		===================================== ================================

		Kernel to userspace:
		@@ -225,6 +226,7 @@ Kernel to userspace:
		``ETHTOOL_MSG_CHANNELS_NTF`` channel counts
		``ETHTOOL_MSG_COALESCE_GET_REPLY`` coalescing parameters
		``ETHTOOL_MSG_COALESCE_NTF`` coalescing parameters
		``ETHTOOL_MSG_PAUSE_GET_REPLY`` pause parameters
		===================================== =================================

		``GET`` requests are sent by userspace applications to retrieve device
		@@ -832,6 +834,42 @@ is not set), regardless of their values. Driver may impose additional
		constraints on coalescing parameters and their values.


		PAUSE_GET
		============

		Gets channel counts like ``ETHTOOL_GPAUSE`` ioctl request.

		Request contents:

		===================================== ====== ==========================
		``ETHTOOL_A_PAUSE_HEADER`` nested request header
		===================================== ====== ==========================

		Kernel response contents:

		===================================== ====== ==========================
		``ETHTOOL_A_PAUSE_HEADER`` nested request header
		``ETHTOOL_A_PAUSE_AUTONEG`` bool pause autonegotiation
		``ETHTOOL_A_PAUSE_RX`` bool receive pause frames
		``ETHTOOL_A_PAUSE_TX`` bool transmit pause frames
		===================================== ====== ==========================


		PAUSE_SET
		============

		Sets pause parameters like ``ETHTOOL_GPAUSEPARAM`` ioctl request.

		Request contents:

		===================================== ====== ==========================
		``ETHTOOL_A_PAUSE_HEADER`` nested request header
		``ETHTOOL_A_PAUSE_AUTONEG`` bool pause autonegotiation
		``ETHTOOL_A_PAUSE_RX`` bool receive pause frames
		``ETHTOOL_A_PAUSE_TX`` bool transmit pause frames
		===================================== ====== ==========================


		Request translation
		===================

		@@ -860,7 +898,7 @@ have their netlink replacement yet.
		``ETHTOOL_SCOALESCE`` ``ETHTOOL_MSG_COALESCE_SET``
		``ETHTOOL_GRINGPARAM`` ``ETHTOOL_MSG_RINGS_GET``
		``ETHTOOL_SRINGPARAM`` ``ETHTOOL_MSG_RINGS_SET``
		``ETHTOOL_GPAUSEPARAM`` n/a
		``ETHTOOL_GPAUSEPARAM`` ``ETHTOOL_MSG_PAUSE_GET``
		``ETHTOOL_SPAUSEPARAM`` n/a
		``ETHTOOL_GRXCSUM`` ``ETHTOOL_MSG_FEATURES_GET``
		``ETHTOOL_SRXCSUM`` ``ETHTOOL_MSG_FEATURES_SET``

include/uapi/linux/ethtool_netlink.h

+16 −0

Original line number	Diff line number	Diff line
		@@ -34,6 +34,7 @@ enum {
		ETHTOOL_MSG_CHANNELS_SET,
		ETHTOOL_MSG_COALESCE_GET,
		ETHTOOL_MSG_COALESCE_SET,
		ETHTOOL_MSG_PAUSE_GET,

		/* add new constants above here */
		__ETHTOOL_MSG_USER_CNT,
		@@ -64,6 +65,7 @@ enum {
		ETHTOOL_MSG_CHANNELS_NTF,
		ETHTOOL_MSG_COALESCE_GET_REPLY,
		ETHTOOL_MSG_COALESCE_NTF,
		ETHTOOL_MSG_PAUSE_GET_REPLY,

		/* add new constants above here */
		__ETHTOOL_MSG_KERNEL_CNT,
		@@ -347,6 +349,20 @@ enum {
		ETHTOOL_A_COALESCE_MAX = (__ETHTOOL_A_COALESCE_CNT - 1)
		};

		/* PAUSE */

		enum {
		ETHTOOL_A_PAUSE_UNSPEC,
		ETHTOOL_A_PAUSE_HEADER, /* nest - _A_HEADER_* */
		ETHTOOL_A_PAUSE_AUTONEG, /* u8 */
		ETHTOOL_A_PAUSE_RX, /* u8 */
		ETHTOOL_A_PAUSE_TX, /* u8 */

		/* add new constants above here */
		__ETHTOOL_A_PAUSE_CNT,
		ETHTOOL_A_PAUSE_MAX = (__ETHTOOL_A_PAUSE_CNT - 1)
		};

		/* generic netlink info */
		#define ETHTOOL_GENL_NAME "ethtool"
		#define ETHTOOL_GENL_VERSION 1

net/ethtool/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -6,4 +6,4 @@ obj-$(CONFIG_ETHTOOL_NETLINK) += ethtool_nl.o

		ethtool_nl-y := netlink.o bitset.o strset.o linkinfo.o linkmodes.o \
		linkstate.o debug.o wol.o features.o privflags.o rings.o \
		channels.o coalesce.o
		channels.o coalesce.o pause.o

net/ethtool/netlink.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -228,6 +228,7 @@ ethnl_default_requests[__ETHTOOL_MSG_USER_CNT] = {
		[ETHTOOL_MSG_RINGS_GET] = &ethnl_rings_request_ops,
		[ETHTOOL_MSG_CHANNELS_GET] = &ethnl_channels_request_ops,
		[ETHTOOL_MSG_COALESCE_GET] = &ethnl_coalesce_request_ops,
		[ETHTOOL_MSG_PAUSE_GET] = &ethnl_pause_request_ops,
		};

		static struct ethnl_dump_ctx ethnl_dump_context(struct netlink_callback cb)
		@@ -801,6 +802,13 @@ static const struct genl_ops ethtool_genl_ops[] = {
		.flags = GENL_UNS_ADMIN_PERM,
		.doit = ethnl_set_coalesce,
		},
		{
		.cmd = ETHTOOL_MSG_PAUSE_GET,
		.doit = ethnl_default_doit,
		.start = ethnl_default_start,
		.dumpit = ethnl_default_dumpit,
		.done = ethnl_default_done,
		},
		};

		static const struct genl_multicast_group ethtool_nl_mcgrps[] = {

net/ethtool/netlink.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -342,6 +342,7 @@ extern const struct ethnl_request_ops ethnl_privflags_request_ops;
		extern const struct ethnl_request_ops ethnl_rings_request_ops;
		extern const struct ethnl_request_ops ethnl_channels_request_ops;
		extern const struct ethnl_request_ops ethnl_coalesce_request_ops;
		extern const struct ethnl_request_ops ethnl_pause_request_ops;

		int ethnl_set_linkinfo(struct sk_buff skb, struct genl_info info);
		int ethnl_set_linkmodes(struct sk_buff skb, struct genl_info info);

Admin message