From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E6724C433EF for ; Mon, 31 Jan 2022 13:39:36 +0000 (UTC) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4JnTgq20dnz3cCJ for ; Tue, 1 Feb 2022 00:39:35 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=eoqRFG/n; dkim-atps=neutral Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=kernel.org (client-ip=145.40.68.75; helo=ams.source.kernel.org; envelope-from=guoren@kernel.org; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=eoqRFG/n; dkim-atps=neutral Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4JnTg44dgDz2xt0 for ; Tue, 1 Feb 2022 00:38:56 +1100 (AEDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id BD1E9B82B2B for ; Mon, 31 Jan 2022 13:38:52 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 65CAFC340EF for ; Mon, 31 Jan 2022 13:38:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1643636331; bh=RA0FVrl6eXQy361ALGzH978zET9hjuNIFCrB+wSQl5g=; h=References:In-Reply-To:From:Date:Subject:To:Cc:From; b=eoqRFG/nNASJJ2ghO0MXaXsK3x/8sEn8zE461QkX/XqEoCrM+7t03dyPlvxMBHb+k JAOJOlobIJ9uwC3m0p9hZslwyi8MmrWp7XctqfDk3aNQVTztmJdAoKx0G5T46WCDvx FVf5uZQpfFlXO7kTriG+6gC9ZyG9lp9Rkwu5ZzREucONL6xrL9S8y0ywvz81puGMFG 6UFgcJm0rSH87vxfufgrMEuZzWHwofArqB8Mq99Y+G54jP00gtmHudJ8RGZv+KXZfc 9G3Ao0gulozIwDQ7Toq1aobwn0Ka/WDqBVFF+ZI6xE6GItxG035MGBofMrfqH1X4bZ sZyS7e9CU2t7g== Received: by mail-vk1-f176.google.com with SMTP id v192so8258752vkv.4 for ; Mon, 31 Jan 2022 05:38:51 -0800 (PST) X-Gm-Message-State: AOAM531PbGvfhW3zibdlzJiWvGusAtbSzxWb0qqwXt2FywUt6fB6Q/Um 65/uH9Bs9QlLvGFraj1wMbRXSw/KMOeAvgXtuPI= X-Google-Smtp-Source: ABdhPJzfz8qCfL1NXgodda1dSRl1VLyno35z1oJfIiOI1wGeFTV33rxyeukjw8DnP7wlrRwRPc0y9bOoMBTRs/ZlfGU= X-Received: by 2002:a1f:640e:: with SMTP id y14mr8256495vkb.2.1643636330386; Mon, 31 Jan 2022 05:38:50 -0800 (PST) MIME-Version: 1.0 References: <20220131064933.3780271-1-hch@lst.de> <20220131064933.3780271-5-hch@lst.de> In-Reply-To: <20220131064933.3780271-5-hch@lst.de> From: Guo Ren Date: Mon, 31 Jan 2022 21:38:39 +0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH 4/5] uapi: always define F_GETLK64/F_SETLK64/F_SETLKW64 in fcntl.h To: Christoph Hellwig Content-Type: text/plain; charset="UTF-8" X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arch , linux-s390 , Arnd Bergmann , Parisc List , the arch/x86 maintainers , "open list:BROADCOM NVRAM DRIVER" , Linux Kernel Mailing List , sparclinux , linuxppc-dev , Linux ARM Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev" Acked-by: Guo Ren On Mon, Jan 31, 2022 at 2:49 PM Christoph Hellwig wrote: > > The F_GETLK64/F_SETLK64/F_SETLKW64 fcntl opcodes are only implemented > for the 32-bit syscall APIs, but are also needed for compat handling > on 64-bit kernels. > > Consolidate them in unistd.h instead of definining the internal compat > definitions in compat.h, which is rather errror prone (e.g. parisc > gets the values wrong currently). > > Note that before this change they were never visible to userspace due > to the fact that CONFIG_64BIT is only set for kernel builds. > > Signed-off-by: Christoph Hellwig > --- > arch/arm64/include/asm/compat.h | 4 ---- > arch/mips/include/asm/compat.h | 4 ---- > arch/mips/include/uapi/asm/fcntl.h | 4 ++-- > arch/powerpc/include/asm/compat.h | 4 ---- > arch/s390/include/asm/compat.h | 4 ---- > arch/sparc/include/asm/compat.h | 4 ---- > arch/x86/include/asm/compat.h | 4 ---- > include/uapi/asm-generic/fcntl.h | 4 ++-- > tools/include/uapi/asm-generic/fcntl.h | 2 -- > 9 files changed, 4 insertions(+), 30 deletions(-) > > diff --git a/arch/arm64/include/asm/compat.h b/arch/arm64/include/asm/compat.h > index eaa6ca062d89b..2763287654081 100644 > --- a/arch/arm64/include/asm/compat.h > +++ b/arch/arm64/include/asm/compat.h > @@ -73,10 +73,6 @@ struct compat_flock { > compat_pid_t l_pid; > }; > > -#define F_GETLK64 12 /* using 'struct flock64' */ > -#define F_SETLK64 13 > -#define F_SETLKW64 14 > - > struct compat_flock64 { > short l_type; > short l_whence; > diff --git a/arch/mips/include/asm/compat.h b/arch/mips/include/asm/compat.h > index bbb3bc5a42fd8..6a350c1f70d7e 100644 > --- a/arch/mips/include/asm/compat.h > +++ b/arch/mips/include/asm/compat.h > @@ -65,10 +65,6 @@ struct compat_flock { > s32 pad[4]; > }; > > -#define F_GETLK64 33 > -#define F_SETLK64 34 > -#define F_SETLKW64 35 > - > struct compat_flock64 { > short l_type; > short l_whence; > diff --git a/arch/mips/include/uapi/asm/fcntl.h b/arch/mips/include/uapi/asm/fcntl.h > index 9e44ac810db94..0369a38e3d4f2 100644 > --- a/arch/mips/include/uapi/asm/fcntl.h > +++ b/arch/mips/include/uapi/asm/fcntl.h > @@ -44,11 +44,11 @@ > #define F_SETOWN 24 /* for sockets. */ > #define F_GETOWN 23 /* for sockets. */ > > -#ifndef __mips64 > +#if __BITS_PER_LONG == 32 || defined(__KERNEL__) > #define F_GETLK64 33 /* using 'struct flock64' */ > #define F_SETLK64 34 > #define F_SETLKW64 35 > -#endif > +#endif /* __BITS_PER_LONG == 32 || defined(__KERNEL__) */ > > #if _MIPS_SIM != _MIPS_SIM_ABI64 > #define __ARCH_FLOCK_EXTRA_SYSID long l_sysid; > diff --git a/arch/powerpc/include/asm/compat.h b/arch/powerpc/include/asm/compat.h > index 7afc96fb6524b..83d8f70779cbc 100644 > --- a/arch/powerpc/include/asm/compat.h > +++ b/arch/powerpc/include/asm/compat.h > @@ -52,10 +52,6 @@ struct compat_flock { > compat_pid_t l_pid; > }; > > -#define F_GETLK64 12 /* using 'struct flock64' */ > -#define F_SETLK64 13 > -#define F_SETLKW64 14 > - > struct compat_flock64 { > short l_type; > short l_whence; > diff --git a/arch/s390/include/asm/compat.h b/arch/s390/include/asm/compat.h > index cdc7ae72529d8..0f14b3188b1bb 100644 > --- a/arch/s390/include/asm/compat.h > +++ b/arch/s390/include/asm/compat.h > @@ -110,10 +110,6 @@ struct compat_flock { > compat_pid_t l_pid; > }; > > -#define F_GETLK64 12 > -#define F_SETLK64 13 > -#define F_SETLKW64 14 > - > struct compat_flock64 { > short l_type; > short l_whence; > diff --git a/arch/sparc/include/asm/compat.h b/arch/sparc/include/asm/compat.h > index bd949fcf9d63b..108078751bb5a 100644 > --- a/arch/sparc/include/asm/compat.h > +++ b/arch/sparc/include/asm/compat.h > @@ -84,10 +84,6 @@ struct compat_flock { > short __unused; > }; > > -#define F_GETLK64 12 > -#define F_SETLK64 13 > -#define F_SETLKW64 14 > - > struct compat_flock64 { > short l_type; > short l_whence; > diff --git a/arch/x86/include/asm/compat.h b/arch/x86/include/asm/compat.h > index 7516e4199b3c6..8d19a212f4f26 100644 > --- a/arch/x86/include/asm/compat.h > +++ b/arch/x86/include/asm/compat.h > @@ -58,10 +58,6 @@ struct compat_flock { > compat_pid_t l_pid; > }; > > -#define F_GETLK64 12 /* using 'struct flock64' */ > -#define F_SETLK64 13 > -#define F_SETLKW64 14 > - > /* > * IA32 uses 4 byte alignment for 64 bit quantities, > * so we need to pack this structure. > diff --git a/include/uapi/asm-generic/fcntl.h b/include/uapi/asm-generic/fcntl.h > index 98f4ff165b776..8c05d3d89ff18 100644 > --- a/include/uapi/asm-generic/fcntl.h > +++ b/include/uapi/asm-generic/fcntl.h > @@ -116,13 +116,13 @@ > #define F_GETSIG 11 /* for sockets. */ > #endif > > -#ifndef CONFIG_64BIT > +#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 > +#endif /* __BITS_PER_LONG == 32 || defined(__KERNEL__) */ > > #ifndef F_SETOWN_EX > #define F_SETOWN_EX 15 > diff --git a/tools/include/uapi/asm-generic/fcntl.h b/tools/include/uapi/asm-generic/fcntl.h > index bf961a71802e0..6e16722026f39 100644 > --- a/tools/include/uapi/asm-generic/fcntl.h > +++ b/tools/include/uapi/asm-generic/fcntl.h > @@ -115,13 +115,11 @@ > #define F_GETSIG 11 /* for sockets. */ > #endif > > -#ifndef CONFIG_64BIT > #ifndef F_GETLK64 > #define F_GETLK64 12 /* using 'struct flock64' */ > #define F_SETLK64 13 > #define F_SETLKW64 14 > #endif > -#endif > > #ifndef F_SETOWN_EX > #define F_SETOWN_EX 15 > -- > 2.30.2 > -- Best Regards Guo Ren ML: https://lore.kernel.org/linux-csky/