From owner-svn-src-head@freebsd.org Wed Nov 1 06:12:16 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6D353E5DB28; Wed, 1 Nov 2017 06:12:16 +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 mx1.freebsd.org (Postfix) with ESMTPS id 3AF0783CE6; Wed, 1 Nov 2017 06:12:16 +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 vA16CFeU042390; Wed, 1 Nov 2017 06:12:15 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA16CF1S042388; Wed, 1 Nov 2017 06:12:15 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <201711010612.vA16CF1S042388@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Wed, 1 Nov 2017 06:12:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325264 - head/sys/kern X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/kern X-SVN-Commit-Revision: 325264 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Nov 2017 06:12:16 -0000 Author: mjg Date: Wed Nov 1 06:12:14 2017 New Revision: 325264 URL: https://svnweb.freebsd.org/changeset/base/325264 Log: Save on loginclass list locking by checking if caller already uses the struct Modified: head/sys/kern/init_main.c head/sys/kern/kern_loginclass.c Modified: head/sys/kern/init_main.c ============================================================================== --- head/sys/kern/init_main.c Wed Nov 1 05:51:20 2017 (r325263) +++ head/sys/kern/init_main.c Wed Nov 1 06:12:14 2017 (r325264) @@ -421,6 +421,9 @@ proc0_init(void *dummy __unused) struct thread *td; struct ucred *newcred; struct uidinfo tmpuinfo; + struct loginclass tmplc = { + .lc_name = "", + }; vm_paddr_t pageablemem; int i; @@ -509,10 +512,11 @@ proc0_init(void *dummy __unused) newcred->cr_uidinfo = newcred->cr_ruidinfo = &tmpuinfo; newcred->cr_uidinfo = uifind(0); newcred->cr_ruidinfo = uifind(0); + newcred->cr_loginclass = &tmplc; + newcred->cr_loginclass = loginclass_find("default"); /* End hack. creds get properly set later with thread_cow_get_proc */ curthread->td_ucred = NULL; newcred->cr_prison = &prison0; - newcred->cr_loginclass = loginclass_find("default"); proc_set_cred_init(p, newcred); #ifdef AUDIT audit_cred_kproc0(newcred); Modified: head/sys/kern/kern_loginclass.c ============================================================================== --- head/sys/kern/kern_loginclass.c Wed Nov 1 05:51:20 2017 (r325263) +++ head/sys/kern/kern_loginclass.c Wed Nov 1 06:12:14 2017 (r325264) @@ -131,9 +131,16 @@ struct loginclass * loginclass_find(const char *name) { struct loginclass *lc, *new_lc; + struct ucred *cred; if (name[0] == '\0' || strlen(name) >= MAXLOGNAME) return (NULL); + + lc = cred->cr_loginclass; + if (strcmp(name, lc->lc_name) == 0) { + loginclass_hold(lc); + return (lc); + } rw_rlock(&loginclasses_lock); lc = loginclass_lookup(name);