Skip to content

net/sched: Fixes for sch_ingress and sch_clsact

Peilin Ye lkml netdev 6 versions – Applied

Status from this message: This series was applied to netdev/net.git (main)

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v6 Latest4 patches 0 repliesApplied 4/4
  2. v56 patches 38 repliesSuperseded
  3. v46 patches 1 replySuperseded
Earlier versions · 3
VersionPostedPatchesRepliesStatus
v31 of 6 patches1 replySuperseded
v26 patches6 repliesSuperseded
v16 patches29 repliesSuperseded

Changes in v6 from the cover letter

- only include first 4 patches from previous versions

Patches in v6 All 4 applied

#Subject and filesSizeRepliesApplied
1/4net/sched: sch_ingress: Only create under TC_H_INGRESSnet/sched/sch_ingress.c+6 -00 repliesApplied
2/4net/sched: sch_clsact: Only create under TC_H_CLSACTnet/sched/sch_ingress.c+6 -00 repliesApplied
3/4net/sched: Reserve TC_H_INGRESS (TC_H_CLSACT) for ingress (clsact) Qdiscsnet/sched/sch_api.c net/sched/sch_ingress.c+8 -30 repliesApplied
4/4net/sched: Prohibit regrafting ingress or clsact Qdiscsnet/sched/sch_api.c+5 -00 repliesApplied

Reviews trailers per patch

All 4 patches have a Reviewed-by or Acked-by.

PatchPedro TammelaJamal Hadi SalimVlad Buslov
1/4T-b A-b R-b R-b
2/4T-b A-b R-b R-b
3/4T-b A-b R-b R-b
4/4T-b A-b R-b R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 3 reviewers.

Read the v6 thread

Cover letter [PATCH v6 net 0/4] net/sched: Fixes for sch_ingress and sch_clsact

Link to v5: https://lore.kernel.org/r/[email protected]/
Link to v4: https://lore.kernel.org/r/[email protected]/
Link to v3 (incomplete): https://lore.kernel.org/r/[email protected]/
Link to v2: https://lore.kernel.org/r/[email protected]/
Link to v1: https://lore.kernel.org/r/[email protected]/

Hi all,

These are v6 fixes for ingress and clsact Qdiscs, including only first 4 patches (already tested and reviewed) from v5. Patch 5 and 6 from previous versions are still under discussion and will be sent separately. Per-patch changelog omitted.

Change in v6:
- only include first 4 patches from previous versions

Changes in v5:
- for [6/6], reinitialize @q, @p (suggested by Vlad) and @tcm after the "replay:" tag
- for [1,2/6], do nothing in ->destroy() if ->parent isn't ffff:fff1, as reported by Pedro

Change in v3, v4:
- add in-body From: tags

Changes in v2:
- for [1-5/6], include tags from Jamal and Pedro
- for [6/6], as suggested by Vlad, replay the request if the current Qdisc has any ongoing (RTNL-unlocked) filter requests, instead of returning -EBUSY to the user
- use Closes: tag as warned by checkpatch

[1,2/6]: ingress and clsact Qdiscs should only be created under ffff:fff1
[3/6]: Under ffff:fff1, only create ingress and clsact Qdiscs (for now,
at least)
[4/6]: After creating ingress and clsact Qdiscs under ffff:fff1, do not
graft them again to anywhere else (e.g. as the inner Qdisc of a TBF Qdisc)
[5/6]: Prepare for [6/6], do not reuse that for-loop in qdisc_graft()
for ingress and clsact Qdiscs
[6/6]: Fix use-after-free [a] in mini_qdisc_pair_swap()

[a] https://syzkaller.appspot.com/bug?extid=b53a9c0d1ea4ad62da8b

Thanks,
Peilin Ye (4):
net/sched: sch_ingress: Only create under TC_H_INGRESS net/sched: sch_clsact: Only create under TC_H_CLSACT net/sched: Reserve TC_H_INGRESS (TC_H_CLSACT) for ingress (clsact)
Qdiscs
net/sched: Prohibit regrafting ingress or clsact Qdiscs

 net/sched/sch_api.c     | 12 +++++++++++-
 net/sched/sch_ingress.c | 16 ++++++++++++++--
 2 files changed, 25 insertions(+), 3 deletions(-)
Signature · 1 line
2.20.1

Read the cover letter in its thread