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