From: Yury Norov <yury.norov@gmail.com>
To: netdev@vger.kernel.org, "David S . Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Sebastian Andrzej Siewior <bigeasy@linutronix.de>,
Menglong Dong <imagedong@tencent.com>,
Kuniyuki Iwashima <kuniyu@amazon.com>,
Petr Machata <petrm@nvidia.com>,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH 3/4] net: initialize online_mask unconditionally in __netif_set_xps_queue()
Date: Sun, 2 Oct 2022 09:58:48 -0700 [thread overview]
Message-ID: <YznDSKbiDI99Om23@yury-laptop> (raw)
In-Reply-To: <20221002151702.3932770-4-yury.norov@gmail.com>
On Sun, Oct 02, 2022 at 08:17:01AM -0700, Yury Norov wrote:
> If the mask is initialized unconditionally, it's possible to use bitmap
> API to traverse it, which is done in the following patch.
>
> Signed-off-by: Yury Norov <yury.norov@gmail.com>
> ---
> net/core/dev.c | 21 ++++++++++++---------
> 1 file changed, 12 insertions(+), 9 deletions(-)
>
> diff --git a/net/core/dev.c b/net/core/dev.c
> index 39a4cc7b3a06..266378ad1cf1 100644
> --- a/net/core/dev.c
> +++ b/net/core/dev.c
> @@ -2542,7 +2542,7 @@ int __netif_set_xps_queue(struct net_device *dev, const unsigned long *mask,
> u16 index, enum xps_map_type type)
> {
> struct xps_dev_maps *dev_maps, *new_dev_maps = NULL, *old_dev_maps = NULL;
> - const unsigned long *online_mask = NULL;
> + const unsigned long *online_mask;
> bool active = false, copy = false;
> int i, j, tci, numa_node_id = -2;
> int maps_sz, num_tc = 1, tc = 0;
> @@ -2565,9 +2565,11 @@ int __netif_set_xps_queue(struct net_device *dev, const unsigned long *mask,
>
> if (type == XPS_RXQS) {
> nr_ids = dev->num_rx_queues;
> + online_mask = bitmap_alloc(nr_ids, GFP_KERNEL);
> + if (!online_mask)
> + return -ENOMEM;
Oh god, I missed a line here while preparing the patch. It should be:
+ online_mask = bitmap_alloc(nr_ids, GFP_KERNEL);
+ if (!online_mask)
+ return -ENOMEM;
+ bitmap_fill(online_mask, nr_ids);
I'll send v2 after collecting the comments.
> } else {
> - if (num_possible_cpus() > 1)
> - online_mask = cpumask_bits(cpu_online_mask);
> + online_mask = cpumask_bits(cpu_online_mask);
> nr_ids = nr_cpu_ids;
> }
>
> @@ -2593,10 +2595,8 @@ int __netif_set_xps_queue(struct net_device *dev, const unsigned long *mask,
> j < nr_ids;) {
> if (!new_dev_maps) {
> new_dev_maps = kzalloc(maps_sz, GFP_KERNEL);
> - if (!new_dev_maps) {
> - mutex_unlock(&xps_map_mutex);
> - return -ENOMEM;
> - }
> + if (!new_dev_maps)
> + goto err_out;
>
> new_dev_maps->nr_ids = nr_ids;
> new_dev_maps->num_tc = num_tc;
> @@ -2718,7 +2718,8 @@ int __netif_set_xps_queue(struct net_device *dev, const unsigned long *mask,
>
> out_no_maps:
> mutex_unlock(&xps_map_mutex);
> -
> + if (type == XPS_RXQS)
> + bitmap_free(online_mask);
> return 0;
> error:
> /* remove any maps that we added */
> @@ -2733,8 +2734,10 @@ int __netif_set_xps_queue(struct net_device *dev, const unsigned long *mask,
> }
> }
>
> +err_out:
> mutex_unlock(&xps_map_mutex);
> -
> + if (type == XPS_RXQS)
> + bitmap_free(online_mask);
> kfree(new_dev_maps);
> return -ENOMEM;
> }
> --
> 2.34.1
next prev parent reply other threads:[~2022-10-02 16:58 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-02 15:16 [PATCH 0/4] net: drop netif_attrmask_next*() Yury Norov
2022-10-02 15:16 ` [PATCH 1/4] net: move setup code out of mutex in __netif_set_xps_queue() Yury Norov
2022-10-02 15:17 ` [PATCH 2/4] net: merge XPS_CPU_DEV_MAPS_SIZE and XPS_RXQ_DEV_MAPS_SIZE macros Yury Norov
2022-10-02 15:17 ` [PATCH 3/4] net: initialize online_mask unconditionally in __netif_set_xps_queue() Yury Norov
2022-10-02 16:58 ` Yury Norov [this message]
2022-10-02 15:17 ` [PATCH 4/4] net: fix opencoded for_each_and_bit() " Yury Norov
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=YznDSKbiDI99Om23@yury-laptop \
--to=yury.norov@gmail.com \
--cc=bigeasy@linutronix.de \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=imagedong@tencent.com \
--cc=kuba@kernel.org \
--cc=kuniyu@amazon.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=petrm@nvidia.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).