]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ovs: do not allocate memory from offline numa node
authorKonstantin Khlebnikov <khlebnikov@yandex-team.ru>
Fri, 2 Oct 2015 10:18:22 +0000 (13:18 +0300)
committerLuis Henriques <luis.henriques@canonical.com>
Wed, 28 Oct 2015 10:33:20 +0000 (10:33 +0000)
commit 598c12d0ba6de9060f04999746eb1e015774044b upstream.

When openvswitch tries allocate memory from offline numa node 0:
stats = kmem_cache_alloc_node(flow_stats_cache, GFP_KERNEL | __GFP_ZERO, 0)
It catches VM_BUG_ON(nid < 0 || nid >= MAX_NUMNODES || !node_online(nid))
[ replaced with VM_WARN_ON(!node_online(nid)) recently ] in linux/gfp.h
This patch disables numa affinity in this case.

Signed-off-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
Acked-by: Pravin B Shelar <pshelar@nicira.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
net/openvswitch/flow_table.c

index 740041a09b9d79b88b859841b8808488f9954454..7a797ffd75a0d1255b0a360d782e8133caf17e0c 100644 (file)
@@ -90,7 +90,8 @@ struct sw_flow *ovs_flow_alloc(void)
 
        /* Initialize the default stat node. */
        stats = kmem_cache_alloc_node(flow_stats_cache,
-                                     GFP_KERNEL | __GFP_ZERO, 0);
+                                     GFP_KERNEL | __GFP_ZERO,
+                                     node_online(0) ? 0 : NUMA_NO_NODE);
        if (!stats)
                goto err;