From nobody Sat Dec 17 17:09:23 2022 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 4NZCBC4YdTzt54B; Sat, 17 Dec 2022 17:09:23 +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 4NZCBC3Ykgz3vry; Sat, 17 Dec 2022 17:09:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671296963; 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=CIHC1mckMMsCaqMVbNzDq3ISsT2i2u3Zy4PjU87h7Nc=; b=rF8muDRS8IWKZ703+In88LtKnGvjTVpZjBaC/ewq0bP5uBj5Jfjazn2vZ+/b+VEAQtvK3z 0ABWt/iPiPOfAjJgyjPDLcwManb/mqT4FOqt7iVdSJmIFClV2qdQwwWO9ngN0ISG1v5Y5h kH6gxG5FpIjpDSHvWnVmljzLQ2/7l7R8rOA4u2sJU6kp1nDHwzhmVqmzRqLDX92o3ngd8f oRooSYkSHggll9901likwrD7fwWfqDtKdWESfv34FfIlaSgRA+QBEm4JupZnULtZuGpIZG 7xQBlf6w5wuL07tz0FLu7HHxV7c1pK5wGU5RzFV8rP89T5L73rpYsxaCYcAtuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671296963; 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=CIHC1mckMMsCaqMVbNzDq3ISsT2i2u3Zy4PjU87h7Nc=; b=uKOqnzRS41hEHhpxJ1yBb9uf7xSdkSs+h2bytlfBQDAb+00y52B5quigUwCjbVTUzcjQcC DP8vcgBxrHPic5o6LN6qR808BndnV0QPr5vspdbHc7ERW3BP/uoRO52h8oH/poBwNJ+8Iu WLFIJAqJa8ZfvGT4Co55XNCipSswpWtvq9ktjWhQp5cbjNApaQ+M52QS1Hj1ksK2MQL32E +qs/6W9VE7Uh7YUiZLwBlIQW/TKOY3IDoqttann8nx2lwsQJriRAGAdgCqnpnbp8ChN111 urrxKXhuUd4oP29kqD2m8PTxtyTEJGcSI1ECRnjL/SdNJtGzOSfMiFvRzyQm/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1671296963; a=rsa-sha256; cv=none; b=tzVgfEEb9AvELa4BN1bZX9QOO7I940uIpxszK7KonuovndiMycFC89LaNbOOZkliTyYuMz aHLyHUlU38pYrSp+j3+0rgdQKP/wIqr4AuO4+kiD8j7XiKiK06fsTXKP01EySlmTktm/f2 UEPHZeywqZsB/nihA8A3LznxziusZEidZBhdYUagNYHqlLzh71FbqHDC0GSzH3YXzlvNGQ oDwKSoXpY6vqI7n+hDU2AtKNdf3OlKTskeDqEygsI3w8FIgjLY+jSO2Ndu+niP+O/gdx1s 6CZIS269+rFyrtPY+56DZyvlSS6eU/KToEH9AeeTCIfsVTTmHuhM80ix+NpWHg== 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 4NZCBC2gj0z10NF; Sat, 17 Dec 2022 17:09:23 +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 2BHH9N0q087669; Sat, 17 Dec 2022 17:09:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BHH9NJg087668; Sat, 17 Dec 2022 17:09:23 GMT (envelope-from git) Date: Sat, 17 Dec 2022 17:09:23 GMT Message-Id: <202212171709.2BHH9NJg087668@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 4d903a1a74d9 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 4d903a1a74d9526aba4d177e89c10f97df5662f2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=4d903a1a74d9526aba4d177e89c10f97df5662f2 commit 4d903a1a74d9526aba4d177e89c10f97df5662f2 Author: Konstantin Belousov AuthorDate: 2022-12-17 11:03:32 +0000 Commit: Konstantin Belousov CommitDate: 2022-12-17 17:01:56 +0000 tmpfs_getattr(): Only take vm_object lock on 32bit machines Torn reads are only possible for 32bit arches. Requested by: mjg Reviewed by: mjg, markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D37725 --- 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 4d95441c05e4..1e3a4ac68f3f 100644 --- a/sys/fs/tmpfs/tmpfs_vnops.c +++ b/sys/fs/tmpfs/tmpfs_vnops.c @@ -491,7 +491,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); @@ -516,10 +515,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; }