From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F016013A244 for ; Sat, 21 Dec 2024 04:07:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734754056; cv=none; b=Mi7Z31aZEwBK3AmPLKWZJ9vJiXJepF72GwQl7R2uPwR+jKI7DvUPweIfunxiNqu5xE+vDsFh1XmROq0Vsf8pC6nDXVeyCroiQHBxASMteBs8ZPqDmDW57zF6nHh+bVEcYy3IY4V75N4HPS2Xu5OodjlHMMoOtFIdxPCPaTwT/3I= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734754056; c=relaxed/simple; bh=Aic84rPrkxFJF20EvVIeWwD4qYfoO5bHbSoCAoAjHY0=; h=Date:To:From:Subject:Message-Id; b=aznK99LkuZssUOpWPrqfJYGlQTA5zdi11+8YzwupWxsQS5qyUt5vyaWPOmuoEMZMj73L1pqZz1hCD/pFkvvajN5llzCMuiKmRNcV1GCOji+1C6H+RgeI6N8fL+zQl1GcQCmlrnptRdcIDDgLQKcsguQPtjUnhmrGONkG6c0yJ3s= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b=IRhocYOM; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b="IRhocYOM" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 87BD2C4CECE; Sat, 21 Dec 2024 04:07:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1734754055; bh=Aic84rPrkxFJF20EvVIeWwD4qYfoO5bHbSoCAoAjHY0=; h=Date:To:From:Subject:From; b=IRhocYOMdHL8W7/AeSCeCbX1AkFQjUZ2mWtBJuAXq9fzUQbHFQAcv4vswFKEsXtS5 kP7iYEE5dV9eBN5Pdd9AmG14NDMCPyM15QVn0LI21dDIKatAUQq+feLnbbsYLwptdO a2lSycnp78Tjjftd/FWhJb+W93fY+AVQXXpb0934= Date: Fri, 20 Dec 2024 20:07:34 -0800 To: mm-commits@vger.kernel.org,phillip@squashfs.org.uk,willy@infradead.org,akpm@linux-foundation.org From: Andrew Morton Subject: + squashfs-use-a-folio-throughout-squashfs_read_folio.patch added to mm-nonmm-unstable branch Message-Id: <20241221040735.87BD2C4CECE@smtp.kernel.org> Precedence: bulk X-Mailing-List: mm-commits@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: The patch titled Subject: squashfs: use a folio throughout squashfs_read_folio() has been added to the -mm mm-nonmm-unstable branch. Its filename is squashfs-use-a-folio-throughout-squashfs_read_folio.patch This patch will shortly appear at https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/squashfs-use-a-folio-throughout-squashfs_read_folio.patch This patch will later appear in the mm-nonmm-unstable branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next via the mm-everything branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm and is updated there every 2-3 working days ------------------------------------------------------ From: "Matthew Wilcox (Oracle)" Subject: squashfs: use a folio throughout squashfs_read_folio() Date: Fri, 20 Dec 2024 22:46:24 +0000 Use modern folio APIs where they exist and convert back to struct page for the internal functions. Link: https://lkml.kernel.org/r/20241220224634.723899-1-willy@infradead.org Signed-off-by: Matthew Wilcox (Oracle) Cc: Phillip Lougher Signed-off-by: Andrew Morton --- fs/squashfs/file.c | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) --- a/fs/squashfs/file.c~squashfs-use-a-folio-throughout-squashfs_read_folio +++ a/fs/squashfs/file.c @@ -445,21 +445,19 @@ static int squashfs_readpage_sparse(stru static int squashfs_read_folio(struct file *file, struct folio *folio) { - struct page *page = &folio->page; - struct inode *inode = page->mapping->host; + struct inode *inode = folio->mapping->host; struct squashfs_sb_info *msblk = inode->i_sb->s_fs_info; - int index = page->index >> (msblk->block_log - PAGE_SHIFT); + int index = folio->index >> (msblk->block_log - PAGE_SHIFT); int file_end = i_size_read(inode) >> msblk->block_log; int expected = index == file_end ? (i_size_read(inode) & (msblk->block_size - 1)) : msblk->block_size; int res = 0; - void *pageaddr; TRACE("Entered squashfs_readpage, page index %lx, start block %llx\n", - page->index, squashfs_i(inode)->start); + folio->index, squashfs_i(inode)->start); - if (page->index >= ((i_size_read(inode) + PAGE_SIZE - 1) >> + if (folio->index >= ((i_size_read(inode) + PAGE_SIZE - 1) >> PAGE_SHIFT)) goto out; @@ -472,23 +470,18 @@ static int squashfs_read_folio(struct fi goto out; if (res == 0) - res = squashfs_readpage_sparse(page, expected); + res = squashfs_readpage_sparse(&folio->page, expected); else - res = squashfs_readpage_block(page, block, res, expected); + res = squashfs_readpage_block(&folio->page, block, res, expected); } else - res = squashfs_readpage_fragment(page, expected); + res = squashfs_readpage_fragment(&folio->page, expected); if (!res) return 0; out: - pageaddr = kmap_atomic(page); - memset(pageaddr, 0, PAGE_SIZE); - kunmap_atomic(pageaddr); - flush_dcache_page(page); - if (res == 0) - SetPageUptodate(page); - unlock_page(page); + folio_zero_segment(folio, 0, folio_size(folio)); + folio_end_read(folio, res == 0); return res; } _ Patches currently in -mm which might be from willy@infradead.org are mm-page_alloc-cache-page_zone-result-in-free_unref_page.patch mm-make-alloc_pages_mpol-static.patch mm-page_alloc-export-free_frozen_pages-instead-of-free_unref_page.patch mm-page_alloc-move-set_page_refcounted-to-callers-of-post_alloc_hook.patch mm-page_alloc-move-set_page_refcounted-to-callers-of-prep_new_page.patch mm-page_alloc-move-set_page_refcounted-to-callers-of-get_page_from_freelist.patch mm-page_alloc-move-set_page_refcounted-to-callers-of-__alloc_pages_cpuset_fallback.patch mm-page_alloc-move-set_page_refcounted-to-callers-of-__alloc_pages_may_oom.patch mm-page_alloc-move-set_page_refcounted-to-callers-of-__alloc_pages_direct_compact.patch mm-page_alloc-move-set_page_refcounted-to-callers-of-__alloc_pages_direct_reclaim.patch mm-page_alloc-move-set_page_refcounted-to-callers-of-__alloc_pages_slowpath.patch mm-page_alloc-move-set_page_refcounted-to-end-of-__alloc_pages.patch mm-page_alloc-add-__alloc_frozen_pages.patch mm-mempolicy-add-alloc_frozen_pages.patch slab-allocate-frozen-pages.patch ocfs2-handle-a-symlink-read-error-correctly.patch ocfs2-convert-ocfs2_page_mkwrite-to-use-a-folio.patch ocfs2-pass-mmap_folio-around-instead-of-mmap_page.patch ocfs2-convert-ocfs2_read_inline_data-to-take-a-folio.patch ocfs2-use-a-folio-in-ocfs2_fast_symlink_read_folio.patch ocfs2-remove-ocfs2_start_walk_page_trans-prototype.patch iov_iter-remove-setting-of-page-index.patch squashfs-use-a-folio-throughout-squashfs_read_folio.patch squashfs-pass-a-folio-to-squashfs_readpage_fragment.patch squashfs-convert-squashfs_readpage_block-to-take-a-folio.patch squashfs-convert-squashfs_copy_cache-to-take-a-folio.patch squashfs-convert-squashfs_fill_page-to-take-a-folio.patch