From: Yang Shi <shy828301@gmail.com> To: Hugh Dickins <hughd@google.com> Cc: Andrew Morton <akpm@linux-foundation.org>, Shakeel Butt <shakeelb@google.com>, "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>, Miaohe Lin <linmiaohe@huawei.com>, Mike Kravetz <mike.kravetz@oracle.com>, Michal Hocko <mhocko@suse.com>, Rik van Riel <riel@surriel.com>, Christoph Hellwig <hch@infradead.org>, Matthew Wilcox <willy@infradead.org>, "Eric W. Biederman" <ebiederm@xmission.com>, Alexey Gladkov <legion@kernel.org>, Chris Wilson <chris@chris-wilson.co.uk>, Matthew Auld <matthew.auld@intel.com>, Linux FS-devel Mailing List <linux-fsdevel@vger.kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, linux-api@vger.kernel.org, Linux MM <linux-mm@kvack.org> Subject: Re: [PATCH 02/16] huge tmpfs: fix split_huge_page() after FALLOC_FL_KEEP_SIZE Date: Fri, 30 Jul 2021 16:48:48 -0700 [thread overview] Message-ID: <CAHbLzkosYQGKA5V0DLeBm73wz5GAwxyKiy3KpJzXSpPPrCvM6Q@mail.gmail.com> (raw) In-Reply-To: <f3f6f5e7-6749-7830-5627-a1b6b68dc365@google.com> On Fri, Jul 30, 2021 at 12:28 AM Hugh Dickins <hughd@google.com> wrote: > > A successful shmem_fallocate() guarantees that the extent has been > reserved, even beyond i_size when the FALLOC_FL_KEEP_SIZE flag was used. > But that guarantee is broken by shmem_unused_huge_shrink()'s attempts to > split huge pages and free their excess beyond i_size; and by other uses > of split_huge_page() near i_size. > > It's sad to add a shmem inode field just for this, but I did not find a > better way to keep the guarantee. A flag to say KEEP_SIZE has been used > would be cheaper, but I'm averse to unclearable flags. The fallocend > field is not perfect either (many disjoint ranges might be fallocated), > but good enough; and gains another use later on. > > Fixes: 779750d20b93 ("shmem: split huge pages beyond i_size under memory pressure") > Signed-off-by: Hugh Dickins <hughd@google.com> Reviewed-by: Yang Shi <shy828301@gmail.com> > --- > include/linux/shmem_fs.h | 13 +++++++++++++ > mm/huge_memory.c | 6 ++++-- > mm/shmem.c | 15 ++++++++++++++- > 3 files changed, 31 insertions(+), 3 deletions(-) > > diff --git a/include/linux/shmem_fs.h b/include/linux/shmem_fs.h > index 8e775ce517bb..9b7f7ac52351 100644 > --- a/include/linux/shmem_fs.h > +++ b/include/linux/shmem_fs.h > @@ -18,6 +18,7 @@ struct shmem_inode_info { > unsigned long flags; > unsigned long alloced; /* data pages alloced to file */ > unsigned long swapped; /* subtotal assigned to swap */ > + pgoff_t fallocend; /* highest fallocate endindex */ > struct list_head shrinklist; /* shrinkable hpage inodes */ > struct list_head swaplist; /* chain of maybes on swap */ > struct shared_policy policy; /* NUMA memory alloc policy */ > @@ -119,6 +120,18 @@ static inline bool shmem_file(struct file *file) > return shmem_mapping(file->f_mapping); > } > > +/* > + * If fallocate(FALLOC_FL_KEEP_SIZE) has been used, there may be pages > + * beyond i_size's notion of EOF, which fallocate has committed to reserving: > + * which split_huge_page() must therefore not delete. This use of a single > + * "fallocend" per inode errs on the side of not deleting a reservation when > + * in doubt: there are plenty of cases when it preserves unreserved pages. > + */ > +static inline pgoff_t shmem_fallocend(struct inode *inode, pgoff_t eof) > +{ > + return max(eof, SHMEM_I(inode)->fallocend); > +} > + > extern bool shmem_charge(struct inode *inode, long pages); > extern void shmem_uncharge(struct inode *inode, long pages); > > diff --git a/mm/huge_memory.c b/mm/huge_memory.c > index afff3ac87067..890fb73ac89b 100644 > --- a/mm/huge_memory.c > +++ b/mm/huge_memory.c > @@ -2454,11 +2454,11 @@ static void __split_huge_page(struct page *page, struct list_head *list, > > for (i = nr - 1; i >= 1; i--) { > __split_huge_page_tail(head, i, lruvec, list); > - /* Some pages can be beyond i_size: drop them from page cache */ > + /* Some pages can be beyond EOF: drop them from page cache */ > if (head[i].index >= end) { > ClearPageDirty(head + i); > __delete_from_page_cache(head + i, NULL); > - if (IS_ENABLED(CONFIG_SHMEM) && PageSwapBacked(head)) > + if (shmem_mapping(head->mapping)) > shmem_uncharge(head->mapping->host, 1); > put_page(head + i); > } else if (!PageAnon(page)) { > @@ -2686,6 +2686,8 @@ int split_huge_page_to_list(struct page *page, struct list_head *list) > * head page lock is good enough to serialize the trimming. > */ > end = DIV_ROUND_UP(i_size_read(mapping->host), PAGE_SIZE); > + if (shmem_mapping(mapping)) > + end = shmem_fallocend(mapping->host, end); > } > > /* > diff --git a/mm/shmem.c b/mm/shmem.c > index 0cd5c9156457..24c9da6b41c2 100644 > --- a/mm/shmem.c > +++ b/mm/shmem.c > @@ -905,6 +905,9 @@ static void shmem_undo_range(struct inode *inode, loff_t lstart, loff_t lend, > if (lend == -1) > end = -1; /* unsigned, so actually very big */ > > + if (info->fallocend > start && info->fallocend <= end && !unfalloc) > + info->fallocend = start; > + > pagevec_init(&pvec); > index = start; > while (index < end && find_lock_entries(mapping, index, end - 1, > @@ -2667,7 +2670,7 @@ static long shmem_fallocate(struct file *file, int mode, loff_t offset, > struct shmem_sb_info *sbinfo = SHMEM_SB(inode->i_sb); > struct shmem_inode_info *info = SHMEM_I(inode); > struct shmem_falloc shmem_falloc; > - pgoff_t start, index, end; > + pgoff_t start, index, end, undo_fallocend; > int error; > > if (mode & ~(FALLOC_FL_KEEP_SIZE | FALLOC_FL_PUNCH_HOLE)) > @@ -2736,6 +2739,15 @@ static long shmem_fallocate(struct file *file, int mode, loff_t offset, > inode->i_private = &shmem_falloc; > spin_unlock(&inode->i_lock); > > + /* > + * info->fallocend is only relevant when huge pages might be > + * involved: to prevent split_huge_page() freeing fallocated > + * pages when FALLOC_FL_KEEP_SIZE committed beyond i_size. > + */ > + undo_fallocend = info->fallocend; > + if (info->fallocend < end) > + info->fallocend = end; > + > for (index = start; index < end; ) { > struct page *page; > > @@ -2750,6 +2762,7 @@ static long shmem_fallocate(struct file *file, int mode, loff_t offset, > else > error = shmem_getpage(inode, index, &page, SGP_FALLOC); > if (error) { > + info->fallocend = undo_fallocend; > /* Remove the !PageUptodate pages we added */ > if (index > start) { > shmem_undo_range(inode, > -- > 2.26.2 >
next prev parent reply other threads:[~2021-07-30 23:49 UTC|newest] Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-07-30 7:22 [PATCH 00/16] tmpfs: HUGEPAGE and MEM_LOCK fcntls and memfds Hugh Dickins 2021-07-30 7:25 ` [PATCH 01/16] huge tmpfs: fix fallocate(vanilla) advance over huge pages Hugh Dickins 2021-07-30 21:36 ` Yang Shi 2021-08-01 3:38 ` Hugh Dickins 2021-08-02 20:36 ` Yang Shi 2021-07-30 7:28 ` [PATCH 02/16] huge tmpfs: fix split_huge_page() after FALLOC_FL_KEEP_SIZE Hugh Dickins 2021-07-30 23:48 ` Yang Shi [this message] 2021-07-30 7:30 ` [PATCH 03/16] huge tmpfs: remove shrinklist addition from shmem_setattr() Hugh Dickins 2021-07-30 21:50 ` Yang Shi 2021-07-30 7:36 ` [PATCH 04/16] huge tmpfs: revert shmem's use of transhuge_vma_enabled() Hugh Dickins 2021-07-30 21:56 ` Yang Shi 2021-08-01 4:01 ` Hugh Dickins 2021-08-02 20:39 ` Yang Shi 2021-07-30 7:39 ` [PATCH 05/16] huge tmpfs: move shmem_huge_enabled() upwards Hugh Dickins 2021-07-30 21:57 ` Yang Shi 2021-07-30 7:42 ` [PATCH 06/16] huge tmpfs: shmem_is_huge(vma, inode, index) Hugh Dickins 2021-07-30 23:34 ` Yang Shi 2021-08-01 5:22 ` Hugh Dickins 2021-08-01 5:37 ` Hugh Dickins 2021-08-02 21:14 ` Yang Shi 2021-08-04 8:28 ` Hugh Dickins 2021-08-04 19:01 ` Yang Shi 2021-08-06 5:21 ` Hugh Dickins 2021-08-06 17:41 ` Yang Shi 2021-08-05 23:04 ` Yang Shi 2021-08-06 5:43 ` Hugh Dickins 2021-08-06 17:57 ` Yang Shi 2021-08-12 18:19 ` Yang Shi 2021-07-30 7:45 ` [PATCH 07/16] memfd: memfd_create(name, MFD_HUGEPAGE) for shmem huge pages Hugh Dickins 2021-08-04 14:03 ` Kirill A. Shutemov 2021-08-06 3:33 ` Hugh Dickins 2021-07-30 7:48 ` [PATCH 08/16] huge tmpfs: fcntl(fd, F_HUGEPAGE) and fcntl(fd, F_NOHUGEPAGE) Hugh Dickins 2021-08-04 14:08 ` Kirill A. Shutemov 2021-08-06 4:34 ` Hugh Dickins 2021-07-30 7:51 ` [PATCH 09/16] huge tmpfs: decide stat.st_blksize by shmem_is_huge() Hugh Dickins 2021-07-30 23:40 ` Yang Shi 2021-07-30 7:55 ` [PATCH 10/16] tmpfs: fcntl(fd, F_MEM_LOCK) to memlock a tmpfs file Hugh Dickins 2021-08-03 1:38 ` Matthew Wilcox 2021-08-04 9:15 ` Hugh Dickins 2021-07-30 7:57 ` [PATCH 11/16] tmpfs: fcntl(fd, F_MEM_LOCKED) to test if memlocked Hugh Dickins 2021-07-30 8:00 ` [PATCH 12/16] tmpfs: refuse memlock when fallocated beyond i_size Hugh Dickins 2021-07-30 8:03 ` [PATCH 13/16] mm: bool user_shm_lock(loff_t size, struct ucounts *) Hugh Dickins 2021-07-30 8:06 ` [PATCH 14/16] mm: user_shm_lock(,,getuc) and user_shm_unlock(,,putuc) Hugh Dickins 2021-07-30 8:09 ` [PATCH 15/16] tmpfs: permit changing size of memlocked file Hugh Dickins 2021-07-30 8:13 ` [PATCH 16/16] memfd: memfd_create(name, MFD_MEM_LOCK) for memlocked shmem Hugh Dickins
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=CAHbLzkosYQGKA5V0DLeBm73wz5GAwxyKiy3KpJzXSpPPrCvM6Q@mail.gmail.com \ --to=shy828301@gmail.com \ --cc=akpm@linux-foundation.org \ --cc=chris@chris-wilson.co.uk \ --cc=ebiederm@xmission.com \ --cc=hch@infradead.org \ --cc=hughd@google.com \ --cc=kirill.shutemov@linux.intel.com \ --cc=legion@kernel.org \ --cc=linmiaohe@huawei.com \ --cc=linux-api@vger.kernel.org \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=matthew.auld@intel.com \ --cc=mhocko@suse.com \ --cc=mike.kravetz@oracle.com \ --cc=riel@surriel.com \ --cc=shakeelb@google.com \ --cc=willy@infradead.org \ --subject='Re: [PATCH 02/16] huge tmpfs: fix split_huge_page() after FALLOC_FL_KEEP_SIZE' \ /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
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).