All of lore.kernel.org
 help / color / mirror / Atom feed
From: Vladimir Oltean <vladimir.oltean@nxp.com>
To: netdev@vger.kernel.org
Cc: Jiri Pirko <jiri@resnulli.us>,
	Pedro Tammela <pctammela@mojatatu.com>,
	Jamal Hadi Salim <jhs@mojatatu.com>,
	linux-kernel@vger.kernel.org, Eric Dumazet <edumazet@google.com>,
	intel-wired-lan@lists.osuosl.org,
	Cong Wang <xiyou.wangcong@gmail.com>,
	Peilin Ye <yepeilin.cs@gmail.com>,
	Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
	"David S. Miller" <davem@davemloft.net>
Subject: [Intel-wired-lan] [PATCH RESEND net-next 4/5] net/sched: taprio: delete misleading comment about preallocating child qdiscs
Date: Fri,  2 Jun 2023 13:37:49 +0300	[thread overview]
Message-ID: <20230602103750.2290132-5-vladimir.oltean@nxp.com> (raw)
In-Reply-To: <20230602103750.2290132-1-vladimir.oltean@nxp.com>

As mentioned in commit af7b29b1deaa ("Revert "net/sched: taprio: make
qdisc_leaf() see the per-netdev-queue pfifo child qdiscs"") - unlike
mqprio, taprio doesn't use q->qdiscs[] only as a temporary transport
between Qdisc_ops :: init() and Qdisc_ops :: attach().

Delete the comment, which is just stolen from mqprio, but there, the
usage patterns are a lot different, and this is nothing but confusing.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
---
 net/sched/sch_taprio.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/net/sched/sch_taprio.c b/net/sched/sch_taprio.c
index 263306fe38d8..cc7ff98e5e86 100644
--- a/net/sched/sch_taprio.c
+++ b/net/sched/sch_taprio.c
@@ -2084,11 +2084,8 @@ static int taprio_init(struct Qdisc *sch, struct nlattr *opt,
 		return -EOPNOTSUPP;
 	}
 
-	/* pre-allocate qdisc, attachment can't fail */
-	q->qdiscs = kcalloc(dev->num_tx_queues,
-			    sizeof(q->qdiscs[0]),
+	q->qdiscs = kcalloc(dev->num_tx_queues, sizeof(q->qdiscs[0]),
 			    GFP_KERNEL);
-
 	if (!q->qdiscs)
 		return -ENOMEM;
 
-- 
2.34.1

_______________________________________________
Intel-wired-lan mailing list
Intel-wired-lan@osuosl.org
https://lists.osuosl.org/mailman/listinfo/intel-wired-lan

WARNING: multiple messages have this Message-ID (diff)
From: Vladimir Oltean <vladimir.oltean@nxp.com>
To: netdev@vger.kernel.org
Cc: "David S. Miller" <davem@davemloft.net>,
	Eric Dumazet <edumazet@google.com>,
	Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
	Jamal Hadi Salim <jhs@mojatatu.com>,
	Cong Wang <xiyou.wangcong@gmail.com>,
	Jiri Pirko <jiri@resnulli.us>,
	Vinicius Costa Gomes <vinicius.gomes@intel.com>,
	linux-kernel@vger.kernel.org, intel-wired-lan@lists.osuosl.org,
	Muhammad Husaini Zulkifli <muhammad.husaini.zulkifli@intel.com>,
	Peilin Ye <yepeilin.cs@gmail.com>,
	Pedro Tammela <pctammela@mojatatu.com>
Subject: [PATCH RESEND net-next 4/5] net/sched: taprio: delete misleading comment about preallocating child qdiscs
Date: Fri,  2 Jun 2023 13:37:49 +0300	[thread overview]
Message-ID: <20230602103750.2290132-5-vladimir.oltean@nxp.com> (raw)
In-Reply-To: <20230602103750.2290132-1-vladimir.oltean@nxp.com>

As mentioned in commit af7b29b1deaa ("Revert "net/sched: taprio: make
qdisc_leaf() see the per-netdev-queue pfifo child qdiscs"") - unlike
mqprio, taprio doesn't use q->qdiscs[] only as a temporary transport
between Qdisc_ops :: init() and Qdisc_ops :: attach().

Delete the comment, which is just stolen from mqprio, but there, the
usage patterns are a lot different, and this is nothing but confusing.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
---
 net/sched/sch_taprio.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/net/sched/sch_taprio.c b/net/sched/sch_taprio.c
index 263306fe38d8..cc7ff98e5e86 100644
--- a/net/sched/sch_taprio.c
+++ b/net/sched/sch_taprio.c
@@ -2084,11 +2084,8 @@ static int taprio_init(struct Qdisc *sch, struct nlattr *opt,
 		return -EOPNOTSUPP;
 	}
 
-	/* pre-allocate qdisc, attachment can't fail */
-	q->qdiscs = kcalloc(dev->num_tx_queues,
-			    sizeof(q->qdiscs[0]),
+	q->qdiscs = kcalloc(dev->num_tx_queues, sizeof(q->qdiscs[0]),
 			    GFP_KERNEL);
-
 	if (!q->qdiscs)
 		return -ENOMEM;
 
-- 
2.34.1


  parent reply	other threads:[~2023-06-02 10:38 UTC|newest]

Thread overview: 50+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-06-02 10:37 [Intel-wired-lan] [PATCH RESEND net-next 0/5] Improve the taprio qdisc's relationship with its children Vladimir Oltean
2023-06-02 10:37 ` Vladimir Oltean
2023-06-02 10:37 ` [Intel-wired-lan] [PATCH RESEND net-next 1/5] net/sched: taprio: don't access q->qdiscs[] in unoffloaded mode during attach() Vladimir Oltean
2023-06-02 10:37   ` Vladimir Oltean
2023-06-02 10:37 ` [Intel-wired-lan] [PATCH RESEND net-next 2/5] net/sched: taprio: keep child Qdisc refcount elevated at 2 in offload mode Vladimir Oltean
2023-06-02 10:37   ` Vladimir Oltean
2023-06-06 10:27   ` Paolo Abeni
2023-06-06 10:27     ` [Intel-wired-lan] " Paolo Abeni
2023-06-06 15:56     ` Vladimir Oltean
2023-06-06 15:56       ` [Intel-wired-lan] " Vladimir Oltean
2023-06-07 10:05       ` Paolo Abeni
2023-06-07 10:05         ` Paolo Abeni
2023-06-07 10:16         ` Vladimir Oltean
2023-06-07 10:16           ` [Intel-wired-lan] " Vladimir Oltean
2023-06-02 10:37 ` [Intel-wired-lan] [PATCH RESEND net-next 3/5] net/sched: taprio: try again to report q->qdiscs[] to qdisc_leaf() Vladimir Oltean
2023-06-02 10:37   ` Vladimir Oltean
2023-06-02 10:37 ` Vladimir Oltean [this message]
2023-06-02 10:37   ` [PATCH RESEND net-next 4/5] net/sched: taprio: delete misleading comment about preallocating child qdiscs Vladimir Oltean
2023-06-02 10:37 ` [Intel-wired-lan] [PATCH RESEND net-next 5/5] net/sched: taprio: dump class stats for the actual q->qdiscs[] Vladimir Oltean
2023-06-02 10:37   ` Vladimir Oltean
2023-06-08 18:44   ` Jamal Hadi Salim
2023-06-08 18:44     ` [Intel-wired-lan] " Jamal Hadi Salim
2023-06-09 12:10     ` Vladimir Oltean
2023-06-09 12:10       ` [Intel-wired-lan] " Vladimir Oltean
2023-06-09 14:56       ` Victor Nogueira
2023-06-09 14:56         ` [Intel-wired-lan] " Victor Nogueira
2023-06-10 17:49         ` Vladimir Oltean
2023-06-10 17:49           ` [Intel-wired-lan] " Vladimir Oltean
2023-06-09 16:19       ` Jamal Hadi Salim
2023-06-09 16:19         ` Jamal Hadi Salim
2023-06-09 17:56         ` Vladimir Oltean
2023-06-09 17:56           ` [Intel-wired-lan] " Vladimir Oltean
2023-06-05 12:50 ` [PATCH RESEND net-next 0/5] Improve the taprio qdisc's relationship with its children Vladimir Oltean
2023-06-05 12:50   ` [Intel-wired-lan] " Vladimir Oltean
2023-06-05 13:27   ` Simon Horman
2023-06-05 13:27     ` [Intel-wired-lan] " Simon Horman
2023-06-05 15:44 ` Jamal Hadi Salim
2023-06-05 15:44   ` Jamal Hadi Salim
2023-06-05 16:53   ` Vladimir Oltean
2023-06-05 16:53     ` [Intel-wired-lan] " Vladimir Oltean
2023-06-06 15:39     ` Jamal Hadi Salim
2023-06-06 15:39       ` [Intel-wired-lan] " Jamal Hadi Salim
2023-06-06 16:31       ` Vladimir Oltean
2023-06-06 16:31         ` [Intel-wired-lan] " Vladimir Oltean
2023-06-06 17:42         ` Jamal Hadi Salim
2023-06-06 17:42           ` [Intel-wired-lan] " Jamal Hadi Salim
2023-06-07 10:09           ` Vladimir Oltean
2023-06-07 10:09             ` [Intel-wired-lan] " Vladimir Oltean
2023-06-07 10:30             ` Vladimir Oltean
2023-06-07 10:30               ` [Intel-wired-lan] " Vladimir Oltean

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230602103750.2290132-5-vladimir.oltean@nxp.com \
    --to=vladimir.oltean@nxp.com \
    --cc=davem@davemloft.net \
    --cc=edumazet@google.com \
    --cc=intel-wired-lan@lists.osuosl.org \
    --cc=jhs@mojatatu.com \
    --cc=jiri@resnulli.us \
    --cc=kuba@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=pabeni@redhat.com \
    --cc=pctammela@mojatatu.com \
    --cc=xiyou.wangcong@gmail.com \
    --cc=yepeilin.cs@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.