mirror of
https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-10.git
synced 2026-09-09 00:07:04 +08:00
Waiman Long
6daab4673f
JIRA: https://issues.redhat.com/browse/RHEL-152433
Conflicts:
1) A context diff with the kernel/pid_namespace.c hunk due to missing
upstream commit 7863dcc72d0f ("pid: allow pid_max to be set per
pid namespace").
2) A context diff with the net/core/net_namespace.c hunk due to
missing upstream commit e57a6320215c ("net: Add net_passive_inc()
and net_passive_dec().").
commit edd3cb05c00a040dc72bed20b14b5ba865188bce
Author: Simon Schuster <schuster.simon@siemens-energy.com>
Date: Mon, 1 Sep 2025 15:09:51 +0200
copy_process: pass clone_flags as u64 across calltree
With the introduction of clone3 in commit 7f192e3cd3 ("fork: add
clone3") the effective bit width of clone_flags on all architectures was
increased from 32-bit to 64-bit, with a new type of u64 for the flags.
However, for most consumers of clone_flags the interface was not
changed from the previous type of unsigned long.
While this works fine as long as none of the new 64-bit flag bits
(CLONE_CLEAR_SIGHAND and CLONE_INTO_CGROUP) are evaluated, this is still
undesirable in terms of the principle of least surprise.
Thus, this commit fixes all relevant interfaces of callees to
sys_clone3/copy_process (excluding the architecture-specific
copy_thread) to consistently pass clone_flags as u64, so that
no truncation to 32-bit integers occurs on 32-bit architectures.
Signed-off-by: Simon Schuster <schuster.simon@siemens-energy.com>
Link: https://lore.kernel.org/20250901-nios2-implement-clone3-v2-2-53fcf5577d57@siemens-energy.com
Acked-by: David Hildenbrand <david@redhat.com>
Reviewed-by: Lorenzo Stoakes <lorenzo.stoakes@oracle.com>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Christian Brauner <brauner@kernel.org>
Signed-off-by: Waiman Long <longman@redhat.com>
132 lines
3.0 KiB
C
132 lines
3.0 KiB
C
/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
|
|
#ifndef _LINUX_RSEQ_H
|
|
#define _LINUX_RSEQ_H
|
|
|
|
#ifdef CONFIG_RSEQ
|
|
|
|
#include <linux/preempt.h>
|
|
#include <linux/sched.h>
|
|
|
|
/*
|
|
* Map the event mask on the user-space ABI enum rseq_cs_flags
|
|
* for direct mask checks.
|
|
*/
|
|
enum rseq_event_mask_bits {
|
|
RSEQ_EVENT_PREEMPT_BIT = RSEQ_CS_FLAG_NO_RESTART_ON_PREEMPT_BIT,
|
|
RSEQ_EVENT_SIGNAL_BIT = RSEQ_CS_FLAG_NO_RESTART_ON_SIGNAL_BIT,
|
|
RSEQ_EVENT_MIGRATE_BIT = RSEQ_CS_FLAG_NO_RESTART_ON_MIGRATE_BIT,
|
|
};
|
|
|
|
enum rseq_event_mask {
|
|
RSEQ_EVENT_PREEMPT = (1U << RSEQ_EVENT_PREEMPT_BIT),
|
|
RSEQ_EVENT_SIGNAL = (1U << RSEQ_EVENT_SIGNAL_BIT),
|
|
RSEQ_EVENT_MIGRATE = (1U << RSEQ_EVENT_MIGRATE_BIT),
|
|
};
|
|
|
|
static inline void rseq_set_notify_resume(struct task_struct *t)
|
|
{
|
|
if (t->rseq)
|
|
set_tsk_thread_flag(t, TIF_NOTIFY_RESUME);
|
|
}
|
|
|
|
void __rseq_handle_notify_resume(struct ksignal *sig, struct pt_regs *regs);
|
|
|
|
static inline void rseq_handle_notify_resume(struct ksignal *ksig,
|
|
struct pt_regs *regs)
|
|
{
|
|
if (current->rseq)
|
|
__rseq_handle_notify_resume(ksig, regs);
|
|
}
|
|
|
|
static inline void rseq_signal_deliver(struct ksignal *ksig,
|
|
struct pt_regs *regs)
|
|
{
|
|
preempt_disable();
|
|
__set_bit(RSEQ_EVENT_SIGNAL_BIT, ¤t->rseq_event_mask);
|
|
preempt_enable();
|
|
rseq_handle_notify_resume(ksig, regs);
|
|
}
|
|
|
|
/* rseq_preempt() requires preemption to be disabled. */
|
|
static inline void rseq_preempt(struct task_struct *t)
|
|
{
|
|
__set_bit(RSEQ_EVENT_PREEMPT_BIT, &t->rseq_event_mask);
|
|
rseq_set_notify_resume(t);
|
|
}
|
|
|
|
/* rseq_migrate() requires preemption to be disabled. */
|
|
static inline void rseq_migrate(struct task_struct *t)
|
|
{
|
|
__set_bit(RSEQ_EVENT_MIGRATE_BIT, &t->rseq_event_mask);
|
|
rseq_set_notify_resume(t);
|
|
}
|
|
|
|
/*
|
|
* If parent process has a registered restartable sequences area, the
|
|
* child inherits. Unregister rseq for a clone with CLONE_VM set.
|
|
*/
|
|
static inline void rseq_fork(struct task_struct *t, u64 clone_flags)
|
|
{
|
|
if (clone_flags & CLONE_VM) {
|
|
t->rseq = NULL;
|
|
t->rseq_len = 0;
|
|
t->rseq_sig = 0;
|
|
t->rseq_event_mask = 0;
|
|
} else {
|
|
t->rseq = current->rseq;
|
|
t->rseq_len = current->rseq_len;
|
|
t->rseq_sig = current->rseq_sig;
|
|
t->rseq_event_mask = current->rseq_event_mask;
|
|
}
|
|
}
|
|
|
|
static inline void rseq_execve(struct task_struct *t)
|
|
{
|
|
t->rseq = NULL;
|
|
t->rseq_len = 0;
|
|
t->rseq_sig = 0;
|
|
t->rseq_event_mask = 0;
|
|
}
|
|
|
|
#else
|
|
|
|
static inline void rseq_set_notify_resume(struct task_struct *t)
|
|
{
|
|
}
|
|
static inline void rseq_handle_notify_resume(struct ksignal *ksig,
|
|
struct pt_regs *regs)
|
|
{
|
|
}
|
|
static inline void rseq_signal_deliver(struct ksignal *ksig,
|
|
struct pt_regs *regs)
|
|
{
|
|
}
|
|
static inline void rseq_preempt(struct task_struct *t)
|
|
{
|
|
}
|
|
static inline void rseq_migrate(struct task_struct *t)
|
|
{
|
|
}
|
|
static inline void rseq_fork(struct task_struct *t, u64 clone_flags)
|
|
{
|
|
}
|
|
static inline void rseq_execve(struct task_struct *t)
|
|
{
|
|
}
|
|
|
|
#endif
|
|
|
|
#ifdef CONFIG_DEBUG_RSEQ
|
|
|
|
void rseq_syscall(struct pt_regs *regs);
|
|
|
|
#else
|
|
|
|
static inline void rseq_syscall(struct pt_regs *regs)
|
|
{
|
|
}
|
|
|
|
#endif
|
|
|
|
#endif /* _LINUX_RSEQ_H */
|