lkml.org 
[lkml]   [2021]   [Mar]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.11 120/775] bpf, devmap: Use GFP_KERNEL for xdp bulk queue allocation
    Date
    From: Jun'ichi Nomura <junichi.nomura@nec.com>

    [ Upstream commit 7d4553b69fb335496c597c31590e982485ebe071 ]

    The devmap bulk queue is allocated with GFP_ATOMIC and the allocation
    may fail if there is no available space in existing percpu pool.

    Since commit 75ccae62cb8d42 ("xdp: Move devmap bulk queue into struct net_device")
    moved the bulk queue allocation to NETDEV_REGISTER callback, whose context
    is allowed to sleep, use GFP_KERNEL instead of GFP_ATOMIC to let percpu
    allocator extend the pool when needed and avoid possible failure of netdev
    registration.

    As the required alignment is natural, we can simply use alloc_percpu().

    Fixes: 75ccae62cb8d42 ("xdp: Move devmap bulk queue into struct net_device")
    Signed-off-by: Jun'ichi Nomura <junichi.nomura@nec.com>
    Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
    Cc: Toke Høiland-Jørgensen <toke@redhat.com>
    Link: https://lore.kernel.org/bpf/20210209082451.GA44021@jeru.linux.bs1.fc.nec.co.jp
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    kernel/bpf/devmap.c | 4 +---
    1 file changed, 1 insertion(+), 3 deletions(-)

    diff --git a/kernel/bpf/devmap.c b/kernel/bpf/devmap.c
    index f6e9c68afdd42..85d9d1b72a33a 100644
    --- a/kernel/bpf/devmap.c
    +++ b/kernel/bpf/devmap.c
    @@ -802,9 +802,7 @@ static int dev_map_notification(struct notifier_block *notifier,
    break;

    /* will be freed in free_netdev() */
    - netdev->xdp_bulkq =
    - __alloc_percpu_gfp(sizeof(struct xdp_dev_bulk_queue),
    - sizeof(void *), GFP_ATOMIC);
    + netdev->xdp_bulkq = alloc_percpu(struct xdp_dev_bulk_queue);
    if (!netdev->xdp_bulkq)
    return NOTIFY_BAD;

    --
    2.27.0


    \
     
     \ /
      Last update: 2021-03-02 01:11    [W:3.424 / U:1.612 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site