Commit 8b11c35d authored by Paolo Abeni's avatar Paolo Abeni
Browse files

Merge branch 'net-sched-allow-user-to-select-txqueue' 

Tonghao Zhang says:

====================
net: sched: allow user to select txqueue

From: Tonghao Zhang <xiangxia.m.yue@gmail.com>

Patch 1 allow user to select txqueue in clsact hook.
Patch 2 support skbhash to select txqueue.
====================

Link: https://lore.kernel.org/r/20220415164046.26636-1-xiangxia.m.yue@gmail.com


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parents a997157e 38a6f086

include/linux/netdevice.h

+3 −0
Original line number Diff line number Diff line
@@ -3061,6 +3061,9 @@ struct softnet_data { 
	struct {

		u16 recursion;

		u8  more;

#ifdef CONFIG_NET_EGRESS

		u8  skip_txqueue;

#endif

	} xmit;

#ifdef CONFIG_RPS

	/* input_queue_head should be written by cpu owning this struct,

include/linux/rtnetlink.h

+1 −0
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ void net_dec_ingress_queue(void); 
#ifdef CONFIG_NET_EGRESS

void net_inc_egress_queue(void);

void net_dec_egress_queue(void);

void netdev_xmit_skip_txqueue(bool skip);

#endif



void rtnetlink_init(void);

include/net/tc_act/tc_skbedit.h

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ struct tcf_skbedit_params { 
	u32 mark;

	u32 mask;

	u16 queue_mapping;

	u16 mapping_mod;

	u16 ptype;

	struct rcu_head rcu;

};

include/uapi/linux/tc_act/tc_skbedit.h

+2 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#define SKBEDIT_F_PTYPE			0x8

#define SKBEDIT_F_MASK			0x10

#define SKBEDIT_F_INHERITDSFIELD	0x20

#define SKBEDIT_F_TXQ_SKBHASH		0x40



struct tc_skbedit {

	tc_gen;
@@ -45,6 +46,7 @@ enum { 
	TCA_SKBEDIT_PTYPE,

	TCA_SKBEDIT_MASK,

	TCA_SKBEDIT_FLAGS,

	TCA_SKBEDIT_QUEUE_MAPPING_MAX,

	__TCA_SKBEDIT_MAX

};

#define TCA_SKBEDIT_MAX (__TCA_SKBEDIT_MAX - 1)

net/core/dev.c

+29 −2
Original line number Diff line number Diff line
@@ -3925,6 +3925,25 @@ sch_handle_egress(struct sk_buff *skb, int *ret, struct net_device *dev) 


	return skb;

}



static struct netdev_queue *

netdev_tx_queue_mapping(struct net_device *dev, struct sk_buff *skb)

{

	int qm = skb_get_queue_mapping(skb);



	return netdev_get_tx_queue(dev, netdev_cap_txqueue(dev, qm));

}



static bool netdev_xmit_txqueue_skipped(void)

{

	return __this_cpu_read(softnet_data.xmit.skip_txqueue);

}



void netdev_xmit_skip_txqueue(bool skip)

{

	__this_cpu_write(softnet_data.xmit.skip_txqueue, skip);

}

EXPORT_SYMBOL_GPL(netdev_xmit_skip_txqueue);

#endif /* CONFIG_NET_EGRESS */



#ifdef CONFIG_XPS
@@ -4095,7 +4114,7 @@ struct netdev_queue *netdev_core_pick_tx(struct net_device *dev, 
static int __dev_queue_xmit(struct sk_buff *skb, struct net_device *sb_dev)

{

	struct net_device *dev = skb->dev;

	struct netdev_queue *txq;

	struct netdev_queue *txq = NULL;

	struct Qdisc *q;

	int rc = -ENOMEM;

	bool again = false;
@@ -4123,11 +4142,17 @@ static int __dev_queue_xmit(struct sk_buff *skb, struct net_device *sb_dev) 
			if (!skb)

				goto out;

		}



		netdev_xmit_skip_txqueue(false);



		nf_skip_egress(skb, true);

		skb = sch_handle_egress(skb, &rc, dev);

		if (!skb)

			goto out;

		nf_skip_egress(skb, false);



		if (netdev_xmit_txqueue_skipped())

			txq = netdev_tx_queue_mapping(dev, skb);

	}

#endif

	/* If device/qdisc don't need skb->dst, release it right now while
@@ -4138,7 +4163,9 @@ static int __dev_queue_xmit(struct sk_buff *skb, struct net_device *sb_dev) 
	else

		skb_dst_force(skb);



	if (!txq)

		txq = netdev_core_pick_tx(dev, skb, sb_dev);



	q = rcu_dereference_bh(txq->qdisc);



	trace_net_dev_queue(skb);