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 7F5B8C4332F for ; Thu, 7 Apr 2022 22:31:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232025AbiDGWdU (ORCPT ); Thu, 7 Apr 2022 18:33:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47464 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232004AbiDGWdT (ORCPT ); Thu, 7 Apr 2022 18:33:19 -0400 Received: from mail-yw1-x114a.google.com (mail-yw1-x114a.google.com [IPv6:2607:f8b0:4864:20::114a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F1FA8615D for ; Thu, 7 Apr 2022 15:31:17 -0700 (PDT) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-2eba71ef663so60084947b3.14 for ; Thu, 07 Apr 2022 15:31:17 -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=JQlaVXkKFmhzcUBdrM/pR+dql7p698GbFpd9WFCdgFE=; b=rvn9iXtPTlyYUIOuXqyJuGLJ/kVnz0aMqPBRKvfR9+J/UEJZ0l2UHCWmiAJ4EcfvBk ZYuhs1EUv3aFqkdFXaLeG+bmybkOAEwlhj32oqtpOod9V8pZw0Wz/JMWof9C/RQDFjnX IJBana3eF/ekxXedNAOAsjFiOZV3uTNXf+PYN6shSKjZPDwzDuzcLlcxqJaoXCQqVRU+ NOgbcL0nNo6UWtO9RxU0ri9NGCjJi+beKB/wcE7IirKb/TdYHnSrMqdycpRIFkyQpPSl 2v9sxBWBOfHoS3E2W9pAKpQoQaZJGIQf3RAxWlYN/APjcelDMGFZe4W3LxsE5OGfd6Lg 4IFQ== 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=JQlaVXkKFmhzcUBdrM/pR+dql7p698GbFpd9WFCdgFE=; b=FeGorQnpJKDnOCyBEm8k8e6fRpIAa5wiP/eCPHFX0xMvtegthfWmIf/dauJNyTjsx3 WkrYY2sH4fDHamh+Vk6khScZCYC3j3SbLKKNjcOMFJaeZ0InMHKh8pXDckeVmyGnXyyi ED1VnGLJPDKS3ElaGuIHY5QHkC6UAuqmXmZWZ6nT/YLrhE7HeCL9ZrUIYHSzAjURUkI2 6ccn9Lu9hoouZqXpbZa+aAW1laytJ06uQv7abjcIXTrmlRsZEQbdafxq0ISFnnT4/jW0 +dgKJtY3Y8+S8KCV4452BXHqKoSHJYILgMTn5Cx8B0r3Uv5GF8fdtK6QXOoED8RFmQHG goWw== X-Gm-Message-State: AOAM531DqxFvevQZ8rMOny1Zj86Nlds/8Xvl8KjGzxT/KMEgsES/FRej R0DNROFibgDfmgDIdZL6ji1cPoha6FAIPVVpTEzplhSyniLAcF2d40rfJpsmb3BU6qaEuJpPTft 9LobvtvnFUtDq0w7zLQEFqn6oP10t4Iwln6cEzDWxW1MK2Y2KA54z4A== X-Google-Smtp-Source: ABdhPJywh/PCm+D6o6QSJVkzQqzXl9vNn7C/DCjDJGs/05Zs3bROdfTdnMTu5nRIGmO6IX3VLzJvULM= X-Received: from sdf2.svl.corp.google.com ([2620:15c:2c4:201:9e25:5910:c207:e29a]) (user=sdf job=sendgmr) by 2002:a25:ab6c:0:b0:63e:94c:883e with SMTP id u99-20020a25ab6c000000b0063e094c883emr10889677ybi.526.1649370677086; Thu, 07 Apr 2022 15:31:17 -0700 (PDT) Date: Thu, 7 Apr 2022 15:31:06 -0700 In-Reply-To: <20220407223112.1204582-1-sdf@google.com> Message-Id: <20220407223112.1204582-2-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 1/7] bpf: add bpf_func_t and trampoline helpers 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 I'll be adding lsm cgroup specific helpers that grab trampoline mutex. No functional changes. Signed-off-by: Stanislav Fomichev --- include/linux/bpf.h | 11 ++++--- kernel/bpf/trampoline.c | 63 +++++++++++++++++++++++------------------ 2 files changed, 40 insertions(+), 34 deletions(-) diff --git a/include/linux/bpf.h b/include/linux/bpf.h index bdb5298735ce..487aba40ce52 100644 --- a/include/linux/bpf.h +++ b/include/linux/bpf.h @@ -52,6 +52,8 @@ typedef u64 (*bpf_callback_t)(u64, u64, u64, u64, u64); typedef int (*bpf_iter_init_seq_priv_t)(void *private_data, struct bpf_iter_aux_info *aux); typedef void (*bpf_iter_fini_seq_priv_t)(void *private_data); +typedef unsigned int (*bpf_func_t)(const void *, + const struct bpf_insn *); struct bpf_iter_seq_info { const struct seq_operations *seq_ops; bpf_iter_init_seq_priv_t init_seq_private; @@ -798,8 +800,7 @@ struct bpf_dispatcher { static __always_inline __nocfi unsigned int bpf_dispatcher_nop_func( const void *ctx, const struct bpf_insn *insnsi, - unsigned int (*bpf_func)(const void *, - const struct bpf_insn *)) + bpf_func_t bpf_func) { return bpf_func(ctx, insnsi); } @@ -827,8 +828,7 @@ int arch_prepare_bpf_dispatcher(void *image, s64 *funcs, int num_funcs); noinline __nocfi unsigned int bpf_dispatcher_##name##_func( \ const void *ctx, \ const struct bpf_insn *insnsi, \ - unsigned int (*bpf_func)(const void *, \ - const struct bpf_insn *)) \ + bpf_func_t bpf_func) \ { \ return bpf_func(ctx, insnsi); \ } \ @@ -839,8 +839,7 @@ int arch_prepare_bpf_dispatcher(void *image, s64 *funcs, int num_funcs); unsigned int bpf_dispatcher_##name##_func( \ const void *ctx, \ const struct bpf_insn *insnsi, \ - unsigned int (*bpf_func)(const void *, \ - const struct bpf_insn *)); \ + bpf_func_t bpf_func); \ extern struct bpf_dispatcher bpf_dispatcher_##name; #define BPF_DISPATCHER_FUNC(name) bpf_dispatcher_##name##_func #define BPF_DISPATCHER_PTR(name) (&bpf_dispatcher_##name) diff --git a/kernel/bpf/trampoline.c b/kernel/bpf/trampoline.c index ada97751ae1b..0c4fd194e801 100644 --- a/kernel/bpf/trampoline.c +++ b/kernel/bpf/trampoline.c @@ -407,42 +407,34 @@ static enum bpf_tramp_prog_type bpf_attach_type_to_tramp(struct bpf_prog *prog) } } -int bpf_trampoline_link_prog(struct bpf_prog *prog, struct bpf_trampoline *tr) +static int __bpf_trampoline_link_prog(struct bpf_prog *prog, + struct bpf_trampoline *tr) { enum bpf_tramp_prog_type kind; int err = 0; int cnt; kind = bpf_attach_type_to_tramp(prog); - mutex_lock(&tr->mutex); - if (tr->extension_prog) { + if (tr->extension_prog) /* cannot attach fentry/fexit if extension prog is attached. * cannot overwrite extension prog either. */ - err = -EBUSY; - goto out; - } + return -EBUSY; + cnt = tr->progs_cnt[BPF_TRAMP_FENTRY] + tr->progs_cnt[BPF_TRAMP_FEXIT]; if (kind == BPF_TRAMP_REPLACE) { /* Cannot attach extension if fentry/fexit are in use. */ - if (cnt) { - err = -EBUSY; - goto out; - } + if (cnt) + return -EBUSY; tr->extension_prog = prog; - err = bpf_arch_text_poke(tr->func.addr, BPF_MOD_JUMP, NULL, - prog->bpf_func); - goto out; - } - if (cnt >= BPF_MAX_TRAMP_PROGS) { - err = -E2BIG; - goto out; + return bpf_arch_text_poke(tr->func.addr, BPF_MOD_JUMP, NULL, + prog->bpf_func); } - if (!hlist_unhashed(&prog->aux->tramp_hlist)) { + if (cnt >= BPF_MAX_TRAMP_PROGS) + return -E2BIG; + if (!hlist_unhashed(&prog->aux->tramp_hlist)) /* prog already linked */ - err = -EBUSY; - goto out; - } + return -EBUSY; hlist_add_head(&prog->aux->tramp_hlist, &tr->progs_hlist[kind]); tr->progs_cnt[kind]++; err = bpf_trampoline_update(tr); @@ -450,30 +442,45 @@ int bpf_trampoline_link_prog(struct bpf_prog *prog, struct bpf_trampoline *tr) hlist_del_init(&prog->aux->tramp_hlist); tr->progs_cnt[kind]--; } -out: + return err; +} + +int bpf_trampoline_link_prog(struct bpf_prog *prog, struct bpf_trampoline *tr) +{ + int err; + + mutex_lock(&tr->mutex); + err = __bpf_trampoline_link_prog(prog, tr); mutex_unlock(&tr->mutex); return err; } -/* bpf_trampoline_unlink_prog() should never fail. */ -int bpf_trampoline_unlink_prog(struct bpf_prog *prog, struct bpf_trampoline *tr) +static int __bpf_trampoline_unlink_prog(struct bpf_prog *prog, + struct bpf_trampoline *tr) { enum bpf_tramp_prog_type kind; int err; kind = bpf_attach_type_to_tramp(prog); - mutex_lock(&tr->mutex); if (kind == BPF_TRAMP_REPLACE) { WARN_ON_ONCE(!tr->extension_prog); err = bpf_arch_text_poke(tr->func.addr, BPF_MOD_JUMP, tr->extension_prog->bpf_func, NULL); tr->extension_prog = NULL; - goto out; + return err; } hlist_del_init(&prog->aux->tramp_hlist); tr->progs_cnt[kind]--; - err = bpf_trampoline_update(tr); -out: + return bpf_trampoline_update(tr); +} + +/* bpf_trampoline_unlink_prog() should never fail. */ +int bpf_trampoline_unlink_prog(struct bpf_prog *prog, struct bpf_trampoline *tr) +{ + int err; + + mutex_lock(&tr->mutex); + err = __bpf_trampoline_unlink_prog(prog, tr); mutex_unlock(&tr->mutex); return err; } -- 2.35.1.1178.g4f1659d476-goog