* [PATCH] tmpfs: Disallow CONFIG_TMPFS_INODE64 on s390
@ 2021-02-05 23:06 Seth Forshee
2021-02-06 0:05 ` Andrew Morton
2021-02-07 14:48 ` Kirill A. Shutemov
0 siblings, 2 replies; 8+ messages in thread
From: Seth Forshee @ 2021-02-05 23:06 UTC (permalink / raw)
To: Andrew Morton, Hugh Dickins
Cc: Chris Down, Amir Goldstein, Heiko Carstens, Vasily Gorbik,
Christian Borntraeger, linux-mm, linux-s390, linux-kernel
This feature requires ino_t be 64-bits, which is true for every
64-bit architecture but s390, so prevent this option from being
selected there.
Fixes: ea3271f7196c ("tmpfs: support 64-bit inums per-sb")
Cc: <stable@vger.kernel.org> # v5.9+
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
---
fs/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/Kconfig b/fs/Kconfig
index aa4c12282301..3347ec7bd837 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -203,7 +203,7 @@ config TMPFS_XATTR
config TMPFS_INODE64
bool "Use 64-bit ino_t by default in tmpfs"
- depends on TMPFS && 64BIT
+ depends on TMPFS && 64BIT && !S390
default n
help
tmpfs has historically used only inode numbers as wide as an unsigned
--
2.29.2
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH] tmpfs: Disallow CONFIG_TMPFS_INODE64 on s390
2021-02-05 23:06 [PATCH] tmpfs: Disallow CONFIG_TMPFS_INODE64 on s390 Seth Forshee
@ 2021-02-06 0:05 ` Andrew Morton
2021-02-06 0:40 ` Chris Down
` (2 more replies)
2021-02-07 14:48 ` Kirill A. Shutemov
1 sibling, 3 replies; 8+ messages in thread
From: Andrew Morton @ 2021-02-06 0:05 UTC (permalink / raw)
To: Seth Forshee
Cc: Hugh Dickins, Chris Down, Amir Goldstein, Heiko Carstens,
Vasily Gorbik, Christian Borntraeger, linux-mm, linux-s390,
linux-kernel
On Fri, 5 Feb 2021 17:06:20 -0600 Seth Forshee <seth.forshee@canonical.com> wrote:
> This feature requires ino_t be 64-bits, which is true for every
> 64-bit architecture but s390, so prevent this option from being
> selected there.
>
The previous patch nicely described the end-user impact of the bug.
This is especially important when requesting a -stable backport.
Here's what I ended up with:
From: Seth Forshee <seth.forshee@canonical.com>
Subject: tmpfs: disallow CONFIG_TMPFS_INODE64 on s390
Currently there is an assumption in tmpfs that 64-bit architectures also
have a 64-bit ino_t. This is not true on s390 which has a 32-bit ino_t.
With CONFIG_TMPFS_INODE64=y tmpfs mounts will get 64-bit inode numbers and
display "inode64" in the mount options, but passing the "inode64" mount
option will fail. This leads to the following behavior:
# mkdir mnt
# mount -t tmpfs nodev mnt
# mount -o remount,rw mnt
mount: /home/ubuntu/mnt: mount point not mounted or bad option.
As mount sees "inode64" in the mount options and thus passes it in the
options for the remount.
So prevent CONFIG_TMPFS_INODE64 from being selected on s390.
Link: https://lkml.kernel.org/r/20210205230620.518245-1-seth.forshee@canonical.com
Fixes: ea3271f7196c ("tmpfs: support 64-bit inums per-sb")
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
Cc: Chris Down <chris@chrisdown.name>
Cc: Hugh Dickins <hughd@google.com>
Cc: Amir Goldstein <amir73il@gmail.com>
Cc: Heiko Carstens <hca@linux.ibm.com>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Cc: Christian Borntraeger <borntraeger@de.ibm.com>
Cc: <stable@vger.kernel.org> [5.9+]
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
fs/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/fs/Kconfig~tmpfs-disallow-config_tmpfs_inode64-on-s390
+++ a/fs/Kconfig
@@ -203,7 +203,7 @@ config TMPFS_XATTR
config TMPFS_INODE64
bool "Use 64-bit ino_t by default in tmpfs"
- depends on TMPFS && 64BIT
+ depends on TMPFS && 64BIT && !S390
default n
help
tmpfs has historically used only inode numbers as wide as an unsigned
_
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] tmpfs: Disallow CONFIG_TMPFS_INODE64 on s390
2021-02-06 0:05 ` Andrew Morton
@ 2021-02-06 0:40 ` Chris Down
2021-02-07 12:17 ` Heiko Carstens
2021-02-08 22:50 ` Hugh Dickins
2 siblings, 0 replies; 8+ messages in thread
From: Chris Down @ 2021-02-06 0:40 UTC (permalink / raw)
To: Andrew Morton
Cc: Seth Forshee, Hugh Dickins, Amir Goldstein, Heiko Carstens,
Vasily Gorbik, Christian Borntraeger, linux-mm, linux-s390,
linux-kernel
Andrew Morton writes:
>Currently there is an assumption in tmpfs that 64-bit architectures also
>have a 64-bit ino_t. This is not true on s390 which has a 32-bit ino_t.
>With CONFIG_TMPFS_INODE64=y tmpfs mounts will get 64-bit inode numbers and
>display "inode64" in the mount options, but passing the "inode64" mount
>option will fail. This leads to the following behavior:
>
> # mkdir mnt
> # mount -t tmpfs nodev mnt
> # mount -o remount,rw mnt
> mount: /home/ubuntu/mnt: mount point not mounted or bad option.
>
>As mount sees "inode64" in the mount options and thus passes it in the
>options for the remount.
>
>
>So prevent CONFIG_TMPFS_INODE64 from being selected on s390.
>
>Link: https://lkml.kernel.org/r/20210205230620.518245-1-seth.forshee@canonical.com
>Fixes: ea3271f7196c ("tmpfs: support 64-bit inums per-sb")
>Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
>Cc: Chris Down <chris@chrisdown.name>
>Cc: Hugh Dickins <hughd@google.com>
>Cc: Amir Goldstein <amir73il@gmail.com>
>Cc: Heiko Carstens <hca@linux.ibm.com>
>Cc: Vasily Gorbik <gor@linux.ibm.com>
>Cc: Christian Borntraeger <borntraeger@de.ibm.com>
>Cc: <stable@vger.kernel.org> [5.9+]
>Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Either of the two ways presented looks fine to me, no real preference. Thanks!
Acked-by: Chris Down <chris@chrisdown.name>
>---
>
> fs/Kconfig | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>--- a/fs/Kconfig~tmpfs-disallow-config_tmpfs_inode64-on-s390
>+++ a/fs/Kconfig
>@@ -203,7 +203,7 @@ config TMPFS_XATTR
>
> config TMPFS_INODE64
> bool "Use 64-bit ino_t by default in tmpfs"
>- depends on TMPFS && 64BIT
>+ depends on TMPFS && 64BIT && !S390
> default n
> help
> tmpfs has historically used only inode numbers as wide as an unsigned
>_
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] tmpfs: Disallow CONFIG_TMPFS_INODE64 on s390
2021-02-06 0:05 ` Andrew Morton
2021-02-06 0:40 ` Chris Down
@ 2021-02-07 12:17 ` Heiko Carstens
2021-02-08 22:50 ` Hugh Dickins
2 siblings, 0 replies; 8+ messages in thread
From: Heiko Carstens @ 2021-02-07 12:17 UTC (permalink / raw)
To: Andrew Morton
Cc: Seth Forshee, Hugh Dickins, Chris Down, Amir Goldstein,
Vasily Gorbik, Christian Borntraeger, linux-mm, linux-s390,
linux-kernel, Alexander Egorenkov
On Fri, Feb 05, 2021 at 04:05:51PM -0800, Andrew Morton wrote:
> On Fri, 5 Feb 2021 17:06:20 -0600 Seth Forshee <seth.forshee@canonical.com> wrote:
>
> > This feature requires ino_t be 64-bits, which is true for every
> > 64-bit architecture but s390, so prevent this option from being
> > selected there.
> >
>
> The previous patch nicely described the end-user impact of the bug.
> This is especially important when requesting a -stable backport.
>
> Here's what I ended up with:
>
>
> From: Seth Forshee <seth.forshee@canonical.com>
> Subject: tmpfs: disallow CONFIG_TMPFS_INODE64 on s390
>
> Currently there is an assumption in tmpfs that 64-bit architectures also
> have a 64-bit ino_t. This is not true on s390 which has a 32-bit ino_t.
> With CONFIG_TMPFS_INODE64=y tmpfs mounts will get 64-bit inode numbers and
> display "inode64" in the mount options, but passing the "inode64" mount
> option will fail. This leads to the following behavior:
>
> # mkdir mnt
> # mount -t tmpfs nodev mnt
> # mount -o remount,rw mnt
> mount: /home/ubuntu/mnt: mount point not mounted or bad option.
>
> As mount sees "inode64" in the mount options and thus passes it in the
> options for the remount.
>
>
> So prevent CONFIG_TMPFS_INODE64 from being selected on s390.
>
> Link: https://lkml.kernel.org/r/20210205230620.518245-1-seth.forshee@canonical.com
> Fixes: ea3271f7196c ("tmpfs: support 64-bit inums per-sb")
> Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
> Cc: Chris Down <chris@chrisdown.name>
> Cc: Hugh Dickins <hughd@google.com>
> Cc: Amir Goldstein <amir73il@gmail.com>
> Cc: Heiko Carstens <hca@linux.ibm.com>
> Cc: Vasily Gorbik <gor@linux.ibm.com>
> Cc: Christian Borntraeger <borntraeger@de.ibm.com>
> Cc: <stable@vger.kernel.org> [5.9+]
> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
> ---
>
> fs/Kconfig | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> --- a/fs/Kconfig~tmpfs-disallow-config_tmpfs_inode64-on-s390
> +++ a/fs/Kconfig
> @@ -203,7 +203,7 @@ config TMPFS_XATTR
>
> config TMPFS_INODE64
> bool "Use 64-bit ino_t by default in tmpfs"
> - depends on TMPFS && 64BIT
> + depends on TMPFS && 64BIT && !S390
Heh, it's sort of funny that we have a similar patch, which
unfortunately was/is not yet on our external features branch,
which does exactly the same.
In any case:
Acked-by: Heiko Carstens <hca@linux.ibm.com>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] tmpfs: Disallow CONFIG_TMPFS_INODE64 on s390
2021-02-05 23:06 [PATCH] tmpfs: Disallow CONFIG_TMPFS_INODE64 on s390 Seth Forshee
2021-02-06 0:05 ` Andrew Morton
@ 2021-02-07 14:48 ` Kirill A. Shutemov
2021-02-08 13:06 ` Seth Forshee
1 sibling, 1 reply; 8+ messages in thread
From: Kirill A. Shutemov @ 2021-02-07 14:48 UTC (permalink / raw)
To: Seth Forshee
Cc: Andrew Morton, Hugh Dickins, Chris Down, Amir Goldstein,
Heiko Carstens, Vasily Gorbik, Christian Borntraeger, linux-mm,
linux-s390, linux-kernel
On Fri, Feb 05, 2021 at 05:06:20PM -0600, Seth Forshee wrote:
> This feature requires ino_t be 64-bits, which is true for every
> 64-bit architecture but s390, so prevent this option from being
> selected there.
Quick grep suggests the same for alpha. Am I wrong?
--
Kirill A. Shutemov
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] tmpfs: Disallow CONFIG_TMPFS_INODE64 on s390
2021-02-07 14:48 ` Kirill A. Shutemov
@ 2021-02-08 13:06 ` Seth Forshee
2021-02-08 17:48 ` Andrew Morton
0 siblings, 1 reply; 8+ messages in thread
From: Seth Forshee @ 2021-02-08 13:06 UTC (permalink / raw)
To: Kirill A. Shutemov
Cc: Andrew Morton, Hugh Dickins, Chris Down, Amir Goldstein,
Heiko Carstens, Vasily Gorbik, Christian Borntraeger, linux-mm,
linux-s390, linux-kernel
On Sun, Feb 07, 2021 at 05:48:31PM +0300, Kirill A. Shutemov wrote:
> On Fri, Feb 05, 2021 at 05:06:20PM -0600, Seth Forshee wrote:
> > This feature requires ino_t be 64-bits, which is true for every
> > 64-bit architecture but s390, so prevent this option from being
> > selected there.
>
> Quick grep suggests the same for alpha. Am I wrong?
No, it appears you are right. Looks like my grep missed alpha somehow.
Andrew, do you prefer an additional patch or an updated version of the
previous patch?
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] tmpfs: Disallow CONFIG_TMPFS_INODE64 on s390
2021-02-08 13:06 ` Seth Forshee
@ 2021-02-08 17:48 ` Andrew Morton
0 siblings, 0 replies; 8+ messages in thread
From: Andrew Morton @ 2021-02-08 17:48 UTC (permalink / raw)
To: Seth Forshee
Cc: Kirill A. Shutemov, Hugh Dickins, Chris Down, Amir Goldstein,
Heiko Carstens, Vasily Gorbik, Christian Borntraeger, linux-mm,
linux-s390, linux-kernel
On Mon, 8 Feb 2021 07:06:58 -0600 Seth Forshee <seth.forshee@canonical.com> wrote:
> On Sun, Feb 07, 2021 at 05:48:31PM +0300, Kirill A. Shutemov wrote:
> > On Fri, Feb 05, 2021 at 05:06:20PM -0600, Seth Forshee wrote:
> > > This feature requires ino_t be 64-bits, which is true for every
> > > 64-bit architecture but s390, so prevent this option from being
> > > selected there.
> >
> > Quick grep suggests the same for alpha. Am I wrong?
>
> No, it appears you are right. Looks like my grep missed alpha somehow.
>
> Andrew, do you prefer an additional patch or an updated version of the
> previous patch?
Doesn't matter much. A second patch for Alpha would be best, I guess.
Thanks.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] tmpfs: Disallow CONFIG_TMPFS_INODE64 on s390
2021-02-06 0:05 ` Andrew Morton
2021-02-06 0:40 ` Chris Down
2021-02-07 12:17 ` Heiko Carstens
@ 2021-02-08 22:50 ` Hugh Dickins
2 siblings, 0 replies; 8+ messages in thread
From: Hugh Dickins @ 2021-02-08 22:50 UTC (permalink / raw)
To: Seth Forshee
Cc: Andrew Morton, Hugh Dickins, Chris Down, Amir Goldstein,
Heiko Carstens, Vasily Gorbik, Christian Borntraeger, linux-mm,
linux-s390, linux-kernel
On Fri, 5 Feb 2021, Andrew Morton wrote:
> On Fri, 5 Feb 2021 17:06:20 -0600 Seth Forshee <seth.forshee@canonical.com> wrote:
>
> > This feature requires ino_t be 64-bits, which is true for every
> > 64-bit architecture but s390, so prevent this option from being
> > selected there.
> >
>
> The previous patch nicely described the end-user impact of the bug.
> This is especially important when requesting a -stable backport.
>
> Here's what I ended up with:
>
>
> From: Seth Forshee <seth.forshee@canonical.com>
> Subject: tmpfs: disallow CONFIG_TMPFS_INODE64 on s390
>
> Currently there is an assumption in tmpfs that 64-bit architectures also
> have a 64-bit ino_t. This is not true on s390 which has a 32-bit ino_t.
> With CONFIG_TMPFS_INODE64=y tmpfs mounts will get 64-bit inode numbers and
> display "inode64" in the mount options, but passing the "inode64" mount
> option will fail. This leads to the following behavior:
>
> # mkdir mnt
> # mount -t tmpfs nodev mnt
> # mount -o remount,rw mnt
> mount: /home/ubuntu/mnt: mount point not mounted or bad option.
>
> As mount sees "inode64" in the mount options and thus passes it in the
> options for the remount.
>
>
> So prevent CONFIG_TMPFS_INODE64 from being selected on s390.
>
> Link: https://lkml.kernel.org/r/20210205230620.518245-1-seth.forshee@canonical.com
> Fixes: ea3271f7196c ("tmpfs: support 64-bit inums per-sb")
> Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
> Cc: Chris Down <chris@chrisdown.name>
> Cc: Hugh Dickins <hughd@google.com>
Thank you Seth: now that you've fixed Kirill's alpha observation too,
Acked-by: Hugh Dickins <hughd@google.com>
> Cc: Amir Goldstein <amir73il@gmail.com>
> Cc: Heiko Carstens <hca@linux.ibm.com>
> Cc: Vasily Gorbik <gor@linux.ibm.com>
> Cc: Christian Borntraeger <borntraeger@de.ibm.com>
> Cc: <stable@vger.kernel.org> [5.9+]
> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
> ---
>
> fs/Kconfig | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> --- a/fs/Kconfig~tmpfs-disallow-config_tmpfs_inode64-on-s390
> +++ a/fs/Kconfig
> @@ -203,7 +203,7 @@ config TMPFS_XATTR
>
> config TMPFS_INODE64
> bool "Use 64-bit ino_t by default in tmpfs"
> - depends on TMPFS && 64BIT
> + depends on TMPFS && 64BIT && !S390
> default n
> help
> tmpfs has historically used only inode numbers as wide as an unsigned
> _
>
>
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2021-02-08 22:51 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-05 23:06 [PATCH] tmpfs: Disallow CONFIG_TMPFS_INODE64 on s390 Seth Forshee
2021-02-06 0:05 ` Andrew Morton
2021-02-06 0:40 ` Chris Down
2021-02-07 12:17 ` Heiko Carstens
2021-02-08 22:50 ` Hugh Dickins
2021-02-07 14:48 ` Kirill A. Shutemov
2021-02-08 13:06 ` Seth Forshee
2021-02-08 17:48 ` Andrew Morton
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).