From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from fout3-smtp.messagingengine.com (fout3-smtp.messagingengine.com [103.168.172.146]) (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 4217810A19; Wed, 17 Jul 2024 07:18:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=103.168.172.146 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721200740; cv=none; b=PrLBmvNAUPYB8JPyzQcy9VvHDbmeC+8uIYSXykGYCatbjWpCbCuGKVugK+1j1Y1OqQRkWZMUm5IJfmda9NYWZIcxs3ikfu+A4rK2/4ECCL1lYExWAUuOVUWoG/ZsciLO4D4Eid4krtATCdbS41XdHvwKUPnugy+6wnOpyMKfmDs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721200740; c=relaxed/simple; bh=7PaaGe8nbz1zISpPoYX/H9K+UT7ygtmRKsOFHz497zk=; h=MIME-Version:Message-Id:In-Reply-To:References:Date:From:To:Cc: Subject:Content-Type; b=IIKTG2+urqVOcdYSiJK+sniVUQ/N03Uw3g3EAVWAfgFJZ7E0GXwUpJo1NUYKj/D3isYJPq5LsbIr4ChU1BX8FATMETJ3+pzIdzdA6WoF4RI87WeTqbnKE7UvJ2MyqqXyjngyeQF+q1IDCrLh5gyNz79pBj5PzJf4Wezk4BG6vqU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arndb.de; spf=pass smtp.mailfrom=arndb.de; dkim=pass (2048-bit key) header.d=arndb.de header.i=@arndb.de header.b=lM5UPU7h; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=dcqK+/Vp; arc=none smtp.client-ip=103.168.172.146 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arndb.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arndb.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=arndb.de header.i=@arndb.de header.b="lM5UPU7h"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="dcqK+/Vp" Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailfout.nyi.internal (Postfix) with ESMTP id 5F2341380363; Wed, 17 Jul 2024 03:18:56 -0400 (EDT) Received: from wimap26 ([10.202.2.86]) by compute6.internal (MEProxy); Wed, 17 Jul 2024 03:18:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=arndb.de; h=cc :cc:content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to; s=fm2; t=1721200736; x=1721287136; bh=dVPCdXoCdl fuyxQFCO6tR60KWH2cIVkXd2rdl5L6JqE=; b=lM5UPU7h2Gq1rDOJG6qFaYML4f WUGnNEzzA+AYF8qAHUk85HSVSwDB1RzWoxMCLbYobLM5URqk0zFWW8X++y+v/f9U hkdgH7E8AoHUc7CvidcNMcTykk8kGgXrpkpX37TcNTmIRRyaV5AEtPW7f770Qt1k BF3z602UqV2IYxHY4STREyKbOx8ADlXK2GCy7P7+VpQpUZ9UCkj9spKsMBOoy65X 0X5GvUN5OC7Tqk8By3EojwaJoVTG8nD6y4Kr9q/VOqiRJ9SHE4btUE96UHkezzFS D75znMHiptX6Wf6evkVzTNS5DFQ5SunudahqQZkefdwbgxB5mUT+oNmd3UwA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:content-type:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:subject:subject:to :to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; t=1721200736; x=1721287136; bh=dVPCdXoCdlfuyxQFCO6tR60KWH2c IVkXd2rdl5L6JqE=; b=dcqK+/VpvAT5m8FFZ9SAjVK2TWAvP5Gmhhf4aBWHlZuR g4NxLayfnuwlG9N9dRGexf+qvsQ746FlSfoeyWVJDB1xNBepXehBJIKlIXer4Tl6 G8A3doOYJLmzbAzTf806hgrRiEp3fFY1IKBCa62ybQlwTvNS2ZcamzEgf91c5gfD dO5aMTqitBINe53zPn5AdBvlBuKtS6evhiK4Lnzv3o2jFZvzGQyZHkpCsFBNiiy+ zNgbmQQZZVX4nfXU3T1j2gVkdosYyJgMGTndHA/QUdBMllHVzTydeJNhJ1L8+SqD IX9BcxNgED7E/fFP2+5/0hylgld7OhAx2pQlMlEUOA== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrgeehgdduvddtucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepofgfggfkjghffffhvfevufgtsehttdertderredtnecuhfhrohhmpedftehr nhguuceuvghrghhmrghnnhdfuceorghrnhgusegrrhhnuggsrdguvgeqnecuggftrfgrth htvghrnhepffehueegteeihfegtefhjefgtdeugfegjeelheejueethfefgeeghfektdek teffnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomheprg hrnhgusegrrhhnuggsrdguvg X-ME-Proxy: Feedback-ID: i56a14606:Fastmail Received: by mailuser.nyi.internal (Postfix, from userid 501) id 01FBD19C005F; Wed, 17 Jul 2024 03:18:55 -0400 (EDT) X-Mailer: MessagingEngine.com Webmail Interface User-Agent: Cyrus-JMAP/3.11.0-alpha0-568-g843fbadbe-fm-20240701.003-g843fbadb Precedence: bulk X-Mailing-List: linux-arch@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: In-Reply-To: References: Date: Wed, 17 Jul 2024 09:18:33 +0200 From: "Arnd Bergmann" To: "Linus Torvalds" Cc: "Masahiro Yamada" , linux-kernel@vger.kernel.org, Linux-Arch , linux-arm-kernel@lists.infradead.org, "linux-csky@vger.kernel.org" , linux-hexagon@vger.kernel.org, loongarch@lists.linux.dev, "linux-openrisc@vger.kernel.org" , linux-snps-arc@lists.infradead.org Subject: Re: [GIT PULL] asm-generic updates for 6.11 Content-Type: text/plain On Wed, Jul 17, 2024, at 07:08, Linus Torvalds wrote: > On Tue, 16 Jul 2024 at 21:57, Linus Torvalds wrote: > > ./arch/arm64/include/generated/uapi/asm/unistd_64.h > ./arch/arm64/include/generated/asm/syscall_table_32.h > ./arch/arm64/include/generated/asm/syscall_table_64.h > ./arch/arm64/include/generated/asm/unistd_32.h > ./arch/arm64/include/generated/asm/unistd_compat_32.h > ./include/generated/autoconf.h > ./usr/include/asm/unistd_64.h > I've tried to come up with a patch that avoids including asm/unistd.h in most files, which would give some relief and hopefully let you get through the merge window in case we can't figure out my Makefile bug quickly. It's only a small drop in the ocean of excessive header inclusions, but it's still a step in the right direction I think. I'll do some more testing on other architectures with this patch so I can send you something that works. You can also just revert the three arm64 commits for now d2a4a07190f4 arm64: rework compat syscall macros e632bca07c8e arm64: generate 64-bit syscall.tbl 7fe33e9f662c arm64: convert unistd_32.h to syscall.tbl format since the patch to remove uapi/asm-generic/unistd.h wasn't part of the 6.11 series yet and nothing else depends on the arm64 conversion. Arnd extern const unsigned long sys_call_table[]; diff --git a/arch/arm64/kernel/sys.c b/arch/arm64/kernel/sys.c index f08408b6e826..274b67f02f3e 100644 --- a/arch/arm64/kernel/sys.c +++ b/arch/arm64/kernel/sys.c @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include diff --git a/fs/proc/base.c b/fs/proc/base.c index 72a1acd03675..9a535916dc03 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c @@ -92,6 +92,7 @@ #include #include #include +#include #include #include #include diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h index e6c00e860951..5144b80027be 100644 --- a/include/linux/binfmts.h +++ b/include/linux/binfmts.h @@ -3,7 +3,6 @@ #define _LINUX_BINFMTS_H #include -#include #include #include diff --git a/include/linux/compat.h b/include/linux/compat.h index 56cebaff0c91..89c307da6e5d 100644 --- a/include/linux/compat.h +++ b/include/linux/compat.h @@ -17,7 +17,6 @@ #include #include /* for aio_context_t */ #include -#include #include #include diff --git a/include/linux/ptrace.h b/include/linux/ptrace.h index 90507d4afcd6..f1ddc1eb9290 100644 --- a/include/linux/ptrace.h +++ b/include/linux/ptrace.h @@ -9,13 +9,6 @@ #include /* For BUG_ON. */ #include /* For task_active_pid_ns. */ #include -#include - -/* Add sp to seccomp_data, as seccomp is user API, we don't want to modify it */ -struct syscall_info { - __u64 sp; - struct seccomp_data data; -}; extern int ptrace_access_vm(struct task_struct *tsk, unsigned long addr, void *buf, int len, unsigned int gup_flags); @@ -397,8 +390,6 @@ static inline void user_single_step_report(struct pt_regs *regs) #define exception_ip(x) instruction_pointer(x) #endif -extern int task_current_syscall(struct task_struct *target, struct syscall_info *info); - extern void sigaction_compat_abi(struct k_sigaction *act, struct k_sigaction *oact); /* diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h index fff820c3e93e..2613b8f264bb 100644 --- a/include/linux/syscalls.h +++ b/include/linux/syscalls.h @@ -86,7 +86,6 @@ struct mnt_id_req; #include #include #include -#include #include #include #include diff --git a/include/linux/syscalls_api.h b/include/linux/syscalls_api.h index 23e012b04db4..bf997576453f 100644 --- a/include/linux/syscalls_api.h +++ b/include/linux/syscalls_api.h @@ -1 +1,17 @@ +// SPDX-License-Identifier: GPL-2.0 +#ifndef _LINUX_SYSCALLS_API_H +#define _LINUX_SYSCALLS_API_H + #include +#include +#include + +/* Add sp to seccomp_data, as seccomp is user API, we don't want to modify it */ +struct syscall_info { + __u64 sp; + struct seccomp_data data; +}; + +extern int task_current_syscall(struct task_struct *target, struct syscall_info *info); + +#endif diff --git a/include/trace/syscall.h b/include/trace/syscall.h index 8e193f3a33b3..0dfe926e70df 100644 --- a/include/trace/syscall.h +++ b/include/trace/syscall.h @@ -3,7 +3,6 @@ #define _TRACE_SYSCALL_H #include -#include #include #include diff --git a/include/uapi/linux/lsm.h b/include/uapi/linux/lsm.h index 33d8c9f4aa6b..523a53f12d4f 100644 --- a/include/uapi/linux/lsm.h +++ b/include/uapi/linux/lsm.h @@ -11,7 +11,6 @@ #include #include -#include /** * struct lsm_ctx - LSM context information diff --git a/kernel/exit.c b/kernel/exit.c index be81342caf1b..a78a6e97615a 100644 --- a/kernel/exit.c +++ b/kernel/exit.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include diff --git a/kernel/ptrace.c b/kernel/ptrace.c index d5f89f9ef29f..1067da7a8409 100644 --- a/kernel/ptrace.c +++ b/kernel/ptrace.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include diff --git a/lib/syscall.c b/lib/syscall.c index 006e256d2264..5fb67b3699b9 100644 --- a/lib/syscall.c +++ b/lib/syscall.c @@ -3,7 +3,7 @@ #include #include #include -#include +#include static int collect_syscall(struct task_struct *target, struct syscall_info *info) {