From: Guo Ren <guoren@linux.alibaba.com>

Export F_*64 definitions to userspace permanently. "ifndef" usage made it
vailable at all times to the userspace, and this change has actually broken
building strace with the latest kernel headers. There could be some debate
whether having these F_*64 definitions exposed to the user space 64-bit
applications, but it seems that were no harm (as they were exposed already
for quite some time), and they are useful at least for strace for compat
application tracing purposes.

Fixes: 306f7cc1e9061 "uapi: always define F_GETLK64/F_SETLK64/F_SETLKW64 in fcntl.h"
Signed-off-by: Guo Ren <guoren@linux.alibaba.com>
Signed-off-by: Guo Ren <guoren@kernel.org>
Reported-by: Eugene Syromiatnikov <esyr@redhat.com>
Acked-by: Palmer Dabbelt <palmer@rivosinc.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Heiko Stuebner <heiko@sntech.de>
---
 include/uapi/asm-generic/fcntl.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/include/uapi/asm-generic/fcntl.h b/include/uapi/asm-generic/fcntl.h
index 1ecdb911add8..3a389895328a 100644
--- a/include/uapi/asm-generic/fcntl.h
+++ b/include/uapi/asm-generic/fcntl.h
@@ -116,13 +116,11 @@
 #define F_GETSIG	11	/* for sockets. */
 #endif
 
-#if __BITS_PER_LONG == 32 || defined(__KERNEL__)
 #ifndef F_GETLK64
 #define F_GETLK64	12	/*  using 'struct flock64' */
 #define F_SETLK64	13
 #define F_SETLKW64	14
 #endif
-#endif /* __BITS_PER_LONG == 32 || defined(__KERNEL__) */
 
 #ifndef F_SETOWN_EX
 #define F_SETOWN_EX	15
-- 
2.36.1

On Wed, Aug 03, 2022 at 10:54:48PM -0400, guoren@kernel.org wrote:
> Export F_*64 definitions to userspace permanently. "ifndef" usage made it
> vailable at all times to the userspace, and this change has actually broken
> building strace with the latest kernel headers. There could be some debate
> whether having these F_*64 definitions exposed to the user space 64-bit
> applications, but it seems that were no harm (as they were exposed already
> for quite some time), and they are useful at least for strace for compat
> application tracing purposes.
> 
> Fixes: 306f7cc1e9061 "uapi: always define F_GETLK64/F_SETLK64/F_SETLKW64 in fcntl.h"
> Signed-off-by: Guo Ren <guoren@linux.alibaba.com>
> Signed-off-by: Guo Ren <guoren@kernel.org>
> Reported-by: Eugene Syromiatnikov <esyr@redhat.com>
> Acked-by: Palmer Dabbelt <palmer@rivosinc.com>
> Cc: Christoph Hellwig <hch@lst.de>
> Cc: Arnd Bergmann <arnd@arndb.de>
> Cc: Heiko Stuebner <heiko@sntech.de>
> ---
>  include/uapi/asm-generic/fcntl.h | 2 --
>  1 file changed, 2 deletions(-)

Hello,

Is this patch getting merged for 6.1? Will it be included in stable 6.0?


-- 
pozdrawiam / best regards
Wojtek Porczyk
Gramine / Invisible Things Lab
 
 I do not fear computers,
 I fear lack of them.
    -- Isaac Asimov

On Thu, Oct 27, 2022 at 11:35 PM Wojtek Porczyk
<woju@invisiblethingslab.com> wrote:
>
> On Wed, Aug 03, 2022 at 10:54:48PM -0400, guoren@kernel.org wrote:
> > Export F_*64 definitions to userspace permanently. "ifndef" usage made it
> > vailable at all times to the userspace, and this change has actually broken
> > building strace with the latest kernel headers. There could be some debate
> > whether having these F_*64 definitions exposed to the user space 64-bit
> > applications, but it seems that were no harm (as they were exposed already
> > for quite some time), and they are useful at least for strace for compat
> > application tracing purposes.
> >
> > Fixes: 306f7cc1e9061 "uapi: always define F_GETLK64/F_SETLK64/F_SETLKW64 in fcntl.h"
> > Signed-off-by: Guo Ren <guoren@linux.alibaba.com>
> > Signed-off-by: Guo Ren <guoren@kernel.org>
> > Reported-by: Eugene Syromiatnikov <esyr@redhat.com>
> > Acked-by: Palmer Dabbelt <palmer@rivosinc.com>
> > Cc: Christoph Hellwig <hch@lst.de>
> > Cc: Arnd Bergmann <arnd@arndb.de>
> > Cc: Heiko Stuebner <heiko@sntech.de>
> > ---
> >  include/uapi/asm-generic/fcntl.h | 2 --
> >  1 file changed, 2 deletions(-)
>
> Hello,
>
> Is this patch getting merged for 6.1? Will it be included in stable 6.0?
Em... It seems it hasn't been in Arnd's tree for next. It should be in
stable 6.0.

>
>
> --
> pozdrawiam / best regards
> Wojtek Porczyk
> Gramine / Invisible Things Lab
>
>  I do not fear computers,
>  I fear lack of them.
>     -- Isaac Asimov



-- 
Best Regards
 Guo Ren