Messages in this thread | | | Date | Sat, 18 Mar 2023 17:30:46 -0400 | Subject | Re: [PATCH] cpuset: Clean up cpuset_node_allowed | From | Waiman Long <> |
| |
On 3/17/23 21:35, Waiman Long wrote: > On 2/28/23 03:35, Haifeng Xu wrote: >> Commit 002f290627c2 ("cpuset: use static key better and convert to >> new API") >> has used __cpuset_node_allowed() instead of cpuset_node_allowed() to >> check >> whether we can allocate on a memory node. Now this function isn't >> used by >> anyone, so we can do the follow things to clean up it. >> >> 1. remove unused codes >> 2. rename __cpuset_node_allowed() to cpuset_node_allowed() >> 3. update comments in mm/page_alloc.c >> >> Suggested-by: Waiman Long <longman@redhat.com> >> Signed-off-by: Haifeng Xu <haifeng.xu@shopee.com> >> --- >> include/linux/cpuset.h | 16 ++-------------- >> kernel/cgroup/cpuset.c | 4 ++-- >> mm/page_alloc.c | 4 ++-- >> 3 files changed, 6 insertions(+), 18 deletions(-) >> >> diff --git a/include/linux/cpuset.h b/include/linux/cpuset.h >> index d58e0476ee8e..980b76a1237e 100644 >> --- a/include/linux/cpuset.h >> +++ b/include/linux/cpuset.h >> @@ -80,18 +80,11 @@ extern nodemask_t cpuset_mems_allowed(struct >> task_struct *p); >> void cpuset_init_current_mems_allowed(void); >> int cpuset_nodemask_valid_mems_allowed(nodemask_t *nodemask); >> -extern bool __cpuset_node_allowed(int node, gfp_t gfp_mask); >> - >> -static inline bool cpuset_node_allowed(int node, gfp_t gfp_mask) >> -{ >> - if (cpusets_enabled()) >> - return __cpuset_node_allowed(node, gfp_mask); >> - return true; >> -} >> +extern bool cpuset_node_allowed(int node, gfp_t gfp_mask); >> static inline bool __cpuset_zone_allowed(struct zone *z, gfp_t >> gfp_mask) >> { >> - return __cpuset_node_allowed(zone_to_nid(z), gfp_mask); >> + return cpuset_node_allowed(zone_to_nid(z), gfp_mask); >> } >> static inline bool cpuset_zone_allowed(struct zone *z, gfp_t >> gfp_mask) >> @@ -223,11 +216,6 @@ static inline int >> cpuset_nodemask_valid_mems_allowed(nodemask_t *nodemask) >> return 1; >> } >> -static inline bool cpuset_node_allowed(int node, gfp_t gfp_mask) >> -{ >> - return true; >> -} >> - > > Sorry for the late reply as I apparently drop the ball. > > You need to keep the above cpuset_node_allowed() inline function or > you will get compilation error when compiling with a config without > CONFIG_CPUSETS. Other than that, the other changes look good. > It turns out that cpuset_node_allowed() isn't used anywhere except in cpuset.h. So it should be OK to remove the alternate cpuset_node_allowed() function.
Acked-by: Waiman Long <longman@redhat.com>
| |