Unverified Commit cb3c3cb3 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!3935 pid_ns: Make pid_max per namespace 

Merge Pull Request from: @ci-robot 
 
PR sync from: Yi Yang <yiyang13@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/ZV4MFUHGQKKQQYAHMCUHF5XTWC7JUZ6Q/ 
 
https://gitee.com/openeuler/kernel/issues/I8TCPY 
 
Link:https://gitee.com/openeuler/kernel/pulls/3935

 

Reviewed-by: default avatarLu Jialin <lujialin4@huawei.com>
Reviewed-by: default avatarzhangyi (F) <yi.zhang@huawei.com>
Reviewed-by: default avatarZucheng Zheng <zhengzucheng@huawei.com>
Reviewed-by: default avatarZhang Jianhua <chris.zjh@huawei.com>
Reviewed-by: default avatarLiu Chao <liuchao173@huawei.com>
Reviewed-by: default avatarXu Kuohai <xukuohai@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parents c780cd23 ab9c1a22

arch/arm64/configs/openeuler_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -1007,6 +1007,7 @@ CONFIG_ARCH_USE_QUEUED_RWLOCKS=y 
CONFIG_QUEUED_RWLOCKS=y

CONFIG_ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE=y

CONFIG_ARCH_HAS_SYSCALL_WRAPPER=y

CONFIG_PID_MAX_PER_NAMESPACE=y

CONFIG_FREEZER=y



#

arch/x86/configs/openeuler_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -1022,6 +1022,7 @@ CONFIG_QUEUED_RWLOCKS=y 
CONFIG_ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE=y

CONFIG_ARCH_HAS_SYNC_CORE_BEFORE_USERMODE=y

CONFIG_ARCH_HAS_SYSCALL_WRAPPER=y

CONFIG_PID_MAX_PER_NAMESPACE=y

CONFIG_FREEZER=y



#

include/linux/pid.h

+2 −0
Original line number Diff line number Diff line
@@ -113,8 +113,10 @@ extern void transfer_pid(struct task_struct *old, struct task_struct *new, 
struct pid_namespace;

extern struct pid_namespace init_pid_ns;



#ifndef CONFIG_PID_MAX_PER_NAMESPACE

extern int pid_max;

extern int pid_max_min, pid_max_max;

#endif



/*

 * look up a PID in the hash table. Must be called with the tasklist_lock

include/linux/pid_namespace.h

+3 −0
Original line number Diff line number Diff line
@@ -36,6 +36,9 @@ struct pid_namespace { 
#endif

	struct user_namespace *user_ns;

	struct ucounts *ucounts;

#ifdef CONFIG_PID_MAX_PER_NAMESPACE

	int pid_max;

#endif

	int reboot;	/* group exit code if this pidns was rebooted */

	struct ns_common ns;

#if defined(CONFIG_SYSCTL) && defined(CONFIG_MEMFD_CREATE)

init/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -2147,3 +2147,10 @@ config ARCH_HAS_SYNC_CORE_BEFORE_USERMODE 
# <asm/syscall_wrapper.h>.

config ARCH_HAS_SYSCALL_WRAPPER

	def_bool n



config PID_MAX_PER_NAMESPACE

	bool "Make pid_max per namespace"

	depends on PID_NS

	default n

	help

	  Say Y here to enable make pid_max per namespace.