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

Commit bfa5ae63 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

net: rename netdev rx_queue to ingress_queue 



There is some confusion with rx_queue name after RPS, and net drivers
private rx_queue fields.

I suggest to rename "struct net_device"->rx_queue to ingress_queue.

Signed-off-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8560f226

include/linux/netdevice.h

+1 −1
Original line number Diff line number Diff line
@@ -986,7 +986,7 @@ struct net_device { 
	rx_handler_func_t	*rx_handler;

	void			*rx_handler_data;



	struct netdev_queue	rx_queue; /* use two cache lines */

	struct netdev_queue	ingress_queue; /* use two cache lines */



/*

 * Cache lines mostly used on transmit path

net/core/dev.c

+4 −4
Original line number Diff line number Diff line
@@ -2720,7 +2720,7 @@ static int ing_filter(struct sk_buff *skb) 
	skb->tc_verd = SET_TC_RTTL(skb->tc_verd, ttl);

	skb->tc_verd = SET_TC_AT(skb->tc_verd, AT_INGRESS);



	rxq = &dev->rx_queue;

	rxq = &dev->ingress_queue;



	q = rxq->qdisc;

	if (q != &noop_qdisc) {
@@ -2737,7 +2737,7 @@ static inline struct sk_buff *handle_ing(struct sk_buff *skb, 
					 struct packet_type **pt_prev,

					 int *ret, struct net_device *orig_dev)

{

	if (skb->dev->rx_queue.qdisc == &noop_qdisc)

	if (skb->dev->ingress_queue.qdisc == &noop_qdisc)

		goto out;



	if (*pt_prev) {
@@ -4940,7 +4940,7 @@ static void __netdev_init_queue_locks_one(struct net_device *dev, 
static void netdev_init_queue_locks(struct net_device *dev)

{

	netdev_for_each_tx_queue(dev, __netdev_init_queue_locks_one, NULL);

	__netdev_init_queue_locks_one(dev, &dev->rx_queue, NULL);

	__netdev_init_queue_locks_one(dev, &dev->ingress_queue, NULL);

}



unsigned long netdev_fix_features(unsigned long features, const char *name)
@@ -5452,7 +5452,7 @@ static void netdev_init_one_queue(struct net_device *dev, 


static void netdev_init_queues(struct net_device *dev)

{

	netdev_init_one_queue(dev, &dev->rx_queue, NULL);

	netdev_init_one_queue(dev, &dev->ingress_queue, NULL);

	netdev_for_each_tx_queue(dev, netdev_init_one_queue, NULL);

	spin_lock_init(&dev->tx_global_lock);

}

net/sched/sch_api.c

+7 −7
Original line number Diff line number Diff line
@@ -240,7 +240,7 @@ struct Qdisc *qdisc_lookup(struct net_device *dev, u32 handle) 
	if (q)

		goto out;



	q = qdisc_match_from_root(dev->rx_queue.qdisc_sleeping, handle);

	q = qdisc_match_from_root(dev->ingress_queue.qdisc_sleeping, handle);

out:

	return q;

}
@@ -701,7 +701,7 @@ static int qdisc_graft(struct net_device *dev, struct Qdisc *parent, 
		}



		for (i = 0; i < num_q; i++) {

			struct netdev_queue *dev_queue = &dev->rx_queue;

			struct netdev_queue *dev_queue = &dev->ingress_queue;



			if (!ingress)

				dev_queue = netdev_get_tx_queue(dev, i);
@@ -979,7 +979,7 @@ static int tc_get_qdisc(struct sk_buff *skb, struct nlmsghdr *n, void *arg) 
					return -ENOENT;

				q = qdisc_leaf(p, clid);

			} else { /* ingress */

				q = dev->rx_queue.qdisc_sleeping;

				q = dev->ingress_queue.qdisc_sleeping;

			}

		} else {

			q = dev->qdisc;
@@ -1044,7 +1044,7 @@ replay: 
					return -ENOENT;

				q = qdisc_leaf(p, clid);

			} else { /*ingress */

				q = dev->rx_queue.qdisc_sleeping;

				q = dev->ingress_queue.qdisc_sleeping;

			}

		} else {

			q = dev->qdisc;
@@ -1124,7 +1124,7 @@ create_n_graft: 
	if (!(n->nlmsg_flags&NLM_F_CREATE))

		return -ENOENT;

	if (clid == TC_H_INGRESS)

		q = qdisc_create(dev, &dev->rx_queue, p,

		q = qdisc_create(dev, &dev->ingress_queue, p,

				 tcm->tcm_parent, tcm->tcm_parent,

				 tca, &err);

	else {
@@ -1304,7 +1304,7 @@ static int tc_dump_qdisc(struct sk_buff *skb, struct netlink_callback *cb) 
		if (tc_dump_qdisc_root(dev->qdisc, skb, cb, &q_idx, s_q_idx) < 0)

			goto done;



		dev_queue = &dev->rx_queue;

		dev_queue = &dev->ingress_queue;

		if (tc_dump_qdisc_root(dev_queue->qdisc_sleeping, skb, cb, &q_idx, s_q_idx) < 0)

			goto done;
@@ -1595,7 +1595,7 @@ static int tc_dump_tclass(struct sk_buff *skb, struct netlink_callback *cb) 
	if (tc_dump_tclass_root(dev->qdisc, skb, tcm, cb, &t, s_t) < 0)

		goto done;



	dev_queue = &dev->rx_queue;

	dev_queue = &dev->ingress_queue;

	if (tc_dump_tclass_root(dev_queue->qdisc_sleeping, skb, tcm, cb, &t, s_t) < 0)

		goto done;

net/sched/sch_generic.c

+4 −4
Original line number Diff line number Diff line
@@ -753,7 +753,7 @@ void dev_activate(struct net_device *dev) 


	need_watchdog = 0;

	netdev_for_each_tx_queue(dev, transition_one_qdisc, &need_watchdog);

	transition_one_qdisc(dev, &dev->rx_queue, NULL);

	transition_one_qdisc(dev, &dev->ingress_queue, NULL);



	if (need_watchdog) {

		dev->trans_start = jiffies;
@@ -812,7 +812,7 @@ static bool some_qdisc_is_busy(struct net_device *dev) 
void dev_deactivate(struct net_device *dev)

{

	netdev_for_each_tx_queue(dev, dev_deactivate_queue, &noop_qdisc);

	dev_deactivate_queue(dev, &dev->rx_queue, &noop_qdisc);

	dev_deactivate_queue(dev, &dev->ingress_queue, &noop_qdisc);



	dev_watchdog_down(dev);
@@ -838,7 +838,7 @@ void dev_init_scheduler(struct net_device *dev) 
{

	dev->qdisc = &noop_qdisc;

	netdev_for_each_tx_queue(dev, dev_init_scheduler_queue, &noop_qdisc);

	dev_init_scheduler_queue(dev, &dev->rx_queue, &noop_qdisc);

	dev_init_scheduler_queue(dev, &dev->ingress_queue, &noop_qdisc);



	setup_timer(&dev->watchdog_timer, dev_watchdog, (unsigned long)dev);

}
@@ -861,7 +861,7 @@ static void shutdown_scheduler_queue(struct net_device *dev, 
void dev_shutdown(struct net_device *dev)

{

	netdev_for_each_tx_queue(dev, shutdown_scheduler_queue, &noop_qdisc);

	shutdown_scheduler_queue(dev, &dev->rx_queue, &noop_qdisc);

	shutdown_scheduler_queue(dev, &dev->ingress_queue, &noop_qdisc);

	qdisc_destroy(dev->qdisc);

	dev->qdisc = &noop_qdisc;