* [PATCH] mm: remove unnecessary condition in remove_inode_hugepages
@ 2016-09-26 2:34 zhongjiang
2016-09-26 9:01 ` Michal Hocko
0 siblings, 1 reply; 6+ messages in thread
From: zhongjiang @ 2016-09-26 2:34 UTC (permalink / raw)
To: mike.kravetz, akpm; +Cc: mhocko, n-horiguchi, linux-mm
From: zhong jiang <zhongjiang@huawei.com>
when the huge page is added to the page cahce (huge_add_to_page_cache),
the page private flag will be cleared. since this code
(remove_inode_hugepages) will only be called for pages in the
page cahce, PagePrivate(page) will always be false.
The patch remove the code without any functional change.
Signed-off-by: zhong jiang <zhongjiang@huawei.com>
---
fs/hugetlbfs/inode.c | 10 ++++------
include/linux/hugetlb.h | 2 +-
mm/hugetlb.c | 4 ++--
3 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
index 4ea71eb..81f8bbf4 100644
--- a/fs/hugetlbfs/inode.c
+++ b/fs/hugetlbfs/inode.c
@@ -458,18 +458,16 @@ static void remove_inode_hugepages(struct inode *inode, loff_t lstart,
* cache (remove_huge_page) BEFORE removing the
* region/reserve map (hugetlb_unreserve_pages). In
* rare out of memory conditions, removal of the
- * region/reserve map could fail. Before free'ing
- * the page, note PagePrivate which is used in case
- * of error.
+ * region/reserve map could fail. Correspondingly,
+ * the subpool and global reserve usage count can need
+ * to be adjusted.
*/
- rsv_on_error = !PagePrivate(page);
remove_huge_page(page);
freed++;
if (!truncate_op) {
if (unlikely(hugetlb_unreserve_pages(inode,
next, next + 1, 1)))
- hugetlb_fix_reserve_counts(inode,
- rsv_on_error);
+ hugetlb_fix_reserve_counts(inode);
}
unlock_page(page);
diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h
index c26d463..d2e0fc5 100644
--- a/include/linux/hugetlb.h
+++ b/include/linux/hugetlb.h
@@ -90,7 +90,7 @@ int dequeue_hwpoisoned_huge_page(struct page *page);
bool isolate_huge_page(struct page *page, struct list_head *list);
void putback_active_hugepage(struct page *page);
void free_huge_page(struct page *page);
-void hugetlb_fix_reserve_counts(struct inode *inode, bool restore_reserve);
+void hugetlb_fix_reserve_counts(struct inode *inode);
extern struct mutex *hugetlb_fault_mutex_table;
u32 hugetlb_fault_mutex_hash(struct hstate *h, struct mm_struct *mm,
struct vm_area_struct *vma,
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 87e11d8..28a079a 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -567,13 +567,13 @@ retry:
* appear as a "reserved" entry instead of simply dangling with incorrect
* counts.
*/
-void hugetlb_fix_reserve_counts(struct inode *inode, bool restore_reserve)
+void hugetlb_fix_reserve_counts(struct inode *inode)
{
struct hugepage_subpool *spool = subpool_inode(inode);
long rsv_adjust;
rsv_adjust = hugepage_subpool_get_pages(spool, 1);
- if (restore_reserve && rsv_adjust) {
+ if (rsv_adjust) {
struct hstate *h = hstate_inode(inode);
hugetlb_acct_memory(h, 1);
--
1.8.3.1
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] mm: remove unnecessary condition in remove_inode_hugepages
2016-09-26 2:34 [PATCH] mm: remove unnecessary condition in remove_inode_hugepages zhongjiang
@ 2016-09-26 9:01 ` Michal Hocko
2016-09-26 20:16 ` Mike Kravetz
2016-09-27 14:01 ` zhong jiang
0 siblings, 2 replies; 6+ messages in thread
From: Michal Hocko @ 2016-09-26 9:01 UTC (permalink / raw)
To: zhongjiang; +Cc: mike.kravetz, akpm, n-horiguchi, linux-mm
On Mon 26-09-16 10:34:13, zhongjiang wrote:
> From: zhong jiang <zhongjiang@huawei.com>
>
> when the huge page is added to the page cahce (huge_add_to_page_cache),
> the page private flag will be cleared. since this code
> (remove_inode_hugepages) will only be called for pages in the
> page cahce, PagePrivate(page) will always be false.
>
> The patch remove the code without any functional change.
>
> Signed-off-by: zhong jiang <zhongjiang@huawei.com>
> ---
> fs/hugetlbfs/inode.c | 10 ++++------
> include/linux/hugetlb.h | 2 +-
> mm/hugetlb.c | 4 ++--
> 3 files changed, 7 insertions(+), 9 deletions(-)
>
> diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
> index 4ea71eb..81f8bbf4 100644
> --- a/fs/hugetlbfs/inode.c
> +++ b/fs/hugetlbfs/inode.c
> @@ -458,18 +458,16 @@ static void remove_inode_hugepages(struct inode *inode, loff_t lstart,
> * cache (remove_huge_page) BEFORE removing the
> * region/reserve map (hugetlb_unreserve_pages). In
> * rare out of memory conditions, removal of the
> - * region/reserve map could fail. Before free'ing
> - * the page, note PagePrivate which is used in case
> - * of error.
> + * region/reserve map could fail. Correspondingly,
> + * the subpool and global reserve usage count can need
> + * to be adjusted.
> */
> - rsv_on_error = !PagePrivate(page);
This whole code is tricky as hell. I would be calmer if we just stick a
VM_BUG_ON here to make sure that this assumption will not break later
on.
> remove_huge_page(page);
> freed++;
> if (!truncate_op) {
> if (unlikely(hugetlb_unreserve_pages(inode,
> next, next + 1, 1)))
> - hugetlb_fix_reserve_counts(inode,
> - rsv_on_error);
> + hugetlb_fix_reserve_counts(inode);
> }
>
> unlock_page(page);
> diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h
> index c26d463..d2e0fc5 100644
> --- a/include/linux/hugetlb.h
> +++ b/include/linux/hugetlb.h
> @@ -90,7 +90,7 @@ int dequeue_hwpoisoned_huge_page(struct page *page);
> bool isolate_huge_page(struct page *page, struct list_head *list);
> void putback_active_hugepage(struct page *page);
> void free_huge_page(struct page *page);
> -void hugetlb_fix_reserve_counts(struct inode *inode, bool restore_reserve);
> +void hugetlb_fix_reserve_counts(struct inode *inode);
> extern struct mutex *hugetlb_fault_mutex_table;
> u32 hugetlb_fault_mutex_hash(struct hstate *h, struct mm_struct *mm,
> struct vm_area_struct *vma,
> diff --git a/mm/hugetlb.c b/mm/hugetlb.c
> index 87e11d8..28a079a 100644
> --- a/mm/hugetlb.c
> +++ b/mm/hugetlb.c
> @@ -567,13 +567,13 @@ retry:
> * appear as a "reserved" entry instead of simply dangling with incorrect
> * counts.
> */
> -void hugetlb_fix_reserve_counts(struct inode *inode, bool restore_reserve)
> +void hugetlb_fix_reserve_counts(struct inode *inode)
> {
> struct hugepage_subpool *spool = subpool_inode(inode);
> long rsv_adjust;
>
> rsv_adjust = hugepage_subpool_get_pages(spool, 1);
> - if (restore_reserve && rsv_adjust) {
> + if (rsv_adjust) {
> struct hstate *h = hstate_inode(inode);
>
> hugetlb_acct_memory(h, 1);
> --
> 1.8.3.1
--
Michal Hocko
SUSE Labs
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] mm: remove unnecessary condition in remove_inode_hugepages
2016-09-26 9:01 ` Michal Hocko
@ 2016-09-26 20:16 ` Mike Kravetz
2016-09-27 14:19 ` zhong jiang
2016-09-27 14:01 ` zhong jiang
1 sibling, 1 reply; 6+ messages in thread
From: Mike Kravetz @ 2016-09-26 20:16 UTC (permalink / raw)
To: Michal Hocko, zhongjiang; +Cc: akpm, n-horiguchi, linux-mm
On 09/26/2016 02:01 AM, Michal Hocko wrote:
> On Mon 26-09-16 10:34:13, zhongjiang wrote:
>> From: zhong jiang <zhongjiang@huawei.com>
>>
>> when the huge page is added to the page cahce (huge_add_to_page_cache),
>> the page private flag will be cleared. since this code
>> (remove_inode_hugepages) will only be called for pages in the
>> page cahce, PagePrivate(page) will always be false.
>>
>> The patch remove the code without any functional change.
>>
>> Signed-off-by: zhong jiang <zhongjiang@huawei.com>
>> ---
>> fs/hugetlbfs/inode.c | 10 ++++------
>> include/linux/hugetlb.h | 2 +-
>> mm/hugetlb.c | 4 ++--
>> 3 files changed, 7 insertions(+), 9 deletions(-)
>>
>> diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
>> index 4ea71eb..81f8bbf4 100644
>> --- a/fs/hugetlbfs/inode.c
>> +++ b/fs/hugetlbfs/inode.c
>> @@ -458,18 +458,16 @@ static void remove_inode_hugepages(struct inode *inode, loff_t lstart,
>> * cache (remove_huge_page) BEFORE removing the
>> * region/reserve map (hugetlb_unreserve_pages). In
>> * rare out of memory conditions, removal of the
>> - * region/reserve map could fail. Before free'ing
>> - * the page, note PagePrivate which is used in case
>> - * of error.
>> + * region/reserve map could fail. Correspondingly,
>> + * the subpool and global reserve usage count can need
>> + * to be adjusted.
>> */
>> - rsv_on_error = !PagePrivate(page);
>
> This whole code is tricky as hell. I would be calmer if we just stick a
> VM_BUG_ON here to make sure that this assumption will not break later
> on.
I'm OK with adding the VM_BUG_ON.
This has run through the fallocate stress testing without issue. In
addition, I ran it through the (in development) userfaultfd huge page
tests that use fallocate hole punch on a privately mapped hugetlbfs
file.
The original check for PagePrivate was likely added due to observations
about the way the flag is used in dequeue_huge_page_vma/free_huge_page.
Unfortunately, I did not recognize that they did not apply in this case.
--
Mike Kravetz
>
>> remove_huge_page(page);
>> freed++;
>> if (!truncate_op) {
>> if (unlikely(hugetlb_unreserve_pages(inode,
>> next, next + 1, 1)))
>> - hugetlb_fix_reserve_counts(inode,
>> - rsv_on_error);
>> + hugetlb_fix_reserve_counts(inode);
>> }
>>
>> unlock_page(page);
>> diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h
>> index c26d463..d2e0fc5 100644
>> --- a/include/linux/hugetlb.h
>> +++ b/include/linux/hugetlb.h
>> @@ -90,7 +90,7 @@ int dequeue_hwpoisoned_huge_page(struct page *page);
>> bool isolate_huge_page(struct page *page, struct list_head *list);
>> void putback_active_hugepage(struct page *page);
>> void free_huge_page(struct page *page);
>> -void hugetlb_fix_reserve_counts(struct inode *inode, bool restore_reserve);
>> +void hugetlb_fix_reserve_counts(struct inode *inode);
>> extern struct mutex *hugetlb_fault_mutex_table;
>> u32 hugetlb_fault_mutex_hash(struct hstate *h, struct mm_struct *mm,
>> struct vm_area_struct *vma,
>> diff --git a/mm/hugetlb.c b/mm/hugetlb.c
>> index 87e11d8..28a079a 100644
>> --- a/mm/hugetlb.c
>> +++ b/mm/hugetlb.c
>> @@ -567,13 +567,13 @@ retry:
>> * appear as a "reserved" entry instead of simply dangling with incorrect
>> * counts.
>> */
>> -void hugetlb_fix_reserve_counts(struct inode *inode, bool restore_reserve)
>> +void hugetlb_fix_reserve_counts(struct inode *inode)
>> {
>> struct hugepage_subpool *spool = subpool_inode(inode);
>> long rsv_adjust;
>>
>> rsv_adjust = hugepage_subpool_get_pages(spool, 1);
>> - if (restore_reserve && rsv_adjust) {
>> + if (rsv_adjust) {
>> struct hstate *h = hstate_inode(inode);
>>
>> hugetlb_acct_memory(h, 1);
>> --
>> 1.8.3.1
>
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] mm: remove unnecessary condition in remove_inode_hugepages
2016-09-26 20:16 ` Mike Kravetz
@ 2016-09-27 14:19 ` zhong jiang
0 siblings, 0 replies; 6+ messages in thread
From: zhong jiang @ 2016-09-27 14:19 UTC (permalink / raw)
To: Mike Kravetz; +Cc: Michal Hocko, akpm, n-horiguchi, linux-mm
On 2016/9/27 4:16, Mike Kravetz wrote:
> On 09/26/2016 02:01 AM, Michal Hocko wrote:
>> On Mon 26-09-16 10:34:13, zhongjiang wrote:
>>> From: zhong jiang <zhongjiang@huawei.com>
>>>
>>> when the huge page is added to the page cahce (huge_add_to_page_cache),
>>> the page private flag will be cleared. since this code
>>> (remove_inode_hugepages) will only be called for pages in the
>>> page cahce, PagePrivate(page) will always be false.
>>>
>>> The patch remove the code without any functional change.
>>>
>>> Signed-off-by: zhong jiang <zhongjiang@huawei.com>
>>> ---
>>> fs/hugetlbfs/inode.c | 10 ++++------
>>> include/linux/hugetlb.h | 2 +-
>>> mm/hugetlb.c | 4 ++--
>>> 3 files changed, 7 insertions(+), 9 deletions(-)
>>>
>>> diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
>>> index 4ea71eb..81f8bbf4 100644
>>> --- a/fs/hugetlbfs/inode.c
>>> +++ b/fs/hugetlbfs/inode.c
>>> @@ -458,18 +458,16 @@ static void remove_inode_hugepages(struct inode *inode, loff_t lstart,
>>> * cache (remove_huge_page) BEFORE removing the
>>> * region/reserve map (hugetlb_unreserve_pages). In
>>> * rare out of memory conditions, removal of the
>>> - * region/reserve map could fail. Before free'ing
>>> - * the page, note PagePrivate which is used in case
>>> - * of error.
>>> + * region/reserve map could fail. Correspondingly,
>>> + * the subpool and global reserve usage count can need
>>> + * to be adjusted.
>>> */
>>> - rsv_on_error = !PagePrivate(page);
>> This whole code is tricky as hell. I would be calmer if we just stick a
>> VM_BUG_ON here to make sure that this assumption will not break later
>> on.
> I'm OK with adding the VM_BUG_ON.
>
> This has run through the fallocate stress testing without issue. In
> addition, I ran it through the (in development) userfaultfd huge page
> tests that use fallocate hole punch on a privately mapped hugetlbfs
> file.
Thank you for test and review.
> The original check for PagePrivate was likely added due to observations
> about the way the flag is used in dequeue_huge_page_vma/free_huge_page.
> Unfortunately, I did not recognize that they did not apply in this case.
>
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] mm: remove unnecessary condition in remove_inode_hugepages
2016-09-26 9:01 ` Michal Hocko
2016-09-26 20:16 ` Mike Kravetz
@ 2016-09-27 14:01 ` zhong jiang
1 sibling, 0 replies; 6+ messages in thread
From: zhong jiang @ 2016-09-27 14:01 UTC (permalink / raw)
To: Michal Hocko; +Cc: mike.kravetz, akpm, n-horiguchi, linux-mm
On 2016/9/26 17:01, Michal Hocko wrote:
> On Mon 26-09-16 10:34:13, zhongjiang wrote:
>> From: zhong jiang <zhongjiang@huawei.com>
>>
>> when the huge page is added to the page cahce (huge_add_to_page_cache),
>> the page private flag will be cleared. since this code
>> (remove_inode_hugepages) will only be called for pages in the
>> page cahce, PagePrivate(page) will always be false.
>>
>> The patch remove the code without any functional change.
>>
>> Signed-off-by: zhong jiang <zhongjiang@huawei.com>
>> ---
>> fs/hugetlbfs/inode.c | 10 ++++------
>> include/linux/hugetlb.h | 2 +-
>> mm/hugetlb.c | 4 ++--
>> 3 files changed, 7 insertions(+), 9 deletions(-)
>>
>> diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
>> index 4ea71eb..81f8bbf4 100644
>> --- a/fs/hugetlbfs/inode.c
>> +++ b/fs/hugetlbfs/inode.c
>> @@ -458,18 +458,16 @@ static void remove_inode_hugepages(struct inode *inode, loff_t lstart,
>> * cache (remove_huge_page) BEFORE removing the
>> * region/reserve map (hugetlb_unreserve_pages). In
>> * rare out of memory conditions, removal of the
>> - * region/reserve map could fail. Before free'ing
>> - * the page, note PagePrivate which is used in case
>> - * of error.
>> + * region/reserve map could fail. Correspondingly,
>> + * the subpool and global reserve usage count can need
>> + * to be adjusted.
>> */
>> - rsv_on_error = !PagePrivate(page);
> This whole code is tricky as hell. I would be calmer if we just stick a
> VM_BUG_ON here to make sure that this assumption will not break later
> on.
Resonable, I will do it in V2. Thanks.
>> remove_huge_page(page);
>> freed++;
>> if (!truncate_op) {
>> if (unlikely(hugetlb_unreserve_pages(inode,
>> next, next + 1, 1)))
>> - hugetlb_fix_reserve_counts(inode,
>> - rsv_on_error);
>> + hugetlb_fix_reserve_counts(inode);
>> }
>>
>> unlock_page(page);
>> diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h
>> index c26d463..d2e0fc5 100644
>> --- a/include/linux/hugetlb.h
>> +++ b/include/linux/hugetlb.h
>> @@ -90,7 +90,7 @@ int dequeue_hwpoisoned_huge_page(struct page *page);
>> bool isolate_huge_page(struct page *page, struct list_head *list);
>> void putback_active_hugepage(struct page *page);
>> void free_huge_page(struct page *page);
>> -void hugetlb_fix_reserve_counts(struct inode *inode, bool restore_reserve);
>> +void hugetlb_fix_reserve_counts(struct inode *inode);
>> extern struct mutex *hugetlb_fault_mutex_table;
>> u32 hugetlb_fault_mutex_hash(struct hstate *h, struct mm_struct *mm,
>> struct vm_area_struct *vma,
>> diff --git a/mm/hugetlb.c b/mm/hugetlb.c
>> index 87e11d8..28a079a 100644
>> --- a/mm/hugetlb.c
>> +++ b/mm/hugetlb.c
>> @@ -567,13 +567,13 @@ retry:
>> * appear as a "reserved" entry instead of simply dangling with incorrect
>> * counts.
>> */
>> -void hugetlb_fix_reserve_counts(struct inode *inode, bool restore_reserve)
>> +void hugetlb_fix_reserve_counts(struct inode *inode)
>> {
>> struct hugepage_subpool *spool = subpool_inode(inode);
>> long rsv_adjust;
>>
>> rsv_adjust = hugepage_subpool_get_pages(spool, 1);
>> - if (restore_reserve && rsv_adjust) {
>> + if (rsv_adjust) {
>> struct hstate *h = hstate_inode(inode);
>>
>> hugetlb_acct_memory(h, 1);
>> --
>> 1.8.3.1
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] mm: remove unnecessary condition in remove_inode_hugepages
@ 2016-09-25 9:17 zhongjiang
0 siblings, 0 replies; 6+ messages in thread
From: zhongjiang @ 2016-09-25 9:17 UTC (permalink / raw)
To: mike.kravetz, akpm; +Cc: mhocko, n-horiguchi, linux-mm
From: zhong jiang <zhongjiang@huawei.com>
when the huge page is added to the page cahce (huge_add_to_page_cache),
the page private flag will be cleared. since this code
(remove_inode_hugepages) will only be called for pages in the
page cahce, PagePrivate(page) will always be false.
The patch remove the code without any functional change.
Signed-off-by: zhong jiang <zhongjiang@huawei.com>
---
fs/hugetlbfs/inode.c | 10 ++++------
include/linux/hugetlb.h | 2 +-
mm/hugetlb.c | 4 ++--
3 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
index 4ea71eb..59bc923 100644
--- a/fs/hugetlbfs/inode.c
+++ b/fs/hugetlbfs/inode.c
@@ -458,18 +458,16 @@ static void remove_inode_hugepages(struct inode *inode, loff_t lstart,
* cache (remove_huge_page) BEFORE removing the
* region/reserve map (hugetlb_unreserve_pages). In
* rare out of memory conditions, removal of the
- * region/reserve map could fail. Before free'ing
- * the page, note PagePrivate which is used in case
- * of error.
+ * region/reserve map could fail. Correspondingly,
+ * the subpool and global reserve usage count can need
+ * to be adjusted.
*/
- rsv_on_error = !PagePrivate(page);
remove_huge_page(page);
freed++;
if (!truncate_op) {
if (unlikely(hugetlb_unreserve_pages(inode,
next, next + 1, 1)))
- hugetlb_fix_reserve_counts(inode,
- rsv_on_error);
+ hugetlb_fix_reserve_counts(inode)
}
unlock_page(page);
diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h
index c26d463..d2e0fc5 100644
--- a/include/linux/hugetlb.h
+++ b/include/linux/hugetlb.h
@@ -90,7 +90,7 @@ int dequeue_hwpoisoned_huge_page(struct page *page);
bool isolate_huge_page(struct page *page, struct list_head *list);
void putback_active_hugepage(struct page *page);
void free_huge_page(struct page *page);
-void hugetlb_fix_reserve_counts(struct inode *inode, bool restore_reserve);
+void hugetlb_fix_reserve_counts(struct inode *inode);
extern struct mutex *hugetlb_fault_mutex_table;
u32 hugetlb_fault_mutex_hash(struct hstate *h, struct mm_struct *mm,
struct vm_area_struct *vma,
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 87e11d8..28a079a 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -567,13 +567,13 @@ retry:
* appear as a "reserved" entry instead of simply dangling with incorrect
* counts.
*/
-void hugetlb_fix_reserve_counts(struct inode *inode, bool restore_reserve)
+void hugetlb_fix_reserve_counts(struct inode *inode)
{
struct hugepage_subpool *spool = subpool_inode(inode);
long rsv_adjust;
rsv_adjust = hugepage_subpool_get_pages(spool, 1);
- if (restore_reserve && rsv_adjust) {
+ if (rsv_adjust) {
struct hstate *h = hstate_inode(inode);
hugetlb_acct_memory(h, 1);
--
1.8.3.1
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-09-27 14:29 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-09-26 2:34 [PATCH] mm: remove unnecessary condition in remove_inode_hugepages zhongjiang
2016-09-26 9:01 ` Michal Hocko
2016-09-26 20:16 ` Mike Kravetz
2016-09-27 14:19 ` zhong jiang
2016-09-27 14:01 ` zhong jiang
-- strict thread matches above, loose matches on Subject: below --
2016-09-25 9:17 zhongjiang
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).