mm: fix dma_poor_create
Subsystems (2)
PATCH 1/1 mm: fix dma_poor_create
dev_to_node could return node that without RAM. So check it before use it in kmalloc_node
mm/dmapool.c +6 -1
@@ -128,6 +128,7 @@ struct dma_pool *dma_pool_create(const char *name, struct device *dev, {struct dma_pool *retval;size_t allocation; +int node;if (align ==0 ) { align =1 ;
@@ -152,7 +153,11 @@ struct dma_pool *dma_pool_create(const char *name, struct device *dev,return NULL ; } - retval =kmalloc_node (sizeof (*retval),GFP_KERNEL ,dev_to_node (dev)); + node =dev_to_node (dev); +if (node ==-1 || !node_online (node)) + node =numa_node_id (); + + retval =kmalloc_node (sizeof (*retval),GFP_KERNEL , node);if (!retval)return retval;
mm/dmapool.c struct dma_pool *dma_pool_create(const char *name, struct device *dev, · line 160
Quoted 9 lines · Yinghai Lu
dev_to_nodecould return node that without RAM. So check it before use it inkmalloc_nodemm/dmapool.c +5
-1- retval =kmalloc_node (sizeof (*retval),GFP_KERNEL ,dev_to_node (dev)); + node =dev_to_node (dev); +if (node ==-1 || !node_online (node)) + node =numa_node_id (); + + retval =kmalloc_node (sizeof (*retval),GFP_KERNEL , node);
so this is about not crashing during bootup on nodes that have CPUs but which have no node-specific memory attached, right?
Shouldnt kmalloc_node() be made more robust instead? I.e. push the same code into kmalloc_node() - and make sure it will allocate _something_? That would probably also fix a similar bug in net/core/skbuff.c's __netdev_alloc_skb(), which too passes a dev_to_node() result to an allocator.
Ingo
Quoted 16 lines · Ingo Molnar
mm/dmapool.c struct dma_pool *dma_pool_create(const char *name, struct device *dev, · line 160
Quoted 9 lines · Yinghai Lu
dev_to_nodecould return node that without RAM. So check it before use it inkmalloc_nodemm/dmapool.c +5
-1- retval =kmalloc_node (sizeof (*retval),GFP_KERNEL ,dev_to_node (dev)); + node =dev_to_node (dev); +if (node ==-1 || !node_online (node)) + node =numa_node_id (); + + retval =kmalloc_node (sizeof (*retval),GFP_KERNEL , node);so this is about not crashing during bootup on nodes that have CPUs but which have no node-specific memory attached, right?
Quoted 5 lines
Shouldnt
kmalloc_node()be made more robust instead? I.e. push the same code intokmalloc_node()- and make sure it will allocate _something_? That would probably also fix a similar bug in net/core/skbuff.c's__netdev_alloc_skb(), which too passes adev_to_node()result to an allocator.
sound good idea to update the dev_to_node to make sure it will return -1 or the one is online.
Will send updated one.
YH