ecryptfs: Replace kmap() with kmap_local_page()
RFC PATCH 1/1 ecryptfs: Replace kmap() with kmap_local_page()
The use of kmap() is being deprecated in favor of kmap_local_page().
With kmap_local_page() the mappings are per thread, CPU local and not globally visible.
Use kmap_local_page() on all calling sites where kmap() is currently used.
The mappings in fs/ecryptfs seem to conform to the prerequisites for easy conversions to kmap_local_page(), however I am not familiar with this code.
This is why this is an RFC PATCH. I'd appreciate if people familiar with eCryptfs could test and confirm whether these conversions are safe or not.
--- fs/ecryptfs/crypto.c | 8 ++++---- fs/ecryptfs/read_write.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-)
fs/ecryptfs/crypto.c +4 -4
@@ -465,10 +465,10 @@ int ecryptfs_encrypt_page(struct page *page) } lower_offset =lower_offset_for_page (crypt_stat, page); - enc_extent_virt =kmap (enc_extent_page); + enc_extent_virt =kmap_local_page (enc_extent_page); rc =ecryptfs_write_lower (ecryptfs_inode, enc_extent_virt, lower_offset,PAGE_SIZE ); -kunmap (enc_extent_page); +kunmap_local (enc_extent_virt);if (rc <0 ) { ecryptfs_printk(KERN_ERR, "Error attempting to write lower page; rc = [%d]\n",
@@ -514,10 +514,10 @@ int ecryptfs_decrypt_page(struct page *page)BUG_ON (!(crypt_stat->flags &ECRYPTFS_ENCRYPTED )); lower_offset =lower_offset_for_page (crypt_stat, page); - page_virt =kmap (page); + page_virt =kmap_local_page (page); rc =ecryptfs_read_lower (page_virt, lower_offset,PAGE_SIZE , ecryptfs_inode); -kunmap (page); +kunmap_local (page_virt);if (rc <0 ) { ecryptfs_printk(KERN_ERR, "Error attempting to read lower page; rc = [%d]\n",
fs/ecryptfs/read_write.c +4 -4
@@ -64,11 +64,11 @@ int ecryptfs_write_lower_page_segment(struct inode *ecryptfs_inode, offset = ((((loff_t )page_for_lower->index) <<PAGE_SHIFT ) + offset_in_page); - virt =kmap (page_for_lower); + virt =kmap_local_page (page_for_lower); rc =ecryptfs_write_lower (ecryptfs_inode, virt, offset, size);if (rc >0 ) rc =0 ; -kunmap (page_for_lower); +kunmap_local (virt);return rc; }
@@ -253,11 +253,11 @@ int ecryptfs_read_lower_page_segment(struct page *page_for_ecryptfs,int rc; offset = ((((loff_t )page_index) <<PAGE_SHIFT ) + offset_in_page); - virt =kmap (page_for_ecryptfs); + virt =kmap_local_page (page_for_ecryptfs); rc =ecryptfs_read_lower (virt, offset, size, ecryptfs_inode);if (rc >0 ) rc =0 ; -kunmap (page_for_ecryptfs); +kunmap_local (virt);flush_dcache_page (page_for_ecryptfs);return rc; }
Signature · 1 line
2.36.1
Quoted 7 lines · Fabio M. De Francesco
The use of
kmap()is being deprecated in favor ofkmap_local_page().With
kmap_local_page()the mappings are per thread, CPU local and not globally visible.Use
kmap_local_page()on all calling sites wherekmap()is currently used.
Quoted 8 lines
The mappings in fs/ecryptfs seem to conform to the prerequisites for easy conversions to
kmap_local_page(), however I am not familiar with this code.This is why this is an RFC PATCH. I'd appreciate if people familiar with eCryptfs could test and confirm whether these conversions are safe or not.
Suggested-by Ira Weiny <[email protected]>
Quoted 71 lines
Signed-off-by Fabio M. De Francesco <[email protected]>--- fs/ecryptfs/crypto.c | 8 ++++---- fs/ecryptfs/read_write.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-)fs/ecryptfs/crypto.c +4
-4@@ -465,10 +465,10 @@ int ecryptfs_encrypt_page(struct page *page) } lower_offset =lower_offset_for_page (crypt_stat, page); - enc_extent_virt =kmap (enc_extent_page); + enc_extent_virt =kmap_local_page (enc_extent_page); rc =ecryptfs_write_lower (ecryptfs_inode, enc_extent_virt, lower_offset,PAGE_SIZE ); -kunmap (enc_extent_page); +kunmap_local (enc_extent_virt);if (rc <0 ) { ecryptfs_printk(KERN_ERR, "Error attempting to write lower page; rc = [%d]\n",@@ -514,10 +514,10 @@ int ecryptfs_decrypt_page(struct page *page)BUG_ON (!(crypt_stat->flags &ECRYPTFS_ENCRYPTED )); lower_offset =lower_offset_for_page (crypt_stat, page); - page_virt =kmap (page); + page_virt =kmap_local_page (page); rc =ecryptfs_read_lower (page_virt, lower_offset,PAGE_SIZE , ecryptfs_inode); -kunmap (page); +kunmap_local (page_virt);if (rc <0 ) { ecryptfs_printk(KERN_ERR, "Error attempting to read lower page; rc = [%d]\n",fs/ecryptfs/read_write.c +4
-4@@ -64,11 +64,11 @@ int ecryptfs_write_lower_page_segment(struct inode *ecryptfs_inode, offset = ((((loff_t )page_for_lower->index) <<PAGE_SHIFT ) + offset_in_page); - virt =kmap (page_for_lower); + virt =kmap_local_page (page_for_lower); rc =ecryptfs_write_lower (ecryptfs_inode, virt, offset, size);if (rc >0 ) rc =0 ; -kunmap (page_for_lower); +kunmap_local (virt);return rc; }@@ -253,11 +253,11 @@ int ecryptfs_read_lower_page_segment(struct page *page_for_ecryptfs,int rc; offset = ((((loff_t )page_index) <<PAGE_SHIFT ) + offset_in_page); - virt =kmap (page_for_ecryptfs); + virt =kmap_local_page (page_for_ecryptfs); rc =ecryptfs_read_lower (virt, offset, size, ecryptfs_inode);if (rc >0 ) rc =0 ; -kunmap (page_for_ecryptfs); +kunmap_local (virt);flush_dcache_page (page_for_ecryptfs);return rc; }Signature · 1 line
2.36.1