lkml.org 
[lkml]   [2014]   [Jul]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[RFC Patch V1 16/30] mm, ixgbe: Use cpu_to_mem()/numa_mem_id() to support memoryless node
    Date
    When CONFIG_HAVE_MEMORYLESS_NODES is enabled, cpu_to_node()/numa_node_id()
    may return a node without memory, and later cause system failure/panic
    when calling kmalloc_node() and friends with returned node id.
    So use cpu_to_mem()/numa_mem_id() instead to get the nearest node with
    memory for the/current cpu.

    If CONFIG_HAVE_MEMORYLESS_NODES is disabled, cpu_to_mem()/numa_mem_id()
    is the same as cpu_to_node()/numa_node_id().

    Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
    ---
    drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
    index f5aa3311ea28..46dc083573ea 100644
    --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
    +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
    @@ -1962,7 +1962,7 @@ static bool ixgbe_add_rx_frag(struct ixgbe_ring *rx_ring,
    memcpy(__skb_put(skb, size), va, ALIGN(size, sizeof(long)));

    /* we can reuse buffer as-is, just make sure it is local */
    - if (likely(page_to_nid(page) == numa_node_id()))
    + if (likely(page_to_nid(page) == numa_mem_id()))
    return true;

    /* this page cannot be reused so discard it */
    @@ -1974,7 +1974,7 @@ static bool ixgbe_add_rx_frag(struct ixgbe_ring *rx_ring,
    rx_buffer->page_offset, size, truesize);

    /* avoid re-using remote pages */
    - if (unlikely(page_to_nid(page) != numa_node_id()))
    + if (unlikely(page_to_nid(page) != numa_mem_id()))
    return false;

    #if (PAGE_SIZE < 8192)
    --
    1.7.10.4


    \
     
     \ /
      Last update: 2014-07-11 11:21    [W:2.980 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site