From mboxrd@z Thu Jan 1 00:00:00 1970 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 C87B9242D8D 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=1753396358; cv=none; b=omoTAh+s1DAS9rK+cfRj2QAUMD+JWrnUoCNu3sKPTrj8Elqcg7p6i4KKK8NVxBedTyKW0+zDm+CghDqY4nP6+6dg9/1mPxRN9TXnGo81Tf00HVR/FeBhHDQjldgE/fHRJP3mVj3geobDtpiepLMKGYPaV8qs8PmZqmVW/HkUJsM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753396358; c=relaxed/simple; bh=Te5ncN9qqZn2upvGFqeV8Uur3LqS/b0o/rw16rHKk60=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=WYQwqSNtuncpYkY4qnXZ0o7eVsJP87Ioszgu/qsyZbiTiGyYDmxf85eR6ArITG5+HNHOyAB2RJMnDZg08N08En4RK0wB7PRxsAYFi3xJjnh0ntDOzorKFuy6NAbxPJTukIphUUatZKKryrB/W4z42Cx+q/x7mTjvYJYM096/BBM= 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-74927be2ec0so2313904b3a.0 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=vqX6wG9/MeUTP8rhTaD/OV7nuGq4Q5/cL+6tHPvaSyBP/19nw22NprWv52ckpHIHI2 9ZRWHxl9OohLrFXJuLY5r+vMjQu8IxA7V0mmNQL+52br6CY4WOZF0WYLzuVijHNam+5d aAKcc7YC4qoX3GBVciVZzpOZpJFSvCneOVZX+NS9h5hwK0n85k3n4qxJCZqydH/rwRgv 4AHr/iO5w7jZy8Qwyxd+t7TXxD6qeACRrzrxQW5PfpcQhdGKm8xI5z/GRMosU22bevky mYGDf0JAN57Mxx4YuDsUgCTiwsJVP+4H4mPyUs+x6k7Vtvn+dffY4et/PdSYI0MeItlo SDjw== X-Forwarded-Encrypted: i=1; AJvYcCWmpWGGaiHlOCFQBoq5+l63xz1JpTKqNxS4Y3LoKrGQ5y/5y+HpWxHBDrBdrMkIzjs8vieigtI=@vger.kernel.org X-Gm-Message-State: AOJu0Yx0Z3HmvBSEvLO3rkcsAS8PBNRnXD1jqjbuS8aJTR/uvKv6fcUs 1ZhQmmptenPJ14/H3lrDKS2ZmCg1WuhXTeZ78hbKvTivgkS+RK2gEOCAcOC1m9/CMVLGSe5JBe5 x/YrEK3TAEPO67d6NFbHkuTyB5GCSKA== 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: netdev@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-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/testing/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_testmod_ctx *ctx) call_rcu(&ctx->rcu, testmod_free_cb); } +__bpf_kfunc void __bpf_testmod_ctx_release(void *ctx) +{ + bpf_testmod_ctx_release(ctx); +} + static struct bpf_testmod_ops3 *st_ops3; static int bpf_testmod_test_3(void) @@ -631,7 +636,7 @@ BTF_KFUNCS_END(bpf_testmod_common_kfunc_ids) 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) static const struct btf_kfunc_id_set bpf_testmod_common_kfunc_set = { .owner = THIS_MODULE, -- 2.50.1.470.g6ba607880d-goog