From nobody Mon Oct 6 03:15:56 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 E64572571AD for ; Fri, 25 Jul 2025 21:44:20 +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=1753479862; cv=none; b=cuB3lQt83n6TD7u1Kz/LSNWbYp/HF1dWn4th4ccuOiXuBHMx169B+qpa6cNbwXVYOUppEcY3mX7ifj40GQXqoQPpJER7tw9fWbjhn65fiDjGY9ef2HTVKDsgvCBxUc40TlpGZwVb6hPUyubAMLyiCOYyCVOX9DnZeZ38rW/n/as= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753479862; c=relaxed/simple; bh=GO7ImXEAOuMIOar1IsdVoRKFJVlSFfW0FE673eTteVo=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=OZKZU4UJJu3vuaNITJSBbPhDrKFLXcK+cOkkCPeVbNTBTfPuTJM7vZKZOfmgAeaXIJ2bAwm38SNTZLPlfL+DzTit0PLiF28QHenvISFbSA9ipKHCkLtN0FjvtpTCApUMVos5eNrdSiuZZEcFGnhd+yx5abpn3LxNXltrMzAC5NA= 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=1jZ41/pu; 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="1jZ41/pu" Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-3132c1942a1so3810042a91.2 for ; Fri, 25 Jul 2025 14:44:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1753479860; x=1754084660; 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=nh1FjbfwBquX1aOlAjtnfCEBWUtfAe9dDsJi1MAAp54=; b=1jZ41/puEnQyncoRjo+wVUnALmMTTw2u2FMwXTrdEs1AaZHu2E2Fe30pJBLmAQD82C /dklmGfUJMsnVOGEYuZUSXZK0imys2heXE9UXOwmpFgdf/54DoSZ2Fj9VK0xRZqnKsAg MFfBYhOT8ClpC7Hlb9GuUjFr6IUK+yFOH5LwhnAsH4hUG/4InyCH6LhtpOi7+pQqHM+e BHZPjC++loUi8EOUTPNxhCokt8jF1ifRMVa3IRiiElQIQGClWIKWvLk2prqvW8FMsuUs 2/ww0SbPXMeL5W1nwzncVz8XeCjMlpmECr3Gf027NIBScU6Lw7NjqjBdq7IP7D/j/P5H ysQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753479860; x=1754084660; 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=nh1FjbfwBquX1aOlAjtnfCEBWUtfAe9dDsJi1MAAp54=; b=VEKYOi64PMcK4+T3iPRNIeDqunebkYfgVj26YhtCiKwCmr1Kim4wOHQ+uKe4KJzxSg Vfhton1Ak5h++NWwtwYaHT6+nPb+N8W3SRMplvRAakFDH5vJ9iWBATBHOJYkCCyD0jAA KxUIW0TrHtJV9prKKGTTVHdGzLImU6AwBbhN6GvRlnhUrmVE35Ebmu7GGg7oSGbNYBUn 3YblE6+B0O15E8TMlwI8ZeY1PpzJGOS/qxTq3xh0zQafsYqLZc1/9DmDDEbPG8xGaFqJ Rw7mLNP0plHYUWzA09aHGWl7/akB6qPgNAQeneYm1J++oyqwJBbuJ2IarVdRDSNz2e8V P8Jw== X-Forwarded-Encrypted: i=1; AJvYcCXe8GALVcu4rDCBVghkioJSD531+ROn5zHqjDwwlOo8pthPVnu9kbLUuBiWyfOhn2qra2REMqpR2x4s1QE=@vger.kernel.org X-Gm-Message-State: AOJu0Yz1QIDs5iXX3QTWJDxkAAlSF6riCZ1XHgWc0dgRlDYFTt0tIUnP nU1BNSojjAv4dzdhR0Fbj+H+PU35jVPK78+ZznM7evAAqddGy2lry2pgakp8QhcmyhvGwiSe+bg 4v9sFsfi8+3+LeenCXo8KeRMDXDWZmw== X-Google-Smtp-Source: AGHT+IFWY6iwqFym08uHjYBP6xmNfO0fYcS3owVwCfauSHVtUhoNQHns8E0XueGZKuuJciKWYVtKZeSTTNiiVsdsE7Y= 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:134e:b0:31c:23f2:d2ae with SMTP id 98e67ed59e1d1-31e77a59e53mr4606952a91.15.1753479860240; Fri, 25 Jul 2025 14:44:20 -0700 (PDT) Date: Fri, 25 Jul 2025 21:44:04 +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=1396; i=samitolvanen@google.com; h=from:subject; bh=GO7ImXEAOuMIOar1IsdVoRKFJVlSFfW0FE673eTteVo=; b=owGbwMvMwCUWxa662nLh8irG02pJDBnNvxat8TpTKKnffUPxza2IUNVVXzTefJ4ifLQ8Mqfgn 8SmeZtaO0pZGMS4GGTFFFlavq7euvu7U+qrz0USMHNYmUCGMHBxCsBEcrUY/qmlqW+v+bIzq8wz ozFnE/euaI5naVU/L90MiHQ9E7rR9Rsjw5/Zxtcm9mqYVmjLfl9U+OlQo/aElZMiBPUvCiX8srn FwA8A X-Mailer: git-send-email 2.50.1.470.g6ba607880d-goog Message-ID: <20250725214401.1475224-8-samitolvanen@google.com> Subject: [PATCH bpf-next v2 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 | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/net/sched/bpf_qdisc.c b/net/sched/bpf_qdisc.c index adcb618a2bfc..890edd7ab64b 100644 --- a/net/sched/bpf_qdisc.c +++ b/net/sched/bpf_qdisc.c @@ -202,6 +202,13 @@ __bpf_kfunc void bpf_kfree_skb(struct sk_buff *skb) kfree_skb(skb); } =20 +__used __retain void __bpf_kfree_skb(void *skb) +{ + bpf_kfree_skb(skb); +} + +CFI_NOSEAL(__bpf_kfree_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 +456,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