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 3EC93C28D13 for ; Sat, 20 Aug 2022 02:08:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 874C96B0074; Fri, 19 Aug 2022 22:08:25 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8241D6B0075; Fri, 19 Aug 2022 22:08:25 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6D04E6B0078; Fri, 19 Aug 2022 22:08:25 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 5CB636B0074 for ; Fri, 19 Aug 2022 22:08:25 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 30CEDA0408 for ; Sat, 20 Aug 2022 02:08:25 +0000 (UTC) X-FDA: 79818336570.11.47442EB Received: from mail-ej1-f45.google.com (mail-ej1-f45.google.com [209.85.218.45]) by imf24.hostedemail.com (Postfix) with ESMTP id C37F718001D for ; Sat, 20 Aug 2022 02:08:24 +0000 (UTC) Received: by mail-ej1-f45.google.com with SMTP id w19so11827449ejc.7 for ; Fri, 19 Aug 2022 19:08:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=S5HX3yQxHZsdBOSDLucjhTh9DK0BKP1yB69LdNKCN/8=; b=IOUC4tPa0CY67LIUu8g6TGtR9bQztFvfU4xeiSNigSjCUoNvxd/6dDt2OOgJGxcv2u JCQT8Tb8zcwpQBi//KAmiyDw0NaCD84pV+ctbfwnIhq/q02WthnVysWs9elgPBqdQO3Z HLu3zlr6yqWxDbCB62BXm7HDtbClrirP3O+K35ItwLSzRRVZHQRikiD6Mfm6IBDhx/Tf Ir9hGOLcOf4ss0d7ncuUuDf2HVNjZN3y64s6VM0+HiC6+3YW0J90GpGZ2bkc9sV/sVi2 p6j7zXVzWDUEUuZ1oJIzzM+L5wC8jE1dOeE8kJA0lWzK2ty2Gb8w5ur4hOVibOnRIxzi PkCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=S5HX3yQxHZsdBOSDLucjhTh9DK0BKP1yB69LdNKCN/8=; b=ovSx2CHPAGXWaESdWsktYLnBHYQkRTyyIb4db+mJBau5KJKiGeo4l2e/o+VCEkQqmh q+AYiyFuF4e9PcGIyBltf6iMqNxtOZsExCM6z/sSNTbphsgAsVOFjsXy/94oShJ59KwQ kpMMLJ/5gQc0vfdM1ECSPqI9PZ2ohNfQ09r1G1x/39n4hnw39bV6re6pIhvWKnIFiD+2 l1wm1W3O9pC0gJauywI434MzVhmapipGdiCe+kHOn5X6oo3BJn19TGop+Xp/Cv6DnZCu Ir4UJiVfAfqvv928C4Uuw+rIRAhY7GVPkzkfr540gZevmlkYG2wu0OmWziZ/i7NkWrdD yPGg== X-Gm-Message-State: ACgBeo1I2wotTMDtuktJShjmiIUWgoSUsUgKWp8ZzQH++Kmg/ZRJGSgD y00nWFhZIaK3U9RsCq0iUkg= X-Google-Smtp-Source: AA6agR5d4eTzJdLWWCiu455rus1vo4fBpTkfAGLlz0WFRgspFqMvdB4VlwTZWyV5ZCjlQbQ+Xcyl4A== X-Received: by 2002:a17:906:9749:b0:730:c005:5d59 with SMTP id o9-20020a170906974900b00730c0055d59mr6459790ejy.419.1660961303489; Fri, 19 Aug 2022 19:08:23 -0700 (PDT) Received: from opensuse.localnet (host-87-17-106-94.retail.telecomitalia.it. [87.17.106.94]) by smtp.gmail.com with ESMTPSA id y14-20020a1709063a8e00b0073a644ef803sm3011448ejd.101.2022.08.19.19.08.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Aug 2022 19:08:22 -0700 (PDT) From: "Fabio M. De Francesco" To: linux-f2fs-devel@lists.sourceforge.net, Eric Biggers Cc: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org Subject: Re: [PATCH v2] f2fs: use memcpy_{to,from}_page() where possible Date: Sat, 20 Aug 2022 04:08:19 +0200 Message-ID: <4750218.GXAFRqVoOG@opensuse> In-Reply-To: <20220819223300.9128-1-ebiggers@kernel.org> References: <20220819223300.9128-1-ebiggers@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1660961304; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=S5HX3yQxHZsdBOSDLucjhTh9DK0BKP1yB69LdNKCN/8=; b=Mg8kfY1dnxUVqUQNMitLt0QAYut8x3iVunokt0uvKNmU9Ilob2f1vg0oOIU0anKv1d7fMy e21H0WrVnSy2/AeqctYfzQkD2gK4GZqFUOYH2UaPLh0s/HPSvZdVE4z3RhjuFfwxYLVdNE f8l0oeGKIRs/XPD+U64yxVWHDMwm+8I= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=IOUC4tPa; spf=pass (imf24.hostedemail.com: domain of fmdefrancesco@gmail.com designates 209.85.218.45 as permitted sender) smtp.mailfrom=fmdefrancesco@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1660961304; a=rsa-sha256; cv=none; b=SZ6gwXIt4XPotWI7jBxch+Lj1Vx4aIfGD4h/byHEvNjafze6nxow4ifVcGm8r9VTTskl/m qfbllaSfY7QrdC3/qBOC0gY1B2JJdJtVQm86zYDUlbKQqAiLQe26+nm9efgN0ZUYL0S3am 5vJYCDUfydRmX328RgTb/dr7FfOQPkg= X-Rspam-User: X-Rspamd-Queue-Id: C37F718001D Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=IOUC4tPa; spf=pass (imf24.hostedemail.com: domain of fmdefrancesco@gmail.com designates 209.85.218.45 as permitted sender) smtp.mailfrom=fmdefrancesco@gmail.com; dmarc=pass (policy=none) header.from=gmail.com X-Stat-Signature: bxcwtothzje3gaeg7btakkejm5obho4o X-Rspamd-Server: rspam10 X-HE-Tag: 1660961304-214841 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: On sabato 20 agosto 2022 00:33:00 CEST Eric Biggers wrote: > 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(-) It looks good to me... Reviewed-by: Fabio M. De Francesco Thanks, Fabio > 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