From: Ben Hutchings <bhutchings@solarflare.com>
To: Mike Travis <travis@sgi.com>
Cc: Ingo Molnar <mingo@redhat.com>,
Rusty Russell <rusty@rustcorp.com.au>,
linux-kernel@vger.kernel.org, Dean Nelson <dcn@sgi.com>,
Jeremy Fitzhardinge <jeremy@goop.org>,
Robert Richter <robert.richter@amd.com>
Subject: Re: [PATCH 7/8] cpumask: convert misc driver functions
Date: Sat, 20 Dec 2008 23:22:39 +0000 [thread overview]
Message-ID: <1229815359.2723.19.camel@hashbaz.i.decadent.org.uk> (raw)
In-Reply-To: <20081219160145.672392000@polaris-admin.engr.sgi.com>
On Fri, 2008-12-19 at 08:01 -0800, Mike Travis wrote:
[...]
> --- linux-2.6-for-ingo.orig/drivers/net/sfc/efx.c
> +++ linux-2.6-for-ingo/drivers/net/sfc/efx.c
> @@ -809,19 +809,18 @@ static void efx_fini_io(struct efx_nic *
> /* Get number of RX queues wanted. Return number of online CPU
> * packages in the expectation that an IRQ balancer will spread
> * interrupts across them. */
> -static int efx_wanted_rx_queues(void)
> +static int efx_wanted_rx_queues(struct cpumask *scratch)
> {
> - cpumask_t core_mask;
> int count;
> int cpu;
>
> - cpus_clear(core_mask);
> + cpumask_clear(scratch);
> count = 0;
> for_each_online_cpu(cpu) {
> - if (!cpu_isset(cpu, core_mask)) {
> + if (!cpumask_test_cpu(cpu, scratch)) {
> ++count;
> - cpus_or(core_mask, core_mask,
> - topology_core_siblings(cpu));
> + cpumask_or(scratch, scratch,
> + topology_core_cpumask(cpu));
> }
> }
>
> @@ -831,7 +830,7 @@ static int efx_wanted_rx_queues(void)
> /* Probe the number and type of interrupts we are able to obtain, and
> * the resulting numbers of channels and RX queues.
> */
> -static void efx_probe_interrupts(struct efx_nic *efx)
> +static void efx_probe_interrupts(struct efx_nic *efx, struct cpumask *scratch)
> {
> int max_channels =
> min_t(int, efx->type->phys_addr_channels, EFX_MAX_CHANNELS);
> @@ -845,7 +844,8 @@ static void efx_probe_interrupts(struct
> * (or as specified by the rss_cpus module parameter).
> * We will need one channel per interrupt.
> */
> - wanted_ints = rss_cpus ? rss_cpus : efx_wanted_rx_queues();
> + wanted_ints = rss_cpus ? rss_cpus :
> + efx_wanted_rx_queues(scratch);
> efx->n_rx_queues = min(wanted_ints, max_channels);
>
> for (i = 0; i < efx->n_rx_queues; i++)
> @@ -923,24 +923,29 @@ static void efx_set_channels(struct efx_
> static int efx_probe_nic(struct efx_nic *efx)
> {
> int rc;
> + cpumask_var_t scratch;
>
> EFX_LOG(efx, "creating NIC\n");
>
> + if (!alloc_cpumask_var(&scratch, GFP_KERNEL))
> + return -ENOMEM;
> +
> /* Carry out hardware-type specific initialisation */
> rc = falcon_probe_nic(efx);
> if (rc)
> - return rc;
> + goto out;
>
> /* Determine the number of channels and RX queues by trying to hook
> * in MSI-X interrupts. */
> - efx_probe_interrupts(efx);
> + efx_probe_interrupts(efx, scratch);
>
> efx_set_channels(efx);
>
> /* Initialise the interrupt moderation settings */
> efx_init_irq_moderation(efx, tx_irq_mod_usec, rx_irq_mod_usec);
> -
> - return 0;
> +out:
> + free_cpumask_var(scratch);
> + return rc;
> }
>
> static void efx_remove_nic(struct efx_nic *efx)
[...]
I assume you're moving the allocation up to efx_probe_nic() because
efx_wanted_rx_queues() and efx_probe_interrupts() cannot return failure.
It really isn't worth exposing that detail up the call chain though. I
think it's acceptable for efx_wanted_rx_queues() to log an error message
and return 1 in the exceedingly unlikely case that the allocation fails.
Ben.
--
Ben Hutchings, Senior Software Engineer, Solarflare Communications
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.
next prev parent reply other threads:[~2008-12-20 23:52 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-19 16:01 [PATCH 0/8] x86 cpumask: more cpumask updates to core kernel routines Mike Travis
2008-12-19 16:01 ` [PATCH 1/8] cpumask: convert kernel/compat.c Mike Travis
2008-12-19 16:01 ` [PATCH 2/8] cpumask: convert kernel/workqueue.c Mike Travis
2008-12-19 16:01 ` [PATCH 3/8] cpumask: convert kernel time functions Mike Travis
2008-12-20 11:29 ` Rusty Russell
2008-12-19 16:01 ` [PATCH 4/8] cpumask: convert kernel trace functions Mike Travis
2008-12-19 16:16 ` Steven Rostedt
2008-12-19 16:54 ` Mike Travis
2008-12-19 17:01 ` Steven Rostedt
2008-12-20 1:41 ` Steven Rostedt
2008-12-20 11:22 ` Rusty Russell
2008-12-19 16:01 ` [PATCH 5/8] cpumask: convert rest of files in kernel/ Mike Travis
2008-12-20 1:33 ` Lai Jiangshan
2008-12-20 13:02 ` Rusty Russell
2008-12-19 16:01 ` [PATCH 6/8] cpumask: convert kernel mm functions Mike Travis
2008-12-19 18:08 ` Christoph Lameter
2008-12-19 16:01 ` [PATCH 7/8] cpumask: convert misc driver functions Mike Travis
2008-12-20 23:22 ` Ben Hutchings [this message]
2008-12-29 2:28 ` Rusty Russell
2008-12-29 15:37 ` Dean Nelson
2008-12-19 16:01 ` [PATCH 8/8] cpumask: convert other misc kernel functions Mike Travis
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=1229815359.2723.19.camel@hashbaz.i.decadent.org.uk \
--to=bhutchings@solarflare.com \
--cc=dcn@sgi.com \
--cc=jeremy@goop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=robert.richter@amd.com \
--cc=rusty@rustcorp.com.au \
--cc=travis@sgi.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
all inboxes | Powered by JetHome®