| Message ID | 20220413032915.251254-5-liupeng256@huawei.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | hugetlb: Fix some incorrect behavior | expand |
On Wed, Apr 13, 2022 at 03:29:15AM +0000, Peng Liu wrote: > Use more generic functions to deal with issues related to online > nodes. The changes will make the code simplified. > > Signed-off-by: Peng Liu <liupeng256@huawei.com> LGTM. Reviewed-by: Muchun Song <songmuchun@bytedance.com> Thanks.
On 4/13/2022 11:29 AM, Peng Liu wrote: > Use more generic functions to deal with issues related to online > nodes. The changes will make the code simplified. > > Signed-off-by: Peng Liu <liupeng256@huawei.com> Looks more consistent. Thanks. Reviewed-by: Baolin Wang <baolin.wang@linux.alibaba.com> > --- > mm/hugetlb.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/mm/hugetlb.c b/mm/hugetlb.c > index 2e4d8d9fb7c6..4c529774cc08 100644 > --- a/mm/hugetlb.c > +++ b/mm/hugetlb.c > @@ -6953,7 +6953,7 @@ void __init hugetlb_cma_reserve(int order) > if (hugetlb_cma_size_in_node[nid] == 0) > continue; > > - if (!node_state(nid, N_ONLINE)) { > + if (!node_online(nid)) { > pr_warn("hugetlb_cma: invalid node %d specified\n", nid); > hugetlb_cma_size -= hugetlb_cma_size_in_node[nid]; > hugetlb_cma_size_in_node[nid] = 0; > @@ -6992,7 +6992,7 @@ void __init hugetlb_cma_reserve(int order) > } > > reserved = 0; > - for_each_node_state(nid, N_ONLINE) { > + for_each_online_node(nid) { > int res; > char name[CMA_MAX_NAME]; >
On 4/12/22 20:29, Peng Liu wrote: > Use more generic functions to deal with issues related to online > nodes. The changes will make the code simplified. > > Signed-off-by: Peng Liu <liupeng256@huawei.com> > --- > mm/hugetlb.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Thank you! Reviewed-by: Mike Kravetz <mike.kravetz@oracle.com>
On Wed, 13 Apr 2022, Peng Liu wrote: >Use more generic functions to deal with issues related to online >nodes. The changes will make the code simplified. > >Signed-off-by: Peng Liu <liupeng256@huawei.com> >Reviewed-by: Muchun Song <songmuchun@bytedance.com> >Reviewed-by: Baolin Wang <baolin.wang@linux.alibaba.com> >Reviewed-by: Mike Kravetz <mike.kravetz@oracle.com> Reviewed-by: Davidlohr Bueso <dave@stgolabs.net> >--- > mm/hugetlb.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > >diff --git a/mm/hugetlb.c b/mm/hugetlb.c >index 2e4d8d9fb7c6..4c529774cc08 100644 >--- a/mm/hugetlb.c >+++ b/mm/hugetlb.c >@@ -6953,7 +6953,7 @@ void __init hugetlb_cma_reserve(int order) > if (hugetlb_cma_size_in_node[nid] == 0) > continue; > >- if (!node_state(nid, N_ONLINE)) { >+ if (!node_online(nid)) { You could update mm/page_ext.c as well > pr_warn("hugetlb_cma: invalid node %d specified\n", nid); > hugetlb_cma_size -= hugetlb_cma_size_in_node[nid]; > hugetlb_cma_size_in_node[nid] = 0; >@@ -6992,7 +6992,7 @@ void __init hugetlb_cma_reserve(int order) > } > > reserved = 0; >- for_each_node_state(nid, N_ONLINE) { >+ for_each_online_node(nid) { ... and arch/ia64/kernel/uncached.c for this.
On 2022/4/15 10:15, Davidlohr Bueso wrote: > On Wed, 13 Apr 2022, Peng Liu wrote: > >> Use more generic functions to deal with issues related to online >> nodes. The changes will make the code simplified. >> >> Signed-off-by: Peng Liu <liupeng256@huawei.com> >> Reviewed-by: Muchun Song <songmuchun@bytedance.com> >> Reviewed-by: Baolin Wang <baolin.wang@linux.alibaba.com> >> Reviewed-by: Mike Kravetz <mike.kravetz@oracle.com> > > Reviewed-by: Davidlohr Bueso <dave@stgolabs.net> > >> --- >> mm/hugetlb.c | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/mm/hugetlb.c b/mm/hugetlb.c >> index 2e4d8d9fb7c6..4c529774cc08 100644 >> --- a/mm/hugetlb.c >> +++ b/mm/hugetlb.c >> @@ -6953,7 +6953,7 @@ void __init hugetlb_cma_reserve(int order) >> if (hugetlb_cma_size_in_node[nid] == 0) >> continue; >> >> - if (!node_state(nid, N_ONLINE)) { >> + if (!node_online(nid)) { > > You could update mm/page_ext.c as well > >> pr_warn("hugetlb_cma: invalid node %d specified\n", nid); >> hugetlb_cma_size -= hugetlb_cma_size_in_node[nid]; >> hugetlb_cma_size_in_node[nid] = 0; >> @@ -6992,7 +6992,7 @@ void __init hugetlb_cma_reserve(int order) >> } >> >> reserved = 0; >> - for_each_node_state(nid, N_ONLINE) { >> + for_each_online_node(nid) { > > ... and arch/ia64/kernel/uncached.c for this. > . Thank you very much. I catch this.
On 13.04.22 05:29, Peng Liu wrote: > Use more generic functions to deal with issues related to online > nodes. The changes will make the code simplified. > > Signed-off-by: Peng Liu <liupeng256@huawei.com> > --- > mm/hugetlb.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/mm/hugetlb.c b/mm/hugetlb.c > index 2e4d8d9fb7c6..4c529774cc08 100644 > --- a/mm/hugetlb.c > +++ b/mm/hugetlb.c > @@ -6953,7 +6953,7 @@ void __init hugetlb_cma_reserve(int order) > if (hugetlb_cma_size_in_node[nid] == 0) > continue; > > - if (!node_state(nid, N_ONLINE)) { > + if (!node_online(nid)) { > pr_warn("hugetlb_cma: invalid node %d specified\n", nid); > hugetlb_cma_size -= hugetlb_cma_size_in_node[nid]; > hugetlb_cma_size_in_node[nid] = 0; > @@ -6992,7 +6992,7 @@ void __init hugetlb_cma_reserve(int order) > } > > reserved = 0; > - for_each_node_state(nid, N_ONLINE) { > + for_each_online_node(nid) { > int res; > char name[CMA_MAX_NAME]; > Reviewed-by: David Hildenbrand <david@redhat.com>
diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 2e4d8d9fb7c6..4c529774cc08 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -6953,7 +6953,7 @@ void __init hugetlb_cma_reserve(int order) if (hugetlb_cma_size_in_node[nid] == 0) continue; - if (!node_state(nid, N_ONLINE)) { + if (!node_online(nid)) { pr_warn("hugetlb_cma: invalid node %d specified\n", nid); hugetlb_cma_size -= hugetlb_cma_size_in_node[nid]; hugetlb_cma_size_in_node[nid] = 0; @@ -6992,7 +6992,7 @@ void __init hugetlb_cma_reserve(int order) } reserved = 0; - for_each_node_state(nid, N_ONLINE) { + for_each_online_node(nid) { int res; char name[CMA_MAX_NAME];
Use more generic functions to deal with issues related to online nodes. The changes will make the code simplified. Signed-off-by: Peng Liu <liupeng256@huawei.com> --- mm/hugetlb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)