From owner-svn-src-all@freebsd.org Fri Dec 27 13:37:20 2019 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 954A61ED52D; Fri, 27 Dec 2019 13:37:20 +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 47kntm2Fpmz46cF; Fri, 27 Dec 2019 13:37:20 +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 481FC19972; Fri, 27 Dec 2019 13:37:20 +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 xBRDbKCC090781; Fri, 27 Dec 2019 13:37:20 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xBRDbKRS090780; Fri, 27 Dec 2019 13:37:20 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <201912271337.xBRDbKRS090780@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Fri, 27 Dec 2019 13:37:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r356122 - head/sys/kern X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/kern X-SVN-Commit-Revision: 356122 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: Fri, 27 Dec 2019 13:37:20 -0000 Author: mjg Date: Fri Dec 27 13:37:19 2019 New Revision: 356122 URL: https://svnweb.freebsd.org/changeset/base/356122 Log: Plug a warning in read-mostly spinlocks reported by gcc. Modified: head/sys/kern/kern_rmlock.c Modified: head/sys/kern/kern_rmlock.c ============================================================================== --- head/sys/kern/kern_rmlock.c Fri Dec 27 11:26:12 2019 (r356121) +++ head/sys/kern/kern_rmlock.c Fri Dec 27 13:37:19 2019 (r356122) @@ -1064,7 +1064,8 @@ rms_wlock(struct rmslock *rms) mtx_lock(&rms->mtx); rms->writers++; if (rms->writers > 1) { - msleep(&rms->writers, &rms->mtx, PUSER - 1 | PDROP, mtx_name(&rms->mtx), 0); + msleep(&rms->writers, &rms->mtx, (PUSER - 1) | PDROP, + mtx_name(&rms->mtx), 0); MPASS(rms->readers == 0); return; } @@ -1072,7 +1073,8 @@ rms_wlock(struct rmslock *rms) rms_wlock_switch(rms); if (rms->readers > 0) - msleep(&rms->writers, &rms->mtx, PUSER - 1 | PDROP, mtx_name(&rms->mtx), 0); + msleep(&rms->writers, &rms->mtx, (PUSER - 1) | PDROP, + mtx_name(&rms->mtx), 0); else mtx_unlock(&rms->mtx); MPASS(rms->readers == 0);