2023-05-16 10:09:08

by Alexey Romanov

Subject: [PATCH v1 2/2] mm/zsmalloc: get rid of PAGE_MASK

Use offset_in_page() macro instead of 'val & ~PAGE_MASK'

Signed-off-by: Alexey Romanov <[email protected]>
---
mm/zsmalloc.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c
index f23c2da55368..0a3b11aa07a9 100644
--- a/mm/zsmalloc.c
+++ b/mm/zsmalloc.c
@@ -1425,7 +1425,7 @@ void *zs_map_object(struct zs_pool *pool, unsigned long handle,
spin_unlock(&pool->lock);

class = zspage_class(pool, zspage);
- off = (class->size * obj_idx) & ~PAGE_MASK;
+ off = offset_in_page(class->size * obj_idx);

local_lock(&zs_map_area.lock);
area = this_cpu_ptr(&zs_map_area);
@@ -1465,7 +1465,7 @@ void zs_unmap_object(struct zs_pool *pool, unsigned long handle)
obj_to_location(obj, &page, &obj_idx);
zspage = get_zspage(page);
class = zspage_class(pool, zspage);
- off = (class->size * obj_idx) & ~PAGE_MASK;
+ off = offset_in_page(class->size * obj_idx);

area = this_cpu_ptr(&zs_map_area);
if (off + class->size <= PAGE_SIZE)
@@ -1522,7 +1522,7 @@ static unsigned long obj_malloc(struct zs_pool *pool,

offset = obj * class->size;
nr_page = offset >> PAGE_SHIFT;
- m_offset = offset & ~PAGE_MASK;
+ m_offset = offset_in_page(offset);
m_page = get_first_page(zspage);

for (i = 0; i < nr_page; i++)
@@ -1626,7 +1626,7 @@ static void obj_free(int class_size, unsigned long obj, unsigned long *handle)
void *vaddr;

obj_to_location(obj, &f_page, &f_objidx);
- f_offset = (class_size * f_objidx) & ~PAGE_MASK;
+ f_offset = offset_in_page(class_size * f_objidx);
zspage = get_zspage(f_page);

vaddr = kmap_atomic(f_page);
@@ -1718,8 +1718,8 @@ static void zs_object_copy(struct size_class *class, unsigned long dst,
obj_to_location(src, &s_page, &s_objidx);
obj_to_location(dst, &d_page, &d_objidx);

- s_off = (class->size * s_objidx) & ~PAGE_MASK;
- d_off = (class->size * d_objidx) & ~PAGE_MASK;
+ s_off = offset_in_page(class->size * s_objidx);
+ d_off = offset_in_page(class->size * d_objidx);

if (s_off + class->size > PAGE_SIZE)
s_size = PAGE_SIZE - s_off;
--
2.38.1

2023-05-16 10:09:14

by Sergey Senozhatsky

Subject: Re: [PATCH v1 2/2] mm/zsmalloc: get rid of PAGE_MASK

On (23/05/16 12:50), Alexey Romanov wrote:
>
> Use offset_in_page() macro instead of 'val & ~PAGE_MASK'
>
> Signed-off-by: Alexey Romanov <[email protected]>

Reviewed-by: Sergey Senozhatsky <[email protected]>