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 B55F3C32771 for ; Fri, 19 Aug 2022 11:11:48 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 01EA58D0003; Fri, 19 Aug 2022 07:11:48 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id F0FB08D0002; Fri, 19 Aug 2022 07:11:47 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DD78B8D0003; Fri, 19 Aug 2022 07:11:47 -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 CE0248D0002 for ; Fri, 19 Aug 2022 07:11:47 -0400 (EDT) Received: from smtpin31.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id A4E161C696F for ; Fri, 19 Aug 2022 11:11:47 +0000 (UTC) X-FDA: 79816077054.31.D896F23 Received: from mail-ed1-f51.google.com (mail-ed1-f51.google.com [209.85.208.51]) by imf29.hostedemail.com (Postfix) with ESMTP id 3F0F4120028 for ; Fri, 19 Aug 2022 11:11:47 +0000 (UTC) Received: by mail-ed1-f51.google.com with SMTP id z2so5249403edc.1 for ; Fri, 19 Aug 2022 04:11:47 -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=cgcveKfalu9bGwjWhdphSsPeVH0HyR/9XPCDpoeXKuw=; b=p6SchWPgQxCXLwQjgG57ICVW6yFu7NROZezkyPjTiirjSBTVDVoYBv+20hH+i2uF8L tFVkfOHHdO+Z9Vq2IeDZYPABFyvcaOVMaN3aRDXfhpqkLdR4ljyQkUlXKYQnFX/aWi0Q 6s/uFmtViCK34glr7OStVo7q3mBZuRYSY0FGcOdLN5LkQoej2oBrK7mF7VXWYLOd42NY CanKFXuxo2g/+n7MMKStZ9VytQnbeuBBlo5HQ6aS8qeCnMYtUs6Roq81wyDkrWqN/uko dr5F/4kvk5ImzLAvmkVI3t70QOq+eqO29E6DyNga0s1cmVfzfRr8yiGJwdO347XV2Frh B7yA== 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=cgcveKfalu9bGwjWhdphSsPeVH0HyR/9XPCDpoeXKuw=; b=oUf6EduVog185770iJ6EOGAld2iyZvWYkashGNqFLRUUCqS1lVYkGT1PPMsbp9KXXr MQyxwSOOLqct19e/OsCgZPmkPeaWBJHyq+61ZYV0nuwgBd5qqKsFVPnt0uWUC5wXgxRU MkXaEQjGcYrf1+P6kw5yHpBwZZ7UvMEtHn4LKmt3sSbHQjReKnKZujRT1lq1JagsfpRs h7bTOzbPecJU8lkrAO7kcVjbfj1ejc83qicvmb9ALLtlto4gB5PImTrWqs4DYgEqTcsr a6o3VK+VUD1gm4mjcGrlvUmmFySA5qyg+GHUqWMqSs2MljPrSgc3nYmUTeoKAXXSs/SP wY6g== X-Gm-Message-State: ACgBeo2EAc/KRXgX2KpxDrSvhr7h8i8DR7ymYfPoiy4IwUvvJwdW1kUs 78MqnPZ1KKpqQH42WZWIe3Q= X-Google-Smtp-Source: AA6agR6sqNw8K9BDAGKYodlVIVE4ZcURxhL1wDas7RWlI/VD+3/1wZh2ScK1Q0lFI4JUQqOdJThosA== X-Received: by 2002:aa7:cc97:0:b0:445:afab:2634 with SMTP id p23-20020aa7cc97000000b00445afab2634mr5852947edt.54.1660907505893; Fri, 19 Aug 2022 04:11:45 -0700 (PDT) Received: from localhost.localdomain (host-87-17-106-94.retail.telecomitalia.it. [87.17.106.94]) by smtp.gmail.com with ESMTPSA id r5-20020a056402018500b00445f8e0a86esm2869497edv.75.2022.08.19.04.11.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Aug 2022 04:11:43 -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] f2fs: use memcpy_{to,from}_page() where possible Date: Fri, 19 Aug 2022 13:11:41 +0200 Message-ID: <4743896.GXAFRqVoOG@localhost.localdomain> In-Reply-To: <20220818225450.84090-1-ebiggers@kernel.org> References: <20220818225450.84090-1-ebiggers@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1660907507; a=rsa-sha256; cv=none; b=c09dkKsP7qobfvuueTJX7MzrQC4OmNz2PvMMoyxaDfC9EWYwuddSLj6Y1AJUVbbxuku60Q IJdV9h/peXjW1Qj3iWzo1FGsPMb8a2dneF/YtegYK9kAtHBc0G1HkuL8dO+hlVH7S+HISS iYa4cv+GIMKJoGmP3DsL7PhuKwGnc3Y= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=p6SchWPg; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf29.hostedemail.com: domain of fmdefrancesco@gmail.com designates 209.85.208.51 as permitted sender) smtp.mailfrom=fmdefrancesco@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1660907507; 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=cgcveKfalu9bGwjWhdphSsPeVH0HyR/9XPCDpoeXKuw=; b=s1SrKPok0NRXqzWy78ryWyxljvvVyBjV3Y5OwYwzPLdT20Dm/avxt1kVtJEMNWV8Npp026 EnUcTboYwoP1XNFXanv6YYRzLJXewaMYTpnlvSnjwMxicIyWdpUKiED6YZnBInynAN+SmT oFTKNIaPp2q3F5PG4QDxfiht5QFVGx8= Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=p6SchWPg; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf29.hostedemail.com: domain of fmdefrancesco@gmail.com designates 209.85.208.51 as permitted sender) smtp.mailfrom=fmdefrancesco@gmail.com X-Rspam-User: X-Stat-Signature: kz58q8xwb8yj118ocycinzdpfbzectqx X-Rspamd-Queue-Id: 3F0F4120028 X-Rspamd-Server: rspam03 X-HE-Tag: 1660907507-962978 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 Friday, August 19, 2022 12:54:50 AM 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 > --- > fs/f2fs/inline.c | 7 ++----- > fs/f2fs/super.c | 10 ++-------- > fs/f2fs/verity.c | 10 ++-------- > 3 files changed, 6 insertions(+), 21 deletions(-) > > diff --git a/fs/f2fs/inline.c b/fs/f2fs/inline.c > index bf46a7dfbea2fc..69bfd3b08645af 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,9 @@ 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)); > + memcpy_to_page(page, 0, inline_data_addr(inode, ipage), > + MAX_INLINE_DATA(inode)); > flush_dcache_page(page); flush_dcache_page() is redundant here. memcpy_to_page() takes care to call it. > - kunmap_atomic(dst_addr); > if (!PageUptodate(page)) > SetPageUptodate(page); > } > diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c > index 2451623c05a7a8..c9f9269a4e88f3 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,9 +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); > + memcpy_to_page(page, offset, data, tocopy); > flush_dcache_page(page); Same here. > > a_ops->write_end(NULL, mapping, off, tocopy, tocopy, > 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 > > It looks like you forgot a conversion from kmap_atomic() in fs/f2fs/inline.c at line 266. The rest looks good to me. Thanks, Fabio