From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9C408C433FE for ; Thu, 7 Apr 2022 22:31:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232047AbiDGWd2 (ORCPT ); Thu, 7 Apr 2022 18:33:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47916 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232043AbiDGWdZ (ORCPT ); Thu, 7 Apr 2022 18:33:25 -0400 Received: from mail-yw1-x1149.google.com (mail-yw1-x1149.google.com [IPv6:2607:f8b0:4864:20::1149]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1CEA35C84F for ; Thu, 7 Apr 2022 15:31:22 -0700 (PDT) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-2ebd532c5a9so14100937b3.5 for ; Thu, 07 Apr 2022 15:31:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=Y5392ky6UEO57lhdhmFuVAft50lmcn8NrlzrFnva3hM=; b=rtckkn+KVuSNzWk52zLR/6cF7Zlzv2hR6gxQ8MAj/oYmlWfs1lxtom1DZ0861IPOiR Cu2flOHyfAWAb482/xl6Z7jd4RXeBy8Pkqrwkkja1pIxYpMNTQCWBgWWrfiICGDWKLiV N+1qWK+P/MgL28vJ5qFacJKiorE8eFA0O9Q08cshUwmoXuFYTyLItM9viZxri4/GSU1L GuP+b7/0zB7q2fVp5SDkSzbxhS0Rj6HhbdjyJRT5zbO86XLx5xoD7jZ/ocmxtmlQtiw5 TTX9YrikHZhzWU2CtzO5+io73fQD6W+4YTVU7A+gUzt/DH7pvcXpGziwkVVOt+Uxls0T ZZMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=Y5392ky6UEO57lhdhmFuVAft50lmcn8NrlzrFnva3hM=; b=Lcpb0MQKfHK1dxOwsziKDdV9nGN5pKxUHG22MUbgjPkBNltYvz5U/dCUNJOZgcDv8R CPyfoqrpF8ZNCaqqeYQ1/eSCkpr/8i2Gbdv6iH6ETOca7PUMLfHDFn5n2tU4pxTbaUcL N/BSWTRQH2t0VLEDGIOV262ySr5dxUgjsfM7ly4wUl9c4Iu7gxivHIpoLxerIbZWmPSO 7VIee6e4XCtjabEL+yX+mWcGANh8N6wFm7FQoXtUDn+iK1KYze8IQGeNO87i4mE3RHtT nrAzByehjOTc5uxQzYsUDT/gBCfjBtMXujQvXwSYUFBSgi3lFmg4v3gvLLufNcogZ2QK hh6Q== X-Gm-Message-State: AOAM533NlzYnW7uBlxnwBD6dX7PsjbYGqKSCNe9u9wN377kc6lvQN07s ZPAivBWrFUi+eegkatVeAav9equPvObNi7chjBMzAsZzLKfEAYNNC07cy9wwiYprn2f79FT0n7E lURy0+72WevuQa6CywvhuFxaWiEw3MqIT1DYkxk4PCL4ZidW9r2B1VA== X-Google-Smtp-Source: ABdhPJzHWSD9fPCfX7J24JckdJ3kIg+jfvRv7r93q1NPA6jEizRAXP7ly8et4yznJrBlzRt3N4BUAis= X-Received: from sdf2.svl.corp.google.com ([2620:15c:2c4:201:9e25:5910:c207:e29a]) (user=sdf job=sendgmr) by 2002:a05:6902:603:b0:625:989:c675 with SMTP id d3-20020a056902060300b006250989c675mr12406505ybt.470.1649370682060; Thu, 07 Apr 2022 15:31:22 -0700 (PDT) Date: Thu, 7 Apr 2022 15:31:08 -0700 In-Reply-To: <20220407223112.1204582-1-sdf@google.com> Message-Id: <20220407223112.1204582-4-sdf@google.com> Mime-Version: 1.0 References: <20220407223112.1204582-1-sdf@google.com> X-Mailer: git-send-email 2.35.1.1178.g4f1659d476-goog Subject: [PATCH bpf-next v3 3/7] bpf: minimize number of allocated lsm slots per program From: Stanislav Fomichev To: netdev@vger.kernel.org, bpf@vger.kernel.org Cc: ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org, Stanislav Fomichev Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Previous patch adds 1:1 mapping between all 211 LSM hooks and bpf_cgroup program array. Instead of reserving a slot per possible hook, reserve 10 slots per cgroup for lsm programs. Those slots are dynamically allocated on demand and reclaimed. This still adds some bloat to the cgroup and brings us back to roughly pre-cgroup_bpf_attach_type times. It should be possible to eventually extend this idea to all hooks if the memory consumption is unacceptable and shrink overall effective programs array. Signed-off-by: Stanislav Fomichev --- include/linux/bpf-cgroup-defs.h | 4 +- include/linux/bpf_lsm.h | 6 --- kernel/bpf/bpf_lsm.c | 9 ++-- kernel/bpf/cgroup.c | 96 ++++++++++++++++++++++++++++----- 4 files changed, 90 insertions(+), 25 deletions(-) diff --git a/include/linux/bpf-cgroup-defs.h b/include/linux/bpf-cgroup-defs.h index 6c661b4df9fa..d42516e86b3a 100644 --- a/include/linux/bpf-cgroup-defs.h +++ b/include/linux/bpf-cgroup-defs.h @@ -10,7 +10,9 @@ struct bpf_prog_array; -#define CGROUP_LSM_NUM 211 /* will be addressed in the next patch */ +/* Maximum number of concurrently attachable per-cgroup LSM hooks. + */ +#define CGROUP_LSM_NUM 10 enum cgroup_bpf_attach_type { CGROUP_BPF_ATTACH_TYPE_INVALID = -1, diff --git a/include/linux/bpf_lsm.h b/include/linux/bpf_lsm.h index 7f0e59f5f9be..613de44aa429 100644 --- a/include/linux/bpf_lsm.h +++ b/include/linux/bpf_lsm.h @@ -43,7 +43,6 @@ extern const struct bpf_func_proto bpf_inode_storage_delete_proto; void bpf_inode_storage_free(struct inode *inode); int bpf_lsm_find_cgroup_shim(const struct bpf_prog *prog, bpf_func_t *bpf_func); -int bpf_lsm_hook_idx(u32 btf_id); #else /* !CONFIG_BPF_LSM */ @@ -74,11 +73,6 @@ static inline int bpf_lsm_find_cgroup_shim(const struct bpf_prog *prog, return -ENOENT; } -static inline int bpf_lsm_hook_idx(u32 btf_id) -{ - return -EINVAL; -} - #endif /* CONFIG_BPF_LSM */ #endif /* _LINUX_BPF_LSM_H */ diff --git a/kernel/bpf/bpf_lsm.c b/kernel/bpf/bpf_lsm.c index eca258ba71d8..8b948ec9ab73 100644 --- a/kernel/bpf/bpf_lsm.c +++ b/kernel/bpf/bpf_lsm.c @@ -57,10 +57,12 @@ static unsigned int __cgroup_bpf_run_lsm_socket(const void *ctx, if (unlikely(!sk)) return 0; + rcu_read_lock(); /* See bpf_lsm_attach_type_get(). */ cgrp = sock_cgroup_ptr(&sk->sk_cgrp_data); if (likely(cgrp)) ret = BPF_PROG_RUN_ARRAY_CG(cgrp->bpf.effective[prog->aux->cgroup_atype], ctx, bpf_prog_run, 0); + rcu_read_unlock(); return ret; } @@ -77,7 +79,7 @@ static unsigned int __cgroup_bpf_run_lsm_current(const void *ctx, /*prog = container_of(insn, struct bpf_prog, insnsi);*/ prog = (const struct bpf_prog *)((void *)insn - offsetof(struct bpf_prog, insnsi)); - rcu_read_lock(); + rcu_read_lock(); /* See bpf_lsm_attach_type_get(). */ cgrp = task_dfl_cgroup(current); if (likely(cgrp)) ret = BPF_PROG_RUN_ARRAY_CG(cgrp->bpf.effective[prog->aux->cgroup_atype], @@ -122,11 +124,6 @@ int bpf_lsm_find_cgroup_shim(const struct bpf_prog *prog, return 0; } -int bpf_lsm_hook_idx(u32 btf_id) -{ - return btf_id_set_index(&bpf_lsm_hooks, btf_id); -} - int bpf_lsm_verify_prog(struct bpf_verifier_log *vlog, const struct bpf_prog *prog) { diff --git a/kernel/bpf/cgroup.c b/kernel/bpf/cgroup.c index 8c77703954f7..fca95e021e7e 100644 --- a/kernel/bpf/cgroup.c +++ b/kernel/bpf/cgroup.c @@ -26,15 +26,68 @@ DEFINE_STATIC_KEY_ARRAY_FALSE(cgroup_bpf_enabled_key, MAX_CGROUP_BPF_ATTACH_TYPE EXPORT_SYMBOL(cgroup_bpf_enabled_key); #ifdef CONFIG_BPF_LSM +/* Readers are protected by rcu+synchronize_rcu. + * Writers are protected by cgroup_mutex. + */ +int cgroup_lsm_atype_usecnt[CGROUP_LSM_NUM]; +u32 cgroup_lsm_atype_btf_id[CGROUP_LSM_NUM]; + static enum cgroup_bpf_attach_type bpf_lsm_attach_type_get(u32 attach_btf_id) { - return CGROUP_LSM_START + bpf_lsm_hook_idx(attach_btf_id); + int i; + + WARN_ON_ONCE(!mutex_is_locked(&cgroup_mutex)); + + for (i = 0; i < ARRAY_SIZE(cgroup_lsm_atype_btf_id); i++) { + if (cgroup_lsm_atype_btf_id[i] != attach_btf_id) + continue; + + cgroup_lsm_atype_usecnt[i]++; + return CGROUP_LSM_START + i; + } + + for (i = 0; i < ARRAY_SIZE(cgroup_lsm_atype_usecnt); i++) { + if (cgroup_lsm_atype_usecnt[i] != 0) + continue; + + cgroup_lsm_atype_btf_id[i] = attach_btf_id; + cgroup_lsm_atype_usecnt[i] = 1; + return CGROUP_LSM_START + i; + } + + return -E2BIG; +} + +static void bpf_lsm_attach_type_put(u32 attach_btf_id) +{ + int i; + + WARN_ON_ONCE(!mutex_is_locked(&cgroup_mutex)); + + for (i = 0; i < ARRAY_SIZE(cgroup_lsm_atype_btf_id); i++) { + if (cgroup_lsm_atype_btf_id[i] != attach_btf_id) + continue; + + if (--cgroup_lsm_atype_usecnt[i] <= 0) { + /* Wait for any existing users to finish. + */ + synchronize_rcu(); + WARN_ON_ONCE(cgroup_lsm_atype_usecnt[i] < 0); + } + return; + } + + WARN_ON_ONCE(1); } #else static enum cgroup_bpf_attach_type bpf_lsm_attach_type_get(u32 attach_btf_id) { return -EOPNOTSUPP; } + +static void bpf_lsm_attach_type_put(u32 attach_btf_id) +{ +} #endif void cgroup_bpf_offline(struct cgroup *cgrp) @@ -130,6 +183,7 @@ static void bpf_cgroup_lsm_shim_release(struct bpf_prog *prog, return; bpf_trampoline_unlink_cgroup_shim(prog); + bpf_lsm_attach_type_put(prog->aux->attach_btf_id); } /** @@ -522,27 +576,37 @@ static int __cgroup_bpf_attach(struct cgroup *cgrp, progs = &cgrp->bpf.progs[atype]; - if (!hierarchy_allows_attach(cgrp, atype)) - return -EPERM; + if (!hierarchy_allows_attach(cgrp, atype)) { + err = -EPERM; + goto cleanup_attach_type; + } - if (!list_empty(progs) && cgrp->bpf.flags[atype] != saved_flags) + if (!list_empty(progs) && cgrp->bpf.flags[atype] != saved_flags) { /* Disallow attaching non-overridable on top * of existing overridable in this cgroup. * Disallow attaching multi-prog if overridable or none */ - return -EPERM; + err = -EPERM; + goto cleanup_attach_type; + } - if (prog_list_length(progs) >= BPF_CGROUP_MAX_PROGS) - return -E2BIG; + if (prog_list_length(progs) >= BPF_CGROUP_MAX_PROGS) { + err = -E2BIG; + goto cleanup_attach_type; + } pl = find_attach_entry(progs, prog, link, replace_prog, flags & BPF_F_ALLOW_MULTI); - if (IS_ERR(pl)) - return PTR_ERR(pl); + if (IS_ERR(pl)) { + err = PTR_ERR(pl); + goto cleanup_attach_type; + } if (bpf_cgroup_storages_alloc(storage, new_storage, type, - prog ? : link->link.prog, cgrp)) - return -ENOMEM; + prog ? : link->link.prog, cgrp)) { + err = -ENOMEM; + goto cleanup_attach_type; + } if (pl) { old_prog = pl->prog; @@ -550,7 +614,8 @@ static int __cgroup_bpf_attach(struct cgroup *cgrp, pl = kmalloc(sizeof(*pl), GFP_KERNEL); if (!pl) { bpf_cgroup_storages_free(new_storage); - return -ENOMEM; + err = -ENOMEM; + goto cleanup_attach_type; } list_add_tail(&pl->node, progs); } @@ -595,6 +660,13 @@ static int __cgroup_bpf_attach(struct cgroup *cgrp, list_del(&pl->node); kfree(pl); } + +cleanup_attach_type: + if (type == BPF_LSM_CGROUP) { + struct bpf_prog *p = prog ? : link->link.prog; + + bpf_lsm_attach_type_put(p->aux->attach_btf_id); + } return err; } -- 2.35.1.1178.g4f1659d476-goog