Date:   Fri, 10 Feb 2023 17:20:58 +0200
From:   Vladimir Oltean <vladimir.oltean@nxp.com>
To:     Eric Dumazet <edumazet@google.com>
Cc:     netdev@vger.kernel.org, "David S. Miller" <davem@davemloft.net>,
        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>,
        Kurt Kanzenbach <kurt@linutronix.de>,
        Jacob Keller <jacob.e.keller@intel.com>,
        Gerhard Engleder <gerhard@engleder-embedded.com>,
        Jesse Brandeburg <jesse.brandeburg@intel.com>,
        Tony Nguyen <anthony.l.nguyen@intel.com>,
        intel-wired-lan@lists.osuosl.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2 net-next 10/15] net/sched: make stab available before
 ops->init() call
Message-ID: <20230210152058.kvn74av2kyzr2sxq@skbuf>
References: <20230207135440.1482856-1-vladimir.oltean@nxp.com>
 <20230207135440.1482856-11-vladimir.oltean@nxp.com>
 <20230207135440.1482856-1-vladimir.oltean@nxp.com>
 <20230207135440.1482856-11-vladimir.oltean@nxp.com>
 <CANn89iL=Z8TOymdaBJ8WUBh8pXOgp_tKM3KVsQZ05uT3orOj4w@mail.gmail.com>
 <CANn89iL=Z8TOymdaBJ8WUBh8pXOgp_tKM3KVsQZ05uT3orOj4w@mail.gmail.com>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <CANn89iL=Z8TOymdaBJ8WUBh8pXOgp_tKM3KVsQZ05uT3orOj4w@mail.gmail.com>
 <CANn89iL=Z8TOymdaBJ8WUBh8pXOgp_tKM3KVsQZ05uT3orOj4w@mail.gmail.com>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?moDNR+zD3Ddf3gy0r5zrAOT42pokZ0dEIAkEaJIzLSnGblLyQL1PL3M+Whc7?=
 =?us-ascii?Q?kWHSQbJDnmFDRHCYDf9uBaQyccOmzPfvd77WzBXzA2v7T5fqLqehbveN+ODL?=
 =?us-ascii?Q?sYvvAD3bprtl3JkiEBep5heOz0f3eqwUYBEvt2+IYwez61WfbWDubcLuGi1V?=
 =?us-ascii?Q?De7gEZAsn95F4lwpcHJKIbkV103vGYZumRHeXM7L6XR76UeCOAF64M8Sva0d?=
 =?us-ascii?Q?W9kUCxfRI0pw0u9kZj8Es4A8iv7Cj0tPDHafVe82TOZ8GcrWEscmGdJ+R8dJ?=
 =?us-ascii?Q?vlDqjOB5R5zxwMCxjPrmqxHoBTQiKq0q4IVo6MXCjlG3eQyzlXsf7u8QsKKM?=
 =?us-ascii?Q?fklRD7NP9aWaWMiHVstzUun3TjB8L3a2T3Up7vXTyixtmwfntMtiP+8jJDMG?=
 =?us-ascii?Q?lZjEWFq6fY61bMLGT+lBPwYs69w81u+pbEFc4irJvo8DMqcGH0+GYujsE2mb?=
 =?us-ascii?Q?qqhO4o1NP6+HxT9hq80N5nbg/oa2B88mj5rbYUX7BzozCq8B62TgPXkbWF7y?=
 =?us-ascii?Q?OUWyihOClxA7kAW/umi1P0dvmp9w1gV1mmURpneUfEtjiT5z8EYQCIF8Afby?=
 =?us-ascii?Q?WKlJ6J32HL4lFc3jYLSIm6J4BVZiDm2ShIT0KH552iwvRDp4+LSeCJ4EmYtJ?=
 =?us-ascii?Q?WSfrNobxJWnavZ3MdtMCyqSc2gtxwT9Avb/sdadOOCKicjJGgoiwT3ef/oey?=
 =?us-ascii?Q?8KsFs3I/ih/WmpaR/wN4PT40dHOvzELsDZ2XceFUxDB+uFhCNgsjU5LmOx4P?=
 =?us-ascii?Q?yM2DFm01IP7VVxEViwVgWxIXEtDU8xTNzF0tHu/x63Rc6wjmI72+cGqdioIB?=
 =?us-ascii?Q?JPBkiVZ5IscXo5OkcoHUzVskkTkEEkhGdE/aSBEwB8uta2IqjYTCpuI1CVU/?=
 =?us-ascii?Q?MmIgDlF6zjaaMfH5hWfxMXsxBATATgRf5MrA7p6nsV2tvnkFERZfTA5kkseD?=
 =?us-ascii?Q?h3ltkHXvaFI9kJ8QU3ASb66o9zHhHLnT9PH7AgcAPh7jrISDiOCO8884alMo?=
 =?us-ascii?Q?hcSiKO2GrzAfyV2uWOyYJmR0LH9amiV2jAgacKGVNfLH77uhxCHfaEgF3c4v?=
 =?us-ascii?Q?lweqtr1ylzedIxe6oY/8PnpTlunfAXd+u3Nnp2wGbbaYFYuu5IbBgvR3mvy8?=
 =?us-ascii?Q?Fl+kPLYbAVaj5HltZL6WUFFJykOZWMbp82uMhwbo5nXED2KqVf/wDg0sFOcP?=
 =?us-ascii?Q?XKnaVV+JDJaLxfMAc3WADFFu+4GhLOEjQ6aFNK6aNPG8LRwfUw1U3GiNPLQm?=
 =?us-ascii?Q?yCbWHJC30mnVVilYuMGyXVE39Qw4rc8ZHQo1Q1CclrsR/gJlbJjPFFxkvOP/?=
 =?us-ascii?Q?poBrjtgk1un2tVQRQzdOaOUgKRqv9idrye6jBP7kWLueRYTTfubiz0GAaZ/c?=
 =?us-ascii?Q?O+fum6kkLILKSqYPmhAr8GZcew7b9qOhww20KOjv5biasVW5m2D7xx+BA10F?=
 =?us-ascii?Q?lRqxPGY24i92q8eeB6Vm9qjgibqCO1bW1JrjDlLZk8qjIt65oVpTyglmOXO3?=
 =?us-ascii?Q?OVXlYiA6CqLsPc17Jt1yp6Dd6UWM+ci+4eq5lL94Lg2arD/iF14hdAAt3Upj?=
 =?us-ascii?Q?YkZSV9U+Dy+bUt8hC7Ek1p/pzkKwnaDKprZK2zVAgB68aVuKAOcHgAZJEyCx?=
 =?us-ascii?Q?HQ=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 56f2dabc-5a08-4fde-43cb-08db0b7a6c28
X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5136.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Feb 2023 15:21:03.3425
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: bepvSUocE/cwKKCme4huXawf03a1IIMSwu1Rte5HXr4sAu267uOq+rY+UKq3TER4PXil7vMFjdvT9W1kTLmYqg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB8447
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Fri, Feb 10, 2023 at 04:07:42PM +0100, Eric Dumazet wrote:
> On Tue, Feb 7, 2023 at 2:55 PM Vladimir Oltean <vladimir.oltean@nxp.com> wrote:
> > Move it earlier, which nicely seems to simplify the error handling path
> > as well.
> 
> Well... if you say so :)

:)

> If TCA_STAB attribute is malformed, we end up calling ->destroy() on a
> not yet initialized qdisc :/

Right. Sorry, I didn't pay enough attention, and the old structure with
"err_out4" having a "goto err_out3" confused me. Because I was trying to
match the old teardown path with the new (linear) one, I was trying to
keep the order between qdisc_put_stab() and ops->destroy(). But I forgot
that I need to *reverse* it, since I reversed their order in the setup
path :-/

> I am going to send the following fix, unless someone disagrees.
> 
> (Moving qdisc_put_stab() _after_ ops->destroy(sch) is not strictly
> needed for a fix,
> but undo should be done in reverse steps for clarity.

Right, and it's a net-next patch, so a larger fix which brings the code
into shape should be fine.

> 
> diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c
> index e9780631b5b58202068e20c42ccf1197eac2194c..aba789c30a2eb50d339b8a888495b794825e1775
> 100644
> --- a/net/sched/sch_api.c
> +++ b/net/sched/sch_api.c
> @@ -1286,7 +1286,7 @@ static struct Qdisc *qdisc_create(struct net_device *dev,
>                 stab = qdisc_get_stab(tca[TCA_STAB], extack);
>                 if (IS_ERR(stab)) {
>                         err = PTR_ERR(stab);
> -                       goto err_out4;
> +                       goto err_out3;
>                 }
>                 rcu_assign_pointer(sch->stab, stab);
>         }
> @@ -1294,14 +1294,14 @@ static struct Qdisc *qdisc_create(struct
> net_device *dev,
>         if (ops->init) {
>                 err = ops->init(sch, tca[TCA_OPTIONS], extack);
>                 if (err != 0)
> -                       goto err_out5;
> +                       goto err_out4;
>         }
> 
>         if (tca[TCA_RATE]) {
>                 err = -EOPNOTSUPP;
>                 if (sch->flags & TCQ_F_MQROOT) {
>                         NL_SET_ERR_MSG(extack, "Cannot attach rate
> estimator to a multi-queue root qdisc");
> -                       goto err_out5;
> +                       goto err_out4;
>                 }
> 
>                 err = gen_new_estimator(&sch->bstats,
> @@ -1312,7 +1312,7 @@ static struct Qdisc *qdisc_create(struct net_device *dev,
>                                         tca[TCA_RATE]);
>                 if (err) {
>                         NL_SET_ERR_MSG(extack, "Failed to generate new
> estimator");
> -                       goto err_out5;
> +                       goto err_out4;
>                 }
>         }
> 
> @@ -1321,12 +1321,13 @@ static struct Qdisc *qdisc_create(struct
> net_device *dev,
> 
>         return sch;
> 
> -err_out5:
> -       qdisc_put_stab(rtnl_dereference(sch->stab));
>  err_out4:
> -       /* ops->init() failed, we call ->destroy() like qdisc_create_dflt() */
> +       /* Even if ops->init() failed, we call ops->destroy()
> +        * like qdisc_create_dflt().
> +        */
>         if (ops->destroy)
>                 ops->destroy(sch);
> +       qdisc_put_stab(rtnl_dereference(sch->stab));
>  err_out3:
>         netdev_put(dev, &sch->dev_tracker);
>         qdisc_free(sch);

I applied the changes from this patch manually, and the result looks good.
Thanks (and sorry)!