From nobody Fri Jan 20 03:23:34 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NylFg0zQxz30vhq; Fri, 20 Jan 2023 03:23:35 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NylFf6kh1z3nMG; Fri, 20 Jan 2023 03:23:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674185014; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iDHo9Xr43FCBOM8fJZMcwlOzlL5U3t9MyoW7KUV9+R8=; b=kZKf41kJnmsbfpv7SMJ1d0m6wFiyd0S2/XD16BznmufBaj1Zndd0a9sEJi8dING21BPdUU rHqrW1SI0ymF8wfhIsSg6JWY22bwZxYU9+wiMNfTZ+S/adFoshyL+CcDZT5g99huUMAPPi D09eFebV/CLGMtQlyg3As1OlXQpaquC8g2gqLKFBQlY4QYmmypoWguoG1XgGAK8lThI3ds AwP7AinQkuOR4qfSOE2GLTeuvYcXRuoOoz8jlTSmEPQ//RyNDmzfW/0R35ff50r8MptSHk 7IsjxoI2oQsszuO/ehLi8sZwYz4NoLv/srSu2umbwTgUxCXsl46alHjfPIFORQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674185014; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iDHo9Xr43FCBOM8fJZMcwlOzlL5U3t9MyoW7KUV9+R8=; b=XkUlGf24uRtqrngUOLMUf/20syiWsTs869mmu0GbYhqhG08ENZl0Iz51HVDzN/z1rCj55U G+deSiQs6RgGDt+Uan51U1x/Cahn3Y+naNbHkWYdvN76HK3SAfkLgYGTtLD4d9TkqH4JVg I46C9M0lwROCuAH+v2NdEaUIHd2bPnGrJcjnKafQriJv+C1mNaIfWVUNOSrcLSjmJo+hfG WMFYfnOmhTZc32Wn2TW8NLRrKg6MArp1+DBs3gafTMIZ31auHE66M9s7XeRfjrpeR04Pad 8eSslo0xHolaiS6rUcoWq+kuR1Y1sfs7lEnK39gnXhN5AwrhRKb2Une1Vt8ovQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674185014; a=rsa-sha256; cv=none; b=ARhW9vUCUlHykxcYTMe7Wr5ZLOOOqtLcAjlVDFsWvwsbf6n1NkQbE88L5tr/vDRthwJUQF x4KyiWkEGasmHfb2cBqnVQoxd853HPtYHEerqPo29chxp4vggBZoye09+DDlsHEILOTRXP R4/Ag44LIhJoDt1hKjPDwMY5UJ/Wm/WpJFz0GLRoEKUw348pHYvpfnRFIjm3eb2xmdZG7q g1pwLwffRV9caU4FRXhtO1w/byN1o7e29RwzNCa8/nhC5FsV9r/LyCiCfNpseAe4IsgFw4 MXkFaFkhjyIJeWsXt6JUiGRFusH7hp5WhDV6TK/5n+hMgUxtja1AJpfaxiYirg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NylFf5rfKzG9K; Fri, 20 Jan 2023 03:23:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30K3NY2L042343; Fri, 20 Jan 2023 03:23:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30K3NY1v042342; Fri, 20 Jan 2023 03:23:34 GMT (envelope-from git) Date: Fri, 20 Jan 2023 03:23:34 GMT Message-Id: <202301200323.30K3NY1v042342@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: cf77a28cffc3 - stable/13 - tmpfs_getattr(): Only take vm_object lock on 32bit machines List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: cf77a28cffc32a6d529ce7421b1e66beced49c5c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=cf77a28cffc32a6d529ce7421b1e66beced49c5c commit cf77a28cffc32a6d529ce7421b1e66beced49c5c Author: Konstantin Belousov AuthorDate: 2022-12-17 11:03:32 +0000 Commit: Konstantin Belousov CommitDate: 2023-01-20 03:19:56 +0000 tmpfs_getattr(): Only take vm_object lock on 32bit machines Tested by: pho (cherry picked from commit 4d903a1a74d9526aba4d177e89c10f97df5662f2) --- sys/fs/tmpfs/tmpfs_vnops.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sys/fs/tmpfs/tmpfs_vnops.c b/sys/fs/tmpfs/tmpfs_vnops.c index 661004595f18..0074e3203bbb 100644 --- a/sys/fs/tmpfs/tmpfs_vnops.c +++ b/sys/fs/tmpfs/tmpfs_vnops.c @@ -498,7 +498,6 @@ tmpfs_getattr(struct vop_getattr_args *v) { struct vnode *vp = v->a_vp; struct vattr *vap = v->a_vap; - vm_object_t obj; struct tmpfs_node *node; node = VP_TO_TMPFS_NODE(vp); @@ -523,10 +522,15 @@ tmpfs_getattr(struct vop_getattr_args *v) vap->va_rdev = (vp->v_type == VBLK || vp->v_type == VCHR) ? node->tn_rdev : NODEV; if (vp->v_type == VREG) { - obj = node->tn_reg.tn_aobj; +#ifdef __ILP32__ + vm_object_t obj = node->tn_reg.tn_aobj; + VM_OBJECT_RLOCK(obj); +#endif vap->va_bytes = ptoa(node->tn_reg.tn_pages); +#ifdef __ILP32__ VM_OBJECT_RUNLOCK(obj); +#endif } else { vap->va_bytes = node->tn_size; }