From: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
To: linux-block@vger.kernel.org, linux-ext4@vger.kernel.org,
linux-f2fs-devel@lists.sourceforge.net,
linux-fsdevel@vger.kernel.org
Cc: axboe@kernel.dk, tytso@mit.edu, adilger.kernel@dilger.ca,
jaegeuk@kernel.org, chao@kernel.org, johannes.thumshirn@wdc.com,
damien.lemoal@wdc.com, bvanassche@acm.org,
chaitanya.kulkarni@wdc.com, dongli.zhang@oracle.com, clm@fb.com,
ira.weiny@intel.com, dsterba@suse.com, ebiggers@kernel.org,
hch@infradead.org, dave.hansen@intel.com
Subject: [RFC PATCH 4/8] null_blk: use memcpy_page() in copy_from_nullb()
Date: Sun, 7 Feb 2021 11:04:21 -0800 [thread overview]
Message-ID: <20210207190425.38107-5-chaitanya.kulkarni@wdc.com> (raw)
In-Reply-To: <20210207190425.38107-1-chaitanya.kulkarni@wdc.com>
Signed-off-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
---
drivers/block/null_blk/main.c | 16 +++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)
diff --git a/drivers/block/null_blk/main.c b/drivers/block/null_blk/main.c
index c9b6db82b07c..1c0e1a295e90 100644
--- a/drivers/block/null_blk/main.c
+++ b/drivers/block/null_blk/main.c
@@ -1042,7 +1042,6 @@ static int copy_from_nullb(struct nullb *nullb, struct page *dest,
size_t temp, count = 0;
unsigned int offset;
struct nullb_page *t_page;
- void *dst, *src;
while (count < n) {
temp = min_t(size_t, nullb->dev->blocksize, n - count);
@@ -1051,16 +1050,11 @@ static int copy_from_nullb(struct nullb *nullb, struct page *dest,
t_page = null_lookup_page(nullb, sector, false,
!null_cache_active(nullb));
- dst = kmap_atomic(dest);
- if (!t_page) {
- memset(dst + off + count, 0, temp);
- goto next;
- }
- src = kmap_atomic(t_page->page);
- memcpy(dst + off + count, src + offset, temp);
- kunmap_atomic(src);
-next:
- kunmap_atomic(dst);
+ if (t_page)
+ memcpy_page(dest, off + count, t_page->page, offset,
+ temp);
+ else
+ zero_user(dest, off + count, temp);
count += temp;
sector += temp >> SECTOR_SHIFT;
--
2.22.1
next prev parent reply other threads:[~2021-02-07 19:07 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-07 19:04 [RFC PATCH 0/8] use core page calls instead of kmaps Chaitanya Kulkarni
2021-02-07 19:04 ` [RFC PATCH 1/8] brd: use memcpy_from_page() in copy_from_brd() Chaitanya Kulkarni
2021-02-07 19:04 ` [RFC PATCH 2/8] " Chaitanya Kulkarni
2021-02-08 4:35 ` Ira Weiny
2021-02-08 5:47 ` Chaitanya Kulkarni
2021-02-07 19:04 ` [RFC PATCH 3/8] null_blk: use memcpy_page() in copy_to_nullb() Chaitanya Kulkarni
2021-02-07 19:04 ` Chaitanya Kulkarni [this message]
2021-02-07 19:04 ` [RFC PATCH 5/8] ext4: use memcpy_from_page() in pagecache_read() Chaitanya Kulkarni
2021-02-07 19:04 ` [RFC PATCH 6/8] ext4: use memcpy_to_page() in pagecache_write() Chaitanya Kulkarni
2021-03-25 14:22 ` Theodore Ts'o
2021-03-25 15:09 ` Ira Weiny
2021-03-25 15:10 ` Ira Weiny
2021-02-07 19:04 ` [RFC PATCH 7/8] f2fs: use memcpy_from_page() in pagecache_read() Chaitanya Kulkarni
2021-02-07 19:04 ` [RFC PATCH 8/8] f2fs: use memcpy_to_page() in pagecache_write() Chaitanya Kulkarni
2021-02-10 18:01 ` Eric Biggers
2021-02-10 19:41 ` Chaitanya Kulkarni
2021-02-07 19:10 ` [RFC PATCH 0/8] use core page calls instead of kmaps Chaitanya Kulkarni
2021-02-08 4:42 ` Ira Weiny
2021-02-08 5:47 ` Chaitanya Kulkarni
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210207190425.38107-5-chaitanya.kulkarni@wdc.com \
--to=chaitanya.kulkarni@wdc.com \
--cc=adilger.kernel@dilger.ca \
--cc=axboe@kernel.dk \
--cc=bvanassche@acm.org \
--cc=chao@kernel.org \
--cc=clm@fb.com \
--cc=damien.lemoal@wdc.com \
--cc=dave.hansen@intel.com \
--cc=dongli.zhang@oracle.com \
--cc=dsterba@suse.com \
--cc=ebiggers@kernel.org \
--cc=hch@infradead.org \
--cc=ira.weiny@intel.com \
--cc=jaegeuk@kernel.org \
--cc=johannes.thumshirn@wdc.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-f2fs-devel@lists.sourceforge.net \
--cc=linux-fsdevel@vger.kernel.org \
--cc=tytso@mit.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).