From patchwork Mon Jun 17 18:15:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 805018 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 02BF5197553; Mon, 17 Jun 2024 18:16:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718648166; cv=none; b=Iu8UbZB7IpaJHs+Palbep+hr4Q97/xIPKvg/vHWsXLKlPCo4U8NYOEfwWqGEG48K7sANg0XK2FEiwj3+fmruA0xtw7E4K+aMs7ja7eztnGpdbV/sab4Pd70IKhr05RlkC7to0d+AaHn3R+7pnhh1w6zsSOGHX9u0y5pYzhmZoEQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718648166; c=relaxed/simple; bh=4U1a6i5Q7+rGsa8vK/Gbq10wKLL6onxJ2NJdNSHWNYI=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type: Content-Disposition; b=m3b8/EyaTODF8PEgy/Xdn66nqv6aGqr2eIB5v9jnrcsYMTJQUBdAxxv0Ntq3RLL8qg+XMymyYI3rZZ6mB16z5Q3njkye6Cofq1YHRc4aX8AA2CCu3pbzsJUZB8azR5SfK1libSlG+vVFkp0ijV9EvG8sWc26WwWBbo0Lu7K/p8o= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=BjAmXXD/; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="BjAmXXD/" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DE6C1C2BD10; Mon, 17 Jun 2024 18:16:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1718648165; bh=4U1a6i5Q7+rGsa8vK/Gbq10wKLL6onxJ2NJdNSHWNYI=; h=Date:From:To:Cc:Subject:From; b=BjAmXXD/m6pTnx8zCWKKsyaV0BhMKFjEHUBVTVf0VLpIqHCvBxzg/xFh0MOjQmKau kFo4lt4vzd9h7tsveHUnqv9TI0lcmxizorcauGJtRRKV5V4f45J97eRHZSno/28BFr lAQOiBU2k0MBoJqVVdIv+m4khfJSQp2ISTJPqsU3jHWkSCvpo1TOvvrLkdzSa/kq8D QCuil24MI5qDdQy21gq3lJHQc0jfzTiS456NtEVXuhsaquqgyeLY1zajQoJwtWB0Tz wAfCzQub0QH93gB0K2QlTSnyrsj6PJ6I+0d3Jqs1SVhDylkSkWOnRTEw7GPUM4nYAz To2eemruUdJPw== Date: Mon, 17 Jun 2024 19:15:59 +0100 From: Mark Brown To: Daniel Borkmann , Alexei Starovoitov , Andrii Nakryiko , bpf , Networking , Benjamin Tissoires , Jiri Kosina Cc: Kui-Feng Lee , Martin KaFai Lau , linux-input@vger.kernel.org, Linux Kernel Mailing List , Linux Next Mailing List , bpf@vger.kernel.org Subject: linux-next: build failure after merge of the bpf-next tree Message-ID: Precedence: bulk X-Mailing-List: linux-input@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline Hi all, After merging the bpf-next tree, today's linux-next build (x86_64 allmodconfig) failed like this: /tmp/next/build/drivers/hid/bpf/hid_bpf_struct_ops.c:280:16: error: initialization of 'int (*)(void *, struct bpf_link *)' from incompatible pointer type 'int (*)(void *)' [-Werror=incompatible-pointer-types] 280 | .reg = hid_bpf_reg, | ^~~~~~~~~~~ /tmp/next/build/drivers/hid/bpf/hid_bpf_struct_ops.c:280:16: note: (near initialization for 'bpf_hid_bpf_ops.reg') /tmp/next/build/drivers/hid/bpf/hid_bpf_struct_ops.c:281:18: error: initialization of 'void (*)(void *, struct bpf_link *)' from incompatible pointer type 'void (*)(void *)' [-Werror=incompatible-pointer-types] 281 | .unreg = hid_bpf_unreg, | ^~~~~~~~~~~~~ /tmp/next/build/drivers/hid/bpf/hid_bpf_struct_ops.c:281:18: note: (near initialization for 'bpf_hid_bpf_ops.unreg') Caused by commit 73287fe228721b ("bpf: pass bpf_struct_ops_link to callbacks in bpf_struct_ops.") interacting with commit ebc0d8093e8c97 ("HID: bpf: implement HID-BPF through bpf_struct_ops") from the HID tree. I've fixed it up as below: >From e8aeaba00440845f9bd8d6183ca5d7383a678cd3 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Mon, 17 Jun 2024 19:02:27 +0100 Subject: [PATCH] HID: bpf: Fix up build Fix up build error due to 73287fe228721b ("bpf: pass bpf_struct_ops_link to callbacks in bpf_struct_ops.") Signed-off-by: Mark Brown --- drivers/hid/bpf/hid_bpf_struct_ops.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/hid/bpf/hid_bpf_struct_ops.c b/drivers/hid/bpf/hid_bpf_struct_ops.c index 5f200557ff12b..744318e7d936b 100644 --- a/drivers/hid/bpf/hid_bpf_struct_ops.c +++ b/drivers/hid/bpf/hid_bpf_struct_ops.c @@ -175,7 +175,7 @@ static int hid_bpf_ops_init_member(const struct btf_type *t, return 0; } -static int hid_bpf_reg(void *kdata) +static int hid_bpf_reg(void *kdata, struct bpf_link *link) { struct hid_bpf_ops *ops = kdata; struct hid_device *hdev; @@ -229,7 +229,7 @@ static int hid_bpf_reg(void *kdata) return err; } -static void hid_bpf_unreg(void *kdata) +static void hid_bpf_unreg(void *kdata, struct bpf_link *link) { struct hid_bpf_ops *ops = kdata; struct hid_device *hdev;