| commit | 7df40c2673a1307c3260aab6f9d4b9bf97ca8fd7 | |
| author | Eric Dumazet <edumazet@google.com> | |
| Wed, 2 May 2018 17:03:30 +0000 (2 10:03 -0700) | ||
| committer | David S. Miller <davem@davemloft.net> | |
| Wed, 2 May 2018 20:37:38 +0000 (2 16:37 -0400) | ||
| tree | e2da27920cae457805549786292b4dc6e0b592d8 | treesnapshot (tar.gz zip) |
| parent | 30ca22e4a5d0063dd9a9cdf35cd139c5807cbeb3 | commitdiff |
net_sched: fq: take care of throttled flows before reuse
Normally, a socket can not be freed/reused unless all its TX packets
left qdisc and were TX-completed. However connect(AF_UNSPEC) allows
this to happen.
With commit fc59d5bdf1e3 ("pkt_sched: fq: clear time_next_packet for
reused flows") we cleared f->time_next_packet but took no special
action if the flow was still in the throttled rb-tree.
Since f->time_next_packet is the key used in the rb-tree searches,
blindly clearing it might break rb-tree integrity. We need to make
sure the flow is no longer in the rb-tree to avoid this problem.
Fixes: fc59d5bdf1e3 ("pkt_sched: fq: clear time_next_packet for reused flows")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Normally, a socket can not be freed/reused unless all its TX packets
left qdisc and were TX-completed. However connect(AF_UNSPEC) allows
this to happen.
With commit fc59d5bdf1e3 ("pkt_sched: fq: clear time_next_packet for
reused flows") we cleared f->time_next_packet but took no special
action if the flow was still in the throttled rb-tree.
Since f->time_next_packet is the key used in the rb-tree searches,
blindly clearing it might break rb-tree integrity. We need to make
sure the flow is no longer in the rb-tree to avoid this problem.
Fixes: fc59d5bdf1e3 ("pkt_sched: fq: clear time_next_packet for reused flows")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| net/sched/sch_fq.c | diffblobblamehistory |