From mboxrd@z Thu Jan 1 00:00:00 1970 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 5D05431A549 for ; Wed, 4 Mar 2026 14:44:36 +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=1772635476; cv=none; b=Y+9ka1CIMYeDBlngZoj7XUn+OcMSNOE3E8jV8yjEZSXElT9VYUz06azd8nz1WncVHJmizdSDFqUcale5VFJ5T/ivUaqh3NzrkkEvxFno3ZeU8VrVfon6zzc1RIwwzmDW+6xXfwyMUhYu372Qfb0x3s+l7mssD0rCOvNbM91UYmw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772635476; c=relaxed/simple; bh=at2ev2SR9asV7InSrEVlR/xtiti6Dy8RWONpROkBPOQ=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type: Content-Disposition; b=t6LFUpxuEN4I4YTMWGj4KJsLjf65EfmP+vCH7aZ4srqEv7c6K62KzEIN7IgiUCSQg2ZoXg1mcBvjpEn86t9F+VWVZqokzHgTdVuZ8f/rosA4+6ofCNL86l9KYhnXpZ2JRC41spP57D7V1tLMMtczWjoeUX2hZX1zow97Yas1RFk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=BLE8upoI; 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="BLE8upoI" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B5673C19423; Wed, 4 Mar 2026 14:44:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772635476; bh=at2ev2SR9asV7InSrEVlR/xtiti6Dy8RWONpROkBPOQ=; h=Date:From:To:Cc:Subject:From; b=BLE8upoIGmczz9hD8uzqSkg+maw7CjuOVTncCbe2FMxwWZi00FDawpVYiN2pL8lDT +JEslpMOphad7kBeMSIe8isqhNpOcx3hhktHWOacqwMnqF4s29l9XpQVK29JjNU26r YFdypL9BzG3cHW15pFR8s32LvbD+9BoizY/pA0KTCjP2tAIn63JNYxmUjzhUhlKZxt oaPVrJLHwS0W/hBHYO4Sq7xlwARlin2DuLBCtmSGQE+LK6C6kvOwrcntDxYtU8JwrC ML9budzC/v18fJ4qKK7tdkCqSX3DJbIsm5GLEEB0Gtg+L2cj8OU3Ba48p75bTUeEfT HfGcdhEZfNq2Q== Date: Wed, 4 Mar 2026 11:44:33 -0300 From: Arnaldo Carvalho de Melo To: linux-kernel@vger.kernel.org Cc: Christian Brauner , Bhavik Sachdev , Adrian Hunter , Ian Rogers , James Clark , Jiri Olsa , Namhyung Kim Subject: [PATCH 1/1] perf beauty: Sync linux/mount.h copy with the kernel sources Message-ID: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline tldr; Just FYI, I'm carrying this on the perf tools tree. Full explanation: There used to be no copies, with tools/ code using kernel headers directly. From time to time tools/perf/ broke due to legitimate kernel hacking. At some point Linus complained about such direct usage. Then we adopted the current model. See further details at: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/tools/include/uapi/README To pick the changes from: 9b8a0ba68246a61d ("mount: add OPEN_TREE_NAMESPACE") 0e5032237ee55301 ("statmount: accept fd as a parameter") That doesn't change anything in tools this time as nothing that is harvested by the beauty scripts got changed: $ ls -1 tools/perf/trace/beauty/*mount*sh tools/perf/trace/beauty/fsmount.sh tools/perf/trace/beauty/mount_flags.sh tools/perf/trace/beauty/move_mount_flags.sh $ This addresses this perf build warning. Warning: Kernel ABI header differences: diff -u tools/include/uapi/linux/mount.h include/uapi/linux/mount.h Please see tools/include/uapi/README for further details. Cc: Christian Brauner Cc: Bhavik Sachdev Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/trace/beauty/include/uapi/linux/mount.h | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/tools/perf/trace/beauty/include/uapi/linux/mount.h b/tools/perf/trace/beauty/include/uapi/linux/mount.h index 5d3f8c9e3a6256b4..d9d86598d100cb32 100644 --- a/tools/perf/trace/beauty/include/uapi/linux/mount.h +++ b/tools/perf/trace/beauty/include/uapi/linux/mount.h @@ -61,7 +61,8 @@ /* * open_tree() flags. */ -#define OPEN_TREE_CLONE 1 /* Clone the target tree and attach the clone */ +#define OPEN_TREE_CLONE (1 << 0) /* Clone the target tree and attach the clone */ +#define OPEN_TREE_NAMESPACE (1 << 1) /* Clone the target tree into a new mount namespace */ #define OPEN_TREE_CLOEXEC O_CLOEXEC /* Close the file on execve() */ /* @@ -197,7 +198,10 @@ struct statmount { */ struct mnt_id_req { __u32 size; - __u32 mnt_ns_fd; + union { + __u32 mnt_ns_fd; + __u32 mnt_fd; + }; __u64 mnt_id; __u64 param; __u64 mnt_ns_id; @@ -232,4 +236,9 @@ struct mnt_id_req { #define LSMT_ROOT 0xffffffffffffffff /* root mount */ #define LISTMOUNT_REVERSE (1 << 0) /* List later mounts first */ +/* + * @flag bits for statmount(2) + */ +#define STATMOUNT_BY_FD 0x00000001U /* want mountinfo for given fd */ + #endif /* _UAPI_LINUX_MOUNT_H */ -- 2.53.0