linux-f2fs-devel.lists.sourceforge.net archive mirror
 help / color / mirror / Atom feed
* [f2fs-dev] [PATCH] f2fs: use memcpy_{to, from}_page() where possible
@ 2022-08-18 22:54 Eric Biggers
  2022-08-19 11:11 ` Fabio M. De Francesco
  0 siblings, 1 reply; 3+ messages in thread
From: Eric Biggers @ 2022-08-18 22:54 UTC (permalink / raw)
  To: linux-f2fs-devel; +Cc: linux-fsdevel, linux-mm, Fabio M . De Francesco

From: Eric Biggers <ebiggers@google.com>

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 <ebiggers@google.com>
---
 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);
-	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);
 
 		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



_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel

^ permalink raw reply related	[flat|nested] 3+ messages in thread
* Re: [f2fs-dev] [PATCH] f2fs: use memcpy_{to, from}_page() where possible
  2022-08-18 22:54 [f2fs-dev] [PATCH] f2fs: use memcpy_{to, from}_page() where possible Eric Biggers
@ 2022-08-19 11:11 ` Fabio M. De Francesco
  2022-08-19 22:36   ` Eric Biggers
  0 siblings, 1 reply; 3+ messages in thread
From: Fabio M. De Francesco @ 2022-08-19 11:11 UTC (permalink / raw)
  To: linux-f2fs-devel, Eric Biggers; +Cc: linux-fsdevel, linux-mm

On Friday, August 19, 2022 12:54:50 AM CEST Eric Biggers wrote:
> From: Eric Biggers <ebiggers@google.com>
> 
> 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 <ebiggers@google.com>
> ---
>  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




_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel

^ permalink raw reply	[flat|nested] 3+ messages in thread
* Re: [f2fs-dev] [PATCH] f2fs: use memcpy_{to, from}_page() where possible
  2022-08-19 11:11 ` Fabio M. De Francesco
@ 2022-08-19 22:36   ` Eric Biggers
  0 siblings, 0 replies; 3+ messages in thread
From: Eric Biggers @ 2022-08-19 22:36 UTC (permalink / raw)
  To: Fabio M. De Francesco; +Cc: linux-fsdevel, linux-mm, linux-f2fs-devel

On Fri, Aug 19, 2022 at 01:11:41PM +0200, Fabio M. De Francesco wrote:
> > -	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.

Done in v2.

> > -		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.

Likewise.

> 
> It looks like you forgot a conversion from kmap_atomic() in fs/f2fs/inline.c 
> at line 266.

Also done in v2.  I think I had skipped that one intentionally, but I must not
have looked closely because it converts just fine.  Thanks!

- Eric


_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel

^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-08-19 22:36 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-08-18 22:54 [f2fs-dev] [PATCH] f2fs: use memcpy_{to, from}_page() where possible Eric Biggers
2022-08-19 11:11 ` Fabio M. De Francesco
2022-08-19 22:36   ` Eric Biggers

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).