[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <1292361479.2478.2.camel@edumazet-laptop>
Date: Tue, 14 Dec 2010 22:17:59 +0100
From: Eric Dumazet <eric.dumazet@...il.com>
To: Dimitris Michailidis <dm@...lsio.com>
Cc: netdev@...r.kernel.org
Subject: Re: [PATCH 12/12] cxgb4: NUMA-aware Tx queue allocations
Le mardi 14 décembre 2010 à 12:18 -0800, Dimitris Michailidis a écrit :
> Allocate Tx queue memory on the node indicated by the new
> netdev_queue_numa_node_read. If that fails we allocate on any node.
>
> Signed-off-by: Dimitris Michailidis <dm@...lsio.com>
> ---
> drivers/net/cxgb4/sge.c | 20 +++++++++++++-------
> 1 files changed, 13 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/net/cxgb4/sge.c b/drivers/net/cxgb4/sge.c
> index cc0b997..ed98b8a 100644
> --- a/drivers/net/cxgb4/sge.c
> +++ b/drivers/net/cxgb4/sge.c
> @@ -579,6 +579,7 @@ static inline void __refill_fl(struct adapter *adap, struct sge_fl *fl)
> * @phys: the physical address of the allocated ring
> * @metadata: address of the array holding the SW state for the ring
> * @stat_size: extra space in HW ring for status information
> + * @node: preferred node for memory allocations
> *
> * Allocates resources for an SGE descriptor ring, such as Tx queues,
> * free buffer lists, or response queues. Each SGE ring requires
> @@ -590,7 +591,7 @@ static inline void __refill_fl(struct adapter *adap, struct sge_fl *fl)
> */
> static void *alloc_ring(struct device *dev, size_t nelem, size_t elem_size,
> size_t sw_size, dma_addr_t *phys, void *metadata,
> - size_t stat_size)
> + size_t stat_size, int node)
> {
> size_t len = nelem * elem_size + stat_size;
> void *s = NULL;
> @@ -599,7 +600,10 @@ static void *alloc_ring(struct device *dev, size_t nelem, size_t elem_size,
> if (!p)
> return NULL;
> if (sw_size) {
> - s = kcalloc(nelem, sw_size, GFP_KERNEL);
> + if (node >= 0)
> + s = kzalloc_node(nelem * sw_size, GFP_KERNEL, node);
kzalloc_node() has a fallback, you dont need to retry with kcalloc()
> + if (!s)
> + s = kcalloc(nelem, sw_size, GFP_KERNEL);
>
> if (!s) {
> dma_free_coherent(dev, len, p, *phys);
Also, I am not sure it is going to work, since we can setup XPS only
after device being setup ?
By the time your driver allocates rings, we probably read
-1/NUMA_NO_NODE
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists