From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id D0D3BC28D13 for ; Fri, 19 Aug 2022 22:34:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3192E6B0073; Fri, 19 Aug 2022 18:34:17 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2C86A6B0074; Fri, 19 Aug 2022 18:34:17 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 190868D0001; Fri, 19 Aug 2022 18:34:17 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 0B5876B0073 for ; Fri, 19 Aug 2022 18:34:17 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id DA1B41603A1 for ; Fri, 19 Aug 2022 22:34:16 +0000 (UTC) X-FDA: 79817796912.23.D25F09E Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by imf21.hostedemail.com (Postfix) with ESMTP id 553421C002A for ; Fri, 19 Aug 2022 22:34:16 +0000 (UTC) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id DFEF5B82922; Fri, 19 Aug 2022 22:34:14 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 80EFDC433C1; Fri, 19 Aug 2022 22:34:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1660948453; bh=9Jq3sz2Ydj4Z5XHUsMfrEyIV1Huah4b/zVHLCatoY1Y=; h=From:To:Cc:Subject:Date:From; b=ACdBuLxUIXjgNh0HV/SvAATF+/CZ0juRfx9dlgk9UcyBsqGxTRdsHc1qkPiVcy1DT dMeakeRdn1Dz1Fi7Vte5cCyPMxeyW1l9Mzd4ncoHQt7jHKRJ+9VxpUlcVyywJiuIle sq4x0PunK0PdzKEFhiLVsBWB5musWCJSenyIGUTP6VEUWWzjBfynDJAnJVoulm8LUG lY0YzOpvF1NrVCUWhiZvSv6WSya24GcKXLYVbQfOZ3HLISmwgkJXa3vHnPy2BRH7s0 NzsmiMwl4Unoi74chWUn8FaX0TQfUcDHYlcnOU2Fq/JZfe4wuiHE7oPpiRDwj/GIG1 a/dmUD1IFxFeg== From: Eric Biggers To: linux-f2fs-devel@lists.sourceforge.net Cc: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, "Fabio M . De Francesco" Subject: [PATCH v2] f2fs: use memcpy_{to,from}_page() where possible Date: Fri, 19 Aug 2022 15:33:00 -0700 Message-Id: <20220819223300.9128-1-ebiggers@kernel.org> X-Mailer: git-send-email 2.37.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1660948456; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:references:dkim-signature; bh=q7ZO3+CGDjYRuNjXFGa4bQULM1TeWQcld1s6A3yTKOU=; b=cmHLfHnoCc7h7cX3jX+EQ3IHDmBLc5p+A4rJt2yBDb4CSy8LIw8cJFObBtlVTpV06TqNB/ 07MFHkewMkldS3NSqwi6RCH3reRdTFHKJxfoddItEpgKSiASHhIniZ+jn8XwLNfQL7Cs2x pXtJ8GFpg8pLvc1jjb6FQeoxPayvEz0= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=ACdBuLxU; spf=pass (imf21.hostedemail.com: domain of ebiggers@kernel.org designates 145.40.68.75 as permitted sender) smtp.mailfrom=ebiggers@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1660948456; a=rsa-sha256; cv=none; b=ayd5jpl70bxM18BUQawaTKUTFs1BlDiARy9Rq71fMWsFPLQ9I81MFGCes2Rr6G6XFdgye3 sD8p2jX/hyni47FMc8xc/mdF/q5hJa/VwJbIk3ZXajfP5rph1+ZMprlzRt5sihpvqB3c08 ES6VbtzvEaNZmdzMvCrH4v5f6ZjUe/A= X-Stat-Signature: 49mkqy9g6edapp1t1a1u89keweu4xsas X-Rspam-User: Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=ACdBuLxU; spf=pass (imf21.hostedemail.com: domain of ebiggers@kernel.org designates 145.40.68.75 as permitted sender) smtp.mailfrom=ebiggers@kernel.org; dmarc=pass (policy=none) header.from=kernel.org X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 553421C002A X-HE-Tag: 1660948456-547090 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: Eric Biggers This is simpler, and as a side effect it replaces several uses of kmap_atomic() with its recommended replacement kmap_local_page(). Signed-off-by: Eric Biggers --- v2: remove unneeded calls to flush_dcache_page(), and convert the kmap_atomic() in f2fs_write_inline_data(). fs/f2fs/inline.c | 15 ++++----------- fs/f2fs/super.c | 11 ++--------- fs/f2fs/verity.c | 10 ++-------- 3 files changed, 8 insertions(+), 28 deletions(-) diff --git a/fs/f2fs/inline.c b/fs/f2fs/inline.c index bf46a7dfbea2fc..73da9331803696 100644 --- a/fs/f2fs/inline.c +++ b/fs/f2fs/inline.c @@ -64,7 +64,6 @@ bool f2fs_may_inline_dentry(struct inode *inode) void f2fs_do_read_inline_data(struct page *page, struct page *ipage) { struct inode *inode = page->mapping->host; - void *src_addr, *dst_addr; if (PageUptodate(page)) return; @@ -74,11 +73,8 @@ void f2fs_do_read_inline_data(struct page *page, struct page *ipage) zero_user_segment(page, MAX_INLINE_DATA(inode), PAGE_SIZE); /* Copy the whole inline data block */ - src_addr = inline_data_addr(inode, ipage); - dst_addr = kmap_atomic(page); - memcpy(dst_addr, src_addr, MAX_INLINE_DATA(inode)); - flush_dcache_page(page); - kunmap_atomic(dst_addr); + memcpy_to_page(page, 0, inline_data_addr(inode, ipage), + MAX_INLINE_DATA(inode)); if (!PageUptodate(page)) SetPageUptodate(page); } @@ -246,7 +242,6 @@ int f2fs_convert_inline_inode(struct inode *inode) int f2fs_write_inline_data(struct inode *inode, struct page *page) { - void *src_addr, *dst_addr; struct dnode_of_data dn; int err; @@ -263,10 +258,8 @@ int f2fs_write_inline_data(struct inode *inode, struct page *page) f2fs_bug_on(F2FS_I_SB(inode), page->index); f2fs_wait_on_page_writeback(dn.inode_page, NODE, true, true); - src_addr = kmap_atomic(page); - dst_addr = inline_data_addr(inode, dn.inode_page); - memcpy(dst_addr, src_addr, MAX_INLINE_DATA(inode)); - kunmap_atomic(src_addr); + memcpy_from_page(inline_data_addr(inode, dn.inode_page), + page, 0, MAX_INLINE_DATA(inode)); set_page_dirty(dn.inode_page); f2fs_clear_page_cache_dirty_tag(page); diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c index 2451623c05a7a8..3e5743b2538240 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c @@ -2465,7 +2465,6 @@ static ssize_t f2fs_quota_read(struct super_block *sb, int type, char *data, size_t toread; loff_t i_size = i_size_read(inode); struct page *page; - char *kaddr; if (off > i_size) return 0; @@ -2498,9 +2497,7 @@ static ssize_t f2fs_quota_read(struct super_block *sb, int type, char *data, return -EIO; } - kaddr = kmap_atomic(page); - memcpy(data, kaddr + offset, tocopy); - kunmap_atomic(kaddr); + memcpy_from_page(data, page, offset, tocopy); f2fs_put_page(page, 1); offset = 0; @@ -2522,7 +2519,6 @@ static ssize_t f2fs_quota_write(struct super_block *sb, int type, size_t towrite = len; struct page *page; void *fsdata = NULL; - char *kaddr; int err = 0; int tocopy; @@ -2541,10 +2537,7 @@ static ssize_t f2fs_quota_write(struct super_block *sb, int type, break; } - kaddr = kmap_atomic(page); - memcpy(kaddr + offset, data, tocopy); - kunmap_atomic(kaddr); - flush_dcache_page(page); + memcpy_to_page(page, offset, data, tocopy); a_ops->write_end(NULL, mapping, off, tocopy, tocopy, page, fsdata); diff --git a/fs/f2fs/verity.c b/fs/f2fs/verity.c index 7b8f2b41c29b12..97ec60f39d6960 100644 --- a/fs/f2fs/verity.c +++ b/fs/f2fs/verity.c @@ -47,16 +47,13 @@ static int pagecache_read(struct inode *inode, void *buf, size_t count, size_t n = min_t(size_t, count, PAGE_SIZE - offset_in_page(pos)); struct page *page; - void *addr; page = read_mapping_page(inode->i_mapping, pos >> PAGE_SHIFT, NULL); if (IS_ERR(page)) return PTR_ERR(page); - addr = kmap_atomic(page); - memcpy(buf, addr + offset_in_page(pos), n); - kunmap_atomic(addr); + memcpy_from_page(buf, page, offset_in_page(pos), n); put_page(page); @@ -85,16 +82,13 @@ static int pagecache_write(struct inode *inode, const void *buf, size_t count, PAGE_SIZE - offset_in_page(pos)); struct page *page; void *fsdata; - void *addr; int res; res = aops->write_begin(NULL, mapping, pos, n, &page, &fsdata); if (res) return res; - addr = kmap_atomic(page); - memcpy(addr + offset_in_page(pos), buf, n); - kunmap_atomic(addr); + memcpy_to_page(page, offset_in_page(pos), buf, n); res = aops->write_end(NULL, mapping, pos, n, n, page, fsdata); if (res < 0) base-commit: 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 -- 2.37.1