xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: sched: delete duplicate cleanup of backlog and qlen

Browse Source 
[ Upstream commit c19d893fbf3f2f8fa864ae39652c7fee939edde2 ]

qdisc_reset() is clearing qdisc->q.qlen and qdisc->qstats.backlog
_after_ calling qdisc->ops->reset. There is no need to clear them
again in the specific reset function.

Signed-off-by: Zhengchao Shao <shaozhengchao@huawei.com>
Link: https://lore.kernel.org/r/20220824005231.345727-1-shaozhengchao@huawei.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Stable-dep-of: 2a3fc78210b9 ("net: sched: sfb: fix null pointer access issue when sfb_init() fails")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Zhengchao Shao
2022-08-24 08:52:31 +08:00
committed by Greg Kroah-Hartman
parent ae48bee283
commit 305aa36b62
21 changed files with 0 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/net/sch_generic.h
View File

@@ -1178,7 +1178,6 @@ static inline void __qdisc_reset_queue(struct qdisc_skb_head *qh)
static inline void qdisc_reset_queue(struct Qdisc *sch) static inline void qdisc_reset_queue(struct Qdisc *sch)
{ {
__qdisc_reset_queue(&sch->q); __qdisc_reset_queue(&sch->q);
sch->qstats.backlog = 0;
} }
static inline struct Qdisc *qdisc_replace(struct Qdisc *sch, struct Qdisc *new, static inline struct Qdisc *qdisc_replace(struct Qdisc *sch, struct Qdisc *new,

1
net/sched/sch_atm.c
View File

@@ -575,7 +575,6 @@ static void atm_tc_reset(struct Qdisc *sch)
pr_debug("atm_tc_reset(sch %p,[qdisc %p])\n", sch, p); pr_debug("atm_tc_reset(sch %p,[qdisc %p])\n", sch, p);
list_for_each_entry(flow, &p->flows, list) list_for_each_entry(flow, &p->flows, list)
qdisc_reset(flow->q); qdisc_reset(flow->q);
sch->q.qlen = 0;
} }
static void atm_tc_destroy(struct Qdisc *sch) static void atm_tc_destroy(struct Qdisc *sch)

1
net/sched/sch_cbq.c
View File

@@ -1053,7 +1053,6 @@ cbq_reset(struct Qdisc *sch)
cl->cpriority = cl->priority; cl->cpriority = cl->priority;
} }
} }
sch->q.qlen = 0;
} }

2
net/sched/sch_choke.c
View File

@@ -315,8 +315,6 @@ static void choke_reset(struct Qdisc *sch)
rtnl_qdisc_drop(skb, sch); rtnl_qdisc_drop(skb, sch);
} }
sch->q.qlen = 0;
sch->qstats.backlog = 0;
if (q->tab) if (q->tab)
memset(q->tab, 0, (q->tab_mask + 1) * sizeof(struct sk_buff *)); memset(q->tab, 0, (q->tab_mask + 1) * sizeof(struct sk_buff *));
q->head = q->tail = 0; q->head = q->tail = 0;

2
net/sched/sch_drr.c
View File

@@ -443,8 +443,6 @@ static void drr_reset_qdisc(struct Qdisc *sch)
qdisc_reset(cl->qdisc); qdisc_reset(cl->qdisc);
} }
} }
sch->qstats.backlog = 0;
sch->q.qlen = 0;
} }
static void drr_destroy_qdisc(struct Qdisc *sch) static void drr_destroy_qdisc(struct Qdisc *sch)

2
net/sched/sch_dsmark.c
View File

@@ -408,8 +408,6 @@ static void dsmark_reset(struct Qdisc *sch)
pr_debug("%s(sch %p,[qdisc %p])\n", __func__, sch, p); pr_debug("%s(sch %p,[qdisc %p])\n", __func__, sch, p);
if (p->q) if (p->q)
qdisc_reset(p->q); qdisc_reset(p->q);
sch->qstats.backlog = 0;
sch->q.qlen = 0;
} }
static void dsmark_destroy(struct Qdisc *sch) static void dsmark_destroy(struct Qdisc *sch)

3
net/sched/sch_etf.c
View File

@@ -445,9 +445,6 @@ static void etf_reset(struct Qdisc *sch)
timesortedlist_clear(sch); timesortedlist_clear(sch);
__qdisc_reset_queue(&sch->q); __qdisc_reset_queue(&sch->q);
sch->qstats.backlog = 0;
sch->q.qlen = 0;
q->last = 0; q->last = 0;
} }

2
net/sched/sch_ets.c
View File

@@ -722,8 +722,6 @@ static void ets_qdisc_reset(struct Qdisc *sch)
} }
for (band = 0; band < q->nbands; band++) for (band = 0; band < q->nbands; band++)
qdisc_reset(q->classes[band].qdisc); qdisc_reset(q->classes[band].qdisc);
sch->qstats.backlog = 0;
sch->q.qlen = 0;
} }
static void ets_qdisc_destroy(struct Qdisc *sch) static void ets_qdisc_destroy(struct Qdisc *sch)

2
net/sched/sch_fq_codel.c
View File

@@ -347,8 +347,6 @@ static void fq_codel_reset(struct Qdisc *sch)
codel_vars_init(&flow->cvars); codel_vars_init(&flow->cvars);
} }
memset(q->backlogs, 0, q->flows_cnt * sizeof(u32)); memset(q->backlogs, 0, q->flows_cnt * sizeof(u32));
sch->q.qlen = 0;
sch->qstats.backlog = 0;
q->memory_usage = 0; q->memory_usage = 0;
} }

3
net/sched/sch_fq_pie.c
View File

@@ -521,9 +521,6 @@ static void fq_pie_reset(struct Qdisc *sch)
INIT_LIST_HEAD(&flow->flowchain); INIT_LIST_HEAD(&flow->flowchain);
pie_vars_init(&flow->vars); pie_vars_init(&flow->vars);
} }
sch->q.qlen = 0;
sch->qstats.backlog = 0;
} }
static void fq_pie_destroy(struct Qdisc *sch) static void fq_pie_destroy(struct Qdisc *sch)

2
net/sched/sch_hfsc.c
View File

@@ -1484,8 +1484,6 @@ hfsc_reset_qdisc(struct Qdisc *sch)
} }
q->eligible = RB_ROOT; q->eligible = RB_ROOT;
qdisc_watchdog_cancel(&q->watchdog); qdisc_watchdog_cancel(&q->watchdog);
sch->qstats.backlog = 0;
sch->q.qlen = 0;
} }
static void static void

2
net/sched/sch_htb.c
View File

@@ -966,8 +966,6 @@ static void htb_reset(struct Qdisc *sch)
} }
qdisc_watchdog_cancel(&q->watchdog); qdisc_watchdog_cancel(&q->watchdog);
__qdisc_reset_queue(&q->direct_queue); __qdisc_reset_queue(&q->direct_queue);
sch->q.qlen = 0;
sch->qstats.backlog = 0;
memset(q->hlevel, 0, sizeof(q->hlevel)); memset(q->hlevel, 0, sizeof(q->hlevel));
memset(q->row_mask, 0, sizeof(q->row_mask)); memset(q->row_mask, 0, sizeof(q->row_mask));
} }

1
net/sched/sch_multiq.c
View File

@@ -152,7 +152,6 @@ multiq_reset(struct Qdisc *sch)
for (band = 0; band < q->bands; band++) for (band = 0; band < q->bands; band++)
qdisc_reset(q->queues[band]); qdisc_reset(q->queues[band]);
sch->q.qlen = 0;
q->curband = 0; q->curband = 0;
} }

2
net/sched/sch_prio.c
View File

@@ -135,8 +135,6 @@ prio_reset(struct Qdisc *sch)
for (prio = 0; prio < q->bands; prio++) for (prio = 0; prio < q->bands; prio++)
qdisc_reset(q->queues[prio]); qdisc_reset(q->queues[prio]);
sch->qstats.backlog = 0;
sch->q.qlen = 0;
} }
static int prio_offload(struct Qdisc *sch, struct tc_prio_qopt *qopt) static int prio_offload(struct Qdisc *sch, struct tc_prio_qopt *qopt)

2
net/sched/sch_qfq.c
View File

@@ -1458,8 +1458,6 @@ static void qfq_reset_qdisc(struct Qdisc *sch)
qdisc_reset(cl->qdisc); qdisc_reset(cl->qdisc);
} }
} }
sch->qstats.backlog = 0;
sch->q.qlen = 0;
} }
static void qfq_destroy_qdisc(struct Qdisc *sch) static void qfq_destroy_qdisc(struct Qdisc *sch)

2
net/sched/sch_red.c
View File

@@ -176,8 +176,6 @@ static void red_reset(struct Qdisc *sch)
struct red_sched_data *q = qdisc_priv(sch); struct red_sched_data *q = qdisc_priv(sch);
qdisc_reset(q->qdisc); qdisc_reset(q->qdisc);
sch->qstats.backlog = 0;
sch->q.qlen = 0;
red_restart(&q->vars); red_restart(&q->vars);
} }

2
net/sched/sch_sfb.c
View File

@@ -456,8 +456,6 @@ static void sfb_reset(struct Qdisc *sch)
struct sfb_sched_data *q = qdisc_priv(sch); struct sfb_sched_data *q = qdisc_priv(sch);
qdisc_reset(q->qdisc); qdisc_reset(q->qdisc);
sch->qstats.backlog = 0;
sch->q.qlen = 0;
q->slot = 0; q->slot = 0;
q->double_buffering = false; q->double_buffering = false;
sfb_zero_all_buckets(q); sfb_zero_all_buckets(q);

3
net/sched/sch_skbprio.c
View File

@@ -213,9 +213,6 @@ static void skbprio_reset(struct Qdisc *sch)
struct skbprio_sched_data *q = qdisc_priv(sch); struct skbprio_sched_data *q = qdisc_priv(sch);
int prio; int prio;
sch->qstats.backlog = 0;
sch->q.qlen = 0;
for (prio = 0; prio < SKBPRIO_MAX_PRIORITY; prio++) for (prio = 0; prio < SKBPRIO_MAX_PRIORITY; prio++)
__skb_queue_purge(&q->qdiscs[prio]); __skb_queue_purge(&q->qdiscs[prio]);

2
net/sched/sch_taprio.c
View File

@@ -1626,8 +1626,6 @@ static void taprio_reset(struct Qdisc *sch)
if (q->qdiscs[i]) if (q->qdiscs[i])
qdisc_reset(q->qdiscs[i]); qdisc_reset(q->qdiscs[i]);
} }
sch->qstats.backlog = 0;
sch->q.qlen = 0;
} }
static void taprio_destroy(struct Qdisc *sch) static void taprio_destroy(struct Qdisc *sch)

2
net/sched/sch_tbf.c
View File

@@ -316,8 +316,6 @@ static void tbf_reset(struct Qdisc *sch)
struct tbf_sched_data *q = qdisc_priv(sch); struct tbf_sched_data *q = qdisc_priv(sch);
qdisc_reset(q->qdisc); qdisc_reset(q->qdisc);
sch->qstats.backlog = 0;
sch->q.qlen = 0;
q->t_c = ktime_get_ns(); q->t_c = ktime_get_ns();
q->tokens = q->buffer; q->tokens = q->buffer;
q->ptokens = q->mtu; q->ptokens = q->mtu;

1
net/sched/sch_teql.c
View File

@@ -124,7 +124,6 @@ teql_reset(struct Qdisc *sch)
struct teql_sched_data *dat = qdisc_priv(sch); struct teql_sched_data *dat = qdisc_priv(sch);
skb_queue_purge(&dat->q); skb_queue_purge(&dat->q);
sch->q.qlen = 0;
} }
static void static void