1. Patchew
  2. linux
  3. [PATCH v2 -next 00/11] cgroup:cpuset:separate legacy cgroup v1 code and put under config option
  4. View patch

[PATCH v2 -next 01/11] cgroup/cpuset: introduce cpuset-v1.c

Chen Ridong posted 11 patches 1 year, 3 months ago
There is a newer version of this series
[PATCH v2 -next 01/11] cgroup/cpuset: introduce cpuset-v1.c
Posted by Chen Ridong 1 year, 3 months ago 
This patch introduces the cgroup/cpuset-v1.c source file which will be
used for all legacy (cgroup v1) cpuset cgroup code. It also introduces
cgroup/cpuset-internal.h to keep declarations shared between
cgroup/cpuset.c and cpuset/cpuset-v1.c.

As of now, let's compile it if CONFIG_CPUSET is set. Later on it can be
switched to use a separate config option, so that the legacy code won't be
compiled if not required.

Signed-off-by: Chen Ridong <chenridong@huawei.com>
---
 MAINTAINERS                     | 2 ++
 kernel/cgroup/Makefile          | 2 +-
 kernel/cgroup/cpuset-internal.h | 7 +++++++
 kernel/cgroup/cpuset-v1.c       | 4 ++++
 4 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 kernel/cgroup/cpuset-internal.h
 create mode 100644 kernel/cgroup/cpuset-v1.c

diff --git a/MAINTAINERS b/MAINTAINERS
index 82e3924816d2..3b5ec1cafd95 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5698,6 +5698,8 @@ S:	Maintained
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git
 F:	Documentation/admin-guide/cgroup-v1/cpusets.rst
 F:	include/linux/cpuset.h
+F:	kernel/cgroup/cpuset-internal.h
+F:	kernel/cgroup/cpuset-v1.c
 F:	kernel/cgroup/cpuset.c
 F:	tools/testing/selftests/cgroup/test_cpuset.c
 F:	tools/testing/selftests/cgroup/test_cpuset_prs.sh
diff --git a/kernel/cgroup/Makefile b/kernel/cgroup/Makefile
index 12f8457ad1f9..005ac4c675cb 100644
--- a/kernel/cgroup/Makefile
+++ b/kernel/cgroup/Makefile
@@ -4,6 +4,6 @@ obj-y := cgroup.o rstat.o namespace.o cgroup-v1.o freezer.o
 obj-$(CONFIG_CGROUP_FREEZER) += legacy_freezer.o
 obj-$(CONFIG_CGROUP_PIDS) += pids.o
 obj-$(CONFIG_CGROUP_RDMA) += rdma.o
-obj-$(CONFIG_CPUSETS) += cpuset.o
+obj-$(CONFIG_CPUSETS) += cpuset.o cpuset-v1.o
 obj-$(CONFIG_CGROUP_MISC) += misc.o
 obj-$(CONFIG_CGROUP_DEBUG) += debug.o
diff --git a/kernel/cgroup/cpuset-internal.h b/kernel/cgroup/cpuset-internal.h
new file mode 100644
index 000000000000..6605be417e32
--- /dev/null
+++ b/kernel/cgroup/cpuset-internal.h
@@ -0,0 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#ifndef __CPUSET_INTERNAL_H
+#define __CPUSET_INTERNAL_H
+
+#endif /* __CPUSET_INTERNAL_H */
+
diff --git a/kernel/cgroup/cpuset-v1.c b/kernel/cgroup/cpuset-v1.c
new file mode 100644
index 000000000000..ae166eb4f75d
--- /dev/null
+++ b/kernel/cgroup/cpuset-v1.c
@@ -0,0 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "cpuset-internal.h"
+
-- 
2.34.1
Re: [PATCH v2 -next 01/11] cgroup/cpuset: introduce cpuset-v1.c
Posted by Waiman Long 1 year, 3 months ago 
On 8/26/24 09:26, Chen Ridong wrote:
> This patch introduces the cgroup/cpuset-v1.c source file which will be
> used for all legacy (cgroup v1) cpuset cgroup code. It also introduces
> cgroup/cpuset-internal.h to keep declarations shared between
> cgroup/cpuset.c and cpuset/cpuset-v1.c.
>
> As of now, let's compile it if CONFIG_CPUSET is set. Later on it can be
> switched to use a separate config option, so that the legacy code won't be
> compiled if not required.
>
> Signed-off-by: Chen Ridong <chenridong@huawei.com>
> ---
>   MAINTAINERS                     | 2 ++
>   kernel/cgroup/Makefile          | 2 +-
>   kernel/cgroup/cpuset-internal.h | 7 +++++++
>   kernel/cgroup/cpuset-v1.c       | 4 ++++
>   4 files changed, 14 insertions(+), 1 deletion(-)
>   create mode 100644 kernel/cgroup/cpuset-internal.h
>   create mode 100644 kernel/cgroup/cpuset-v1.c
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 82e3924816d2..3b5ec1cafd95 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -5698,6 +5698,8 @@ S:	Maintained
>   T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git
>   F:	Documentation/admin-guide/cgroup-v1/cpusets.rst
>   F:	include/linux/cpuset.h
> +F:	kernel/cgroup/cpuset-internal.h
> +F:	kernel/cgroup/cpuset-v1.c
>   F:	kernel/cgroup/cpuset.c
>   F:	tools/testing/selftests/cgroup/test_cpuset.c
>   F:	tools/testing/selftests/cgroup/test_cpuset_prs.sh
> diff --git a/kernel/cgroup/Makefile b/kernel/cgroup/Makefile
> index 12f8457ad1f9..005ac4c675cb 100644
> --- a/kernel/cgroup/Makefile
> +++ b/kernel/cgroup/Makefile
> @@ -4,6 +4,6 @@ obj-y := cgroup.o rstat.o namespace.o cgroup-v1.o freezer.o
>   obj-$(CONFIG_CGROUP_FREEZER) += legacy_freezer.o
>   obj-$(CONFIG_CGROUP_PIDS) += pids.o
>   obj-$(CONFIG_CGROUP_RDMA) += rdma.o
> -obj-$(CONFIG_CPUSETS) += cpuset.o
> +obj-$(CONFIG_CPUSETS) += cpuset.o cpuset-v1.o
>   obj-$(CONFIG_CGROUP_MISC) += misc.o
>   obj-$(CONFIG_CGROUP_DEBUG) += debug.o
> diff --git a/kernel/cgroup/cpuset-internal.h b/kernel/cgroup/cpuset-internal.h
> new file mode 100644
> index 000000000000..6605be417e32
> --- /dev/null
> +++ b/kernel/cgroup/cpuset-internal.h
> @@ -0,0 +1,7 @@
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
> +
> +#ifndef __CPUSET_INTERNAL_H
> +#define __CPUSET_INTERNAL_H
> +
> +#endif /* __CPUSET_INTERNAL_H */
> +
> diff --git a/kernel/cgroup/cpuset-v1.c b/kernel/cgroup/cpuset-v1.c
> new file mode 100644
> index 000000000000..ae166eb4f75d
> --- /dev/null
> +++ b/kernel/cgroup/cpuset-v1.c
> @@ -0,0 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
> +
> +#include "cpuset-internal.h"
> +

Don't leave a blank line at the end of a file. You will get the 
following error when applying the patch.

0001-cgroup_cpuset-introduce-cpuset-v1.c.patch:70: new blank line at EOF.

All your patches except the last one have this problem.

Cheers,
Longman
Re: [PATCH v2 -next 01/11] cgroup/cpuset: introduce cpuset-v1.c
Posted by Chen Ridong 1 year, 3 months ago 

On 2024/8/27 3:07, Waiman Long wrote:
> On 8/26/24 09:26, Chen Ridong wrote:
>> This patch introduces the cgroup/cpuset-v1.c source file which will be
>> used for all legacy (cgroup v1) cpuset cgroup code. It also introduces
>> cgroup/cpuset-internal.h to keep declarations shared between
>> cgroup/cpuset.c and cpuset/cpuset-v1.c.
>>
>> As of now, let's compile it if CONFIG_CPUSET is set. Later on it can be
>> switched to use a separate config option, so that the legacy code 
>> won't be
>> compiled if not required.
>>
>> Signed-off-by: Chen Ridong <chenridong@huawei.com>
>> ---
>>   MAINTAINERS                     | 2 ++
>>   kernel/cgroup/Makefile          | 2 +-
>>   kernel/cgroup/cpuset-internal.h | 7 +++++++
>>   kernel/cgroup/cpuset-v1.c       | 4 ++++
>>   4 files changed, 14 insertions(+), 1 deletion(-)
>>   create mode 100644 kernel/cgroup/cpuset-internal.h
>>   create mode 100644 kernel/cgroup/cpuset-v1.c
>>
>> diff --git a/MAINTAINERS b/MAINTAINERS
>> index 82e3924816d2..3b5ec1cafd95 100644
>> --- a/MAINTAINERS
>> +++ b/MAINTAINERS
>> @@ -5698,6 +5698,8 @@ S:    Maintained
>>   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git
>>   F:    Documentation/admin-guide/cgroup-v1/cpusets.rst
>>   F:    include/linux/cpuset.h
>> +F:    kernel/cgroup/cpuset-internal.h
>> +F:    kernel/cgroup/cpuset-v1.c
>>   F:    kernel/cgroup/cpuset.c
>>   F:    tools/testing/selftests/cgroup/test_cpuset.c
>>   F:    tools/testing/selftests/cgroup/test_cpuset_prs.sh
>> diff --git a/kernel/cgroup/Makefile b/kernel/cgroup/Makefile
>> index 12f8457ad1f9..005ac4c675cb 100644
>> --- a/kernel/cgroup/Makefile
>> +++ b/kernel/cgroup/Makefile
>> @@ -4,6 +4,6 @@ obj-y := cgroup.o rstat.o namespace.o cgroup-v1.o 
>> freezer.o
>>   obj-$(CONFIG_CGROUP_FREEZER) += legacy_freezer.o
>>   obj-$(CONFIG_CGROUP_PIDS) += pids.o
>>   obj-$(CONFIG_CGROUP_RDMA) += rdma.o
>> -obj-$(CONFIG_CPUSETS) += cpuset.o
>> +obj-$(CONFIG_CPUSETS) += cpuset.o cpuset-v1.o
>>   obj-$(CONFIG_CGROUP_MISC) += misc.o
>>   obj-$(CONFIG_CGROUP_DEBUG) += debug.o
>> diff --git a/kernel/cgroup/cpuset-internal.h 
>> b/kernel/cgroup/cpuset-internal.h
>> new file mode 100644
>> index 000000000000..6605be417e32
>> --- /dev/null
>> +++ b/kernel/cgroup/cpuset-internal.h
>> @@ -0,0 +1,7 @@
>> +/* SPDX-License-Identifier: GPL-2.0-or-later */
>> +
>> +#ifndef __CPUSET_INTERNAL_H
>> +#define __CPUSET_INTERNAL_H
>> +
>> +#endif /* __CPUSET_INTERNAL_H */
>> +
>> diff --git a/kernel/cgroup/cpuset-v1.c b/kernel/cgroup/cpuset-v1.c
>> new file mode 100644
>> index 000000000000..ae166eb4f75d
>> --- /dev/null
>> +++ b/kernel/cgroup/cpuset-v1.c
>> @@ -0,0 +1,4 @@
>> +// SPDX-License-Identifier: GPL-2.0-or-later
>> +
>> +#include "cpuset-internal.h"
>> +
> 
> Don't leave a blank line at the end of a file. You will get the 
> following error when applying the patch.
> 
> 0001-cgroup_cpuset-introduce-cpuset-v1.c.patch:70: new blank line at EOF.
> 
> All your patches except the last one have this problem.
> 
> Cheers,
> Longman

Thank you, will fix it.

Best regards,
Ridong

Patchew 2.1-devel-b67e4c2

© 2016 - 2025 Red Hat, Inc.