• Florian Westphal's avatar
    net: core: set qdisc pkt len before tc_classify · 3365495c
    Florian Westphal authored
    commit d2788d34 ("net: sched: further simplify handle_ing")
    removed the call to qdisc_enqueue_root().
    
    However, after this removal we no longer set qdisc pkt length.
    This breaks traffic policing on ingress.
    
    This is the minimum fix: set qdisc pkt length before tc_classify.
    
    Only setting the length does remove support for 'stab' on ingress, but
    as Alexei pointed out:
     "Though it was allowed to add qdisc_size_table to ingress, it's useless.
      Nothing takes advantage of recomputed qdisc_pkt_len".
    
    Jamal suggested to use qdisc_pkt_len_init(), but as Eric mentioned that
    would result in qdisc_pkt_len_init to no longer get inlined due to the
    additional 2nd call site.
    
    ingress policing is rare and GRO doesn't really work that well with police
    on ingress, as we see packets > mtu and drop skbs that  -- without
    aggregation -- would still have fitted the policier budget.
    Thus to have reliable/smooth ingress policing GRO has to be turned off.
    
    Cc: Alexei Starovoitov <alexei.starovoitov@gmail.com>
    Cc: Eric Dumazet <eric.dumazet@gmail.com>
    Cc: Jamal Hadi Salim <jhs@mojatatu.com>
    Fixes: d2788d34 ("net: sched: further simplify handle_ing")
    Acked-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
    Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
    Acked-by: default avatarEric Dumazet <edumazet@google.com>
    Acked-by: default avatarAlexei Starovoitov <ast@plumgrid.com>
    Acked-by: default avatarJamal Hadi Salim <jhs@mojatatu.com>
    Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    3365495c
dev.c 190 KB