From nobody Wed Apr 12 12:26:11 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 4PxMPv5BtVz44gsM; Wed, 12 Apr 2023 12:26:11 +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 4PxMPv4n9gz43Z6; Wed, 12 Apr 2023 12:26:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681302371; 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=CxvPAP6B+7xC2TBBA424az7yXvkdnm+b1hObHN+bhaU=; b=QpiqvCxCW9nCP2u9I/nzb2KgcpCNF71JoLgZrQWiaYI5EE2HI0dOZzDwJiyIVmTEgDyv3q OBHVZQrkWfp9yH/I+D0kkJJ3GtPiWH0nMJqR+z+WXlImH9B8UlwNn67nIBqh6Rj7aFp61j 1+i/ysjjoFIWSuKSheGQqw6zmWb8uUCLNXbq4APoDr+uX2l1BYvYAM4196kccelsT7wCTq g2CGqKtOBpcolJOThguntzr4Lsv7NPu1EE2hk/1JWq/LDKbusWFdNUU9hGP4PbpaAv7iiI W5BhFSomT7aDV89POnSBM4rHPFdjGpRDmlmgM2SnUFiFW0lvqnJbj86KG1KP8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681302371; 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=CxvPAP6B+7xC2TBBA424az7yXvkdnm+b1hObHN+bhaU=; b=izIYhif0TvMu70r7UZ2r3uayaRcunqvtfu116fY2IT+t2lde4fc6mGa263cJZ3VDn615w8 h/zJW5iDY37Dg9FsDQalEAHiKPdAnV9jEv8VU5V2uIVsmyZmk2Qb5VuRnCvi+VlEuP7W1K JCTciiCwARB1u3I17gqMVTA4VG+dqNYHs/LrwDVtSd3y6N0B+Jbs0ilLvdZSmvI0eR3eoj GL7NOVcxq+WwWyma73ycTE5ESS7SVdPpCMjAHqvF8xbRSaiKI38vAwAwyz9JoxG/OD36Y1 bwimUGJQa8NPC7qtz1dAnbvC+QFnE/jiSCYzjb1pm5rx1T9rNMkBqsN9KVZNFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681302371; a=rsa-sha256; cv=none; b=BC/Rsn3tz6hXGnE9b2wj2KOg4sf+asBjFbZHJ5LHYgn0a1lHrm3YdF6vbZJHtg8jimzeS4 gGJO+g/aCRdC92RXUQuApg4s+ldgLs/EhQDUGrL1DkkiGShS8orp0sAQMrpfPauE97PJlT sgWE2y5sr/zTmWW+yxUbwG2B2AnRXTBwqsAdRPRe2R7dqhrkcfaxqAKXMQU/UK2Ggud7GN N8L4FmSMEHb00xluCaSZJSJIWMyqzbh6o3SF+j+EVeuyh6raIQq0v5zA5g0RFz/SwhL62s 1NxAYraUJ5qwrm1QAdKquah8X8zYOXZZvUyjo1Z4MyxckGri57JhsmhSLuoQpg== 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 4PxMPv3tFcz10BJ; Wed, 12 Apr 2023 12:26:11 +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 33CCQB88088678; Wed, 12 Apr 2023 12:26:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33CCQBCK088677; Wed, 12 Apr 2023 12:26:11 GMT (envelope-from git) Date: Wed, 12 Apr 2023 12:26:11 GMT Message-Id: <202304121226.33CCQBCK088677@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 421516f25e9c - main - Create pmap_mask_set_locked on arm64 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: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 421516f25e9cfa91b33841f633a463889bc10af7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=421516f25e9cfa91b33841f633a463889bc10af7 commit 421516f25e9cfa91b33841f633a463889bc10af7 Author: Andrew Turner AuthorDate: 2023-04-12 12:09:06 +0000 Commit: Andrew Turner CommitDate: 2023-04-12 12:10:13 +0000 Create pmap_mask_set_locked on arm64 Create a locked version of pmap_mask_set. We will need this for BTI support. Sponsored by: Arm Ltd --- sys/arm64/arm64/pmap.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/sys/arm64/arm64/pmap.c b/sys/arm64/arm64/pmap.c index 2e5b2c23efd7..fc4650c8d449 100644 --- a/sys/arm64/arm64/pmap.c +++ b/sys/arm64/arm64/pmap.c @@ -3837,14 +3837,14 @@ pmap_protect_l2(pmap_t pmap, pt_entry_t *l2, vm_offset_t sva, pt_entry_t mask, * pmap and range */ static void -pmap_mask_set(pmap_t pmap, vm_offset_t sva, vm_offset_t eva, pt_entry_t mask, +pmap_mask_set_locked(pmap_t pmap, vm_offset_t sva, vm_offset_t eva, pt_entry_t mask, pt_entry_t nbits, bool invalidate) { vm_offset_t va, va_next; pd_entry_t *l0, *l1, *l2; pt_entry_t *l3p, l3; - PMAP_LOCK(pmap); + PMAP_LOCK_ASSERT(pmap, MA_OWNED); for (; sva < eva; sva = va_next) { l0 = pmap_l0(pmap, sva); if (pmap_load(l0) == 0) { @@ -3938,6 +3938,14 @@ pmap_mask_set(pmap_t pmap, vm_offset_t sva, vm_offset_t eva, pt_entry_t mask, if (va != va_next && invalidate) pmap_s1_invalidate_range(pmap, va, sva, true); } +} + +static void +pmap_mask_set(pmap_t pmap, vm_offset_t sva, vm_offset_t eva, pt_entry_t mask, + pt_entry_t nbits, bool invalidate) +{ + PMAP_LOCK(pmap); + pmap_mask_set_locked(pmap, sva, eva, mask, nbits, invalidate); PMAP_UNLOCK(pmap); }