From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from sxb1plsmtpa01-07.prod.sxb1.secureserver.net (sxb1plsmtpa01-07.prod.sxb1.secureserver.net [92.204.81.212]) (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 032B020E6E7 for ; Tue, 14 Jan 2025 22:51:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=92.204.81.212 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736895091; cv=none; b=f7Mm6qeitDjJ61Gi6A6XvW5FJhgC1YjNNVIbA8rme5lIieAMJ4Wc0nVnDwbs1wjrPQHD/eQsvY+abYyN4z3daO9dphRGaxLQth6K+XF5P0yssVDHXVks85hptNODnWVUHSEdQRePcFut0JarVspHqW9RJAxzNlXs98LIYWnRAz4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736895091; c=relaxed/simple; bh=9tUaxhOx7+0yXfCtN4AVvJPL4qrrrMl7QRxeaUyXNcU=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=g6mLXe75ahhwr4qqp726IhHeypRB9ctnCITX1dlTNJDU3C0vQmXDvtJkMbmgwD5m5XSHyzNx2GDaZ2389MFIcUD+fhyJdPHJtEioivqx7/z9zf31e0CJ8pxGp/8yTOwj04wyrsBpfpCAeQ6RM9CIbj3Mm17Rcm0z7UNMXl1zgfY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=squashfs.org.uk; spf=pass smtp.mailfrom=squashfs.org.uk; arc=none smtp.client-ip=92.204.81.212 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=squashfs.org.uk Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=squashfs.org.uk Received: from [192.168.178.95] ([82.69.79.175]) by :SMTPAUTH: with ESMTPSA id Xo9qtxqGXOmR4Xo9rteqgO; Tue, 14 Jan 2025 14:09:07 -0700 X-CMAE-Analysis: v=2.4 cv=FN/hx/os c=1 sm=1 tr=0 ts=6786d273 a=84ok6UeoqCVsigPHarzEiQ==:117 a=84ok6UeoqCVsigPHarzEiQ==:17 a=IkcTkHD0fZMA:10 a=JfrnYn6hAAAA:8 a=FXvPX3liAAAA:8 a=W2xiLW0GlORWcRYWJokA:9 a=QEXdDO2ut3YA:10 a=1CNFftbPRP8L7MoqJWF3:22 a=UObqyxdv-6Yh2QiB9mM_:22 X-SECURESERVER-ACCT: phillip@squashfs.org.uk Message-ID: <41ed0b22-099a-40dd-b7e7-1e8719241fcc@squashfs.org.uk> Date: Tue, 14 Jan 2025 21:08:41 +0000 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 5/5] squashfs: Convert squashfs_fill_page() to take a folio To: "Matthew Wilcox (Oracle)" Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org References: <20241216162701.57549-1-willy@infradead.org> <20241216162701.57549-5-willy@infradead.org> Content-Language: en-US From: Phillip Lougher In-Reply-To: <20241216162701.57549-5-willy@infradead.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-CMAE-Envelope: MS4xfCXhunHkNxoWSf35AGq1AS2ZxNymf8dCK3R07SZLZu5nJ3RksmXsoJ7y4Qe8N7NdOtLSSNf75fiveT2/Grvw4TiGMgYrUuXkMPybT+Y/pgWAFcw0fAXo B90QsaVPRVGjqebSFlXyXfphndQ6V4ctkTSj1nGGmCp2oE6BuVkiU4SA/4qaxfT95QIolXgQOpoV3yelLaIBJQbLhvGX04BL48giWtrg1sShrGMwfOoP+kyD HqKvjUYcGSzFxdyeEoUdtXaiQ3mm8T52snXv7rR/88RzGKJ7K9ifqjRLjS+nkzyf/vlQpmRdKMa5PoHSVteBmA== On 12/16/24 16:26, Matthew Wilcox (Oracle) wrote: > squashfs_fill_page is only used in this file, so make it static. > Use kmap_local instead of kmap_atomic, and return a bool so that > the caller can use folio_end_read() which saves an atomic operation > over calling folio_mark_uptodate() followed by folio_unlock(). > > Signed-off-by: Matthew Wilcox (Oracle) Reviewed-by: Phillip Lougher Tested-by: Phillip Lougher > --- > fs/squashfs/file.c | 21 ++++++++++++--------- > fs/squashfs/squashfs.h | 1 - > 2 files changed, 12 insertions(+), 10 deletions(-) > > diff --git a/fs/squashfs/file.c b/fs/squashfs/file.c > index 1f27e8161319..d363fb26c2c8 100644 > --- a/fs/squashfs/file.c > +++ b/fs/squashfs/file.c > @@ -362,19 +362,21 @@ static int read_blocklist(struct inode *inode, int index, u64 *block) > return squashfs_block_size(size); > } > > -void squashfs_fill_page(struct page *page, struct squashfs_cache_entry *buffer, int offset, int avail) > +static bool squashfs_fill_page(struct folio *folio, > + struct squashfs_cache_entry *buffer, size_t offset, > + size_t avail) > { > - int copied; > + size_t copied; > void *pageaddr; > > - pageaddr = kmap_atomic(page); > + pageaddr = kmap_local_folio(folio, 0); > copied = squashfs_copy_data(pageaddr, buffer, offset, avail); > memset(pageaddr + copied, 0, PAGE_SIZE - copied); > - kunmap_atomic(pageaddr); > + kunmap_local(pageaddr); > > - flush_dcache_page(page); > - if (copied == avail) > - SetPageUptodate(page); > + flush_dcache_folio(folio); > + > + return copied == avail; > } > > /* Copy data into page cache */ > @@ -398,6 +400,7 @@ void squashfs_copy_cache(struct folio *folio, > bytes -= PAGE_SIZE, offset += PAGE_SIZE) { > struct folio *push_folio; > size_t avail = buffer ? min(bytes, PAGE_SIZE) : 0; > + bool filled = false; > > TRACE("bytes %zu, i %d, available_bytes %zu\n", bytes, i, avail); > > @@ -412,9 +415,9 @@ void squashfs_copy_cache(struct folio *folio, > if (folio_test_uptodate(push_folio)) > goto skip_folio; > > - squashfs_fill_page(&push_folio->page, buffer, offset, avail); > + filled = squashfs_fill_page(push_folio, buffer, offset, avail); > skip_folio: > - folio_unlock(push_folio); > + folio_end_read(folio, filled); > if (i != folio->index) > folio_put(push_folio); > } > diff --git a/fs/squashfs/squashfs.h b/fs/squashfs/squashfs.h > index 9295556ecfd0..37f3518a804a 100644 > --- a/fs/squashfs/squashfs.h > +++ b/fs/squashfs/squashfs.h > @@ -67,7 +67,6 @@ extern __le64 *squashfs_read_fragment_index_table(struct super_block *, > u64, u64, unsigned int); > > /* file.c */ > -void squashfs_fill_page(struct page *, struct squashfs_cache_entry *, int, int); > void squashfs_copy_cache(struct folio *, struct squashfs_cache_entry *, > size_t bytes, size_t offset); >