2019-11-05 09:39:57

by Yunfeng Ye

Subject: [PATCH v2] mm/memory-failure.c: replace with page_shift() in add_to_kill()

The function page_shift() is supported after the commit 94ad9338109f
("mm: introduce page_shift()").

So replace with page_shift() in add_to_kill() for readability.

Signed-off-by: Yunfeng Ye <[email protected]>
Reviewed-by: David Hildenbrand <[email protected]>
Acked-by: Naoya Horiguchi <[email protected]>
---
v1 -> v2:
- add Reviewed-by and Acked-by

mm/memory-failure.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mm/memory-failure.c b/mm/memory-failure.c
index 3151c87dff73..e48c50cac889 100644
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@ -326,7 +326,7 @@ static void add_to_kill(struct task_struct *tsk, struct page *p,
if (is_zone_device_page(p))
tk->size_shift = dev_pagemap_mapping_shift(p, vma);
else
- tk->size_shift = compound_order(compound_head(p)) + PAGE_SHIFT;
+ tk->size_shift = page_shift(compound_head(p));

/*
* Send SIGKILL if "tk->addr == -EFAULT". Also, as
--
2.7.4

2019-11-05 09:54:27

by David Hildenbrand

Subject: Re: [PATCH v2] mm/memory-failure.c: replace with page_shift() in add_to_kill()

On 05.11.19 10:38, Yunfeng Ye wrote:
> The function page_shift() is supported after the commit 94ad9338109f
> ("mm: introduce page_shift()").
>
> So replace with page_shift() in add_to_kill() for readability.
>
> Signed-off-by: Yunfeng Ye <[email protected]>
> Reviewed-by: David Hildenbrand <[email protected]>
> Acked-by: Naoya Horiguchi <[email protected]>
> ---
> v1 -> v2:
> - add Reviewed-by and Acked-by

Note for the future: No need to resend if there were no
code/documentation changes. Andrew will apply the tags when picking up
the patch.

>
> mm/memory-failure.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/mm/memory-failure.c b/mm/memory-failure.c
> index 3151c87dff73..e48c50cac889 100644
> --- a/mm/memory-failure.c
> +++ b/mm/memory-failure.c
> @@ -326,7 +326,7 @@ static void add_to_kill(struct task_struct *tsk, struct page *p,
> if (is_zone_device_page(p))
> tk->size_shift = dev_pagemap_mapping_shift(p, vma);
> else
> - tk->size_shift = compound_order(compound_head(p)) + PAGE_SHIFT;
> + tk->size_shift = page_shift(compound_head(p));
>
> /*
> * Send SIGKILL if "tk->addr == -EFAULT". Also, as
>


--

Thanks,

David / dhildenb

2019-11-05 10:20:55

by Yunfeng Ye

Subject: Re: [PATCH v2] mm/memory-failure.c: replace with page_shift() in add_to_kill()

On 2019/11/5 17:50, David Hildenbrand wrote:
> On 05.11.19 10:38, Yunfeng Ye wrote:
>> The function page_shift() is supported after the commit 94ad9338109f
>> ("mm: introduce page_shift()").
>>
>> So replace with page_shift() in add_to_kill() for readability.
>>
>> Signed-off-by: Yunfeng Ye <[email protected]>
>> Reviewed-by: David Hildenbrand <[email protected]>
>> Acked-by: Naoya Horiguchi <[email protected]>
>> ---
>> v1 -> v2:
>>   - add Reviewed-by and Acked-by
>
> Note for the future: No need to resend if there were no code/documentation changes. Andrew will apply the tags when picking up the patch.
>
ok, thanks.

>>
>>   mm/memory-failure.c | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/mm/memory-failure.c b/mm/memory-failure.c
>> index 3151c87dff73..e48c50cac889 100644
>> --- a/mm/memory-failure.c
>> +++ b/mm/memory-failure.c
>> @@ -326,7 +326,7 @@ static void add_to_kill(struct task_struct *tsk, struct page *p,
>>       if (is_zone_device_page(p))
>>           tk->size_shift = dev_pagemap_mapping_shift(p, vma);
>>       else
>> -        tk->size_shift = compound_order(compound_head(p)) + PAGE_SHIFT;
>> +        tk->size_shift = page_shift(compound_head(p));
>>
>>       /*
>>        * Send SIGKILL if "tk->addr == -EFAULT". Also, as
>>
>
>