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 E243421D5A2 for ; Tue, 1 Apr 2025 22:18:28 +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=1743545909; cv=none; b=fpb8QL30DLX6ajx1oFLnFuZe+HY3Oo45s7wZ2lG4m7MLxK/P9aBW/QFW+F85/dqeUlUGY3mZW7A5/IqvqkXE15MPIGUHU768hxJqz9K4K82uYooM6HTBUY4CnCEX4Wd5QcQndfeBTLrzXd9NyWMYTrOz40ggvhxcBlYY5797Jw0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743545909; c=relaxed/simple; bh=G0JZVpfDzLOwMiTXvsblIlK3ibLvUFjDXHTKNTUxHk8=; h=Date:To:From:Subject:Message-Id; b=O9HCWY3OfnfvZDHQAawGK2cs1+//RYGuY3BsNEdsB9zoceFMhN5m4A8KANcING/aYJfdIWWQeoc6PXjhXFAvovoPCwOm/JTth8x3W+egzLkKpFZKJfERaDrNHr9ac2Y1RlKrc1AHtZ7sueXQux7fHOjvWhWDn17pqEPfF7C8BLs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b=zJ14XUnH; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b="zJ14XUnH" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 01983C4CEE4; Tue, 1 Apr 2025 22:18:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1743545908; bh=G0JZVpfDzLOwMiTXvsblIlK3ibLvUFjDXHTKNTUxHk8=; h=Date:To:From:Subject:From; b=zJ14XUnHHWchLs8u4N+cofyerk2ZdC48eqLGjILzemWRQ5WQHTHRDRX+1mwVV6od4 xCfFLYRUB+pXFN8QC4gK5OWr1iqnDAfwoqbWhg/gS/2AVu3aihIXFPbJWd9TYSkter Tm4fFxJjG8V4r0KTwbQ0o16NsmA5xCBnmLhWeu7w= Date: Tue, 01 Apr 2025 15:18:27 -0700 To: mm-commits@vger.kernel.org,willy@infradead.org,vbabka@suse.cz,thomas.weissschuh@linutronix.de,sroettger@google.com,rientjes@google.com,rdunlap@infradead.org,peterx@redhat.com,pedro.falcato@gmail.com,oleg@redhat.com,ojeda@kernel.org,mpe@ellerman.id.au,mingo@kernel.org,mike.rapoport@gmail.com,mhocko@suse.com,mark.rutland@arm.com,lorenzo.stoakes@oracle.com,linus.walleij@linaro.org,Liam.Howlett@oracle.com,kees@kernel.org,jorgelo@chromium.org,johannes@sipsolutions.net,jason@zx2c4.com,jannh@google.com,hch@lst.de,hca@linux.ibm.com,groeck@chromium.org,gerg@kernel.org,f.fainelli@gmail.com,enh@google.com,deller@gmx.de,davem@davemloft.net,dave.hansen@linux.intel.com,benjamin@sipsolutions.net,avagin@gmail.com,ardb@kernel.org,anna-maria@linutronix.de,aleksandr.mikhalitsyn@canonical.com,adobriyan@gmail.com,adhemerval.zanella@linaro.org,42.hyeyoo@gmail.com,jeffxu@chromium.org,akpm@linux-foundation.org From: Andrew Morton Subject: [merged mm-stable] selftests-x86-test_mremap_vdso-skip-if-vdso-is-msealed.patch removed from -mm tree Message-Id: <20250401221828.01983C4CEE4@smtp.kernel.org> Precedence: bulk X-Mailing-List: mm-commits@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: The quilt patch titled Subject: selftests: x86: test_mremap_vdso: skip if vdso is msealed has been removed from the -mm tree. Its filename was selftests-x86-test_mremap_vdso-skip-if-vdso-is-msealed.patch This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm ------------------------------------------------------ From: Jeff Xu Subject: selftests: x86: test_mremap_vdso: skip if vdso is msealed Date: Wed, 5 Mar 2025 02:17:06 +0000 Add code to detect if the vdso is memory sealed, skip the test if it is. Link: https://lkml.kernel.org/r/20250305021711.3867874-3-jeffxu@google.com Signed-off-by: Jeff Xu Reviewed-by: Kees Cook Reviewed-by: Lorenzo Stoakes Reviewed-by: Liam R. Howlett Cc: Adhemerval Zanella Cc: Alexander Mikhalitsyn Cc: Alexey Dobriyan Cc: Andrei Vagin Cc: Anna-Maria Behnsen Cc: Ard Biesheuvel Cc: Benjamin Berg Cc: Christoph Hellwig Cc: Dave Hansen Cc: David Rientjes Cc: David S. Miller Cc: Elliot Hughes Cc: Florian Faineli Cc: Greg Ungerer Cc: Guenter Roeck Cc: Heiko Carstens Cc: Helge Deller Cc: Hyeonggon Yoo <42.hyeyoo@gmail.com> Cc: Ingo Molnar Cc: Jann Horn Cc: Jason A. Donenfeld Cc: Johannes Berg Cc: Jorge Lucangeli Obes Cc: Linus Waleij Cc: Mark Rutland Cc: Matthew Wilcow (Oracle) Cc: Michael Ellerman Cc: Michal Hocko Cc: Miguel Ojeda Cc: Mike Rapoport Cc: Oleg Nesterov Cc: Pedro Falcato Cc: Peter Xu Cc: Randy Dunlap Cc: Stephen Röttger Cc: Thomas Weißschuh Cc: Vlastimil Babka Signed-off-by: Andrew Morton --- tools/testing/selftests/x86/test_mremap_vdso.c | 43 +++++++++++++++ 1 file changed, 43 insertions(+) --- a/tools/testing/selftests/x86/test_mremap_vdso.c~selftests-x86-test_mremap_vdso-skip-if-vdso-is-msealed +++ a/tools/testing/selftests/x86/test_mremap_vdso.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include @@ -55,13 +56,55 @@ static int try_to_remap(void *vdso_addr, } +#define VDSO_NAME "[vdso]" +#define VMFLAGS "VmFlags:" +#define MSEAL_FLAGS "sl" +#define MAX_LINE_LEN 512 + +bool vdso_sealed(FILE *maps) +{ + char line[MAX_LINE_LEN]; + bool has_vdso = false; + + while (fgets(line, sizeof(line), maps)) { + if (strstr(line, VDSO_NAME)) + has_vdso = true; + + if (has_vdso && !strncmp(line, VMFLAGS, strlen(VMFLAGS))) { + if (strstr(line, MSEAL_FLAGS)) + return true; + + return false; + } + } + + return false; +} + int main(int argc, char **argv, char **envp) { pid_t child; + FILE *maps; ksft_print_header(); ksft_set_plan(1); + maps = fopen("/proc/self/smaps", "r"); + if (!maps) { + ksft_test_result_skip( + "Could not open /proc/self/smaps, errno=%d\n", + errno); + + return 0; + } + + if (vdso_sealed(maps)) { + ksft_test_result_skip("vdso is sealed\n"); + return 0; + } + + fclose(maps); + child = fork(); if (child == -1) ksft_exit_fail_msg("failed to fork (%d): %m\n", errno); _ Patches currently in -mm which might be from jeffxu@chromium.org are