[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20210128173736.625461b1@kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com>
Date: Thu, 28 Jan 2021 17:37:36 -0800
From: Jakub Kicinski <kuba@...nel.org>
To: Saeed Mahameed <saeed@...nel.org>
Cc: davem@...emloft.net, netdev@...r.kernel.org, roid@...dia.com,
maord@...dia.com
Subject: Re: [net 01/12] net/mlx5: Fix memory leak on flow table creation
error flow
On Thu, 28 Jan 2021 00:33:20 -0800 Saeed Mahameed wrote:
> On Thu, 2021-01-28 at 03:30 +0000, patchwork-bot+netdevbpf@...nel.org
> wrote:
> > Hello:
> >
> > This series was applied to netdev/net.git (refs/heads/master):
> >
> >
> ...
>
> > https://git.kernel.org/netdev/net/c/89e394675818
> > - [net,09/12] net/mlx5e: Correctly handle changing the number of
> > queues when the interface is down
>
>
>
> Hi Jakub,
>
> I just noticed that this patch will conflict with HTB offlaod feature
> in net-next, I couldn't foresee it before in my queues since HTB wasn't
> submitted through my trees.
>
> anyway to solve the conflict just use this hunk:
>
> + /* Don't allow changing the number of channels if HTB offload
> is active,
> + * because the numeration of the QoS SQs will change, while
> per-queue
> + * qdiscs are attached.
> + */
> + if (priv->htb.maj_id) {
> + err = -EINVAL;
> + netdev_err(priv->netdev, "%s: HTB offload is active,
> cannot change the number of channels\n",
> + __func__);
> + goto out;
> + }
> +
> - new_channels.params = priv->channels.params;
> - new_channels.params.num_channels = count;
> + new_channels.params = *cur_params;
>
Done, thanks!
Powered by blists - more mailing lists