From: Hugh Dickins <hughd@google.com>
To: gregkh@linuxfoundation.org
Cc: akpm@linux-foundation.org, aha310510@gmail.com,
chuck.lever@oracle.com, hughd@google.com,
stable@vger.kernel.org, yuzhao@google.com
Subject: Re: FAILED: patch "[PATCH] mm: revert "mm: shmem: fix data-race in shmem_getattr()"" failed to apply to 5.10-stable tree
Date: Sun, 17 Nov 2024 20:55:28 -0800 (PST) [thread overview]
Message-ID: <a83ff8e9-6431-d237-94ec-5059c166a84f@google.com> (raw)
In-Reply-To: <2024111703-uncork-sincerity-4d6e@gregkh>
On Sun, 17 Nov 2024, gregkh@linuxfoundation.org wrote:
>
> The patch below does not apply to the 5.10-stable tree.
> If someone wants it applied there, or to any other stable or longterm
> tree, then please email the backport, including the original git commit
> id to <stable@vger.kernel.org>.
>
> To reproduce the conflict and resubmit, you may use the following commands:
>
> git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.10.y
> git checkout FETCH_HEAD
> git cherry-pick -x d1aa0c04294e29883d65eac6c2f72fe95cc7c049
> # <resolve conflicts, build, test, etc.>
> git commit -s
> git send-email --to '<stable@vger.kernel.org>' --in-reply-to '2024111703-uncork-sincerity-4d6e@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^..
For 5.10 and 5.4 and 4.19 please use this replacement patch:
From 98dfa72dd24347bfcbb9a60ac65ad42130ff44f5 Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@linux-foundation.org>
Date: Fri, 15 Nov 2024 16:57:24 -0800
Subject: [PATCH] mm: revert "mm: shmem: fix data-race in shmem_getattr()"
commit d1aa0c04294e29883d65eac6c2f72fe95cc7c049 upstream.
Revert d949d1d14fa2 ("mm: shmem: fix data-race in shmem_getattr()") as
suggested by Chuck [1]. It is causing deadlocks when accessing tmpfs over
NFS.
As Hugh commented, "added just to silence a syzbot sanitizer splat: added
where there has never been any practical problem".
Link: https://lkml.kernel.org/r/ZzdxKF39VEmXSSyN@tissot.1015granger.net [1]
Fixes: d949d1d14fa2 ("mm: shmem: fix data-race in shmem_getattr()")
Acked-by: Hugh Dickins <hughd@google.com>
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeongjun Park <aha310510@gmail.com>
Cc: Yu Zhao <yuzhao@google.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Hugh Dickins <hughd@google.com>
---
mm/shmem.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/mm/shmem.c b/mm/shmem.c
index 8239a0beb01c..e173d83b4448 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -1077,9 +1077,7 @@ static int shmem_getattr(const struct path *path, struct kstat *stat,
shmem_recalc_inode(inode);
spin_unlock_irq(&info->lock);
}
- inode_lock_shared(inode);
generic_fillattr(inode, stat);
- inode_unlock_shared(inode);
if (is_huge_enabled(sb_info))
stat->blksize = HPAGE_PMD_SIZE;
--
2.47.0.338.g60cca15819-goog
WARNING: multiple messages have this Message-ID (diff)
From: Sasha Levin <sashal@kernel.org>
To: stable@vger.kernel.org
Cc: Hugh Dickins <hughd@google.com>, Sasha Levin <sashal@kernel.org>
Subject: Re: FAILED: patch "[PATCH] mm: revert "mm: shmem: fix data-race in shmem_getattr()"" failed to apply to 5.10-stable tree
Date: Mon, 18 Nov 2024 23:36:27 -0500 [thread overview]
Message-ID: <a83ff8e9-6431-d237-94ec-5059c166a84f@google.com> (raw)
Message-ID: <20241119043627.gHJstTy3Wk_motsNNkii3lLZMvzECfe8TNG5Rwg3H4I@z> (raw)
In-Reply-To: <a83ff8e9-6431-d237-94ec-5059c166a84f@google.com>
[ Sasha's backport helper bot ]
Hi,
The upstream commit SHA1 provided is correct: d1aa0c04294e29883d65eac6c2f72fe95cc7c049
WARNING: Author mismatch between patch and upstream commit:
Backport author: Hugh Dickins <hughd@google.com>
Commit author: Andrew Morton <akpm@linux-foundation.org>
Commit in newer trees:
|-----------------|----------------------------------------------|
| 6.11.y | Present (different SHA1: 285505dc512d) |
| 6.6.y | Present (different SHA1: 552c02da3b0f) |
| 6.1.y | Not found |
| 5.15.y | Not found |
| 5.10.y | Not found |
|-----------------|----------------------------------------------|
Note: The patch differs from the upstream commit:
---
--- - 2024-11-18 22:55:31.238709435 -0500
+++ /tmp/tmp.VNf4ys5kLv 2024-11-18 22:55:31.230277300 -0500
@@ -1,3 +1,12 @@
+For 5.10 and 5.4 and 4.19 please use this replacement patch:
+
+>From 98dfa72dd24347bfcbb9a60ac65ad42130ff44f5 Mon Sep 17 00:00:00 2001
+From: Andrew Morton <akpm@linux-foundation.org>
+Date: Fri, 15 Nov 2024 16:57:24 -0800
+Subject: [PATCH] mm: revert "mm: shmem: fix data-race in shmem_getattr()"
+
+commit d1aa0c04294e29883d65eac6c2f72fe95cc7c049 upstream.
+
Revert d949d1d14fa2 ("mm: shmem: fix data-race in shmem_getattr()") as
suggested by Chuck [1]. It is causing deadlocks when accessing tmpfs over
NFS.
@@ -13,21 +22,25 @@
Cc: Yu Zhao <yuzhao@google.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Hugh Dickins <hughd@google.com>
---
mm/shmem.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/mm/shmem.c b/mm/shmem.c
-index e87f5d6799a7b..568bb290bdce3 100644
+index 8239a0beb01c..e173d83b4448 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
-@@ -1166,9 +1166,7 @@ static int shmem_getattr(struct mnt_idmap *idmap,
- stat->attributes_mask |= (STATX_ATTR_APPEND |
- STATX_ATTR_IMMUTABLE |
- STATX_ATTR_NODUMP);
+@@ -1077,9 +1077,7 @@ static int shmem_getattr(const struct path *path, struct kstat *stat,
+ shmem_recalc_inode(inode);
+ spin_unlock_irq(&info->lock);
+ }
- inode_lock_shared(inode);
- generic_fillattr(idmap, request_mask, inode, stat);
+ generic_fillattr(inode, stat);
- inode_unlock_shared(inode);
- if (shmem_huge_global_enabled(inode, 0, 0, false, NULL, 0))
+ if (is_huge_enabled(sb_info))
stat->blksize = HPAGE_PMD_SIZE;
+--
+2.47.0.338.g60cca15819-goog
+
---
Results of testing on various branches:
| Branch | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| stable/linux-5.10.y | Success | Success |
next prev parent reply other threads:[~2024-11-18 4:55 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-17 20:25 FAILED: patch "[PATCH] mm: revert "mm: shmem: fix data-race in shmem_getattr()"" failed to apply to 5.10-stable tree gregkh
2024-11-18 4:55 ` Hugh Dickins [this message]
2024-11-19 4:36 ` Sasha Levin
2024-11-19 13:29 ` Greg KH
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=a83ff8e9-6431-d237-94ec-5059c166a84f@google.com \
--to=hughd@google.com \
--cc=aha310510@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=chuck.lever@oracle.com \
--cc=gregkh@linuxfoundation.org \
--cc=stable@vger.kernel.org \
--cc=yuzhao@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox