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 remove it safely.
Signed-off-by: Haifeng Xu <[email protected]>
---
include/linux/cpuset.h | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/include/linux/cpuset.h b/include/linux/cpuset.h
index d58e0476ee8e..7fad5afe3bba 100644
--- a/include/linux/cpuset.h
+++ b/include/linux/cpuset.h
@@ -82,13 +82,6 @@ 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;
-}
-
static inline bool __cpuset_zone_allowed(struct zone *z, gfp_t gfp_mask)
{
return __cpuset_node_allowed(zone_to_nid(z), 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;
-}
-
static inline bool __cpuset_zone_allowed(struct zone *z, gfp_t gfp_mask)
{
return true;
--
2.25.1
On 2/27/23 03:07, 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 remove it safely.
>
> Signed-off-by: Haifeng Xu <[email protected]>
> ---
> include/linux/cpuset.h | 12 ------------
> 1 file changed, 12 deletions(-)
>
> diff --git a/include/linux/cpuset.h b/include/linux/cpuset.h
> index d58e0476ee8e..7fad5afe3bba 100644
> --- a/include/linux/cpuset.h
> +++ b/include/linux/cpuset.h
> @@ -82,13 +82,6 @@ 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;
> -}
> -
> static inline bool __cpuset_zone_allowed(struct zone *z, gfp_t gfp_mask)
> {
> return __cpuset_node_allowed(zone_to_nid(z), 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;
> -}
> -
> static inline bool __cpuset_zone_allowed(struct zone *z, gfp_t gfp_mask)
> {
> return true;
The kernel convention is to add a "__" prefix to a function name if
there is higher level helper without the "__" prefix that uses it. Since
cpuset_node_allowed() is no longer used. We should just rename
__cpuset_node_allowed() to cpuset_node_allowed() and get rid of the
unused helper. A bit more code changes are needed for this, though.
Cheers,
Longman
On 2023/2/27 22:56, Waiman Long wrote:
> On 2/27/23 03:07, 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 remove it safely.
>>
>> Signed-off-by: Haifeng Xu <[email protected]>
>> ---
>> include/linux/cpuset.h | 12 ------------
>> 1 file changed, 12 deletions(-)
>>
>> diff --git a/include/linux/cpuset.h b/include/linux/cpuset.h
>> index d58e0476ee8e..7fad5afe3bba 100644
>> --- a/include/linux/cpuset.h
>> +++ b/include/linux/cpuset.h
>> @@ -82,13 +82,6 @@ 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;
>> -}
>> -
>> static inline bool __cpuset_zone_allowed(struct zone *z, gfp_t gfp_mask)
>> {
>> return __cpuset_node_allowed(zone_to_nid(z), 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;
>> -}
>> -
>> static inline bool __cpuset_zone_allowed(struct zone *z, gfp_t gfp_mask)
>> {
>> return true;
>
> The kernel convention is to add a "__" prefix to a function name if there is higher level helper without the "__" prefix that uses it. Since cpuset_node_allowed() is no longer used. We should just rename __cpuset_node_allowed() to cpuset_node_allowed() and get rid of the unused helper. A bit more code changes are needed for this, though.
>
> Cheers,
> Longman
>
Maybe we can still use cpuset_node_allowed in __cpuset_zone_allowed? If so, less code need to be changed.
Thanks.
On 2/27/23 21:40, Haifeng Xu wrote:
>
> On 2023/2/27 22:56, Waiman Long wrote:
>> On 2/27/23 03:07, 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 remove it safely.
>>>
>>> Signed-off-by: Haifeng Xu <[email protected]>
>>> ---
>>> include/linux/cpuset.h | 12 ------------
>>> 1 file changed, 12 deletions(-)
>>>
>>> diff --git a/include/linux/cpuset.h b/include/linux/cpuset.h
>>> index d58e0476ee8e..7fad5afe3bba 100644
>>> --- a/include/linux/cpuset.h
>>> +++ b/include/linux/cpuset.h
>>> @@ -82,13 +82,6 @@ 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;
>>> -}
>>> -
>>> static inline bool __cpuset_zone_allowed(struct zone *z, gfp_t gfp_mask)
>>> {
>>> return __cpuset_node_allowed(zone_to_nid(z), 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;
>>> -}
>>> -
>>> static inline bool __cpuset_zone_allowed(struct zone *z, gfp_t gfp_mask)
>>> {
>>> return true;
>> The kernel convention is to add a "__" prefix to a function name if there is higher level helper without the "__" prefix that uses it. Since cpuset_node_allowed() is no longer used. We should just rename __cpuset_node_allowed() to cpuset_node_allowed() and get rid of the unused helper. A bit more code changes are needed for this, though.
>>
>> Cheers,
>> Longman
>>
> Maybe we can still use cpuset_node_allowed in __cpuset_zone_allowed? If so, less code need to be changed.
>
mm/page_alloc.c has 2 references to __cpuset_node_allowed() in their
comments. These references should also be updated as well. That is why I
said a bit more code needs to be touched.
Cheers,
Longman
On 2023/2/28 10:52, Waiman Long wrote:
> On 2/27/23 21:40, Haifeng Xu wrote:
>>
>> On 2023/2/27 22:56, Waiman Long wrote:
>>> On 2/27/23 03:07, 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 remove it safely.
>>>>
>>>> Signed-off-by: Haifeng Xu <[email protected]>
>>>> ---
>>>> include/linux/cpuset.h | 12 ------------
>>>> 1 file changed, 12 deletions(-)
>>>>
>>>> diff --git a/include/linux/cpuset.h b/include/linux/cpuset.h
>>>> index d58e0476ee8e..7fad5afe3bba 100644
>>>> --- a/include/linux/cpuset.h
>>>> +++ b/include/linux/cpuset.h
>>>> @@ -82,13 +82,6 @@ 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;
>>>> -}
>>>> -
>>>> static inline bool __cpuset_zone_allowed(struct zone *z, gfp_t gfp_mask)
>>>> {
>>>> return __cpuset_node_allowed(zone_to_nid(z), 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;
>>>> -}
>>>> -
>>>> static inline bool __cpuset_zone_allowed(struct zone *z, gfp_t gfp_mask)
>>>> {
>>>> return true;
>>> The kernel convention is to add a "__" prefix to a function name if there is higher level helper without the "__" prefix that uses it. Since cpuset_node_allowed() is no longer used. We should just rename __cpuset_node_allowed() to cpuset_node_allowed() and get rid of the unused helper. A bit more code changes are needed for this, though.
>>>
>>> Cheers,
>>> Longman
>>>
>> Maybe we can still use cpuset_node_allowed in __cpuset_zone_allowed? If so, less code need to be changed.
>>
> mm/page_alloc.c has 2 references to __cpuset_node_allowed() in their comments. These references should also be updated as well. That is why I said a bit more code needs to be touched.
>
> Cheers,
> Longman
>
Ok. I mean maybe we could keep cpuset_node_allowed() and use it in __cpuset_zone_allowed(). So we don't need rename __cpuset_node_allowed() or update releated comments.
Thanks.
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 <[email protected]>
Signed-off-by: Haifeng Xu <[email protected]>
---
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;
-}
-
static inline bool __cpuset_zone_allowed(struct zone *z, gfp_t gfp_mask)
{
return true;
diff --git a/kernel/cgroup/cpuset.c b/kernel/cgroup/cpuset.c
index 636f1c682ac0..0241b07d6f21 100644
--- a/kernel/cgroup/cpuset.c
+++ b/kernel/cgroup/cpuset.c
@@ -3831,7 +3831,7 @@ static struct cpuset *nearest_hardwall_ancestor(struct cpuset *cs)
}
/*
- * __cpuset_node_allowed - Can we allocate on a memory node?
+ * cpuset_node_allowed - Can we allocate on a memory node?
* @node: is this an allowed node?
* @gfp_mask: memory allocation flags
*
@@ -3870,7 +3870,7 @@ static struct cpuset *nearest_hardwall_ancestor(struct cpuset *cs)
* GFP_KERNEL - any node in enclosing hardwalled cpuset ok
* GFP_USER - only nodes in current tasks mems allowed ok.
*/
-bool __cpuset_node_allowed(int node, gfp_t gfp_mask)
+bool cpuset_node_allowed(int node, gfp_t gfp_mask)
{
struct cpuset *cs; /* current cpuset ancestors */
bool allowed; /* is allocation in zone z allowed? */
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 3bb3484563ed..0d170ae590d8 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -4175,7 +4175,7 @@ get_page_from_freelist(gfp_t gfp_mask, unsigned int order, int alloc_flags,
retry:
/*
* Scan zonelist, looking for a zone with enough free.
- * See also __cpuset_node_allowed() comment in kernel/cgroup/cpuset.c.
+ * See also cpuset_node_allowed() comment in kernel/cgroup/cpuset.c.
*/
no_fallback = alloc_flags & ALLOC_NOFRAGMENT;
z = ac->preferred_zoneref;
@@ -4843,7 +4843,7 @@ gfp_to_alloc_flags(gfp_t gfp_mask)
alloc_flags |= ALLOC_HARDER;
/*
* Ignore cpuset mems for GFP_ATOMIC rather than fail, see the
- * comment for __cpuset_node_allowed().
+ * comment for cpuset_node_allowed().
*/
alloc_flags &= ~ALLOC_CPUSET;
} else if (unlikely(rt_task(current)) && in_task())
--
2.25.1
On Tue, Feb 28, 2023 at 08:35:37AM +0000, 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 <[email protected]>
> Signed-off-by: Haifeng Xu <[email protected]>
Waiman, can you review and ack?
Thanks.
--
tejun
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 <[email protected]>
> Signed-off-by: Haifeng Xu <[email protected]>
> ---
> 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.
Cheers,
Longman
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 <[email protected]>
>> Signed-off-by: Haifeng Xu <[email protected]>
>> ---
>> 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 <[email protected]>