uapi/linux/prctl: provide macro definitions for the PR_SCHED_CORE type argument
Subsystems (4)
PATCH v4 1/1 uapi/linux/prctl: provide macro definitions for the PR_SCHED_CORE type argument
Commit 7ac592aa35a684ff ("sched: prctl() core-scheduling interface") made use of enum pid_type in prctl's arg4; this type and the associated enumeration definitions are not exposed to userspace. Christian has suggested to provide additional macro definitions that convey the meaning of the type argument more in alignment with its actual usage, and this patch does exactly that.
Complements: 7ac592aa35a684ff ("sched: prctl() core-scheduling interface")
---
v4:
- Rewritten in accordance with Christian Brauner's suggestion to provide macro definitions that are explicitly tailored for the prctl op.
v3: https://lore.kernel.org/lkml/[email protected]/
- Fixed header guard macro: s/_UAPI_LINUX_PID_H/_UAPI_LINUX_PIDTYPE_H/, as noted by Dmitry Levin.
v2: https://lore.kernel.org/lkml/[email protected]/
- Header file is renamed from pid.h to pidtype.h to avoid collisions
with include/linux/pid.h when included from uapi headers;
- The enum type has renamed from __kernel_pid_type to __kernel_pidtype to avoid possible confusion with __kernel_pid_t.
v1: https://lore.kernel.org/lkml/[email protected]/
--- Documentation/admin-guide/hw-vuln/core-scheduling.rst | 5 +++-- include/uapi/linux/prctl.h | 3 +++ kernel/sched/core_sched.c | 4 ++++ 3 files changed, 10 insertions(+), 2 deletions(-)
Documentation/admin-guide/hw-vuln/core-scheduling.rst +3 -2
@@ -61,8 +61,9 @@ arg3: ``pid`` of the task for which the operation applies. arg4: - ``pid_type`` for which the operation applies. It is of type ``enum pid_type``. - For example, if arg4 is ``PIDTYPE_TGID``, then the operation of this command + ``pid_type`` for which the operation applies. It is one of + ``PR_SCHED_CORE_SCOPE_``-prefixed macro constants. For example, if arg4 + is ``PR_SCHED_CORE_SCOPE_THREAD_GROUP``, then the operation of this command will be performed for all tasks in the task group of ``pid``. arg5:
include/uapi/linux/prctl.h +3 -0
@@ -266,5 +266,8 @@ struct prctl_mm_map {# define PR_SCHED_CORE_SHARE_TO 2/* push core_sched cookie to pid */ # define PR_SCHED_CORE_SHARE_FROM 3/* pull core_sched cookie to pid */ # define PR_SCHED_CORE_MAX 4 +# define PR_SCHED_CORE_SCOPE_THREAD 0 +# define PR_SCHED_CORE_SCOPE_THREAD_GROUP 1 +# define PR_SCHED_CORE_SCOPE_PROCESS_GROUP 2#endif /* _LINUX_PRCTL_H */
kernel/sched/core_sched.c +4 -0
@@ -134,6 +134,10 @@ int sched_core_share_pid(unsigned int cmd, pid_t pid, enum pid_type type,if (!static_branch_likely (&sched_smt_present))return -ENODEV ; +BUILD_BUG_ON (PR_SCHED_CORE_SCOPE_THREAD !=PIDTYPE_PID ); +BUILD_BUG_ON (PR_SCHED_CORE_SCOPE_THREAD_GROUP !=PIDTYPE_TGID ); +BUILD_BUG_ON (PR_SCHED_CORE_SCOPE_PROCESS_GROUP !=PIDTYPE_PGID ); +if (type >PIDTYPE_PGID || cmd >=PR_SCHED_CORE_MAX || pid <0 || (cmd !=PR_SCHED_CORE_GET && uaddr))return -EINVAL ;
Signature · 1 line
2.1.4
Quoted 11 lines · Eugene Syromiatnikov
Commit
7ac592aa35a684ff("sched:prctl()core-scheduling interface") made use of enumpid_typein prctl's arg4; this type and the associated enumeration definitions are not exposed to userspace. Christian has suggested to provide additional macro definitions that convey the meaning of the type argument more in alignment with its actual usage, and this patch does exactly that.Suggested-by Christian Brauner <[email protected]>Complements:
7ac592aa35a684ff("sched:prctl()core-scheduling interface")Signed-off-by Eugene Syromiatnikov <[email protected]>---
I mean, I proposed the names so I'm ok with them. :)
Peter et al. are you ok with this and do the names make sense to you?
Christian
Quoted 68 lines
v4:
- Rewritten in accordance with Christian Brauner's suggestion to provide macro definitions that are explicitly tailored for the prctl op.v3: https://lore.kernel.org/lkml/[email protected]/
- Fixed header guard macro: s/_UAPI_LINUX_PID_H/_UAPI_LINUX_PIDTYPE_H/, as noted by Dmitry Levin.v2: https://lore.kernel.org/lkml/[email protected]/
- Header file is renamed frompid.htopidtype.hto avoid collisionswith include/linux/pid.h when included from uapi headers;- The enum type has renamed from
__kernel_pid_typeto__kernel_pidtypeto avoid possible confusion with__kernel_pid_t.v1: https://lore.kernel.org/lkml/[email protected]/
--- Documentation/admin-guide/hw-vuln/core-scheduling.rst | 5 +++-- include/uapi/linux/prctl.h | 3 +++ kernel/sched/core_sched.c | 4 ++++ 3 files changed, 10 insertions(+), 2 deletions(-)Documentation/admin-guide/hw-vuln/core-scheduling.rst +3
-2@@ -61,8 +61,9 @@ arg3: ``pid`` of the task for which the operation applies. arg4: - ``pid_type`` for which the operation applies. It is of type ``enum pid_type``. - For example, if arg4 is ``PIDTYPE_TGID``, then the operation of this command + ``pid_type`` for which the operation applies. It is one of + ``PR_SCHED_CORE_SCOPE_``-prefixed macro constants. For example, if arg4 + is ``PR_SCHED_CORE_SCOPE_THREAD_GROUP``, then the operation of this command will be performed for all tasks in the task group of ``pid``. arg5:include/uapi/linux/prctl.h +3
-0@@ -266,5 +266,8 @@ struct prctl_mm_map {# define PR_SCHED_CORE_SHARE_TO 2/* push core_sched cookie to pid */ # define PR_SCHED_CORE_SHARE_FROM 3/* pull core_sched cookie to pid */ # define PR_SCHED_CORE_MAX 4 +# define PR_SCHED_CORE_SCOPE_THREAD 0 +# define PR_SCHED_CORE_SCOPE_THREAD_GROUP 1 +# define PR_SCHED_CORE_SCOPE_PROCESS_GROUP 2#endif /* _LINUX_PRCTL_H */ kernel/sched/core_sched.c +4
-0@@ -134,6 +134,10 @@ int sched_core_share_pid(unsigned int cmd, pid_t pid, enum pid_type type,if (!static_branch_likely (&sched_smt_present))return -ENODEV ; +BUILD_BUG_ON (PR_SCHED_CORE_SCOPE_THREAD !=PIDTYPE_PID ); +BUILD_BUG_ON (PR_SCHED_CORE_SCOPE_THREAD_GROUP !=PIDTYPE_TGID ); +BUILD_BUG_ON (PR_SCHED_CORE_SCOPE_PROCESS_GROUP !=PIDTYPE_PGID ); +if (type >PIDTYPE_PGID || cmd >=PR_SCHED_CORE_MAX || pid <0 || (cmd !=PR_SCHED_CORE_GET && uaddr))return -EINVAL ;Signature · 1 line
2.1.4
Quoted 13 lines · Christian Brauner
Quoted 11 lines · Eugene Syromiatnikov
Commit
7ac592aa35a684ff("sched:prctl()core-scheduling interface") made use of enumpid_typein prctl's arg4; this type and the associated enumeration definitions are not exposed to userspace. Christian has suggested to provide additional macro definitions that convey the meaning of the type argument more in alignment with its actual usage, and this patch does exactly that.Suggested-by Christian Brauner <[email protected]>Complements:
7ac592aa35a684ff("sched:prctl()core-scheduling interface")Signed-off-by Eugene Syromiatnikov <[email protected]>---
Quoted 4 lines
I mean, I proposed the names so I'm ok with them. :)
Peter et al. are you ok with this and do the names make sense to you?
I'll pick this up once the merge window closes then.
Thanks!
Christian
Quoted 71 lines
Christian
Quoted 68 lines
v4:
- Rewritten in accordance with Christian Brauner's suggestion to provide macro definitions that are explicitly tailored for the prctl op.v3: https://lore.kernel.org/lkml/[email protected]/
- Fixed header guard macro: s/_UAPI_LINUX_PID_H/_UAPI_LINUX_PIDTYPE_H/, as noted by Dmitry Levin.v2: https://lore.kernel.org/lkml/[email protected]/
- Header file is renamed frompid.htopidtype.hto avoid collisionswith include/linux/pid.h when included from uapi headers;- The enum type has renamed from
__kernel_pid_typeto__kernel_pidtypeto avoid possible confusion with__kernel_pid_t.v1: https://lore.kernel.org/lkml/[email protected]/
--- Documentation/admin-guide/hw-vuln/core-scheduling.rst | 5 +++-- include/uapi/linux/prctl.h | 3 +++ kernel/sched/core_sched.c | 4 ++++ 3 files changed, 10 insertions(+), 2 deletions(-)Documentation/admin-guide/hw-vuln/core-scheduling.rst +3
-2@@ -61,8 +61,9 @@ arg3: ``pid`` of the task for which the operation applies. arg4: - ``pid_type`` for which the operation applies. It is of type ``enum pid_type``. - For example, if arg4 is ``PIDTYPE_TGID``, then the operation of this command + ``pid_type`` for which the operation applies. It is one of + ``PR_SCHED_CORE_SCOPE_``-prefixed macro constants. For example, if arg4 + is ``PR_SCHED_CORE_SCOPE_THREAD_GROUP``, then the operation of this command will be performed for all tasks in the task group of ``pid``. arg5:include/uapi/linux/prctl.h +3
-0@@ -266,5 +266,8 @@ struct prctl_mm_map {# define PR_SCHED_CORE_SHARE_TO 2/* push core_sched cookie to pid */ # define PR_SCHED_CORE_SHARE_FROM 3/* pull core_sched cookie to pid */ # define PR_SCHED_CORE_MAX 4 +# define PR_SCHED_CORE_SCOPE_THREAD 0 +# define PR_SCHED_CORE_SCOPE_THREAD_GROUP 1 +# define PR_SCHED_CORE_SCOPE_PROCESS_GROUP 2#endif /* _LINUX_PRCTL_H */ kernel/sched/core_sched.c +4
-0@@ -134,6 +134,10 @@ int sched_core_share_pid(unsigned int cmd, pid_t pid, enum pid_type type,if (!static_branch_likely (&sched_smt_present))return -ENODEV ; +BUILD_BUG_ON (PR_SCHED_CORE_SCOPE_THREAD !=PIDTYPE_PID ); +BUILD_BUG_ON (PR_SCHED_CORE_SCOPE_THREAD_GROUP !=PIDTYPE_TGID ); +BUILD_BUG_ON (PR_SCHED_CORE_SCOPE_PROCESS_GROUP !=PIDTYPE_PGID ); +if (type >PIDTYPE_PGID || cmd >=PR_SCHED_CORE_MAX || pid <0 || (cmd !=PR_SCHED_CORE_GET && uaddr))return -EINVAL ;Signature · 1 line
2.1.4