0001-libxfs-fix-atomic64_t-detection-on-x86-32-bit-archit.patch

@@ -0,0 +1,65 @@
+From 73ae943b19e658295140f56cb0f0fada2294921d Mon Sep 17 00:00:00 2001
+From: "Darrick J. Wong" <djwong@kernel.org>
+Date: Tue, 12 Sep 2023 12:40:10 -0700
+Subject: [PATCH] libxfs: fix atomic64_t detection on x86 32-bit architectures
+References: bsc#1214416
+
+xfsprogs during compilation tries to detect if liburcu supports atomic
+64-bit ops on the platform it is being compiled on, and if not it falls
+back to using pthread mutex locks.
+
+The detection logic for that fallback relies on _uatomic_link_error()
+which is a link-time trick used by liburcu that will cause compilation
+errors on archs that lack the required support. That only works for the
+generic liburcu code though, and it is not implemented for the
+x86-specific code.
+
+In practice this means that when xfsprogs is compiled on 32-bit x86
+archs will successfully link to liburcu for atomic ops, but liburcu does
+not support atomic64_t on those archs. It indicates this during runtime
+by generating an illegal instruction that aborts execution, and thus
+causes various xfsprogs utils to be segfaulting.
+
+Fix this by executing the liburcu atomic64_t detection code during
+configure instead of only relying on the linker error, so that
+compilation will properly fall back to pthread mutexes on those archs.
+
+Fixes: 7448af588a2e ("libxfs: fix atomic64_t poorly for 32-bit architectures")
+Reported-by: Anthony Iliopoulos <ailiop@suse.com>
+Signed-off-by: "Darrick J. Wong" <djwong@kernel.org>
+---
+ m4/package_urcu.m4 | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/m4/package_urcu.m4 b/m4/package_urcu.m4
+index ef116e0cda76..4bb2b886f068 100644
+--- a/m4/package_urcu.m4
++++ b/m4/package_urcu.m4
+@@ -26,7 +26,11 @@ rcu_init();
+ #
+ # Make sure that calling uatomic_inc on a 64-bit integer doesn't cause a link
+ # error on _uatomic_link_error, which is how liburcu signals that it doesn't
+-# support atomic operations on 64-bit data types.
++# support atomic operations on 64-bit data types for its generic
++# implementation (which relies on compiler builtins). For certain archs
++# where liburcu carries its own implementation (such as x86_32), it
++# signals lack of support during runtime by emitting an illegal
++# instruction, so we also need to check CAA_BITS_PER_LONG to detect that.
+ #
+ AC_DEFUN([AC_HAVE_LIBURCU_ATOMIC64],
+   [ AC_MSG_CHECKING([for atomic64_t support in liburcu])
+@@ -34,8 +38,11 @@ AC_DEFUN([AC_HAVE_LIBURCU_ATOMIC64],
+     [	AC_LANG_PROGRAM([[
+ #define _GNU_SOURCE
+ #include <urcu.h>
++#define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2*!!(condition)]))
+ 	]], [[
+ long long f = 3;
++
++BUILD_BUG_ON(CAA_BITS_PER_LONG < 64);
+ uatomic_inc(&f);
+ 	]])
+     ], have_liburcu_atomic64=yes
+-- 
+2.42.0
+

xfsprogs.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Sep 22 12:56:31 UTC 2023 - Anthony Iliopoulos <ailiop@suse.com>
+
+- libxfs: fix atomic64_t detection on x86 32-bit architectures (bsc#1214416)
+  - add 0001-libxfs-fix-atomic64_t-detection-on-x86-32-bit-archit.patch
+
 -------------------------------------------------------------------
 Thu Jul 20 08:45:36 UTC 2023 - Anthony Iliopoulos <ailiop@suse.com>
 

xfsprogs.spec

@@ -38,6 +38,7 @@ Source3:        module-setup.sh.in
 Source4:        dracut-fsck-help.txt
 Patch0:         xfsprogs-docdir.diff
 Patch1:         0001-repair-shift-inode-back-into-place-if-corrupted-by-b.patch
+Patch2:         0001-libxfs-fix-atomic64_t-detection-on-x86-32-bit-archit.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  libblkid-devel
@@ -111,6 +112,7 @@ on xfs filesystems.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 aclocal -I m4