From owner-svn-src-all@freebsd.org Sat May 4 19:05:31 2019 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 630351595F4C; Sat, 4 May 2019 19:05:31 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0B9EE6D903; Sat, 4 May 2019 19:05:31 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DB37CC95A; Sat, 4 May 2019 19:05:30 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x44J5U2k083177; Sat, 4 May 2019 19:05:30 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x44J5ULR083174; Sat, 4 May 2019 19:05:30 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <201905041905.x44J5ULR083174@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Sat, 4 May 2019 19:05:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r347132 - head/sys/kern X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/kern X-SVN-Commit-Revision: 347132 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 0B9EE6D903 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.97)[-0.968,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 May 2019 19:05:31 -0000 Author: mjg Date: Sat May 4 19:05:30 2019 New Revision: 347132 URL: https://svnweb.freebsd.org/changeset/base/347132 Log: sysv: get rid of fork/exit hooks if the code is compiled in Sponsored by: The FreeBSD Foundation Modified: head/sys/kern/sysv_ipc.c head/sys/kern/sysv_shm.c Modified: head/sys/kern/sysv_ipc.c ============================================================================== --- head/sys/kern/sysv_ipc.c Sat May 4 19:04:17 2019 (r347131) +++ head/sys/kern/sysv_ipc.c Sat May 4 19:05:30 2019 (r347132) @@ -50,6 +50,7 @@ __FBSDID("$FreeBSD$"); #include #include +#ifndef SYSVSHM void (*shmfork_hook)(struct proc *, struct proc *) = NULL; void (*shmexit_hook)(struct vmspace *) = NULL; @@ -73,6 +74,7 @@ shmexit(struct vmspace *vm) shmexit_hook(vm); return; } +#endif /* * Check for IPC permission. Modified: head/sys/kern/sysv_shm.c ============================================================================== --- head/sys/kern/sysv_shm.c Sat May 4 19:04:17 2019 (r347131) +++ head/sys/kern/sysv_shm.c Sat May 4 19:05:30 2019 (r347132) @@ -137,8 +137,10 @@ static void shmrealloc(void); static int shminit(void); static int sysvshm_modload(struct module *, int, void *); static int shmunload(void); +#ifndef SYSVSHM static void shmexit_myhook(struct vmspace *vm); static void shmfork_myhook(struct proc *p1, struct proc *p2); +#endif static int sysctl_shmsegs(SYSCTL_HANDLER_ARGS); static void shm_remove(struct shmid_kernel *, int); static struct prison *shm_find_prison(struct ucred *); @@ -810,8 +812,13 @@ sys_shmget(struct thread *td, struct shmget_args *uap) return (error); } +#ifdef SYSVSHM +void +shmfork(struct proc *p1, struct proc *p2) +#else static void shmfork_myhook(struct proc *p1, struct proc *p2) +#endif { struct shmmap_state *shmmap_s; size_t size; @@ -834,8 +841,13 @@ shmfork_myhook(struct proc *p1, struct proc *p2) SYSVSHM_UNLOCK(); } +#ifdef SYSVSHM +void +shmexit(struct vmspace *vm) +#else static void shmexit_myhook(struct vmspace *vm) +#endif { struct shmmap_state *base, *shm; int i; @@ -956,8 +968,10 @@ shminit(void) shm_nused = 0; shm_committed = 0; sx_init(&sysvshmsx, "sysvshmsx"); +#ifndef SYSVSHM shmexit_hook = &shmexit_myhook; shmfork_hook = &shmfork_myhook; +#endif /* Set current prisons according to their allow.sysvipc. */ shm_prison_slot = osd_jail_register(NULL, methods); @@ -1021,8 +1035,10 @@ shmunload(void) vm_object_deallocate(shmsegs[i].object); } free(shmsegs, M_SHM); +#ifndef SYSVSHM shmexit_hook = NULL; shmfork_hook = NULL; +#endif sx_destroy(&sysvshmsx); return (0); }