From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm2-f9.google.com (mail-wm2-f9.google.com [74.125.225.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BB31047D45B for ; Wed, 5 Aug 2026 15:53:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.225.137 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785945222; cv=none; b=WMpwpfskVc5NLV+DMWOTO0UB5FYof+zccnqd+z6kNmHAHlu7+8Q1xyPVUo0bVIHqijc/lQrHRUEsOYSEqXkHwn0IDDjrqkTYp7RLqjZ3TDWkmG2Zn8y6kcoJDMbyIV/q5LJerM5QZyJ7NCLLYd0TYZafpaNiSLWH2ZkX0x8x0p4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785945222; c=relaxed/simple; bh=QO3BqkVxyUrkTUqvQfHr743dqzYLfuPVPHYNLhEdZXQ=; h=Mime-Version:Content-Type:Date:Message-Id:Cc:Subject:From:To: References:In-Reply-To; b=fYnOihhEncERT1OYvse4kiIT+ca4IXgs/AyCexN9KHCBwd83AzRs7jFbrbJa1Dki18evD6VqQfp2lV/PsDO+pARYPxMqM1BKY1dzI2AA2y6PmR2bB5fWEqWGkhWdulDH9yBdq/ca/NNG283Wz2EbDHKZ5dWHI+MkPdPTwUc667o= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Z5gGqII0; arc=none smtp.client-ip=74.125.225.137 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Z5gGqII0" Received: by mail-wm2-f9.google.com with SMTP id 5b1f17b1804b1-4955674321eso2221165e9.0 for ; Wed, 05 Aug 2026 08:53:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785945219; x=1786550019; darn=vger.kernel.org; h=in-reply-to:references:to:from:subject:cc:message-id:date :content-type:content-transfer-encoding:mime-version:from:to:cc :subject:date:message-id:reply-to:content-type; bh=aD/ffMH7E/Q4BMVF4E/DHHzbc7v9+rybNn2m7lcvWwI=; b=Z5gGqII08Io3Tqa5/YW26Nq4nHF42jdMWAdOg/7qHmW6oA+c+RpAUx2tdgHMQfAkWS Q82y2D0JdTo20wbObP2J3dF1Dai8BJlq5ZwXbq7r/okm+cCqR2XjC0pAibyJe0yMT1gY X4A6Or/tQ4XVHzGFWC7Ob9M0f9qSwHkiEVdmOunqbOErHymOYVwIaHxQ0ooUbHDPiCIt 0UdQp5oER6Rbnet9dfSXrvb/lh8OHZgg6GlhMYiqFJeNlJKGnHAe8zM7YlOWrmxRNntB BnmwWsJT8Vx42MzIY9r/sV2qxcG0o6UffVObkciWGuT4A1R7iUBNRJXrCD8C1vjX9XTE t24w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785945219; x=1786550019; h=in-reply-to:references:to:from:subject:cc:message-id:date :content-type:content-transfer-encoding:mime-version:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=aD/ffMH7E/Q4BMVF4E/DHHzbc7v9+rybNn2m7lcvWwI=; b=SpdAOQrVlRUPZ2Z72PL7soTjv2OoTd26ilJ4IiCr2J1t1O8Bym/e8MZVPOw836lZsn 4CwNEPf7+pLPrVcTdP7k1D+l/ag0Pn1DBWolj5suIL6Qahp1wKQvQc1j68Il74OY/Ul4 ogKOJxQfEHzB7v5Mje1XL9PiLy/gWtvWovHOnr2Wtu48d2GucbhuKsiCNYkzny9yqW2c EQOlq/95+InM1hegsswVrMNov3E2dSoetXcaK9EyK1YcPK6lj/BNDJfCcNZnnfI15/8u foQ3zS0Y6bP6tULJyNgETrAo1pzVdeCJSW713nQ2V+lqt23C3Zn2VMcHeey0RoLqYMwa HfXg== X-Gm-Message-State: AOJu0YzOEklxlA13BrFHBZTWUp7RynBgwwU02b4o+pdR+bgFC+KYXvSh G9lkcM11LCR+UC65aYzM7YoOK0g6ybHVcSZhkCr/Y+ZtbnDwOhR19xDy X-Gm-Gg: AR+sD11mmgg6Ig2XjgXKohdAKTkDg+alIcs+F7Kn1FixVINl0quYhOpS2MvtpiZviZM A9g68LIifYt0ZotQrYKc/Ps97pK6K6PnUX/t4jXHjuLQzBRMLtYeIf+tuXIxSJLKiZbXdaAd+bv kHOJjUk6NYckdrLx5Y3TKdRtm6l0wztIZ3JAGZCI+l/5+1rV1/s/uzbAej8xsURYls58I9cNQzR ouraDfXPoIbZVNhjHVwdBWbS6JEINbzd78znqTSLXO6W9G85DhnpTJ67R15PwqUNr4TJwILQjtM Fp67rCKWaB17N+mgBzpbXY/VXquSAw6ChuPFscAhEH4ppg5Eh4tIQMi2JNE/sy3qCXLveiW3WWE +Nb6LFqR+Lh9DSlay7t/YkUjwpPEpGomMatqgVtu4l9mxUNZFZjrY1RByfRnFyvJqw7uxJTebTh 4pI6794YFho2DvjR7FtwABwhSTNUXxXfLgwb6sSMNUaKF4kjelZtrqlhsW8/QBrF3efXW7FX81n CVZa1YSM7TPHnotQ3+ulDyD8MxkHpcLguzx7kU8MCoPGANsMo8obliDOi9i8pSEF7RwvubF7X+w rM2/2OBMchj88Vbn2tqEysu5eis= X-Received: by 2002:a05:600c:1f96:b0:493:e365:7630 with SMTP id 5b1f17b1804b1-4994e7cbc2fmr85893515e9.14.1785945218582; Wed, 05 Aug 2026 08:53:38 -0700 (PDT) Received: from localhost (nat-icclus-192-26-29-3.epfl.ch. [192.26.29.3]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49949fd4c33sm170365265e9.8.2026.08.05.08.53.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Aug 2026 08:53:37 -0700 (PDT) Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=UTF-8 Date: Wed, 05 Aug 2026 17:53:37 +0200 Message-Id: Cc: , "Tejun Heo" , "Alexei Starovoitov" , "Andrii Nakryiko" , "Daniel Borkmann" , "Eduard Zingerman" , "Emil Tsalapatis" , , Subject: Re: [PATCH bpf-next v3 1/9] bpf: Support __arena and __arena_nullable kfunc argument suffixes From: "Kumar Kartikeya Dwivedi" To: "Amery Hung" X-Mailer: aerc 0.21.0 References: <20260803125115.2264733-1-memxor@gmail.com> <20260803125115.2264733-2-memxor@gmail.com> In-Reply-To: On Tue Aug 4, 2026 at 7:42 PM CEST, Amery Hung wrote: > On Mon, Aug 3, 2026 at 6:12=E2=80=AFAM Kumar Kartikeya Dwivedi wrote: >> >> From: Tejun Heo >> >> Passing an arena pointer to a kfunc takes two steps today. There is no >> arena pointer argument type, so the pointer crosses the boundary as a >> bare scalar, and the kfunc then offsets it by the arena base and casts >> it before it can touch the memory. Every such kfunc open-codes the same >> translation. >> >> Add the __arena and __arena_nullable argument suffixes to make this more >> convenient. The kfunc declares the parameter by its real pointer type >> and dereferences it directly, with the JIT rebasing the value at the >> call site, rN =3D kern_vm_start + (u32)rN. No bounds check is needed: th= e >> u32 offset stays within the guard-padded arena kernel mapping, and a >> fault on an unpopulated page recovers through the per-arena scratch >> page. A suffixed argument accepts a PTR_TO_ARENA or scalar register, >> matching global subprog arena arguments. >> >> __arena rebases unconditionally, so the kfunc never sees NULL and a >> value with zero in the low 32 bits arrives as the arena base. >> __arena_nullable preserves NULL for optional arguments by skipping the >> rebase when the truncated value, arena offset 0, is zero. Keeping the >> plain form NULL-free saves the NULL test on every call. >> >> This patch adds the verifier side: the suffixes are recognized in >> check_kfunc_args() and distilled into argument flags in the function >> model stored in the kfunc descriptor. JITs retrieve the model while >> emitting the call, avoiding per-call state in insn_aux_data. >> >> JITs declare support with bpf_jit_supports_arena_args() and verification >> fails with -ENOTSUPP elsewhere. >> >> Signed-off-by: Tejun Heo >> Co-developed-by: Kumar Kartikeya Dwivedi >> Signed-off-by: Kumar Kartikeya Dwivedi >> --- >> Documentation/bpf/kfuncs.rst | 29 ++++++++++++++++++++++++++ >> include/linux/bpf.h | 6 ++++++ >> include/linux/filter.h | 1 + >> kernel/bpf/btf.c | 18 +++++++++++++++- >> kernel/bpf/core.c | 5 +++++ >> kernel/bpf/verifier.c | 40 +++++++++++++++++++++++++++++++++++- >> 6 files changed, 97 insertions(+), 2 deletions(-) >> >> diff --git a/Documentation/bpf/kfuncs.rst b/Documentation/bpf/kfuncs.rst >> index cbde86d082cc..8e84484636c5 100644 >> --- a/Documentation/bpf/kfuncs.rst >> +++ b/Documentation/bpf/kfuncs.rst >> @@ -278,6 +278,33 @@ An example is given below:: >> ... >> } >> >> +2.3.8 __arena and __arena_nullable Annotations >> +---------------------------------------------- >> + >> +Both annotations indicate that the pointer argument points into the >> +calling program's arena. The JIT rebases the value at the call site so >> +the kfunc receives a directly dereferenceable kernel address, subject t= o >> +the access rules described in :ref:`BPF_kfunc_arena_access` (at most >> +``GUARD_SZ / 2``, 32 KiB, past the pointer in a single unchecked access= ). >> + >> +With ``__arena`` the rebase is unconditional and the argument is never >> +NULL: a value whose lower 32 bits are zero arrives as the arena base >> +address (arena offset 0). The kfunc must not check the argument for NUL= L. >> +With ``__arena_nullable`` such a value arrives as NULL instead and the >> +kfunc must check before dereferencing. >> + >> +An example is given below:: >> + >> + __bpf_kfunc int bpf_process_item(struct item *item__arena) >> + { >> + ... >> + } >> + >> +Calling such a kfunc requires the program to use an arena map and a JIT= with >> +arena argument support (currently x86-64); verification fails otherwise= . The >> +program can pass any value without compromising the kernel. A value tha= t does >> +not point into the arena is a program bug. >> + >> .. _BPF_kfunc_nodef: >> >> 2.4 Using an existing kernel function >> @@ -515,6 +542,8 @@ In order to accommodate such requirements, the verif= ier will enforce strict >> PTR_TO_BTF_ID type matching if two types have the exact same name, with= one >> being suffixed with ``___init``. >> >> +.. _BPF_kfunc_arena_access: >> + >> 2.8 Accessing arena memory through kfunc arguments >> -------------------------------------------------- >> >> diff --git a/include/linux/bpf.h b/include/linux/bpf.h >> index 356884587ae1..6da8a6be930c 100644 >> --- a/include/linux/bpf.h >> +++ b/include/linux/bpf.h >> @@ -1213,6 +1213,12 @@ struct bpf_prog_offload { >> /* The argument is signed. */ >> #define BTF_FMODEL_SIGNED_ARG BIT(1) >> >> +/* The argument is an arena pointer. */ >> +#define BTF_FMODEL_ARENA_ARG BIT(2) >> + >> +/* The argument is nullable. */ >> +#define BTF_FMODEL_NULLABLE_ARG BIT(3) >> + >> struct btf_func_model { >> u8 ret_size; >> u8 ret_flags; >> diff --git a/include/linux/filter.h b/include/linux/filter.h >> index 32d5297c557e..36ce3403fe59 100644 >> --- a/include/linux/filter.h >> +++ b/include/linux/filter.h >> @@ -1183,6 +1183,7 @@ bool bpf_jit_supports_subprog_tailcalls(void); >> bool bpf_jit_supports_percpu_insn(void); >> bool bpf_jit_supports_kfunc_call(void); >> bool bpf_jit_supports_stack_args(void); >> +bool bpf_jit_supports_arena_args(void); >> bool bpf_jit_supports_far_kfunc_call(void); >> bool bpf_jit_supports_exceptions(void); >> bool bpf_jit_supports_ptr_xchg(void); >> diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c >> index 5e8ac45ce56a..bf86df91a70b 100644 >> --- a/kernel/bpf/btf.c >> +++ b/kernel/bpf/btf.c >> @@ -7541,6 +7541,22 @@ static u8 __get_type_fmodel_flags(const struct bt= f_type *t) >> return flags; >> } >> >> +static u8 __get_arg_fmodel_flags(const struct btf *btf, >> + const struct btf_param *arg, >> + const struct btf_type *t) >> +{ >> + u8 flags =3D __get_type_fmodel_flags(t); >> + >> + if (btf_param_match_suffix(btf, arg, "__arena") || >> + btf_param_match_suffix(btf, arg, "__arena_nullable")) >> + flags |=3D BTF_FMODEL_ARENA_ARG; >> + if (btf_param_match_suffix(btf, arg, "__nullable") || >> + btf_param_match_suffix(btf, arg, "__arena_nullable")) >> + flags |=3D BTF_FMODEL_NULLABLE_ARG; >> + >> + return flags; >> +} >> + >> int btf_distill_func_proto(struct bpf_verifier_log *log, >> struct btf *btf, >> const struct btf_type *func, >> @@ -7606,7 +7622,7 @@ int btf_distill_func_proto(struct bpf_verifier_log= *log, >> return -EINVAL; >> } >> m->arg_size[i] =3D ret; >> - m->arg_flags[i] =3D __get_type_fmodel_flags(t); >> + m->arg_flags[i] =3D __get_arg_fmodel_flags(btf, &args[i]= , t); >> } >> m->nr_args =3D nargs; >> return 0; >> diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c >> index e2076667b245..a3e1fae32eac 100644 >> --- a/kernel/bpf/core.c >> +++ b/kernel/bpf/core.c >> @@ -3308,6 +3308,11 @@ bool __weak bpf_jit_supports_stack_args(void) >> return false; >> } >> >> +bool __weak bpf_jit_supports_arena_args(void) >> +{ >> + return false; >> +} >> + >> bool __weak bpf_jit_supports_far_kfunc_call(void) >> { >> return false; >> diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c >> index b274004fccfd..4c50237f49f1 100644 >> --- a/kernel/bpf/verifier.c >> +++ b/kernel/bpf/verifier.c >> @@ -10907,6 +10907,16 @@ static bool is_kfunc_arg_irq_flag(const struct = btf *btf, const struct btf_param >> return btf_param_match_suffix(btf, arg, "__irq_flag"); >> } >> >> +static bool is_kfunc_arg_arena(const struct btf *btf, const struct btf_= param *arg) >> +{ >> + return btf_param_match_suffix(btf, arg, "__arena"); >> +} >> + >> +static bool is_kfunc_arg_arena_nullable(const struct btf *btf, const st= ruct btf_param *arg) >> +{ >> + return btf_param_match_suffix(btf, arg, "__arena_nullable"); >> +} >> + > > From the verifier's point of view, __arena and __arena_nullable all > maps to KF_ARG_PTR_TO_ARENA and require the same check so maybe > is_kfunc_arg_arena() alone with two suffix matching is good enough, > but it also doesn't hurt to have two separated functions. > >> static bool is_kfunc_arg_scalar_with_name(const struct btf *btf, >> const struct btf_param *arg, >> const char *name) >> @@ -11127,6 +11137,7 @@ enum kfunc_ptr_arg_type { >> KF_ARG_PTR_TO_IRQ_FLAG, >> KF_ARG_PTR_TO_RES_SPIN_LOCK, >> KF_ARG_PTR_TO_TASK_WORK, >> + KF_ARG_PTR_TO_ARENA, >> }; >> >> enum special_kfunc_type { >> @@ -11412,7 +11423,6 @@ get_kfunc_arg_type(struct bpf_verifier_env *env,= struct bpf_call_arg_meta *meta, >> reg_arg_name(env, argno), btf_type_str(t)); >> return -EINVAL; >> } >> - >> ref_t =3D btf_type_skip_modifiers(meta->btf, t->type, NULL); >> ref_tname =3D btf_name_by_offset(meta->btf, ref_t->name_off); >> >> @@ -11461,6 +11471,9 @@ get_kfunc_arg_type(struct bpf_verifier_env *env,= struct bpf_call_arg_meta *meta, >> arg_type =3D KF_ARG_PTR_TO_RES_SPIN_LOCK; >> else if (is_kfunc_arg_callback(env, meta->btf, &args[arg])) >> arg_type =3D KF_ARG_PTR_TO_CALLBACK; >> + else if (is_kfunc_arg_arena(meta->btf, &args[arg]) || >> + is_kfunc_arg_arena_nullable(meta->btf, &args[arg])) >> + arg_type =3D KF_ARG_PTR_TO_ARENA; >> else if (arg + 1 < nargs && >> (is_kfunc_arg_mem_size(meta->btf, &args[arg + 1]) || >> is_kfunc_arg_const_mem_size(meta->btf, &args[arg + 1])= )) { >> @@ -12154,6 +12167,31 @@ static int check_kfunc_args(struct bpf_verifier= _env *env, struct bpf_call_arg_me >> >> t =3D btf_type_skip_modifiers(btf, args[i].type, NULL); >> >> + if (base_type(kf_arg_type) =3D=3D KF_ARG_PTR_TO_ARENA) { >> + if (!bpf_jit_supports_arena_args()) { >> + verbose(env, "JIT does not support kfunc= %s() with arena pointer arguments\n", >> + func_name); >> + return -ENOTSUPP; >> + } > > nit: JIT and register-based arg check can be done earlier in > get_kfunc_arg_type(). We probably will want a consolidated pass > validating bpf_func_proto. > I moved it up there. We still have prog aux argument doing stack argument rejection later, but I will let you figure out the right placement when you rework these bits. Only thing left here now is the register type check. >> + if (!env->prog->aux->arena) { >> + verbose(env, >> + "%s arena pointer requires a pro= gram with an associated arena\n", >> + reg_arg_name(env, argno)); >> + return -EINVAL; >> + } >> + if (regno < 0) { >> + verbose(env, "%s arena pointer cannot be= a stack argument\n", >> + reg_arg_name(env, argno)); >> + return -EINVAL; >> + } >> + if (reg->type !=3D PTR_TO_ARENA && reg->type != =3D SCALAR_VALUE) { >> + verbose(env, "%s is not a pointer to are= na or scalar\n", >> + reg_arg_name(env, argno)); >> + return -EINVAL; >> + } >> + continue; >> + } >> + > > Can we move arena argument checking to the second switch case below? > It only takes adding one condition below. > > This help reduce churn in the future when check_kfunc_args() also > receieve check_reg_type(). > >> if (btf_type_is_ptr(t) && (bpf_register_is_null(reg) || = type_may_be_null(reg->type)) && >> !is_kfunc_arg_nullable(meta->btf, &args[i])) { >> verbose(env, "Possibly NULL pointer passed to tr= usted %s\n", > > if (btf_type_is_ptr(t) && base_type(kf_arg_type) !=3D KF_ARG_PTR_TO_ARE= NA && > (bpf_register_is_null(reg) || type_may_be_null(reg->type)) && > !type_may_be_null(kf_arg_type)) { > verbose(env, "Possibly NULL pointer passed to trusted %s\n", > > To simplify this and avoid special casing, I changed the kf_arg_type to KF_ARG_PTR_TO_ARENA | PTR_MAYBE_NULL, since known NULL is kosher for both c= ases and we place no static constraints on the precise value.