All of lore.kernel.org
 help / color / mirror / Atom feed
From: Andrew Morton <akpm@linux-foundation.org>
To: mm-commits@vger.kernel.org,shuah@kernel.org,ljs@kernel.org,
	cyphar@cyphar.com,cmllamas@google.com,aris@redhat.com,wakel@google.com,
	akpm@linux-foundation.org
Subject: + selftests-memfd-rename-local-union-semun-to-avoid-bionic-clash.patch added to mm-new branch
Date: Wed, 18 Nov 2026 21:26:47 -0800	[thread overview]
Message-ID: <20261119052648.406311F000C4@smtp.kernel.org> (raw)
In-Reply-To: <20261105030843.3319056-1-wakel@google.com>


The patch titled
     Subject: selftests/memfd: rename local union semun to avoid bionic clash
has been added to the -mm mm-new branch.  Its filename is
     selftests-memfd-rename-local-union-semun-to-avoid-bionic-clash.patch

This patch will shortly appear at
     https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/selftests-memfd-rename-local-union-semun-to-avoid-bionic-clash.patch

This patch will later appear in the mm-new branch at
    git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

Note, mm-new is a provisional staging ground for work-in-progress
patches, and acceptance into mm-new is a notification for others take
notice and to finish up reviews.  Please do not hesitate to respond to
review feedback and post updated versions to replace or incrementally
fixup patches in mm-new.

The mm-new branch of mm.git is not included in linux-next

If a few days of testing in mm-new is successful, the patch will me moved
into mm.git's mm-unstable branch, which is included in linux-next

Before you just go and hit "reply", please:
   a) Consider who else should be cc'ed
   b) Prefer to cc a suitable mailing list as well
   c) Ideally: find the original patch on the mailing list and do a
      reply-to-all to that, adding suitable additional cc's

*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***

The -mm tree is included into linux-next via various
branches at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
and is updated there most days

------------------------------------------------------
From: Wake Liu <wakel@google.com>
Subject: selftests/memfd: rename local union semun to avoid bionic clash
Date: Thu,  5 Nov 2026 03:08:43 +0000

Commit b24335521de9 ("selftests/memfd: use IPC semaphore instead of
SIGSTOP/SIGCONT") added a local definition of union semun, since glibc and
musl expect the caller to define it before calling semctl().  Bionic,
however, already defines union semun in <sys/sem.h>, so memfd_test no
longer builds against it:

  memfd_test.c:45:7: error: redefinition of 'semun'

Rename the local union to memfd_semun.  Its layout is unchanged, so it can
still be passed as the variadic semctl() argument with any C library.

Link: https://patch.msgid.link/20261105030843.3319056-1-wakel@google.com
Fixes: b24335521de9 ("selftests/memfd: use IPC semaphore instead of SIGSTOP/SIGCONT")
Signed-off-by: Wake Liu <wakel@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Cc: Aristeu Rozanski <aris@redhat.com>
Cc: Shuah Khan <shuah@kernel.org>
Cc: Aleksa Sarai <cyphar@cyphar.com>
Cc: Lorenzo Stoakes <ljs@kernel.org>
Cc: Carlos Llamas <cmllamas@google.com>

 tools/testing/selftests/memfd/memfd_test.c |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

--- a/tools/testing/selftests/memfd/memfd_test.c~selftests-memfd-rename-local-union-semun-to-avoid-bionic-clash
+++ a/tools/testing/selftests/memfd/memfd_test.c
@@ -42,7 +42,13 @@
 		    F_SEAL_EXEC)
 
 #define MFD_NOEXEC_SEAL	0x0008U
-union semun {
+
+/*
+ * glibc and musl leave union semun for the caller to define, but bionic
+ * already provides it in <sys/sem.h>. Use a private name so the test
+ * builds against all of them.
+ */
+union memfd_semun {
 	int val;
 	struct semid_ds *buf;
 	unsigned short int *array;
@@ -1387,7 +1393,7 @@ static void test_sysctl_sysctl2_failset(
 static int sysctl_nested_child(void *arg)
 {
 	int pid, sem;
-	union semun semun;
+	union memfd_semun semun;
 	struct sembuf sembuf;
 
 	printf("%s nested sysctl 0\n", memfd_str);
_

Patches currently in -mm which might be from wakel@google.com are

selftests-memfd-rename-local-union-semun-to-avoid-bionic-clash.patch


      parent reply	other threads:[~2026-11-19  5:26 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-05  3:08 [PATCH] selftests/memfd: Rename local union semun to avoid bionic clash Wake Liu
2026-11-19  3:35 ` Wake Liu
2026-11-19  5:26 ` Andrew Morton [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20261119052648.406311F000C4@smtp.kernel.org \
    --to=akpm@linux-foundation.org \
    --cc=aris@redhat.com \
    --cc=cmllamas@google.com \
    --cc=cyphar@cyphar.com \
    --cc=ljs@kernel.org \
    --cc=mm-commits@vger.kernel.org \
    --cc=shuah@kernel.org \
    --cc=wakel@google.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.