Commit e4a1717b authored by Michal Kubecek's avatar Michal Kubecek Committed by David S. Miller
Browse files

ethtool: provide ring sizes with RINGS_GET request 



Implement RINGS_GET request to get ring sizes of a network device. These
are traditionally available via ETHTOOL_GRINGPARAM ioctl request.

Omit attributes for ring types which are not supported by driver or device
(zero reported for maximum).

v2: (all suggested by Jakub Kicinski)
  - minor cleanup in rings_prepare_data()
  - more descriptive rings_reply_size()
  - omit attributes with zero max size

Signed-off-by: default avatarMichal Kubecek <mkubecek@suse.cz>
Reviewed-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 111dcba3

Documentation/networking/ethtool-netlink.rst

+29 −1
Original line number Diff line number Diff line
@@ -193,6 +193,7 @@ Userspace to kernel: 
  ``ETHTOOL_MSG_FEATURES_SET``          set device features

  ``ETHTOOL_MSG_PRIVFLAGS_GET``         get private flags

  ``ETHTOOL_MSG_PRIVFLAGS_SET``         set private flags

  ``ETHTOOL_MSG_RINGS_GET``             get ring sizes

  ===================================== ================================



Kernel to userspace:
@@ -213,6 +214,7 @@ Kernel to userspace: 
  ``ETHTOOL_MSG_FEATURES_NTF``          netdev features notification

  ``ETHTOOL_MSG_PRIVFLAGS_GET_REPLY``   private flags

  ``ETHTOOL_MSG_PRIVFLAGS_NTF``         private flags

  ``ETHTOOL_MSG_RINGS_GET_REPLY``       ring sizes

  ===================================== =================================



``GET`` requests are sent by userspace applications to retrieve device
@@ -645,6 +647,32 @@ Request contents: 
modify only values of some of them.





RINGS_GET

=========



Gets ring sizes like ``ETHTOOL_GRINGPARAM`` ioctl request.



Request contents:



  ====================================  ======  ==========================

  ``ETHTOOL_A_RINGS_HEADER``            nested  request header

  ====================================  ======  ==========================



Kernel response contents:



  ====================================  ======  ==========================

  ``ETHTOOL_A_RINGS_HEADER``            nested  reply header

  ``ETHTOOL_A_RINGS_RX_MAX``            u32     max size of RX ring

  ``ETHTOOL_A_RINGS_RX_MINI_MAX``       u32     max size of RX mini ring

  ``ETHTOOL_A_RINGS_RX_JUMBO_MAX``      u32     max size of RX jumbo ring

  ``ETHTOOL_A_RINGS_TX_MAX``            u32     max size of TX ring

  ``ETHTOOL_A_RINGS_RX``                u32     size of RX ring

  ``ETHTOOL_A_RINGS_RX_MINI``           u32     size of RX mini ring

  ``ETHTOOL_A_RINGS_RX_JUMBO``          u32     size of RX jumbo ring

  ``ETHTOOL_A_RINGS_TX``                u32     size of TX ring

  ====================================  ======  ==========================





Request translation

===================
@@ -671,7 +699,7 @@ have their netlink replacement yet. 
  ``ETHTOOL_SEEPROM``                 n/a

  ``ETHTOOL_GCOALESCE``               n/a

  ``ETHTOOL_SCOALESCE``               n/a

  ``ETHTOOL_GRINGPARAM``              n/a

  ``ETHTOOL_GRINGPARAM``              ``ETHTOOL_MSG_RINGS_GET``

  ``ETHTOOL_SRINGPARAM``              n/a

  ``ETHTOOL_GPAUSEPARAM``             n/a

  ``ETHTOOL_SPAUSEPARAM``             n/a

include/uapi/linux/ethtool_netlink.h

+21 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ enum { 
	ETHTOOL_MSG_FEATURES_SET,

	ETHTOOL_MSG_PRIVFLAGS_GET,

	ETHTOOL_MSG_PRIVFLAGS_SET,

	ETHTOOL_MSG_RINGS_GET,



	/* add new constants above here */

	__ETHTOOL_MSG_USER_CNT,
@@ -52,6 +53,7 @@ enum { 
	ETHTOOL_MSG_FEATURES_NTF,

	ETHTOOL_MSG_PRIVFLAGS_GET_REPLY,

	ETHTOOL_MSG_PRIVFLAGS_NTF,

	ETHTOOL_MSG_RINGS_GET_REPLY,



	/* add new constants above here */

	__ETHTOOL_MSG_KERNEL_CNT,
@@ -264,6 +266,25 @@ enum { 
	ETHTOOL_A_PRIVFLAGS_MAX = __ETHTOOL_A_PRIVFLAGS_CNT - 1

};



/* RINGS */



enum {

	ETHTOOL_A_RINGS_UNSPEC,

	ETHTOOL_A_RINGS_HEADER,				/* nest - _A_HEADER_* */

	ETHTOOL_A_RINGS_RX_MAX,				/* u32 */

	ETHTOOL_A_RINGS_RX_MINI_MAX,			/* u32 */

	ETHTOOL_A_RINGS_RX_JUMBO_MAX,			/* u32 */

	ETHTOOL_A_RINGS_TX_MAX,				/* u32 */

	ETHTOOL_A_RINGS_RX,				/* u32 */

	ETHTOOL_A_RINGS_RX_MINI,			/* u32 */

	ETHTOOL_A_RINGS_RX_JUMBO,			/* u32 */

	ETHTOOL_A_RINGS_TX,				/* u32 */



	/* add new constants above here */

	__ETHTOOL_A_RINGS_CNT,

	ETHTOOL_A_RINGS_MAX = (__ETHTOOL_A_RINGS_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
@@ -5,4 +5,4 @@ obj-y += ioctl.o common.o 
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
 
		   linkstate.o debug.o wol.o features.o privflags.o rings.o

net/ethtool/netlink.c

+8 −0
Original line number Diff line number Diff line
@@ -217,6 +217,7 @@ ethnl_default_requests[__ETHTOOL_MSG_USER_CNT] = { 
	[ETHTOOL_MSG_WOL_GET]		= &ethnl_wol_request_ops,

	[ETHTOOL_MSG_FEATURES_GET]	= &ethnl_features_request_ops,

	[ETHTOOL_MSG_PRIVFLAGS_GET]	= &ethnl_privflags_request_ops,

	[ETHTOOL_MSG_RINGS_GET]		= &ethnl_rings_request_ops,

};



static struct ethnl_dump_ctx *ethnl_dump_context(struct netlink_callback *cb)
@@ -748,6 +749,13 @@ static const struct genl_ops ethtool_genl_ops[] = { 
		.flags	= GENL_UNS_ADMIN_PERM,

		.doit	= ethnl_set_privflags,

	},

	{

		.cmd	= ETHTOOL_MSG_RINGS_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
@@ -339,6 +339,7 @@ extern const struct ethnl_request_ops ethnl_debug_request_ops; 
extern const struct ethnl_request_ops ethnl_wol_request_ops;

extern const struct ethnl_request_ops ethnl_features_request_ops;

extern const struct ethnl_request_ops ethnl_privflags_request_ops;

extern const struct ethnl_request_ops ethnl_rings_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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE