The commit is pushed to "branch-rh9-5.14.0-427.55.1.vz9.82.x-ovz" and will
appear at g...@bitbucket.org:openvz/vzkernel.git
after rh9-5.14.0-427.55.1.vz9.82.1
------>
commit cf9df589f95197a36d4b2ef2144775a05ef16724
Author: Konstantin Khorenko <khore...@virtuozzo.com>
Date: Fri Jun 27 19:28:04 2025 +0200
Revert RH extra commit "mm: fix BUG splat with kvmalloc + GFP_ATOMIC"
This reverts commit 30c19366636f72515679aa10dad61a4d988d4c9a.
RedHat has backported the ms commit twice:
30c19366636f7 ("mm: fix BUG splat with kvmalloc + GFP_ATOMIC")
kernel changelog:
* Wed Mar 29 2023 Jan Stancek <jstan...@redhat.com> [5.14.0-293.el9]
- mm: fix BUG splat with kvmalloc + GFP_ATOMIC (Chris von Recklinghausen)
[2160210]
* Mon Oct 31 2022 Frantisek Hrbata <fhrb...@redhat.com> [5.14.0-183.el9]
- mm: fix BUG splat with kvmalloc + GFP_ATOMIC (Chris von Recklinghausen)
[2131716]
void *kvmalloc_node(size_t size, gfp_t flags, int node)
{
...
/* non-sleeping allocations are not supported by vmalloc */
if (!gfpflags_allow_blocking(flags))
return NULL;
/* non-sleeping allocations are not supported by vmalloc */
if (!gfpflags_allow_blocking(flags))
return NULL;
...
}
So let's drop the duplicated code.
https://virtuozzo.atlassian.net/browse/VSTOR-109592
Signed-off-by: Konstantin Khorenko <khore...@virtuozzo.com>
Feature: fix ms/mm
---
mm/util.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/mm/util.c b/mm/util.c
index e4ab3e549bd07..799ec9fda40eb 100644
--- a/mm/util.c
+++ b/mm/util.c
@@ -650,10 +650,6 @@ void *kvmalloc_node(size_t size, gfp_t flags, int node)
if (!gfpflags_allow_blocking(flags))
return NULL;
- /* non-sleeping allocations are not supported by vmalloc */
- if (!gfpflags_allow_blocking(flags))
- return NULL;
-
/* Don't even allow crazy sizes */
if (unlikely(size > INT_MAX)) {
WARN_ON_ONCE(!(flags & __GFP_NOWARN));
_______________________________________________
Devel mailing list
Devel@openvz.org
https://lists.openvz.org/mailman/listinfo/devel
