From nobody Mon Oct 6 04:58:13 2025 Received: from mail-pj1-f74.google.com (mail-pj1-f74.google.com [209.85.216.74]) (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 3146223B605 for ; Thu, 24 Jul 2025 22:32:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753396354; cv=none; b=ZKV2gN7rBk1AJyGugHvX4rgnXFEekv+cWob1gZlx0OQZGf2jMmDGOSKWpnpo0WDybdcc0ZxiKdjxeCWJ+kvkknVM3+3+VdUA2ls+fY8z7p5Vr9TnzSUVKefxyp9826jcEnILvhS3ORN3jxx3tNChptg/N7dAa7TtfgQzmeRE2Fs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753396354; c=relaxed/simple; bh=HteP852RK5J1QiH2uzeIVvSELts0Mqfzj/8HRpKenLk=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=cID6h4OGHg33cTVIjH+y1GRw138ur26fO9rP6v3QVOn+jzcJ8uguBuqImpr9+LZ0DUs+C77huNUl18w3JK6sg57lOnRmer9KWTWNm4ODeNULy/RuulbtycxN3d1WY4Y/UmiweEfGtI5A9xDSuPnnF2aRfDkFXCaJGXQFjmdNCFY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--samitolvanen.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=1rGxNHwm; arc=none smtp.client-ip=209.85.216.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--samitolvanen.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="1rGxNHwm" Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-31315427249so1365434a91.1 for ; Thu, 24 Jul 2025 15:32:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1753396352; x=1754001152; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=W++rfy7Ckrm4pbQZbQbrjeSn7L0O+EOfVFPaS3WWK2g=; b=1rGxNHwmip3SLoNVBeYgd7lKzvq/U/Y6mc561U4Zjy3HRp108Dq0F54Bff9jYJoS45 OI8ICaKsgGgm7HS1FTuewbjpe/chbDbNt1X+MIL3Nmf3oAGDQK8XhmgeV1HVwL0pVhAn TGluIuoJTXuNjo2YKdKKDv9TaYJDx89MT3/UdLWbv2ErZso9coOUbHaIqqVIKr5QVgOy fARvBaijsRaJd9oCs2Tu6TqBBLVsTgkzrqcm0XzB6Z1cqRIFrpFptypD05WkS0d3oR4W dPUMN9JqFkAmEjojwXfn7+K5fuV07OW1yR+BJ91tFooipfMPSoxVME7RF7fd8PEEbSJY 703w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753396352; x=1754001152; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=W++rfy7Ckrm4pbQZbQbrjeSn7L0O+EOfVFPaS3WWK2g=; b=QK7AGSuru+YswCMSW6UR945W+1sUFYhPCCrczhUwA4goFaRee1RoQcqQElWglDwdta 4Im+B0d4u1ojWOUsgfpgwUlLwg62D+cFISOzz8nyac/cxbWuECq5TRVM/D/3EBAk6atH mkXIjBtT5DNNfTbqf5rP5Y35UJfy299lIglDEWiHZHkzbLerwQJVRCVAk9Z/JiZzEeGV YQysdBylLcepv8A+zyd1QPp5WuNadB/av8iytoHjhiWn+CNzV5a5eEwxyvSPYrbeeRdI +eD2D4si3Vid7dWG0+ewOMQkbfmEx6uAb6Zlf7ofNOd9E/v6fVN9HliSA72ktZMlZa7y QfWQ== X-Forwarded-Encrypted: i=1; AJvYcCWPOg4eT8LNBcmdOsuCcJ6AljkjEyBTzOobm30UXbRUHlUb29pYQnAOCukU/s7OZz3U0QkIqV+Q3CygrjQ=@vger.kernel.org X-Gm-Message-State: AOJu0Yyu3+XppgJa6tj3W9YCmE4JmUvrpQMED7JA8pCFhnTz2b0KXjOf 9NHlM4p6OqwsC1cU1V7ZnRyjYtGyGGPIbhYEF4zKz52YL8vruzAqF1VuDQ+aA8W7awujKs0ZkRq /CHZew6RGOlIZvvWbxKC75/27MNu1nQ== X-Google-Smtp-Source: AGHT+IGgkCKtpxoLZCJIhQvorDzFLqiG8h8Sn2E1b+a5JvxAcvHUrj2rVlHQjJhJHSFxhgZAh1/lsIYz1+ylxt5EJKw= X-Received: from pjboe10.prod.google.com ([2002:a17:90b:394a:b0:311:ef56:7694]) (user=samitolvanen job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:3809:b0:31e:326e:4d2d with SMTP id 98e67ed59e1d1-31e5073f566mr10846803a91.5.1753396352411; Thu, 24 Jul 2025 15:32:32 -0700 (PDT) Date: Thu, 24 Jul 2025 22:32:27 +0000 In-Reply-To: <20250724223225.1481960-6-samitolvanen@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250724223225.1481960-6-samitolvanen@google.com> X-Developer-Key: i=samitolvanen@google.com; a=openpgp; fpr=35CCFB63B283D6D3AEB783944CB5F6848BBC56EE X-Developer-Signature: v=1; a=openpgp-sha256; l=1650; i=samitolvanen@google.com; h=from:subject; bh=HteP852RK5J1QiH2uzeIVvSELts0Mqfzj/8HRpKenLk=; b=owGbwMvMwCUWxa662nLh8irG02pJDBlNW6r63p77Pv3SnbiFyWE7qoKaY94fud1SOW8ui2aRU Zfv9rAJHaUsDGJcDLJiiiwtX1dv3f3dKfXV5yIJmDmsTCBDGLg4BWAir5IY/krOrlsb8MvHsWhC BeMr7qDtuW9z30W31nm0pPPzHYqNT2Fk+MftN6P//8OvIjNPa0rZrJpvpeqZ9cJQel13f/1JNuU HnAA= X-Mailer: git-send-email 2.50.1.470.g6ba607880d-goog Message-ID: <20250724223225.1481960-7-samitolvanen@google.com> Subject: [PATCH bpf-next 1/4] bpf: crypto: Use the correct destructor kfunc type From: Sami Tolvanen To: bpf@vger.kernel.org Cc: Vadim Fedorenko , Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Eduard Zingerman , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , Jamal Hadi Salim , Cong Wang , Jiri Pirko , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Sami Tolvanen Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" With CONFIG_CFI_CLANG enabled, the kernel strictly enforces that indirect function calls use a function pointer type that matches the target function. I ran into the following type mismatch when running BPF self-tests: CFI failure at bpf_obj_free_fields+0x190/0x238 (target: bpf_crypto_ctx_release+0x0/0x94; expected type: 0xa488ebfc) Internal error: Oops - CFI: 00000000f2008228 [#1] SMP ... As bpf_crypto_ctx_release() is also used in BPF programs and using a void pointer as the argument would make the verifier unhappy, add a simple stub function with the correct type and register it as the destructor kfunc instead. Signed-off-by: Sami Tolvanen --- kernel/bpf/crypto.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/kernel/bpf/crypto.c b/kernel/bpf/crypto.c index 94854cd9c4cc..b703b1d1c282 100644 --- a/kernel/bpf/crypto.c +++ b/kernel/bpf/crypto.c @@ -261,6 +261,11 @@ __bpf_kfunc void bpf_crypto_ctx_release(struct bpf_cry= pto_ctx *ctx) call_rcu(&ctx->rcu, crypto_free_cb); } =20 +__bpf_kfunc void __bpf_crypto_ctx_release(void *ctx) +{ + bpf_crypto_ctx_release(ctx); +} + static int bpf_crypto_crypt(const struct bpf_crypto_ctx *ctx, const struct bpf_dynptr_kern *src, const struct bpf_dynptr_kern *dst, @@ -368,7 +373,7 @@ static const struct btf_kfunc_id_set crypt_kfunc_set = =3D { =20 BTF_ID_LIST(bpf_crypto_dtor_ids) BTF_ID(struct, bpf_crypto_ctx) -BTF_ID(func, bpf_crypto_ctx_release) +BTF_ID(func, __bpf_crypto_ctx_release) =20 static int __init crypto_kfunc_init(void) { --=20 2.50.1.470.g6ba607880d-goog From nobody Mon Oct 6 04:58:13 2025 Received: from mail-pl1-f201.google.com (mail-pl1-f201.google.com [209.85.214.201]) (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 A676E23C8A3 for ; Thu, 24 Jul 2025 22:32:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753396356; cv=none; b=KuPOCdk0TCP8reaZb/REtXk6XxbwWNI8JRlVn6VM3gxKsZ+9RVk1EYXIKxCN4SZbAXUwTxqFSMFXjXIRV2x1rP5qtpPvxqUhATDJX6sQ8HOxKbT8rXvXnB0Vgn9vm0AZ/tmRHD2nmbroOP/PkPHx7XxMZtcMOwv1XNbLHWUI3O0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753396356; c=relaxed/simple; bh=HdyMAFjZbu02whUTePCpE5p+N23Zl14tyqBKb8V/jYA=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=PV4m88kDk2jZIW9nGeDjFolCnjo7W3JuMvvKWU1/qpmAHRWfNwmGPlSd3mBOO+X6hB0v81lmI9reB5+LLyfz/nvoH4u4d8qgHoQjo0XOsqYaqufFivaEmS9cexX3SQS8mwePNOvuVAXtpH8zJsNvjKTbTVYaVwuNpafW+q6GKUI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--samitolvanen.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=1qurIDdg; arc=none smtp.client-ip=209.85.214.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--samitolvanen.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="1qurIDdg" Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-235dd77d11fso14783335ad.0 for ; Thu, 24 Jul 2025 15:32:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1753396354; x=1754001154; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=oLn0DiL3hOFcQhckESIdE+NOImyGoMwrsGYgAXL6v7w=; b=1qurIDdgzjK6wVts9X7KFmDYYx3sGOiCIa3xcPbEU02UgLwo/e69nY4ZN74ST9NEZZ XZlMhefHrw7iOTuSddSxYM4BTUVN71r6abgSIBGcNO2aFW3k5XPho1ZZr1AlY48A1u1e +ykwX/MWr2TFzJrxXq0iRgY7ZfC7GsvjCiGpWTQN06vTVheY2v276VQB10JIOyvoSL5N NemMvmjiRArkOAe/FT2nBwwDeLFS9/DYsi+CyZUGwZqXRDaHLqmMmVqYjBbjtG10uOso Ms1lWv53RF8oVInA1qkpe6tMOv6Sy52k2KXmy/ZKSLp3j1WoOF5KErv8uD+qS5WMZsVD B/Dg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753396354; x=1754001154; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=oLn0DiL3hOFcQhckESIdE+NOImyGoMwrsGYgAXL6v7w=; b=UfCFGdU2/OhtOVzybtm512P+RAhYjpqSk7pkIxgyC1abNgmy5RnyYSPC5GOwPob5Jz tUQYx8UhX6LGR5W/l0dUkkLm9BUys1ZMFR63qhW8Y4BnIqn9uwCsVF4rmU0ZvoCCuQXh tGF1AR5dGVAd1okSxq9if3mMWLMzGN5WfsgTlM8jLP07DTd/HJGgz/J1nd0DHtR3PO5/ T8REJmBgkEDBBaXQJz2m8ZuWef6v6GmnBAJNrPVMKXqMnsewJIgdMPJByat+jRsL/YNU 3WJPD0fynGoHO3tfsjdWQPEr5eI0IyyyraLZW/c5PPbCJ2t9r0i9JrdzExr5ZaprneI6 3MAA== X-Forwarded-Encrypted: i=1; AJvYcCUL0knZYWKDva7Flfn7EkiRCEcJ+EcHOWv37oFXcXRQeDewkqcMzpJOV3Cxc6ehckbXAPRY9aLJC+kyIKM=@vger.kernel.org X-Gm-Message-State: AOJu0Yz6c1aWarRBlVe3sv3FjR/d6kfXj1lbZN46IPi+cidnaTaapJ5e J1Cs+kYghALXk9LNEFOIwrMh84IHC8VJwvZnFU+cThKstDFQIo5zcz9ToAdOaLMhJSlhVqYI+RC k49TeOmvZLKzZhP7IiiaY5S7Qsa4DaA== X-Google-Smtp-Source: AGHT+IE/QhfK7fSPgf6hdUxRmb8vKHKetBGCtQfilh+Wr3qz/NoJP6cIGl1MPxzdX5KENkA2B5R5VHLZrK0UZU3hIFw= X-Received: from pjtu6.prod.google.com ([2002:a17:90a:c886:b0:311:d79d:e432]) (user=samitolvanen job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:c409:b0:234:c8f6:1b05 with SMTP id d9443c01a7336-23f9824cb15mr100337625ad.52.1753396354017; Thu, 24 Jul 2025 15:32:34 -0700 (PDT) Date: Thu, 24 Jul 2025 22:32:28 +0000 In-Reply-To: <20250724223225.1481960-6-samitolvanen@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250724223225.1481960-6-samitolvanen@google.com> X-Developer-Key: i=samitolvanen@google.com; a=openpgp; fpr=35CCFB63B283D6D3AEB783944CB5F6848BBC56EE X-Developer-Signature: v=1; a=openpgp-sha256; l=1356; i=samitolvanen@google.com; h=from:subject; bh=HdyMAFjZbu02whUTePCpE5p+N23Zl14tyqBKb8V/jYA=; b=owGbwMvMwCUWxa662nLh8irG02pJDBlNW6rOiG77U+Q9PzPkhfjcr1Hn7wj82L5m+XXflWq5j omxuy6s6yhlYRDjYpAVU2Rp+bp66+7vTqmvPhdJwMxhZQIZwsDFKQATcexk+J9+jq/5nuOKW/N4 pq9cNNmp3ffeizPy/2vy9fYfUOZ+0PeKkWGmiPvGYntji0k8U093njbInM8oeOolo9ypeYwl+ov Dz3EDAA== X-Mailer: git-send-email 2.50.1.470.g6ba607880d-goog Message-ID: <20250724223225.1481960-8-samitolvanen@google.com> Subject: [PATCH bpf-next 2/4] bpf: net_sched: Use the correct destructor kfunc type From: Sami Tolvanen To: bpf@vger.kernel.org Cc: Vadim Fedorenko , Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Eduard Zingerman , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , Jamal Hadi Salim , Cong Wang , Jiri Pirko , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Sami Tolvanen Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" With CONFIG_CFI_CLANG enabled, the kernel strictly enforces that indirect function calls use a function pointer type that matches the target function. As bpf_kfree_skb() signature differs from the btf_dtor_kfunc_t pointer type used for the destructor calls in bpf_obj_free_fields(), add a stub function with the correct type to fix the type mismatch. Signed-off-by: Sami Tolvanen --- net/sched/bpf_qdisc.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/net/sched/bpf_qdisc.c b/net/sched/bpf_qdisc.c index adcb618a2bfc..4558f5c01ed5 100644 --- a/net/sched/bpf_qdisc.c +++ b/net/sched/bpf_qdisc.c @@ -202,6 +202,11 @@ __bpf_kfunc void bpf_kfree_skb(struct sk_buff *skb) kfree_skb(skb); } =20 +__bpf_kfunc void __bpf_kfree_skb(void *skb) +{ + bpf_kfree_skb(skb); +} + /* bpf_qdisc_skb_drop - Drop an skb by adding it to a deferred free list. * @skb: The skb whose reference to be released and dropped. * @to_free_list: The list of skbs to be dropped. @@ -449,7 +454,7 @@ static struct bpf_struct_ops bpf_Qdisc_ops =3D { .owner =3D THIS_MODULE, }; =20 -BTF_ID_LIST_SINGLE(bpf_sk_buff_dtor_ids, func, bpf_kfree_skb) +BTF_ID_LIST_SINGLE(bpf_sk_buff_dtor_ids, func, __bpf_kfree_skb) =20 static int __init bpf_qdisc_kfunc_init(void) { --=20 2.50.1.470.g6ba607880d-goog From nobody Mon Oct 6 04:58:13 2025 Received: from mail-pf1-f202.google.com (mail-pf1-f202.google.com [209.85.210.202]) (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 6AB02242D6C for ; Thu, 24 Jul 2025 22:32:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753396357; cv=none; b=Z7ZE17SkLaHXLMjREIfheLGOlfrhDfymCf/EFQs2Ln/iuY/fpWpC3VMoPKA8dxVkvRIZOoAxAU94V8A9w7yOucpkGbClcSVwO5yMb2rrMyyTGg8H3iSaeDM5NT7VJaGhW/dpQayMzP3Sul9C5me33CwUuwELf/6Xli4vSGooyMI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753396357; c=relaxed/simple; bh=Te5ncN9qqZn2upvGFqeV8Uur3LqS/b0o/rw16rHKk60=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Ev202hD9WRD3wYmHtFMfiZnVhpnACt7ut4j0rPtTU9Gx7iaQBt25wKLW6BYB0FhW9oR/rXbXDAbKBfZpESC8AIXGeayNFvHwkGhoZOeAdtUkujENNOWd8DyU6j3ldJARy8DyCgDk73VALTr3KfiPnuRvR4eqH01JTa3eFn4r0yA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--samitolvanen.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=kW1fiaog; arc=none smtp.client-ip=209.85.210.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--samitolvanen.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="kW1fiaog" Received: by mail-pf1-f202.google.com with SMTP id d2e1a72fcca58-74943a7cd9aso2592292b3a.3 for ; Thu, 24 Jul 2025 15:32:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1753396356; x=1754001156; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=JNYfwAxqd7I2x0nMz51JmjiHwnxOLAwCMiMi5aEmTUc=; b=kW1fiaogDZi+5GuC2HzqXepHggblg3w8CPafaEpOWtc9NTDr4M/AxtDA41Reyuf56q N2/7BzjOaW5i6efxsNRAL6z7ccVM3YZYsZPKQXxK9SUly7zmKPTLyYwS1t6x/lFe3WHU JzMg6EJN1IDkOJ27Kuu9SGNYzGOLVlIPv+fzikKqTddBklICfzO5Ms5+dkv/6uietmYr RCiTBilZkMgVuaM4PjKHabG5noU8RwT0F1wktma3Smuj9L4u1t9hoLjyWixxmbu/KiQv aYBpP2PN8evyVpeEnfflIPtf7LQxi8FJsUKqdlwyFT5vkc4Ig+aSN/batm4ExGSM4IcQ mdbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753396356; x=1754001156; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=JNYfwAxqd7I2x0nMz51JmjiHwnxOLAwCMiMi5aEmTUc=; b=ukmaZbgCHbPp9r8cObtbqqRla6B1bRD9BWnf9BIbTCXUgG8xe7WlATEtcvMJzDKgEz /3FH4oklooB5RFnW8YD18pKJGrvW+1dsHtQP77lxZVlSHHPR14J3tQRbMEXtmDL1ZbdL Rkr3dNQ2uVPqeXwhpB64Bm2WZ9n/a1ngw8o/kChi5DnUIKGZjZe0sd4uKYLHVVEGWyLi iKftgmIxmfBrqF759PlGjplTZRmY19WhWy47yjYCzh/Ce9mqXJK8gUdK34ml8b2wgztn R/3tSpzJCPR++CuJ5D/hYQLJ74jgIjAj0rsepUFULZ6s4gDF7DY69VWBbLnOYotQ5h3C XYZw== X-Forwarded-Encrypted: i=1; AJvYcCVu5GKcC0LJa0cSAEdljP26u5EPBxl+y3zZDANld36va8wOOVWoagXEMkeZnGR4OVaG44zxn1qd9plXOBM=@vger.kernel.org X-Gm-Message-State: AOJu0YzQZtJ3lui63zL0OU3xuh+soYmqM+wjmvy7z6Fc2KLjM54sn4xY 95nofUq2/8SyHp97BDlpouNSlQA8i/2wp8kjnwyUM8mEq6aM7IAG0eih8qIQ9R1DK/nHGyrfHz2 zzaY3QX9Gx2COuFGingoBsWHtyCfKCQ== X-Google-Smtp-Source: AGHT+IHl2FsekGmmMkPb5Lkwpl2L6PcannsxEfE7R5Ah7fvhaheXO+MosnNohdRUZsY8h9CbPwKVJbwWDMBsZWMF4io= X-Received: from pfbif3.prod.google.com ([2002:a05:6a00:8b03:b0:747:bd3b:4b63]) (user=samitolvanen job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:1141:b0:742:b3a6:db16 with SMTP id d2e1a72fcca58-760356fdcf8mr11431105b3a.20.1753396355585; Thu, 24 Jul 2025 15:32:35 -0700 (PDT) Date: Thu, 24 Jul 2025 22:32:29 +0000 In-Reply-To: <20250724223225.1481960-6-samitolvanen@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250724223225.1481960-6-samitolvanen@google.com> X-Developer-Key: i=samitolvanen@google.com; a=openpgp; fpr=35CCFB63B283D6D3AEB783944CB5F6848BBC56EE X-Developer-Signature: v=1; a=openpgp-sha256; l=1511; i=samitolvanen@google.com; h=from:subject; bh=Te5ncN9qqZn2upvGFqeV8Uur3LqS/b0o/rw16rHKk60=; b=owGbwMvMwCUWxa662nLh8irG02pJDBlNW6oFj+X9La2LELl3VXbZsb/eLUs2Z/NfWR977rkzf 9nNSVtYOkpZGMS4GGTFFFlavq7euvu7U+qrz0USMHNYmUCGMHBxCsBEtn9m+GdwPOLhhjV2R5iE nuwq5+J+26t+b7fkFoPgfv1onW5WnxqGf0YbHvIzfbvcIm0gd2iOWT1z0uGH7Vezumct2ZKRmvB PgR0A X-Mailer: git-send-email 2.50.1.470.g6ba607880d-goog Message-ID: <20250724223225.1481960-9-samitolvanen@google.com> Subject: [PATCH bpf-next 3/4] selftests/bpf: Use the correct destructor kfunc type From: Sami Tolvanen To: bpf@vger.kernel.org Cc: Vadim Fedorenko , Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Eduard Zingerman , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , Jamal Hadi Salim , Cong Wang , Jiri Pirko , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Sami Tolvanen Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" With CONFIG_CFI_CLANG enabled, the kernel strictly enforces that indirect function calls use a function pointer type that matches the target function. As bpf_testmod_ctx_release() signature differs from the btf_dtor_kfunc_t pointer type used for the destructor calls in bpf_obj_free_fields(), add a stub function with the correct type to fix the type mismatch. Signed-off-by: Sami Tolvanen --- tools/testing/selftests/bpf/test_kmods/bpf_testmod.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/bpf/test_kmods/bpf_testmod.c b/tools/t= esting/selftests/bpf/test_kmods/bpf_testmod.c index e9e918cdf31f..8404d62ae524 100644 --- a/tools/testing/selftests/bpf/test_kmods/bpf_testmod.c +++ b/tools/testing/selftests/bpf/test_kmods/bpf_testmod.c @@ -249,6 +249,11 @@ __bpf_kfunc void bpf_testmod_ctx_release(struct bpf_te= stmod_ctx *ctx) call_rcu(&ctx->rcu, testmod_free_cb); } =20 +__bpf_kfunc void __bpf_testmod_ctx_release(void *ctx) +{ + bpf_testmod_ctx_release(ctx); +} + static struct bpf_testmod_ops3 *st_ops3; =20 static int bpf_testmod_test_3(void) @@ -631,7 +636,7 @@ BTF_KFUNCS_END(bpf_testmod_common_kfunc_ids) =20 BTF_ID_LIST(bpf_testmod_dtor_ids) BTF_ID(struct, bpf_testmod_ctx) -BTF_ID(func, bpf_testmod_ctx_release) +BTF_ID(func, __bpf_testmod_ctx_release) =20 static const struct btf_kfunc_id_set bpf_testmod_common_kfunc_set =3D { .owner =3D THIS_MODULE, --=20 2.50.1.470.g6ba607880d-goog From nobody Mon Oct 6 04:58:13 2025 Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.202]) (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 ED96D243968 for ; Thu, 24 Jul 2025 22:32:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753396359; cv=none; b=NywFRHNKOEiE7IGR5N6/Q4Ek82Cq+/J5wwZnBTHR40TxPn9sXwhcPKWjrQ4YssNnfRCZLbNMA8pBh/1pmnv/l7VtKIgSUsSDNhnSPE+WQvDbTFPEzYH4MtTm9nIelVkiMjdsQbtPAYdj0UrODWQtJoef96aw2gN/bbqQKUTl/4E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753396359; c=relaxed/simple; bh=4N95PHaH5sTwnPpy+bRhfgpn+/S4W3TV/v5oApqGZh8=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=VE+cuFL/Grggs6cvgT95FoglNqO8XfIJJK8bDiIzeGOH5GmNvaTlV46CklZMWgqDZHQkB0pueUlfx4QDl+tb7zJm/Ul4+ci7ksXxlJI3Ddn4Bfbs0Zv9Caqv9Ns02bASL5ejlbTRFp48j1H0gtRGvTdFvB8lIOqoFNQdLToR8tU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--samitolvanen.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=f6pz76tU; arc=none smtp.client-ip=209.85.214.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--samitolvanen.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="f6pz76tU" Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-2354ba59eb6so22614985ad.1 for ; Thu, 24 Jul 2025 15:32:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1753396357; x=1754001157; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=l30q4xjgSSq02GIRwkV5JkxzVEDFHasp0ZpBbR5DA+c=; b=f6pz76tUwhT6aRhJrd4AwFaRjwyTq9hvQjspqSvTCqjPPwoE5isDKW5fjnzMvUHKJs H2I7OtHf1DXX0IZRJZlBer3693ARAw/botWss/g3e77HFdNignoe93i7txYOOfq8jzUn nK7R/yxA0DiTXpINVRy4lqac2OtSCgxLRs3eRv/8DCtI93r0UiY6cKP3ioH/dJKlAl/g luL0xqREQyuB3RgBaSnDC6z5jSw4IjD92KfZGwVnFZWyWa7WfYG68ctFB5esj7s55/lY JkRxS8WijFvjhXky6qh8bDgiR942xCCOqvUj3xdiDeP+3dBYogzKzAaDlVJW4XcwktUg AFNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753396357; x=1754001157; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=l30q4xjgSSq02GIRwkV5JkxzVEDFHasp0ZpBbR5DA+c=; b=kkuGgSKLoaGLYxx+yW1rUm0Epu9ijYqGnmhSXr8f7DhrP6zQznmfDgEF+PTRvXslY0 9Ocwz3ugH/uPOpXWrtRzdUcDJKHvsJP8apV2/XYRQb5rA5TNDqyVh5d9JwbtQTiq++v7 9ZfDTWfbLWwJDDgjsb57vNNhknYqNsICzEvUfgWqBqzYwpl6fzp8iPxlogYZzFejlZPR 2MMXL8dfzvDliVJiTeSGgvbNv2HqWk6a6m/ib9pWi4+NgJSTDDUve9UhatC2hWq1Oee3 sM3wmJMILG/44kgebLIYlAWlo1euxwzUF1ioWrDu6AU52BL4fKVPvjaasQZZHXZyBA3h QN9A== X-Forwarded-Encrypted: i=1; AJvYcCU2kpEVxUpHvU4bpBXztWGFd+4TLqjsGWdN9KNK2G1/pPAaD1Zvgeob2jUcUw3RmA0tIw9tI9PJFPmkTgY=@vger.kernel.org X-Gm-Message-State: AOJu0YzSiU2jibB3/ktiouCQ/e+sEJ787iBnimaxSfAMV5Aw8MbhABoy fingZrKyQQ+mvZ7ZjQ37aodYcuSOTzLJf+d6TD9gj/Q9xMueel+oBj2hLvt4/bOTJ3tCgwiO6uD lwvBdhRbyhNd4F+g+PYp5T+4XdZpoSw== X-Google-Smtp-Source: AGHT+IEtA2E9+sMjT0EnxYfMCkPY3zq5lHvnVQxkTuwFfK+T/mp7UOYRrBkZNv+MUuGcmJKgNUMqUZbXZBtd12P/kOI= X-Received: from pjoo3.prod.google.com ([2002:a17:90b:5823:b0:311:a879:981f]) (user=samitolvanen job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:291:b0:234:df51:d16c with SMTP id d9443c01a7336-23f981b8595mr141323515ad.45.1753396357152; Thu, 24 Jul 2025 15:32:37 -0700 (PDT) Date: Thu, 24 Jul 2025 22:32:30 +0000 In-Reply-To: <20250724223225.1481960-6-samitolvanen@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250724223225.1481960-6-samitolvanen@google.com> X-Developer-Key: i=samitolvanen@google.com; a=openpgp; fpr=35CCFB63B283D6D3AEB783944CB5F6848BBC56EE X-Developer-Signature: v=1; a=openpgp-sha256; l=853; i=samitolvanen@google.com; h=from:subject; bh=4N95PHaH5sTwnPpy+bRhfgpn+/S4W3TV/v5oApqGZh8=; b=owGbwMvMwCUWxa662nLh8irG02pJDBlNW6oPVFdXMfZ1b3i/oViLecokq1PaTWvD/rEEzLV9L XfoS9/EjlIWBjEuBlkxRZaWr6u37v7ulPrqc5EEzBxWJpAhDFycAjCR8wcZ/kfOXf/X9MMFhtYQ xVSuoNPiJ7t9nU5aTri79v7eivOBDoKMDHMEDi9+d11Np4HT/+q958yCvDuUDjuE5D8IC0/MjAo 5yAkA X-Mailer: git-send-email 2.50.1.470.g6ba607880d-goog Message-ID: <20250724223225.1481960-10-samitolvanen@google.com> Subject: [PATCH bpf-next 4/4] bpf, btf: Enforce destructor kfunc type with CFI From: Sami Tolvanen To: bpf@vger.kernel.org Cc: Vadim Fedorenko , Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Eduard Zingerman , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , Jamal Hadi Salim , Cong Wang , Jiri Pirko , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Sami Tolvanen Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Ensure that registered destructor kfuncs have the same type as btf_dtor_kfunc_t to avoid a kernel panic on systems with CONFIG_CFI_CLANG enabled. Signed-off-by: Sami Tolvanen --- kernel/bpf/btf.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c index 0aff814cb53a..2b0ebd46db4a 100644 --- a/kernel/bpf/btf.c +++ b/kernel/bpf/btf.c @@ -8856,6 +8856,13 @@ static int btf_check_dtor_kfuncs(struct btf *btf, co= nst struct btf_id_dtor_kfunc */ if (!t || !btf_type_is_ptr(t)) return -EINVAL; + + if (IS_ENABLED(CONFIG_CFI_CLANG)) { + /* Ensure the destructor kfunc type matches btf_dtor_kfunc_t */ + t =3D btf_type_by_id(btf, t->type); + if (!btf_type_is_void(t)) + return -EINVAL; + } } return 0; } --=20 2.50.1.470.g6ba607880d-goog