Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1595523

[PATCH 2/5] zram: Convert to using memset_l()

Show all headers | View raw

From: Matthew Wilcox <mawilcox@microsoft.com>

zram was the motivation for creating memset_l().

Signed-off-by: Matthew Wilcox <mawilcox@microsoft.com>
---
 drivers/block/zram/zram_drv.c | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c
index e27d89a36c34..25dcad309695 100644
--- a/drivers/block/zram/zram_drv.c
+++ b/drivers/block/zram/zram_drv.c
@@ -157,20 +157,11 @@ static inline void update_used_max(struct zram *zram,
 	} while (old_max != cur_max);
 }
 
-static inline void zram_fill_page(char *ptr, unsigned long len,
+static inline void zram_fill_page(void *ptr, unsigned long len,
 					unsigned long value)
 {
-	int i;
-	unsigned long *page = (unsigned long *)ptr;
-
 	WARN_ON_ONCE(!IS_ALIGNED(len, sizeof(unsigned long)));
-
-	if (likely(value == 0)) {
-		memset(ptr, 0, len);
-	} else {
-		for (i = 0; i < len / sizeof(*page); i++)
-			page[i] = value;
-	}
+	memset_l(ptr, value, len / sizeof(unsigned long));
 }
 
 static bool page_same_filled(void *ptr, unsigned long *element)
@@ -193,7 +184,7 @@ static bool page_same_filled(void *ptr, unsigned long *element)
 static void handle_same_page(struct bio_vec *bvec, unsigned long element)
 {
 	struct page *page = bvec->bv_page;
-	void *user_mem;
+	char *user_mem;
 
 	user_mem = kmap_atomic(page);
 	zram_fill_page(user_mem + bvec->bv_offset, bvec->bv_len, element);
-- 
2.11.0

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[RFC 0/5] memset_l and memfill Matthew Wilcox <willy@infradead.org> - 2017-03-08 22:10 +0100
  [PATCH 2/5] zram: Convert to using memset_l() Matthew Wilcox <willy@infradead.org> - 2017-03-08 22:10 +0100
  [PATCH 3/5] sym53c8xx_2: Convert to use memset32() Matthew Wilcox <willy@infradead.org> - 2017-03-08 22:10 +0100
  [PATCH 5/5] Hacky testsuite for memfill() and memset_l() Matthew Wilcox <willy@infradead.org> - 2017-03-08 22:10 +0100
  [PATCH 1/5] Add memset_l(), memset32() and memset64() Matthew Wilcox <willy@infradead.org> - 2017-03-08 23:10 +0100

csiph-web