Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ac2c7ad0 authored by Kan Liang's avatar Kan Liang Committed by David S. Miller
Browse files

net/ethtool: introduce a new ioctl for per queue setting 



Introduce a new ioctl ETHTOOL_PERQUEUE for per queue parameters setting.
The following patches will enable some SUB_COMMANDs for per queue
setting.

Signed-off-by: default avatarKan Liang <kan.liang@intel.com>
Reviewed-by: default avatarBen Hutchings <ben@decadent.org.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5fd003f5

include/uapi/linux/ethtool.h

+17 −0
Original line number Diff line number Diff line
@@ -1202,6 +1202,21 @@ enum ethtool_sfeatures_retval_bits { 
#define ETHTOOL_F_WISH          (1 << ETHTOOL_F_WISH__BIT)

#define ETHTOOL_F_COMPAT        (1 << ETHTOOL_F_COMPAT__BIT)



#define MAX_NUM_QUEUE		4096



/**

 * struct ethtool_per_queue_op - apply sub command to the queues in mask.

 * @cmd: ETHTOOL_PERQUEUE

 * @sub_command: the sub command which apply to each queues

 * @queue_mask: Bitmap of the queues which sub command apply to

 * @data: A complete command structure following for each of the queues addressed

 */

struct ethtool_per_queue_op {

	__u32	cmd;

	__u32	sub_command;

	__u32	queue_mask[DIV_ROUND_UP(MAX_NUM_QUEUE, 32)];

	char	data[];

};



/* CMDs currently supported */

#define ETHTOOL_GSET		0x00000001 /* Get settings. */
@@ -1285,6 +1300,8 @@ enum ethtool_sfeatures_retval_bits { 
#define ETHTOOL_STUNABLE	0x00000049 /* Set tunable configuration */

#define ETHTOOL_GPHYSTATS	0x0000004a /* get PHY-specific statistics */



#define ETHTOOL_PERQUEUE	0x0000004b /* Set per queue options */



/* compatibility with older code */

#define SPARC_ETH_GSET		ETHTOOL_GSET

#define SPARC_ETH_SSET		ETHTOOL_SSET

net/core/ethtool.c

+25 −2
Original line number Diff line number Diff line
@@ -1888,13 +1888,27 @@ static int ethtool_set_tunable(struct net_device *dev, void __user *useraddr) 
	return ret;

}



static int ethtool_set_per_queue(struct net_device *dev, void __user *useraddr)

{

	struct ethtool_per_queue_op per_queue_opt;



	if (copy_from_user(&per_queue_opt, useraddr, sizeof(per_queue_opt)))

		return -EFAULT;



	switch (per_queue_opt.sub_command) {



	default:

		return -EOPNOTSUPP;

	};

}



/* The main entry point in this file.  Called from net/core/dev_ioctl.c */



int dev_ethtool(struct net *net, struct ifreq *ifr)

{

	struct net_device *dev = __dev_get_by_name(net, ifr->ifr_name);

	void __user *useraddr = ifr->ifr_data;

	u32 ethcmd;

	u32 ethcmd, sub_cmd;

	int rc;

	netdev_features_t old_features;
@@ -1904,8 +1918,14 @@ int dev_ethtool(struct net *net, struct ifreq *ifr) 
	if (copy_from_user(&ethcmd, useraddr, sizeof(ethcmd)))

		return -EFAULT;



	if (ethcmd == ETHTOOL_PERQUEUE) {

		if (copy_from_user(&sub_cmd, useraddr + sizeof(ethcmd), sizeof(sub_cmd)))

			return -EFAULT;

	} else {

		sub_cmd = ethcmd;

	}

	/* Allow some commands to be done by anyone */

	switch (ethcmd) {

	switch (sub_cmd) {

	case ETHTOOL_GSET:

	case ETHTOOL_GDRVINFO:

	case ETHTOOL_GMSGLVL:
@@ -2135,6 +2155,9 @@ int dev_ethtool(struct net *net, struct ifreq *ifr) 
	case ETHTOOL_GPHYSTATS:

		rc = ethtool_get_phy_stats(dev, useraddr);

		break;

	case ETHTOOL_PERQUEUE:

		rc = ethtool_set_per_queue(dev, useraddr);

		break;

	default:

		rc = -EOPNOTSUPP;

	}