lkml.org 
[lkml]   [2021]   [Nov]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.14 108/125] bpf: Move BPF_MAP_TYPE for INODE_STORAGE and TASK_STORAGE outside of CONFIG_NET
    Date
    From: Tejun Heo <tj@kernel.org>

    [ Upstream commit 99d0a3831e3500d945162cdb2310e3a5fce90b60 ]

    bpf_types.h has BPF_MAP_TYPE_INODE_STORAGE and BPF_MAP_TYPE_TASK_STORAGE
    declared inside #ifdef CONFIG_NET although they are built regardless of
    CONFIG_NET. So, when CONFIG_BPF_SYSCALL && !CONFIG_NET, they are built
    without the declarations leading to spurious build failures and not
    registered to bpf_map_types making them unavailable.

    Fix it by moving the BPF_MAP_TYPE for the two map types outside of
    CONFIG_NET.

    Reported-by: kernel test robot <lkp@intel.com>
    Fixes: a10787e6d58c ("bpf: Enable task local storage for tracing programs")
    Signed-off-by: Tejun Heo <tj@kernel.org>
    Signed-off-by: Alexei Starovoitov <ast@kernel.org>
    Acked-by: Martin KaFai Lau <kafai@fb.com>
    Link: https://lore.kernel.org/bpf/YXG1cuuSJDqHQfRY@slm.duckdns.org
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    include/linux/bpf_types.h | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    diff --git a/include/linux/bpf_types.h b/include/linux/bpf_types.h
    index ae3ac3a2018c..2eb9c53468e7 100644
    --- a/include/linux/bpf_types.h
    +++ b/include/linux/bpf_types.h
    @@ -101,14 +101,14 @@ BPF_MAP_TYPE(BPF_MAP_TYPE_STACK_TRACE, stack_trace_map_ops)
    #endif
    BPF_MAP_TYPE(BPF_MAP_TYPE_ARRAY_OF_MAPS, array_of_maps_map_ops)
    BPF_MAP_TYPE(BPF_MAP_TYPE_HASH_OF_MAPS, htab_of_maps_map_ops)
    -#ifdef CONFIG_NET
    -BPF_MAP_TYPE(BPF_MAP_TYPE_DEVMAP, dev_map_ops)
    -BPF_MAP_TYPE(BPF_MAP_TYPE_DEVMAP_HASH, dev_map_hash_ops)
    -BPF_MAP_TYPE(BPF_MAP_TYPE_SK_STORAGE, sk_storage_map_ops)
    #ifdef CONFIG_BPF_LSM
    BPF_MAP_TYPE(BPF_MAP_TYPE_INODE_STORAGE, inode_storage_map_ops)
    #endif
    BPF_MAP_TYPE(BPF_MAP_TYPE_TASK_STORAGE, task_storage_map_ops)
    +#ifdef CONFIG_NET
    +BPF_MAP_TYPE(BPF_MAP_TYPE_DEVMAP, dev_map_ops)
    +BPF_MAP_TYPE(BPF_MAP_TYPE_DEVMAP_HASH, dev_map_hash_ops)
    +BPF_MAP_TYPE(BPF_MAP_TYPE_SK_STORAGE, sk_storage_map_ops)
    BPF_MAP_TYPE(BPF_MAP_TYPE_CPUMAP, cpu_map_ops)
    #if defined(CONFIG_XDP_SOCKETS)
    BPF_MAP_TYPE(BPF_MAP_TYPE_XSKMAP, xsk_map_ops)
    --
    2.33.0


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