On Sat, 19 Sep 2020, Matthew Wilcox wrote:
> On Fri, Sep 18, 2020 at 10:44:32PM -0700, Hugh Dickins wrote:
> > It behaves a lot better with this patch in than without it; but you're
> > right, only the head will get written to swap, and the tails left in
> > memory; with dirty cleared, so they may be left indefinitely (I've
> > not yet looked to see when if ever PageDirty might get set later).
> >
> > Hmm. It may just be a matter of restyling the i915 code with
> >
> > if (!page_mapped(page)) {
> > clear_page_dirty_for_io(page);
> >
> > but I don't want to rush to that conclusion - there might turn
> > out to be a good way of doing it at the shmem_writepage() end, but
> > probably only hacks available. I'll mull it over: it deserves some
> > thought about what would suit, if a THP arrived here some other way.
>
> I think the ultimate solution is to do as I have done for iomap and make
> ->writepage handle arbitrary sized pages. However, I don't know the
> swap I/O path particularly well, and I would rather not learn it just yet.
Understood ;)
>
> How about this for a band-aid until we sort that out properly? Just mark
> the page as dirty before splitting it so subsequent iterations see the
> subpages as dirty.
This is certainly much better than my original, and I've had no problem
in running with it (briefly); and it's what I'll now keep in my testing
tree - thanks. But it is more obviously a hack, or as you put it, a
band-aid: fit for Linus's tree?
This issue has only come up with i915 and shmem_enabled "force", nobody
has been bleeding except me: but if it's something that impedes or may
impede your own testing, or that you feel should go in anyway, say so and
I'll push your new improved version to akpm (adding your signoff to mine).
> Arguably, we should use set_page_dirty() instead of SetPageDirty,
My position on that has changed down the years: I went through a
phase of replacing shmem.c's SetPageDirtys by set_page_dirtys, with
the idea that its "if (!PageDirty)" is good to avoid setting cacheline
dirty. Then Spectre changed the balance, so now I'd rather avoid the
indirect function call, and go with your SetPageDirty. But the bdi
flags are such that they do the same thing, and if they ever diverge,
then we make the necessary changes at that time.
> but I don't think i915 cares. In particular, it uses
> an untagged iteration instead of searching for PAGECACHE_TAG_DIRTY.
PAGECACHE_TAG_DIRTY comes with bdi flags that shmem does not use:
with one exception, every shmem page is always dirty (since its swap
is freed as soon as the page is moved from swap cache to file cache);
unless I'm forgetting something (like the tails in my patch!), the
only exception is a page allocated to a hole on fault (after which
a write fault will soon set pte dirty).
So I didn't quite get what i915 was doing with its set_page_dirty()s:
but very probably being a good citizen, marking when it exposed the
page to changes itself, making no assumption of what shmem.c does.
It would be good to have a conversation with i915 guys about huge pages
sometime (they forked off their own mount point in i915_gemfs_init(),
precisely in order to make use of huge pages, but couldn't get them
working, so removed the option to ask for them, but kept the separate
mount point. But not a conversation I'll be responsive on at present.)
Hugh
>
> diff --git a/mm/shmem.c b/mm/shmem.c
> index 271548ca20f3..6231207ab1eb 100644
> --- a/mm/shmem.c
> +++ b/mm/shmem.c
> @@ -1362,8 +1362,21 @@ static int shmem_writepage(struct page *page, struct writeback_control *wbc)
> swp_entry_t swap;
> pgoff_t index;
>
> - VM_BUG_ON_PAGE(PageCompound(page), page);
> BUG_ON(!PageLocked(page));
> +
> + /*
> + * If /sys/kernel/mm/transparent_hugepage/shmem_enabled is "force",
> + * then drivers/gpu/drm/i915/gem/i915_gem_shmem.c gets huge pages,
> + * and its shmem_writeback() needs them to be split when swapping.
> + */
> + if (PageTransCompound(page)) {
> + /* Ensure the subpages are still dirty */
> + SetPageDirty(page);
> + if (split_huge_page(page) < 0)
> + goto redirty;
> + ClearPageDirty(page);
> + }
> +
> mapping = page->mapping;
> index = page->index;
> inode = mapping->host;
