Page MenuHomeFreeBSD
Files F115813621

D26778.diff
No OneTemporary
Actions

D26778.diff
View Options

Index: head/sys/compat/linux/linux_emul.c
===================================================================
--- head/sys/compat/linux/linux_emul.c
+++ head/sys/compat/linux/linux_emul.c
@@ -115,6 +115,29 @@
KASSERT(error == 0, ("kern_proc_setrlimit failed"));
}
+/*
+ * The default stack size limit in Linux is 8MB.
+ */
+static void
+linux_set_default_stacksize(struct thread *td, struct proc *p)
+{
+ struct rlimit rlim;
+ int error;
+
+ if (linux_default_stacksize < 0)
+ return;
+
+ PROC_LOCK(p);
+ lim_rlimit_proc(p, RLIMIT_STACK, &rlim);
+ PROC_UNLOCK(p);
+ if (rlim.rlim_cur != rlim.rlim_max ||
+ rlim.rlim_cur <= linux_default_stacksize)
+ return;
+ rlim.rlim_cur = linux_default_stacksize;
+ error = kern_proc_setrlimit(td, p, RLIMIT_STACK, &rlim);
+ KASSERT(error == 0, ("kern_proc_setrlimit failed"));
+}
+
void
linux_proc_init(struct thread *td, struct thread *newtd, int flags)
{
@@ -145,6 +168,7 @@
newtd->td_emuldata = em;
linux_set_default_openfiles(td, p);
+ linux_set_default_stacksize(td, p);
} else {
p = td->td_proc;
Index: head/sys/compat/linux/linux_mib.h
===================================================================
--- head/sys/compat/linux/linux_mib.h
+++ head/sys/compat/linux/linux_mib.h
@@ -64,6 +64,7 @@
extern int linux_debug;
extern int linux_default_openfiles;
+extern int linux_default_stacksize;
extern int linux_ignore_ip_recverr;
extern int linux_preserve_vstatus;
extern bool linux_map_sched_prio;
Index: head/sys/compat/linux/linux_mib.c
===================================================================
--- head/sys/compat/linux/linux_mib.c
+++ head/sys/compat/linux/linux_mib.c
@@ -72,6 +72,11 @@
&linux_default_openfiles, 0,
"Default soft openfiles resource limit, or -1 for unlimited");
+int linux_default_stacksize = 8 * 1024 * 1024;
+SYSCTL_INT(_compat_linux, OID_AUTO, default_stacksize, CTLFLAG_RWTUN,
+ &linux_default_stacksize, 0,
+ "Default soft stack size resource limit, or -1 for unlimited");
+
int linux_ignore_ip_recverr = 1;
SYSCTL_INT(_compat_linux, OID_AUTO, ignore_ip_recverr, CTLFLAG_RWTUN,
&linux_ignore_ip_recverr, 0, "Ignore enabling IP_RECVERR");

File Metadata

Mime Type
text/plain
Expires
Wed, Apr 30, 1:02 AM (9 h, 59 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
17849226
Default Alt Text
D26778.diff (2 KB)

Event Timeline