From nobody Mon Oct 6 03:15:55 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 6FEC225E816 for ; Fri, 25 Jul 2025 21:44:22 +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=1753479863; cv=none; b=I3hDQvZhf1/iyT+JdvubtFSznmeHXaXSvYq192dpNIuWOZwNsAxpmADLe01TV9tmfLul+03PAgyA9EnLeSP516/AdEDIk88Xv0xN50z7GzfPmQWvPdwu+9f6CqweDoAsi5lG5QuIgUsVHvRkdS62QM+maKsYDZ8OfQQgznOwxoo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753479863; c=relaxed/simple; bh=Iq1cnbTmEgni4YxG9ywBHoblhfyo+0pPO0BkBz61KdU=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Ga+e5twP13dh+mwYk/5CdsN2KvtWW7IzQJ+t1/BRL2Zv6g7TJA2LhuifOXgOEsuCLmWUL2OT6Be4yldz2CsGjXN/VEj+f3G8Qkn75fmJyArkl5R4YGozeLQS9NUQ3uKPECncNEW1Ufra41CjQ3pYWij930w9kXyhl5kbOAGddZQ= 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=XP0CYcbd; 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="XP0CYcbd" Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-234906c5e29so31159575ad.0 for ; Fri, 25 Jul 2025 14:44:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1753479862; x=1754084662; 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=JB3KE76w5fALvodnJVMWZoQmA6fWA680+neCuoDNhMQ=; b=XP0CYcbdivf+2cL8ff+GlnRSfkxB5uTSZkJ+/EF+iduBs9DvFMmqK0j/+FqmVKHSR9 lUewCSjVZ8yFErvSxFr3UKOeW1fEl2wKiTofKv4PTXknW/3q8gKWfPpkQI+L0PA3fOjE xD/9w3TZ90eLlSNgM+ggJgaTCRJGlWFEFVvpxNZLgUYXl2ff93zPclvRQaBiL7HJC4+M V8d+PSKTbjWXYY5KggiJ+SNfKFjUUB7DMXidcEwID01U80ZTBDtSCG8Iamazi/mAP/+Y Go3fzGjwxNwuoRpsmr13khj7kpuVGG+QSbvMT5QU7dxQ2X6zIVSDZB9eYyIQDJqUzauC VQ4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753479862; x=1754084662; 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=JB3KE76w5fALvodnJVMWZoQmA6fWA680+neCuoDNhMQ=; b=Dm5VidAI9jXqIfV8fTOz5hhIEphOCA2VCVwnVOaucT29jrEpfHDYpjkxDMqrg8+8dQ 9iaWya5iTfkOdP+qZhN1n0gAT30NFAn9RgN07bgft3j9QYFNxP6DlnfpM4/TllHIVVG/ NDGFFJw18LDaL7j/Hs92mT+3K5diKouD5q/1ReaVQvcypd7Q6pIXcL9GmNlx2TY9HMA4 0WRvvCOoQWhE157RirlDn5uAE+Ql+I0PFVhpMSvPaio6LycBj0JmcXWIuHbXxBklOgbj hH6Y+w86IGizz0KOnFK8Z8i6KsENohkzaJT+Q6xw8Ka0UYmtdVseENWTkBbPV8yUGhkJ uVYw== X-Forwarded-Encrypted: i=1; AJvYcCXwNrMhvLm0rLxfc1HvvERnEnsy2xUNd0xXXx49ESxuQYS67RylNnHIYubHpqtAWyIFYF9qLWDigvhMLNo=@vger.kernel.org X-Gm-Message-State: AOJu0YwxoKJvR801zIpUDPE/1H4XzzWIhna9us2Kt3WGes8zgidFvhN2 E2Z6UvSnGz4Ve2zXlH8XgFJl90O2YeSbndWWZ9wJh9ni2WfmWFJMps3pJqJ/PYDENqEY7W5RTjn 5hkULtEqHqsRGQuRULSxr/gt4hZV1uQ== X-Google-Smtp-Source: AGHT+IH1ZJHPyFWJEdvWuwgbW1dYgGrOlGx8FCPu/AvhGsRm/WBEUq4PZp8pRuQZXST0DqCbfK7QypThYkUVSL1Bzmk= X-Received: from plbkk3.prod.google.com ([2002:a17:903:703:b0:23f:bf61:8e96]) (user=samitolvanen job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:fa4:b0:234:df51:d16c with SMTP id d9443c01a7336-23fb30e8d49mr68338175ad.45.1753479861796; Fri, 25 Jul 2025 14:44:21 -0700 (PDT) Date: Fri, 25 Jul 2025 21:44:05 +0000 In-Reply-To: <20250725214401.1475224-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: <20250725214401.1475224-6-samitolvanen@google.com> X-Developer-Key: i=samitolvanen@google.com; a=openpgp; fpr=35CCFB63B283D6D3AEB783944CB5F6848BBC56EE X-Developer-Signature: v=1; a=openpgp-sha256; l=1561; i=samitolvanen@google.com; h=from:subject; bh=Iq1cnbTmEgni4YxG9ywBHoblhfyo+0pPO0BkBz61KdU=; b=owGbwMvMwCUWxa662nLh8irG02pJDBnNvxZfydzy1CX3xZLb0m2B61RMppTsa7uoWnvwlrFc8 IQyS87UjlIWBjEuBlkxRZaWr6u37v7ulPrqc5EEzBxWJpAhDFycAjARZ22G/x7cWg/DfK5eCLlm Mm966O9tv/WWy3ac/CRy5Wi58pyyQ70Mf6XXVCt66S3kT14eb+q9obL6xlWlkGVuXqcb0u9F7BK 7xgYA X-Mailer: git-send-email 2.50.1.470.g6ba607880d-goog Message-ID: <20250725214401.1475224-9-samitolvanen@google.com> Subject: [PATCH bpf-next v2 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 | 9 ++++++++- 1 file changed, 8 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..b086244f259a 100644 --- a/tools/testing/selftests/bpf/test_kmods/bpf_testmod.c +++ b/tools/testing/selftests/bpf/test_kmods/bpf_testmod.c @@ -249,6 +249,13 @@ __bpf_kfunc void bpf_testmod_ctx_release(struct bpf_te= stmod_ctx *ctx) call_rcu(&ctx->rcu, testmod_free_cb); } =20 +__used __retain void __bpf_testmod_ctx_release(void *ctx) +{ + bpf_testmod_ctx_release(ctx); +} + +CFI_NOSEAL(__bpf_testmod_ctx_release); + static struct bpf_testmod_ops3 *st_ops3; =20 static int bpf_testmod_test_3(void) @@ -631,7 +638,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