Commit 4be074e6 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'net-sched-fix-over-mtu-packet-of-defrag-in' 

wenxu says:

====================
net/sched: fix over mtu packet of defrag in

Currently kernel tc subsystem can do conntrack in act_ct. But when several
fragment packets go through the act_ct, function tcf_ct_handle_fragments
will defrag the packets to a big one. But the last action will redirect
mirred to a device which maybe lead the reassembly big packet over the mtu
of target device.

The first patch fix miss init the qdisc_skb_cb->mru
The send one refactor the hanle of xmit in act_mirred and prepare for the
third one
The last one add implict packet fragment support to fix the over mtu for
defrag in act_ct.
====================

Link: https://lore.kernel.org/r/1606276883-6825-1-git-send-email-wenxu@ucloud.cn


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents fb3158ea c129412f

include/net/act_api.h

+6 −0
Original line number Diff line number Diff line
@@ -239,6 +239,12 @@ int tcf_action_check_ctrlact(int action, struct tcf_proto *tp, 
			     struct netlink_ext_ack *newchain);

struct tcf_chain *tcf_action_set_ctrlact(struct tc_action *a, int action,

					 struct tcf_chain *newchain);



#ifdef CONFIG_INET

DECLARE_STATIC_KEY_FALSE(tcf_frag_xmit_count);

#endif



int tcf_dev_queue_xmit(struct sk_buff *skb, int (*xmit)(struct sk_buff *skb));

#endif /* CONFIG_NET_CLS_ACT */



static inline void tcf_action_stats_update(struct tc_action *a, u64 bytes,

include/net/sch_generic.h

+1 −4
Original line number Diff line number Diff line
@@ -1281,9 +1281,6 @@ void mini_qdisc_pair_init(struct mini_Qdisc_pair *miniqp, struct Qdisc *qdisc, 
void mini_qdisc_pair_block_init(struct mini_Qdisc_pair *miniqp,

				struct tcf_block *block);



static inline int skb_tc_reinsert(struct sk_buff *skb, struct tcf_result *res)

{

	return res->ingress ? netif_receive_skb(skb) : dev_queue_xmit(skb);

}

int sch_frag_xmit_hook(struct sk_buff *skb, int (*xmit)(struct sk_buff *skb));



#endif

net/core/dev.c

+2 −0
Original line number Diff line number Diff line
@@ -3872,6 +3872,7 @@ sch_handle_egress(struct sk_buff *skb, int *ret, struct net_device *dev) 
		return skb;



	/* qdisc_skb_cb(skb)->pkt_len was already set by the caller. */

	qdisc_skb_cb(skb)->mru = 0;

	mini_qdisc_bstats_cpu_update(miniq, skb);



	switch (tcf_classify(skb, miniq->filter_list, &cl_res, false)) {
@@ -4959,6 +4960,7 @@ sch_handle_ingress(struct sk_buff *skb, struct packet_type **pt_prev, int *ret, 
	}



	qdisc_skb_cb(skb)->pkt_len = skb->len;

	qdisc_skb_cb(skb)->mru = 0;

	skb->tc_at_ingress = 1;

	mini_qdisc_bstats_cpu_update(miniq, skb);

net/sched/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 


obj-y	:= sch_generic.o sch_mq.o



obj-$(CONFIG_INET)		+= sch_frag.o

obj-$(CONFIG_NET_SCHED)		+= sch_api.o sch_blackhole.o

obj-$(CONFIG_NET_CLS)		+= cls_api.o

obj-$(CONFIG_NET_CLS_ACT)	+= act_api.o

net/sched/act_api.c

+16 −0
Original line number Diff line number Diff line
@@ -22,6 +22,22 @@ 
#include <net/act_api.h>

#include <net/netlink.h>



#ifdef CONFIG_INET

DEFINE_STATIC_KEY_FALSE(tcf_frag_xmit_count);

EXPORT_SYMBOL_GPL(tcf_frag_xmit_count);

#endif



int tcf_dev_queue_xmit(struct sk_buff *skb, int (*xmit)(struct sk_buff *skb))

{

#ifdef CONFIG_INET

	if (static_branch_unlikely(&tcf_frag_xmit_count))

		return sch_frag_xmit_hook(skb, xmit);

#endif



	return xmit(skb);

}

EXPORT_SYMBOL_GPL(tcf_dev_queue_xmit);



static void tcf_action_goto_chain_exec(const struct tc_action *a,

				       struct tcf_result *res)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE