diff options
| author |   Paolo Bonzini <pbonzini@redhat.com> | 2023-03-31 11:15:09 -0400 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2023-03-31 11:15:09 -0400 |
| commit | 85b475a4502d45380c1b9223c01954daa228eeb0 (patch) | |
| tree | 2f37f9ea8519f7a101decd8a1e9ec13db051363b /mm/page_alloc.c | |
| parent | KVM: nVMX: Do not report error code when synthesizing VM-Exit from Real Mode (diff) | |
| parent | KVM: s390: pv: fix external interruption loop not always detected (diff) | |
| download | wireguard-linux-85b475a4502d45380c1b9223c01954daa228eeb0.tar.xz wireguard-linux-85b475a4502d45380c1b9223c01954daa228eeb0.zip | |
Merge tag 'kvm-s390-master-6.3-1' of https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD
A small fix that repairs the external loop detection code for PV
guests.
Diffstat (limited to 'mm/page_alloc.c')
| -rw-r--r-- | mm/page_alloc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index ac1fc986af44..7136c36c5d01 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -1398,6 +1398,7 @@ static __always_inline bool free_pages_prepare(struct page *page, unsigned int order, bool check_free, fpi_t fpi_flags) { int bad = 0; + bool skip_kasan_poison = should_skip_kasan_poison(page, fpi_flags); bool init = want_init_on_free(); VM_BUG_ON_PAGE(PageTail(page), page); @@ -1470,7 +1471,7 @@ static __always_inline bool free_pages_prepare(struct page *page, * With hardware tag-based KASAN, memory tags must be set before the * page becomes unavailable via debug_pagealloc or arch_free_page. */ - if (!should_skip_kasan_poison(page, fpi_flags)) { + if (!skip_kasan_poison) { kasan_poison_pages(page, order, init); /* Memory is already initialized if KASAN did it internally. */ |