sch_htb: Avoid grafting on htb_destroy_class_offload when destroying htb
authorRahul Rameshbabu <rrameshbabu@nvidia.com>
Fri, 13 Jan 2023 00:55:29 +0000 (16:55 -0800)
committerJakub Kicinski <kuba@kernel.org>
Sat, 14 Jan 2023 06:14:25 +0000 (22:14 -0800)
commita22b7388d658ecfcd226600c8c34ce4481e88655
tree5ae9972e0a7c28a1b1aab91c913c1157f1a66599
parentda263fcb86ae1ca40b5329e64ad7d7f69d260477
sch_htb: Avoid grafting on htb_destroy_class_offload when destroying htb

Peek at old qdisc and graft only when deleting a leaf class in the htb,
rather than when deleting the htb itself. Do not peek at the qdisc of the
netdev queue when destroying the htb. The caller may already have grafted a
new qdisc that is not part of the htb structure being destroyed.

This fix resolves two use cases.

  1. Using tc to destroy the htb.
    - Netdev was being prematurely activated before the htb was fully
      destroyed.
  2. Using tc to replace the htb with another qdisc (which also leads to
     the htb being destroyed).
    - Premature netdev activation like previous case. Newly grafted qdisc
      was also getting accidentally overwritten when destroying the htb.

Fixes: d03b195b5aa0 ("sch_htb: Hierarchical QoS hardware offload")
Signed-off-by: Rahul Rameshbabu <rrameshbabu@nvidia.com>
Reviewed-by: Saeed Mahameed <saeedm@nvidia.com>
Reviewed-by: Maxim Mikityanskiy <maxtram95@gmail.com>
Reviewed-by: Jiri Pirko <jiri@nvidia.com>
Link: https://lore.kernel.org/r/20230113005528.302625-1-rrameshbabu@nvidia.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/sched/sch_htb.c