From: Uladzislau Rezki <urezki@gmail.com>
To: Andrew Morton <akpm@linux-foundation.org>,
Minchan Kim <minchan@kernel.org>
Cc: linux-kernel@vger.kernel.org, linux-mm <linux-mm@kvack.org>,
"Aneesh Kumar K . V" <aneesh.kumar@linux.ibm.com>,
Harish Sriram <harish@linux.ibm.com>,
stable@vger.kernel.org,
"Uladzislau Rezki (Sony)" <urezki@gmail.com>
Subject: Re: [PATCH] Revert "mm/vunmap: add cond_resched() in vunmap_pmd_range"
Date: Tue, 17 Nov 2020 14:57:58 +0100 [thread overview]
Message-ID: <20201117135758.GA11602@pc636> (raw)
In-Reply-To: <20201116152058.effcc5e6915cd9b98ba31348@linux-foundation.org>
>
> Let's cc Uladzislau on vmalloc things?
>
> > How about this?
>
> Well, lol, that's a simple approach to avoiding the problem ;)
>
To me it looks like a specific workaround for a specific one user.
> > unmap_kernel_range had been atomic operation and zsmalloc has used
> > it in atomic context in zs_unmap_object.
> > However, ("e47110e90584, mm/vunmap: add cond_resched() in vunmap_pmd_range")
> > changed it into non-atomic operation via adding cond_resched.
> > It causes zram decompresion failure by corrupting compressed buffer
> > in atomic context.
> >
> > This patch introduces unmap_kernel_range_atomic which works for
> > only range less than PMD_SIZE to prevent cond_resched call.
> >
> > ...
> >
> > --- a/include/linux/vmalloc.h
> > +++ b/include/linux/vmalloc.h
> > @@ -180,6 +180,7 @@ int map_kernel_range(unsigned long start, unsigned long size, pgprot_t prot,
> > struct page **pages);
> > extern void unmap_kernel_range_noflush(unsigned long addr, unsigned long size);
> > extern void unmap_kernel_range(unsigned long addr, unsigned long size);
> > +extern void unmap_kernel_range_atomic(unsigned long addr, unsigned long size);
> > static inline void set_vm_flush_reset_perms(void *addr)
> > {
> > struct vm_struct *vm = find_vm_area(addr);
> > @@ -200,6 +201,7 @@ unmap_kernel_range_noflush(unsigned long addr, unsigned long size)
> > {
> > }
> > #define unmap_kernel_range unmap_kernel_range_noflush
> > +#define unmap_kernel_range_atomic unmap_kernel_range_noflush
> > static inline void set_vm_flush_reset_perms(void *addr)
> > {
> > }
> > diff --git a/mm/vmalloc.c b/mm/vmalloc.c
> > index d7075ad340aa..714e5425dc45 100644
> > --- a/mm/vmalloc.c
> > +++ b/mm/vmalloc.c
> > @@ -88,6 +88,7 @@ static void vunmap_pmd_range(pud_t *pud, unsigned long addr, unsigned long end,
> > pmd_t *pmd;
> > unsigned long next;
> > int cleared;
> > + bool check_resched = (end - addr) > PMD_SIZE;
> >
> > pmd = pmd_offset(pud, addr);
> > do {
> > @@ -102,8 +103,8 @@ static void vunmap_pmd_range(pud_t *pud, unsigned long addr, unsigned long end,
> > if (pmd_none_or_clear_bad(pmd))
> > continue;
> > vunmap_pte_range(pmd, addr, next, mask);
> > -
> > - cond_resched();
> > + if (check_resched)
> > + cond_resched();
> > } while (pmd++, addr = next, addr != end);
> > }
> >
> > @@ -2024,6 +2025,24 @@ void unmap_kernel_range(unsigned long addr, unsigned long size)
> > flush_tlb_kernel_range(addr, end);
> > }
> >
> > +/**
> > + * unmap_kernel_range_atomic - unmap kernel VM area and flush cache and TLB
> > + * @addr: start of the VM area to unmap
> > + * @size: size of the VM area to unmap
> > + *
> > + * Similar to unmap_kernel_range_noflush() but it's atomic. @size should be
> > + * less than PMD_SIZE.
> > + */
> > +void unmap_kernel_range_atomic(unsigned long addr, unsigned long size)
> > +{
> > + unsigned long end = addr + size;
> > +
> > + flush_cache_vunmap(addr, end);
> > + WARN_ON(size > PMD_SIZE);
>
> WARN_ON_ONCE() would be better here - no point in creating a million
> warnings where one would suffice.
>
> > + unmap_kernel_range_noflush(addr, size);
> > + flush_tlb_kernel_range(addr, end);
> > +}
> > +
> > static inline void setup_vmalloc_vm_locked(struct vm_struct *vm,
> > struct vmap_area *va, unsigned long flags, const void *caller)
> > {
> > diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c
> > index 662ee420706f..9decc7634852 100644
> > --- a/mm/zsmalloc.c
> > +++ b/mm/zsmalloc.c
> > @@ -1154,7 +1154,7 @@ static inline void __zs_unmap_object(struct mapping_area *area,
> > {
> > unsigned long addr = (unsigned long)area->vm_addr;
> >
> > - unmap_kernel_range(addr, PAGE_SIZE * 2);
> > + unmap_kernel_range_atomic(addr, PAGE_SIZE * 2);
> > }
>
> I suppose we could live with it if no better solutions are forthcoming.
>
Maybe solve it on zsmalloc side? For example to add __zs_unmap_object_deferred(),
so it schedules the work that calls unmap_kernel_range() on a list of mapping_area
objects.
--
Vlad Rezki
next prev parent reply other threads:[~2020-11-17 13:58 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-05 17:02 [PATCH] Revert "mm/vunmap: add cond_resched() in vunmap_pmd_range" Minchan Kim
2020-11-05 17:16 ` Matthew Wilcox
2020-11-05 17:33 ` Minchan Kim
2020-11-07 1:59 ` Andrew Morton
2020-11-07 8:39 ` Minchan Kim
2020-11-09 11:33 ` Uladzislau Rezki
2020-11-12 20:01 ` Minchan Kim
2020-11-12 22:49 ` Andrew Morton
2020-11-13 16:25 ` Minchan Kim
2020-11-16 17:53 ` Minchan Kim
2020-11-16 23:20 ` Andrew Morton
2020-11-17 13:57 ` Uladzislau Rezki [this message]
2020-11-17 13:56 ` Christoph Hellwig
2020-11-17 20:29 ` Minchan Kim
2020-11-18 2:06 ` Sergey Senozhatsky
2020-11-19 9:29 ` Tony Lindgren
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=20201117135758.GA11602@pc636 \
--to=urezki@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=aneesh.kumar@linux.ibm.com \
--cc=harish@linux.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=minchan@kernel.org \
--cc=stable@vger.kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).