From patchwork Fri May 29 04:38:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexei Starovoitov X-Patchwork-Id: 218248 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 57F6EC433DF for ; Fri, 29 May 2020 04:38:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2745D20C56 for ; Fri, 29 May 2020 04:38:52 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="iUiJA68r" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725994AbgE2Eit (ORCPT ); Fri, 29 May 2020 00:38:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33402 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725355AbgE2Eir (ORCPT ); Fri, 29 May 2020 00:38:47 -0400 Received: from mail-pl1-x641.google.com (mail-pl1-x641.google.com [IPv6:2607:f8b0:4864:20::641]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0C4FBC08C5C6; Thu, 28 May 2020 21:38:47 -0700 (PDT) Received: by mail-pl1-x641.google.com with SMTP id y11so545651plt.12; Thu, 28 May 2020 21:38:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=5YwhA9MWyJVU/KlXkvkJ04UGIgmdYIyHDhF11BR3MM8=; b=iUiJA68r8vZkLuIY1ojzpFPv7Rv6z2D3efvy78qRUhvSflDLnWxVjbLLb1g4z/vt8m 4QeCSKAyuQ++24UI2GrZxzrMp1kv7jaXb0wKkUrKH2KQ4HHn88DP8j7/FeGQd7zFXn+P 14jJpNl2/b5eo+KviAlHislLUzIfOO9/GK/iazIlhnC9D+eBCIn+9GpeZZBrR8zUQcrZ UZw4qine4jB/p8MI+AhAFnhAgb2IRenSojpbOQEfG1L7UgOuHsN8BU/nsLyl7CQqTWgo jO2cT1RfdY/gwP6VCwfjTp1XguGq6OxobI7fuDmwDF2UlHm1559/0zZ+wJUQ1Pe+58Xj jxKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=5YwhA9MWyJVU/KlXkvkJ04UGIgmdYIyHDhF11BR3MM8=; b=lTglDLJ5Fpw4L4iiK3YIA9cwbFKt/FUvWGK1Q13YN/fzktpuKMpmtPE2aWdCRimzQO FZE1rPkH6atdWhJ+IWhKGzByma9lbUJTrjgfDEOXhfNtNXt5RLySaPxsCrjIK+E/TQjy jr+HzXrnJ2c1HFvqzLCqL/xD7BvgItp+Oh9kmZfPAbfQub9GM7wDX8NeBWKutzgGQa6v 90SYK6qjzojI9asfJajEoZoAwOtZ/oRSQcTyPSXG4p90EIlNdnNgMLKgiHHkUIw1xo+p ExQWos0x09f9URICvSEJrozEZo11wVe9kiEnb2azRtBJU/g6uuGrYWlasStIV2k1deNX XJZQ== X-Gm-Message-State: AOAM530rlsZUU5b8JJTJ9+rzPPN2EQDAVqAQ3pKY6qRpI3DhyXkttVxS r3c+eeQq5B7kcDVTS8JXO0o= X-Google-Smtp-Source: ABdhPJz75d8fdVSvzoRdomz2wARDFMEyG8xZf8cedgn903uNp5x5mZqGUWcO50P4RwKOm9tIzbDhcw== X-Received: by 2002:a17:90a:de97:: with SMTP id n23mr7326552pjv.164.1590727126226; Thu, 28 May 2020 21:38:46 -0700 (PDT) Received: from ast-mbp.thefacebook.com ([163.114.132.7]) by smtp.gmail.com with ESMTPSA id w73sm6288777pfd.113.2020.05.28.21.38.44 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 May 2020 21:38:45 -0700 (PDT) From: Alexei Starovoitov To: davem@davemloft.net Cc: daniel@iogearbox.net, netdev@vger.kernel.org, bpf@vger.kernel.org, kernel-team@fb.com Subject: [PATCH v2 bpf-next 2/4] bpf: Introduce sleepable BPF programs Date: Thu, 28 May 2020 21:38:37 -0700 Message-Id: <20200529043839.15824-3-alexei.starovoitov@gmail.com> X-Mailer: git-send-email 2.13.5 In-Reply-To: <20200529043839.15824-1-alexei.starovoitov@gmail.com> References: <20200529043839.15824-1-alexei.starovoitov@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Alexei Starovoitov Introduce sleepable BPF programs that can request such property for themselves via BPF_F_SLEEPABLE flag at program load time. In such case they will be able to use helpers like bpf_copy_from_user() that might sleep. At present only fentry/fexit/fmod_ret and lsm programs can request to be sleepable and only when they are attached to kernel functions that are known to allow sleeping. The non-sleepable programs are relying on implicit rcu_read_lock() and migrate_disable() to protect life time of programs, maps that they use and per-cpu kernel structures used to pass info between bpf programs and the kernel. The sleepable programs cannot be enclosed into rcu_read_lock(). migrate_disable() maps to preempt_disable() in non-RT kernels, so the progs should not be enclosed in migrate_disable() as well. Therefore bpf_srcu is used to protect the life time of sleepable progs. There are many networking and tracing program types. In many cases the 'struct bpf_prog *' pointer itself is rcu protected within some other kernel data structure and the kernel code is using rcu_dereference() to load that program pointer and call BPF_PROG_RUN() on it. All these cases are not touched. Instead sleepable bpf programs are allowed with bpf trampoline only. The program pointers are hard-coded into generated assembly of bpf trampoline and synchronize_srcu(&bpf_srcu) is used to protect the life time of the program. The same trampoline can hold both sleepable and non-sleepable progs. When bpf_srcu lock is held it means that some sleepable bpf program is running from bpf trampoline. Those programs can use bpf arrays and preallocated hash/lru maps. These map types are waiting on programs to complete via synchronize_srcu(&bpf_srcu); Updates to trampoline now has to do synchronize_srcu + synchronize_rcu_tasks to wait for sleepable progs to finish and for trampoline assembly to finish. In the future srcu will be replaced with upcoming rcu_trace. That will complete the first step of introducing sleepable progs. After that dynamically allocated hash maps can be allowed. All map elements would have to be srcu protected instead of normal rcu. per-cpu maps will be allowed. Either via the following pattern: void *elem = bpf_map_lookup_elem(map, key); if (elem) { // access elem bpf_map_release_elem(map, elem); } where modified lookup() helper will do migrate_disable() and new bpf_map_release_elem() will do corresponding migrate_enable(). Or explicit bpf_migrate_disable/enable() helpers will be introduced. Signed-off-by: Alexei Starovoitov Acked-by: KP Singh --- arch/x86/net/bpf_jit_comp.c | 36 ++++++++++++++------ include/linux/bpf.h | 4 +++ include/uapi/linux/bpf.h | 8 +++++ kernel/bpf/arraymap.c | 5 +++ kernel/bpf/hashtab.c | 19 +++++++---- kernel/bpf/syscall.c | 12 +++++-- kernel/bpf/trampoline.c | 33 +++++++++++++++++- kernel/bpf/verifier.c | 62 +++++++++++++++++++++++++++++++++- tools/include/uapi/linux/bpf.h | 8 +++++ 9 files changed, 165 insertions(+), 22 deletions(-) diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c index 42b6709e6dc7..3fdb62c89d6f 100644 --- a/arch/x86/net/bpf_jit_comp.c +++ b/arch/x86/net/bpf_jit_comp.c @@ -1379,10 +1379,17 @@ static int invoke_bpf_prog(const struct btf_func_model *m, u8 **pprog, u8 *prog = *pprog; int cnt = 0; - if (emit_call(&prog, __bpf_prog_enter, prog)) - return -EINVAL; - /* remember prog start time returned by __bpf_prog_enter */ - emit_mov_reg(&prog, true, BPF_REG_6, BPF_REG_0); + if (p->aux->sleepable) { + if (emit_call(&prog, __bpf_prog_enter_sleepable, prog)) + return -EINVAL; + /* remember srcu idx returned by __bpf_prog_enter_sleepable */ + emit_mov_reg(&prog, true, BPF_REG_6, BPF_REG_0); + } else { + if (emit_call(&prog, __bpf_prog_enter, prog)) + return -EINVAL; + /* remember prog start time returned by __bpf_prog_enter */ + emit_mov_reg(&prog, true, BPF_REG_6, BPF_REG_0); + } /* arg1: lea rdi, [rbp - stack_size] */ EMIT4(0x48, 0x8D, 0x7D, -stack_size); @@ -1402,13 +1409,20 @@ static int invoke_bpf_prog(const struct btf_func_model *m, u8 **pprog, if (mod_ret) emit_stx(&prog, BPF_DW, BPF_REG_FP, BPF_REG_0, -8); - /* arg1: mov rdi, progs[i] */ - emit_mov_imm64(&prog, BPF_REG_1, (long) p >> 32, - (u32) (long) p); - /* arg2: mov rsi, rbx <- start time in nsec */ - emit_mov_reg(&prog, true, BPF_REG_2, BPF_REG_6); - if (emit_call(&prog, __bpf_prog_exit, prog)) - return -EINVAL; + if (p->aux->sleepable) { + /* arg1: mov rdi, rbx <- srcu idx */ + emit_mov_reg(&prog, true, BPF_REG_1, BPF_REG_6); + if (emit_call(&prog, __bpf_prog_exit_sleepable, prog)) + return -EINVAL; + } else { + /* arg1: mov rdi, progs[i] */ + emit_mov_imm64(&prog, BPF_REG_1, (long) p >> 32, + (u32) (long) p); + /* arg2: mov rsi, rbx <- start time in nsec */ + emit_mov_reg(&prog, true, BPF_REG_2, BPF_REG_6); + if (emit_call(&prog, __bpf_prog_exit, prog)) + return -EINVAL; + } *pprog = prog; return 0; diff --git a/include/linux/bpf.h b/include/linux/bpf.h index efe8836b5c48..7b8291a96838 100644 --- a/include/linux/bpf.h +++ b/include/linux/bpf.h @@ -36,6 +36,7 @@ struct seq_operations; extern struct idr btf_idr; extern spinlock_t btf_idr_lock; +extern struct srcu_struct bpf_srcu; /* map is generic key/value storage optionally accesible by eBPF programs */ struct bpf_map_ops { @@ -476,6 +477,8 @@ int arch_prepare_bpf_trampoline(void *image, void *image_end, /* these two functions are called from generated trampoline */ u64 notrace __bpf_prog_enter(void); void notrace __bpf_prog_exit(struct bpf_prog *prog, u64 start); +u64 notrace __bpf_prog_enter_sleepable(void); +void notrace __bpf_prog_exit_sleepable(u64 idx); struct bpf_ksym { unsigned long start; @@ -668,6 +671,7 @@ struct bpf_prog_aux { bool offload_requested; bool attach_btf_trace; /* true if attaching to BTF-enabled raw tp */ bool func_proto_unreliable; + bool sleepable; enum bpf_tramp_prog_type trampoline_prog_type; struct bpf_trampoline *trampoline; struct hlist_node tramp_hlist; diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h index 54b93f8b49b8..cc08a2064d4e 100644 --- a/include/uapi/linux/bpf.h +++ b/include/uapi/linux/bpf.h @@ -329,6 +329,14 @@ enum bpf_link_type { /* The verifier internal test flag. Behavior is undefined */ #define BPF_F_TEST_STATE_FREQ (1U << 3) +/* If BPF_F_SLEEPABLE is used in BPF_PROG_LOAD command, the verifier will + * restrict map and helper usage for such programs. Sleepable BPF programs can + * only be attached to hooks where kernel execution context allows sleeping. + * Such programs are allowed to use helpers that may sleep like + * bpf_copy_from_user(). + */ +#define BPF_F_SLEEPABLE (1U << 4) + /* When BPF ldimm64's insn[0].src_reg != 0 then this can have * two extensions: * diff --git a/kernel/bpf/arraymap.c b/kernel/bpf/arraymap.c index 11584618e861..26b18b6a3dbc 100644 --- a/kernel/bpf/arraymap.c +++ b/kernel/bpf/arraymap.c @@ -393,6 +393,11 @@ static void array_map_free(struct bpf_map *map) */ synchronize_rcu(); + /* arrays could have been used by both sleepable and non-sleepable bpf + * progs. Make sure to wait for both prog types to finish executing. + */ + synchronize_srcu(&bpf_srcu); + if (array->map.map_type == BPF_MAP_TYPE_PERCPU_ARRAY) bpf_array_free_percpu(array); diff --git a/kernel/bpf/hashtab.c b/kernel/bpf/hashtab.c index b4b288a3c3c9..b001957fdcbf 100644 --- a/kernel/bpf/hashtab.c +++ b/kernel/bpf/hashtab.c @@ -577,8 +577,8 @@ static void *__htab_map_lookup_elem(struct bpf_map *map, void *key) struct htab_elem *l; u32 hash, key_size; - /* Must be called with rcu_read_lock. */ - WARN_ON_ONCE(!rcu_read_lock_held()); + /* Must be called with s?rcu_read_lock. */ + WARN_ON_ONCE(!rcu_read_lock_held() && !srcu_read_lock_held(&bpf_srcu)); key_size = map->key_size; @@ -935,7 +935,7 @@ static int htab_map_update_elem(struct bpf_map *map, void *key, void *value, /* unknown flags */ return -EINVAL; - WARN_ON_ONCE(!rcu_read_lock_held()); + WARN_ON_ONCE(!rcu_read_lock_held() && !srcu_read_lock_held(&bpf_srcu)); key_size = map->key_size; @@ -1026,7 +1026,7 @@ static int htab_lru_map_update_elem(struct bpf_map *map, void *key, void *value, /* unknown flags */ return -EINVAL; - WARN_ON_ONCE(!rcu_read_lock_held()); + WARN_ON_ONCE(!rcu_read_lock_held() && !srcu_read_lock_held(&bpf_srcu)); key_size = map->key_size; @@ -1214,7 +1214,7 @@ static int htab_map_delete_elem(struct bpf_map *map, void *key) u32 hash, key_size; int ret = -ENOENT; - WARN_ON_ONCE(!rcu_read_lock_held()); + WARN_ON_ONCE(!rcu_read_lock_held() && !srcu_read_lock_held(&bpf_srcu)); key_size = map->key_size; @@ -1246,7 +1246,7 @@ static int htab_lru_map_delete_elem(struct bpf_map *map, void *key) u32 hash, key_size; int ret = -ENOENT; - WARN_ON_ONCE(!rcu_read_lock_held()); + WARN_ON_ONCE(!rcu_read_lock_held() && !srcu_read_lock_held(&bpf_srcu)); key_size = map->key_size; @@ -1297,6 +1297,13 @@ static void htab_map_free(struct bpf_map *map) */ synchronize_rcu(); + /* preallocated hash map could have been used by both sleepable and + * non-sleepable bpf progs. Make sure to wait for both prog types + * to finish executing. + */ + if (htab_is_prealloc(htab)) + synchronize_srcu(&bpf_srcu); + /* some of free_htab_elem() callbacks for elements of this map may * not have executed. Wait for them. */ diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c index 2c969a9b90d3..44d0c3ed744a 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c @@ -1725,10 +1725,14 @@ static void __bpf_prog_put_noref(struct bpf_prog *prog, bool deferred) btf_put(prog->aux->btf); bpf_prog_free_linfo(prog); - if (deferred) - call_rcu(&prog->aux->rcu, __bpf_prog_put_rcu); - else + if (deferred) { + if (prog->aux->sleepable) + call_srcu(&bpf_srcu, &prog->aux->rcu, __bpf_prog_put_rcu); + else + call_rcu(&prog->aux->rcu, __bpf_prog_put_rcu); + } else { __bpf_prog_put_rcu(&prog->aux->rcu); + } } static void __bpf_prog_put(struct bpf_prog *prog, bool do_idr_lock) @@ -2093,6 +2097,7 @@ static int bpf_prog_load(union bpf_attr *attr, union bpf_attr __user *uattr) if (attr->prog_flags & ~(BPF_F_STRICT_ALIGNMENT | BPF_F_ANY_ALIGNMENT | BPF_F_TEST_STATE_FREQ | + BPF_F_SLEEPABLE | BPF_F_TEST_RND_HI32)) return -EINVAL; @@ -2148,6 +2153,7 @@ static int bpf_prog_load(union bpf_attr *attr, union bpf_attr __user *uattr) } prog->aux->offload_requested = !!attr->prog_ifindex; + prog->aux->sleepable = attr->prog_flags & BPF_F_SLEEPABLE; err = security_bpf_prog_alloc(prog->aux); if (err) diff --git a/kernel/bpf/trampoline.c b/kernel/bpf/trampoline.c index 9be85aa4ec5f..d35d26e9693d 100644 --- a/kernel/bpf/trampoline.c +++ b/kernel/bpf/trampoline.c @@ -205,13 +205,21 @@ static int bpf_trampoline_update(struct bpf_trampoline *tr) tprogs[BPF_TRAMP_MODIFY_RETURN].nr_progs) flags = BPF_TRAMP_F_CALL_ORIG | BPF_TRAMP_F_SKIP_FRAME; + /* the same trampoline can hold both sleepable and non-sleepable progs. + * synchronize_srcu() is cheap when sleepable progs are not running, so + * just call it here to make sure all sleepable progs finish executing. + * Then call synchronize_rcu_tasks() to make sure that the rest of + * generated tramopline assembly finishes too before updating + * trampoline. + */ + synchronize_srcu(&bpf_srcu); + /* Though the second half of trampoline page is unused a task could be * preempted in the middle of the first half of trampoline and two * updates to trampoline would change the code from underneath the * preempted task. Hence wait for tasks to voluntarily schedule or go * to userspace. */ - synchronize_rcu_tasks(); err = arch_prepare_bpf_trampoline(new_image, new_image + PAGE_SIZE / 2, @@ -344,6 +352,11 @@ void bpf_trampoline_put(struct bpf_trampoline *tr) if (WARN_ON_ONCE(!hlist_empty(&tr->progs_hlist[BPF_TRAMP_FEXIT]))) goto out; bpf_image_ksym_del(&tr->ksym); + /* This code will be executed when all bpf progs (both sleepable and + * non-sleepable) went through + * bpf_prog_put()->call_s?rcu()->bpf_prog_free_deferred(). + * Hence no need for another synchronize_srcu(&bpf_srcu) here. + */ /* wait for tasks to get out of trampoline before freeing it */ synchronize_rcu_tasks(); bpf_jit_free_exec(tr->image); @@ -394,6 +407,23 @@ void notrace __bpf_prog_exit(struct bpf_prog *prog, u64 start) rcu_read_unlock(); } +/* when bpf_srcu lock is held it means that some sleepable bpf program is + * running. Those programs can use bpf arrays and preallocated hash maps. These + * map types are waiting on programs to complete via + * synchronize_srcu(&bpf_srcu); + */ +struct srcu_struct bpf_srcu; + +u64 notrace __bpf_prog_enter_sleepable(void) +{ + return srcu_read_lock(&bpf_srcu); +} + +void notrace __bpf_prog_exit_sleepable(u64 idx) +{ + srcu_read_unlock(&bpf_srcu, idx); +} + int __weak arch_prepare_bpf_trampoline(void *image, void *image_end, const struct btf_func_model *m, u32 flags, @@ -409,6 +439,7 @@ static int __init init_trampolines(void) for (i = 0; i < TRAMPOLINE_TABLE_SIZE; i++) INIT_HLIST_HEAD(&trampoline_table[i]); + init_srcu_struct(&bpf_srcu); return 0; } late_initcall(init_trampolines); diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c index 8cf8dae86f00..f4d41a9d692c 100644 --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c @@ -8922,6 +8922,23 @@ static int check_map_prog_compatibility(struct bpf_verifier_env *env, return -EINVAL; } + if (prog->aux->sleepable) + switch (map->map_type) { + case BPF_MAP_TYPE_HASH: + case BPF_MAP_TYPE_LRU_HASH: + case BPF_MAP_TYPE_ARRAY: + if (!is_preallocated_map(map)) { + verbose(env, + "Sleepable programs can only use preallocated hash maps\n"); + return -EINVAL; + } + break; + default: + verbose(env, + "Sleepable programs can only use array and hash maps\n"); + return -EINVAL; + } + return 0; } @@ -10532,6 +10549,22 @@ static int check_attach_modify_return(struct bpf_prog *prog, unsigned long addr) return -EINVAL; } +/* list of non-sleepable kernel functions that are otherwise + * available to attach by bpf_lsm or fmod_ret progs. + */ +static int check_sleepable_blacklist(unsigned long addr) +{ +#ifdef CONFIG_BPF_LSM + if (addr == (long)bpf_lsm_task_free) + return -EINVAL; +#endif +#ifdef CONFIG_SECURITY + if (addr == (long)security_task_free) + return -EINVAL; +#endif + return 0; +} + static int check_attach_btf_id(struct bpf_verifier_env *env) { struct bpf_prog *prog = env->prog; @@ -10549,6 +10582,12 @@ static int check_attach_btf_id(struct bpf_verifier_env *env) long addr; u64 key; + if (prog->aux->sleepable && prog->type != BPF_PROG_TYPE_TRACING && + prog->type != BPF_PROG_TYPE_LSM) { + verbose(env, "Only fentry/fexit/fmod_ret and lsm programs can be sleepable\n"); + return -EINVAL; + } + if (prog->type == BPF_PROG_TYPE_STRUCT_OPS) return check_struct_ops_btf_id(env); @@ -10762,8 +10801,29 @@ static int check_attach_btf_id(struct bpf_verifier_env *env) if (ret) verbose(env, "%s() is not modifiable\n", prog->aux->attach_func_name); + } else if (prog->aux->sleepable) { + switch (prog->type) { + case BPF_PROG_TYPE_TRACING: + /* fentry/fexit progs can be sleepable only if they are + * attached to ALLOW_ERROR_INJECTION or security_*() funcs. + */ + ret = check_attach_modify_return(prog, addr); + if (!ret) + ret = check_sleepable_blacklist(addr); + break; + case BPF_PROG_TYPE_LSM: + /* LSM progs check that they are attached to bpf_lsm_*() funcs + * which are sleepable too. + */ + ret = check_sleepable_blacklist(addr); + break; + default: + break; + } + if (ret) + verbose(env, "%s is not sleepable\n", + prog->aux->attach_func_name); } - if (ret) goto out; tr->func.addr = (void *)addr; diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h index 54b93f8b49b8..cc08a2064d4e 100644 --- a/tools/include/uapi/linux/bpf.h +++ b/tools/include/uapi/linux/bpf.h @@ -329,6 +329,14 @@ enum bpf_link_type { /* The verifier internal test flag. Behavior is undefined */ #define BPF_F_TEST_STATE_FREQ (1U << 3) +/* If BPF_F_SLEEPABLE is used in BPF_PROG_LOAD command, the verifier will + * restrict map and helper usage for such programs. Sleepable BPF programs can + * only be attached to hooks where kernel execution context allows sleeping. + * Such programs are allowed to use helpers that may sleep like + * bpf_copy_from_user(). + */ +#define BPF_F_SLEEPABLE (1U << 4) + /* When BPF ldimm64's insn[0].src_reg != 0 then this can have * two extensions: * From patchwork Fri May 29 04:38:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexei Starovoitov X-Patchwork-Id: 218247 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E07FCC433E0 for ; Fri, 29 May 2020 04:39:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B78C720707 for ; Fri, 29 May 2020 04:39:00 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="eNsLLAIP" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726207AbgE2Ei7 (ORCPT ); Fri, 29 May 2020 00:38:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33410 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725883AbgE2Eis (ORCPT ); Fri, 29 May 2020 00:38:48 -0400 Received: from mail-pf1-x444.google.com (mail-pf1-x444.google.com [IPv6:2607:f8b0:4864:20::444]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 61368C08C5C6; Thu, 28 May 2020 21:38:48 -0700 (PDT) Received: by mail-pf1-x444.google.com with SMTP id y198so645082pfb.4; Thu, 28 May 2020 21:38:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=h4ZHrkBgJpMmqdfVG33n92n7yUXUN91GchFFtsy+Ugw=; b=eNsLLAIPN50kCmKBGKqeIVdZe6yDQC48Frtm5lj2RKnLBsnV2BbQn9MJD+9egUbARt D+wnx+D8i6vByDyOQXz49irZkgyQzjkzPZmmHH+H438ti90YM/TUn03AQSJrGMHnZ3SQ NgDkPspmFFEBELL3u77oRpZnhpCZtq07iUL+MNIpamH5Rkgz+471de4ilV+zkBD926hi xCVPzDBQW2rU5ZY2axhGSIAPQ7yPfGA9oclZijNyW+9zzJUI9KsR01oKHjZkdVidGo1f 75oW5Y92mZF9wVuiSr5Fa/Wrxx4opoCpx7BPLOggAX/wHoVjj7oTHK2mpnw2Kr3G8XMU mG7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=h4ZHrkBgJpMmqdfVG33n92n7yUXUN91GchFFtsy+Ugw=; b=rPWU4+4ktXpPqCiSTDuLiQKPpjoT1CcvIEt7tnESOIQjBB/huahbtokPwm/45r07wq ql2hP1fCACJOVX6BdjinGh567KCq//kM/z9JbK+BH7Q9H8x7VNNKM0M5s+6qR2QUartB T6acE8v7aGGtn79APxhBwMbojw2AZ7r/4kUluS5Mscbm+dvNKRwWKM0KEnzJVKaKVTOT tQ74jhaNN5PJubZ+m31Q5G+9uE0r/DUvcRToDz++Ix+IHCxaWy/EmUgtG+Z4s43D7g/e Z5WmwgGsALP8EHjUcxq28uyqWpBJOer7IHZZW7HOgvDT+yxhKm1hGablIA4sFWeFVa+k /Ycw== X-Gm-Message-State: AOAM533VMeIDF+3FBsQv7360EL/2r/VfIwnvtazg3iRR/oZQHxY5TkXC 1/qN8nlmBoYp8LG0AL58PoI= X-Google-Smtp-Source: ABdhPJwYL73PfNa8m+wjBjB4qrVnf3jxUHb0RSddv3pOM/qI4Ly+UPLO2Z7OlVWcpwMrLod3Mb21fw== X-Received: by 2002:a65:4241:: with SMTP id d1mr247197pgq.307.1590727127955; Thu, 28 May 2020 21:38:47 -0700 (PDT) Received: from ast-mbp.thefacebook.com ([163.114.132.7]) by smtp.gmail.com with ESMTPSA id w73sm6288777pfd.113.2020.05.28.21.38.46 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 May 2020 21:38:47 -0700 (PDT) From: Alexei Starovoitov To: davem@davemloft.net Cc: daniel@iogearbox.net, netdev@vger.kernel.org, bpf@vger.kernel.org, kernel-team@fb.com Subject: [PATCH v2 bpf-next 3/4] libbpf: support sleepable progs Date: Thu, 28 May 2020 21:38:38 -0700 Message-Id: <20200529043839.15824-4-alexei.starovoitov@gmail.com> X-Mailer: git-send-email 2.13.5 In-Reply-To: <20200529043839.15824-1-alexei.starovoitov@gmail.com> References: <20200529043839.15824-1-alexei.starovoitov@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Alexei Starovoitov Pass request to load program as sleepable via ".s" suffix in the section name. If it happens in the future that all map types and helpers are allowed with BPF_F_SLEEPABLE flag "fmod_ret/" and "lsm/" can be aliased to "fmod_ret.s/" and "lsm.s/" to make all lsm and fmod_ret programs sleepable by default. The fentry and fexit programs would always need to have sleepable vs non-sleepable distinction, since not all fentry/fexit progs will be attached to sleepable kernel functions. Signed-off-by: Alexei Starovoitov Acked-by: KP Singh --- tools/lib/bpf/libbpf.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c index 74d967619dcf..d59a362ab8f9 100644 --- a/tools/lib/bpf/libbpf.c +++ b/tools/lib/bpf/libbpf.c @@ -209,6 +209,7 @@ struct bpf_sec_def { bool is_exp_attach_type_optional; bool is_attachable; bool is_attach_btf; + bool is_sleepable; attach_fn_t attach_fn; }; @@ -5451,6 +5452,8 @@ __bpf_object__open(const char *path, const void *obj_buf, size_t obj_buf_sz, /* couldn't guess, but user might manually specify */ continue; + if (prog->sec_def->is_sleepable) + prog->prog_flags |= BPF_F_SLEEPABLE; bpf_program__set_type(prog, prog->sec_def->prog_type); bpf_program__set_expected_attach_type(prog, prog->sec_def->expected_attach_type); @@ -6646,6 +6649,21 @@ static const struct bpf_sec_def section_defs[] = { .expected_attach_type = BPF_TRACE_FEXIT, .is_attach_btf = true, .attach_fn = attach_trace), + SEC_DEF("fentry.s/", TRACING, + .expected_attach_type = BPF_TRACE_FENTRY, + .is_attach_btf = true, + .is_sleepable = true, + .attach_fn = attach_trace), + SEC_DEF("fmod_ret.s/", TRACING, + .expected_attach_type = BPF_MODIFY_RETURN, + .is_attach_btf = true, + .is_sleepable = true, + .attach_fn = attach_trace), + SEC_DEF("fexit.s/", TRACING, + .expected_attach_type = BPF_TRACE_FEXIT, + .is_attach_btf = true, + .is_sleepable = true, + .attach_fn = attach_trace), SEC_DEF("freplace/", EXT, .is_attach_btf = true, .attach_fn = attach_trace), @@ -6653,6 +6671,11 @@ static const struct bpf_sec_def section_defs[] = { .is_attach_btf = true, .expected_attach_type = BPF_LSM_MAC, .attach_fn = attach_lsm), + SEC_DEF("lsm.s/", LSM, + .is_attach_btf = true, + .is_sleepable = true, + .expected_attach_type = BPF_LSM_MAC, + .attach_fn = attach_lsm), SEC_DEF("iter/", TRACING, .expected_attach_type = BPF_TRACE_ITER, .is_attach_btf = true, @@ -7292,7 +7315,7 @@ int bpf_prog_load_xattr(const struct bpf_prog_load_attr *attr, prog->prog_ifindex = attr->ifindex; prog->log_level = attr->log_level; - prog->prog_flags = attr->prog_flags; + prog->prog_flags |= attr->prog_flags; if (!first_prog) first_prog = prog; }