diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2020-11-27 14:36:04 -0800 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2020-11-27 14:36:04 -0800 |
| commit | 4be074e6dd24e83da38e7b700c150a62667cf2f7 (patch) | |
| tree | 05c6360e02fed40ef5dd599c1974414b639cb7e7 /net/core/dev.c | |
| parent | Merge branch 'add-chacha20-poly1305-cipher-to-kernel-tls' (diff) | |
| parent | net/sched: sch_frag: add generic packet fragment support. (diff) | |
| download | linux-4be074e6dd24e83da38e7b700c150a62667cf2f7.tar.gz linux-4be074e6dd24e83da38e7b700c150a62667cf2f7.zip | |
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: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/core/dev.c')
| -rw-r--r-- | net/core/dev.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 3c3070d9d26f..51b263076124 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -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); |