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

Commit a5135bcf authored by Willem de Bruijn's avatar Willem de Bruijn Committed by David S. Miller
Browse files

net-tc: convert tc_verd to integer bitfields 



Extract the remaining two fields from tc_verd and remove the __u16
completely. TC_AT and TC_FROM are converted to equivalent two-bit
integer fields tc_at and tc_from. Where possible, use existing
helper skb_at_tc_ingress when reading tc_at. Introduce helper
skb_reset_tc to clear fields.

Not documenting tc_from and tc_at, because they will be replaced
with single bit fields in follow-on patches.

Signed-off-by: default avatarWillem de Bruijn <willemb@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e7246e12

drivers/net/ifb.c

+3 −4
Original line number Diff line number Diff line
@@ -78,9 +78,9 @@ static void ifb_ri_tasklet(unsigned long _txp) 
	}



	while ((skb = __skb_dequeue(&txp->tq)) != NULL) {

		u32 from = G_TC_FROM(skb->tc_verd);

		u32 from = skb->tc_from;



		skb->tc_verd = 0;

		skb_reset_tc(skb);

		skb->tc_skip_classify = 1;



		u64_stats_update_begin(&txp->tsync);
@@ -239,7 +239,6 @@ static void ifb_setup(struct net_device *dev) 
static netdev_tx_t ifb_xmit(struct sk_buff *skb, struct net_device *dev)

{

	struct ifb_dev_private *dp = netdev_priv(dev);

	u32 from = G_TC_FROM(skb->tc_verd);

	struct ifb_q_private *txp = dp->tx_private + skb_get_queue_mapping(skb);



	u64_stats_update_begin(&txp->rsync);
@@ -247,7 +246,7 @@ static netdev_tx_t ifb_xmit(struct sk_buff *skb, struct net_device *dev) 
	txp->rx_bytes += skb->len;

	u64_stats_update_end(&txp->rsync);



	if (!(from & (AT_INGRESS|AT_EGRESS)) || !skb->skb_iif) {

	if (skb->tc_from == AT_STACK || !skb->skb_iif) {

		dev_kfree_skb(skb);

		dev->stats.rx_dropped++;

		return NETDEV_TX_OK;

drivers/staging/octeon/ethernet-tx.c

+2 −3
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#endif /* CONFIG_XFRM */



#include <linux/atomic.h>

#include <net/sch_generic.h>



#include <asm/octeon/octeon.h>
@@ -369,9 +370,7 @@ int cvm_oct_xmit(struct sk_buff *skb, struct net_device *dev) 


#ifdef CONFIG_NET_SCHED

	skb->tc_index = 0;

#ifdef CONFIG_NET_CLS_ACT

	skb->tc_verd = 0;

#endif /* CONFIG_NET_CLS_ACT */

	skb_reset_tc(skb);

#endif /* CONFIG_NET_SCHED */

#endif /* REUSE_SKBUFFS_WITHOUT_FREE */

include/linux/skbuff.h

+2 −4
Original line number Diff line number Diff line
@@ -599,7 +599,6 @@ static inline bool skb_mstamp_after(const struct skb_mstamp *t1, 
 *	@nf_bridge: Saved data about a bridged frame - see br_netfilter.c

 *	@skb_iif: ifindex of device we arrived on

 *	@tc_index: Traffic control index

 *	@tc_verd: traffic control verdict

 *	@hash: the packet hash

 *	@queue_mapping: Queue mapping for multiqueue devices

 *	@xmit_more: More SKBs are pending for this queue
@@ -752,13 +751,12 @@ struct sk_buff { 
#endif

#ifdef CONFIG_NET_CLS_ACT

	__u8			tc_skip_classify:1;

	__u8			tc_at:2;

	__u8			tc_from:2;

#endif



#ifdef CONFIG_NET_SCHED

	__u16			tc_index;	/* traffic control index */

#ifdef CONFIG_NET_CLS_ACT

	__u16			tc_verd;	/* traffic control verdict */

#endif

#endif



	union {

include/net/sch_generic.h

+9 −1
Original line number Diff line number Diff line
@@ -409,10 +409,18 @@ bool tcf_destroy(struct tcf_proto *tp, bool force); 
void tcf_destroy_chain(struct tcf_proto __rcu **fl);

int skb_do_redirect(struct sk_buff *);



static inline void skb_reset_tc(struct sk_buff *skb)

{

#ifdef CONFIG_NET_CLS_ACT

	skb->tc_at = 0;

	skb->tc_from = 0;

#endif

}



static inline bool skb_at_tc_ingress(const struct sk_buff *skb)

{

#ifdef CONFIG_NET_CLS_ACT

	return G_TC_AT(skb->tc_verd) & AT_INGRESS;

	return skb->tc_at & AT_INGRESS;

#else

	return false;

#endif

include/uapi/linux/pkt_cls.h

+0 −31
Original line number Diff line number Diff line
@@ -5,40 +5,9 @@ 
#include <linux/pkt_sched.h>



#ifdef __KERNEL__

/* I think i could have done better macros ; for now this is stolen from

 * some arch/mips code - jhs

*/

#define _TC_MAKE32(x) ((x))



#define _TC_MAKEMASK1(n) (_TC_MAKE32(1) << _TC_MAKE32(n))

#define _TC_MAKEMASK(v,n) (_TC_MAKE32((_TC_MAKE32(1)<<(v))-1) << _TC_MAKE32(n))

#define _TC_MAKEVALUE(v,n) (_TC_MAKE32(v) << _TC_MAKE32(n))

#define _TC_GETVALUE(v,n,m) ((_TC_MAKE32(v) & _TC_MAKE32(m)) >> _TC_MAKE32(n))



/* verdict bit breakdown 

 *

bit 6,7: Where this packet was last seen 

0: Above the transmit example at the socket level

1: on the Ingress

2: on the Egress



 *

 * */



#define S_TC_FROM          _TC_MAKE32(6)

#define M_TC_FROM          _TC_MAKEMASK(2,S_TC_FROM)

#define G_TC_FROM(x)       _TC_GETVALUE(x,S_TC_FROM,M_TC_FROM)

#define V_TC_FROM(x)       _TC_MAKEVALUE(x,S_TC_FROM)

#define SET_TC_FROM(v,n)   ((V_TC_FROM(n)) | (v & ~M_TC_FROM))

#define AT_STACK	0x0

#define AT_INGRESS	0x1

#define AT_EGRESS	0x2



#define S_TC_AT          _TC_MAKE32(12)

#define M_TC_AT          _TC_MAKEMASK(2,S_TC_AT)

#define G_TC_AT(x)       _TC_GETVALUE(x,S_TC_AT,M_TC_AT)

#define V_TC_AT(x)       _TC_MAKEVALUE(x,S_TC_AT)

#define SET_TC_AT(v,n)   ((V_TC_AT(n)) | (v & ~M_TC_AT))

#endif



/* Action attributes */