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

Commit f7dd5215 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'net_sched-reflect-tx_queue_len-change-for-pfifo_fast' 



Cong Wang says:

====================
net_sched: reflect tx_queue_len change for pfifo_fast

This pathcset restores the pfifo_fast qdisc behavior of dropping
packets based on latest dev->tx_queue_len. Patch 1 introduces
a helper, patch 2 introduces a new Qdisc ops which is called when
we modify tx_queue_len, patch 3 implements this ops for pfifo_fast.

Please see each patch for details.

---
v3: use skb_array_resize_multiple()
v2: handle error case for ->change_tx_queue_len()
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 4cd87951 7007ba63

include/linux/netdevice.h

+1 −0
Original line number Diff line number Diff line
@@ -3331,6 +3331,7 @@ int dev_get_alias(const struct net_device *, char *, size_t); 
int dev_change_net_namespace(struct net_device *, struct net *, const char *);

int __dev_set_mtu(struct net_device *, int);

int dev_set_mtu(struct net_device *, int);

int dev_change_tx_queue_len(struct net_device *, unsigned long);

void dev_set_group(struct net_device *, int);

int dev_set_mac_address(struct net_device *, struct sockaddr *);

int dev_change_carrier(struct net_device *, bool new_carrier);

include/net/sch_generic.h

+2 −0
Original line number Diff line number Diff line
@@ -200,6 +200,7 @@ struct Qdisc_ops { 
					  struct nlattr *arg,

					  struct netlink_ext_ack *extack);

	void			(*attach)(struct Qdisc *sch);

	int			(*change_tx_queue_len)(struct Qdisc *, unsigned int);



	int			(*dump)(struct Qdisc *, struct sk_buff *);

	int			(*dump_stats)(struct Qdisc *, struct gnet_dump *);
@@ -489,6 +490,7 @@ void qdisc_class_hash_remove(struct Qdisc_class_hash *, 
void qdisc_class_hash_grow(struct Qdisc *, struct Qdisc_class_hash *);

void qdisc_class_hash_destroy(struct Qdisc_class_hash *);



int dev_qdisc_change_tx_queue_len(struct net_device *dev);

void dev_init_scheduler(struct net_device *dev);

void dev_shutdown(struct net_device *dev);

void dev_activate(struct net_device *dev);

net/core/dev.c

+29 −0
Original line number Diff line number Diff line
@@ -7047,6 +7047,35 @@ int dev_set_mtu(struct net_device *dev, int new_mtu) 
}

EXPORT_SYMBOL(dev_set_mtu);



/**

 *	dev_change_tx_queue_len - Change TX queue length of a netdevice

 *	@dev: device

 *	@new_len: new tx queue length

 */

int dev_change_tx_queue_len(struct net_device *dev, unsigned long new_len)

{

	unsigned int orig_len = dev->tx_queue_len;

	int res;



	if (new_len != (unsigned int)new_len)

		return -ERANGE;



	if (new_len != orig_len) {

		dev->tx_queue_len = new_len;

		res = call_netdevice_notifiers(NETDEV_CHANGE_TX_QUEUE_LEN, dev);

		res = notifier_to_errno(res);

		if (res) {

			netdev_err(dev,

				   "refused to change device tx_queue_len\n");

			dev->tx_queue_len = orig_len;

			return res;

		}

		return dev_qdisc_change_tx_queue_len(dev);

	}



	return 0;

}



/**

 *	dev_set_group - Change group this device belongs to

 *	@dev: device

net/core/net-sysfs.c

+1 −24
Original line number Diff line number Diff line
@@ -346,29 +346,6 @@ static ssize_t flags_store(struct device *dev, struct device_attribute *attr, 
}

NETDEVICE_SHOW_RW(flags, fmt_hex);



static int change_tx_queue_len(struct net_device *dev, unsigned long new_len)

{

	unsigned int orig_len = dev->tx_queue_len;

	int res;



	if (new_len != (unsigned int)new_len)

		return -ERANGE;



	if (new_len != orig_len) {

		dev->tx_queue_len = new_len;

		res = call_netdevice_notifiers(NETDEV_CHANGE_TX_QUEUE_LEN, dev);

		res = notifier_to_errno(res);

		if (res) {

			netdev_err(dev,

				   "refused to change device tx_queue_len\n");

			dev->tx_queue_len = orig_len;

			return -EFAULT;

		}

	}



	return 0;

}



static ssize_t tx_queue_len_store(struct device *dev,

				  struct device_attribute *attr,

				  const char *buf, size_t len)
@@ -376,7 +353,7 @@ static ssize_t tx_queue_len_store(struct device *dev, 
	if (!capable(CAP_NET_ADMIN))

		return -EPERM;



	return netdev_store(dev, attr, buf, len, change_tx_queue_len);

	return netdev_store(dev, attr, buf, len, dev_change_tx_queue_len);

}

NETDEVICE_SHOW_RW(tx_queue_len, fmt_dec);

net/core/rtnetlink.c

+5 −13
Original line number Diff line number Diff line
@@ -2337,20 +2337,12 @@ static int do_setlink(const struct sk_buff *skb, 


	if (tb[IFLA_TXQLEN]) {

		unsigned int value = nla_get_u32(tb[IFLA_TXQLEN]);

		unsigned int orig_len = dev->tx_queue_len;



		if (dev->tx_queue_len ^ value) {

			dev->tx_queue_len = value;

			err = call_netdevice_notifiers(

			      NETDEV_CHANGE_TX_QUEUE_LEN, dev);

			err = notifier_to_errno(err);

			if (err) {

				dev->tx_queue_len = orig_len;

		err = dev_change_tx_queue_len(dev, value);

		if (err)

			goto errout;

			}

		status |= DO_SETLINK_MODIFIED;

	}

	}



	if (tb[IFLA_GSO_MAX_SIZE]) {

		u32 max_size = nla_get_u32(tb[IFLA_GSO_MAX_SIZE]);