From nobody Mon Sep 25 11:00:50 2023 X-Original-To: dev-commits-src-branches@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 4RvKfq1XNgz4vMZp; Mon, 25 Sep 2023 11:00:51 +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 4RvKfp61tSz3M82; Mon, 25 Sep 2023 11:00:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695639650; 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=xabEW/ik/AqwdAkCvPs8NvA8hgW0X7O5swk1E2vlFL0=; b=Zxsb+JiZWWnH5ZU0KdVA/fZsdqwnX9ZudB1nXnRDzw9x9fbcivhr4l/p/Ed4SXPM+2ugBM AGtaGoLR167clAO1jm3HB1U6T9TOlgcyCo8iph7IPzuLgMSQxGG7aLtNNEhE1Jcj/T9akl jEnEVt/6j9OtyTCX5ggD9HjNxTmWwX3A2fM7THqUimsXmrB6uwViGl5ylqo17A0xx3yn0v qx9GwiJQDMiPHikbAjhQ4AiDnfCluG8wr/ne9E70rTVaOvOZ7bkJ9qp9yUgAREaj7YJqBV cMOSimouUajc/2OMT5heEVPH4iP0YmwlyO0/CjqdoD+gRUFuqvMkU3mn4lo6Aw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695639650; a=rsa-sha256; cv=none; b=PD00z0+10ohcGATzFWrZq4DzFL9QbnMCKSLWujpEprbdrqC38T5LV6E0CnFlUSCni6CeQK mlovWE+wUiHb1lbYGyXq6p1SEW9zoTWPFFr/d3orAn2eCJJkGOeA0VDSrACQzDaWp0YIET Uix9tAMOr+8hnvrGLTwP2gVcqRxvkEyr0t9YMmmkFgpfkNWo7Uy0UCrvFtIXAmYmzNiw6y 85Maa+wEiE1ZMXPXRZUm5891/IorNWmTYn1LxO8dW84HJIZqAxiuWtaIJeWBbhJBYMqI5e kj/EfSPHPqr6BaLhtyWZfg1VNJeQ+12QzRr8D31MQ1gb7puw6C3vWhUpxadOqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695639650; 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=xabEW/ik/AqwdAkCvPs8NvA8hgW0X7O5swk1E2vlFL0=; b=c5yVuVCxmDT6Q3UMAFiN3DzInjmUFiqKJ38VCcmKOKrgNX+A0wt4kFFBhXfTatLqt1+gPp y9CipZeIOvVezhxP5V4qS//d6mICcGE1xnpHi4QdEfbdO0TacRmlLdN1wSZ0dV4wLrL4B2 L03tbM/fY3MT7c0iyA2HGtDpjMij28U73d9nkZpu9u7zj79ZYo0azvYpFguCNdlOUeWPsa PWys5g+3VE1RMbcrzFVy3Kcns9Hrjs/XrnhCiwPnMhTMcM5uKG662SAx5VVWOXmyrrotsD 1DBUxNp8eG3Bu/YgE1GiKml0Hly39BAJphBwaeQbpiQjuzejGaFhHeS6FZyDag== 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 4RvKfp538dz1QSd; Mon, 25 Sep 2023 11:00:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38PB0oBR052627; Mon, 25 Sep 2023 11:00:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38PB0oRA052624; Mon, 25 Sep 2023 11:00:50 GMT (envelope-from git) Date: Mon, 25 Sep 2023 11:00:50 GMT Message-Id: <202309251100.38PB0oRA052624@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: e19bdeccc89a - stable/13 - Split out pmap_map_delete on arm64 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: e19bdeccc89a76727ddb56c9c2dbfc66daf9003a Auto-Submitted: auto-generated The branch stable/13 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=e19bdeccc89a76727ddb56c9c2dbfc66daf9003a commit e19bdeccc89a76727ddb56c9c2dbfc66daf9003a Author: Andrew Turner AuthorDate: 2023-04-28 10:54:19 +0000 Commit: Andrew Turner CommitDate: 2023-09-25 08:41:16 +0000 Split out pmap_map_delete on arm64 This will be used when supporting some extensions, e.g. Branch Target Identification (BTI). Sponsored by: Arm Ltd (cherry picked from commit 020edaea2ab05c9cea7d83872f28a4e5e65407e2) --- sys/arm64/arm64/pmap.c | 12 ++++++++++++ sys/arm64/include/pmap.h | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/sys/arm64/arm64/pmap.c b/sys/arm64/arm64/pmap.c index edd34bcd5e68..037f1d5a805f 100644 --- a/sys/arm64/arm64/pmap.c +++ b/sys/arm64/arm64/pmap.c @@ -3294,6 +3294,18 @@ pmap_remove(pmap_t pmap, vm_offset_t sva, vm_offset_t eva) vm_page_free_pages_toq(&free, true); } +/* + * Remove the given range of addresses as part of a logical unmap + * operation. This has the effect of calling pmap_remove(), but + * also clears any metadata that should persist for the lifetime + * of a logical mapping. + */ +void +pmap_map_delete(pmap_t pmap, vm_offset_t sva, vm_offset_t eva) +{ + pmap_remove(pmap, sva, eva); +} + /* * Routine: pmap_remove_all * Function: diff --git a/sys/arm64/include/pmap.h b/sys/arm64/include/pmap.h index 95e43eada9cc..7305b8d32e87 100644 --- a/sys/arm64/include/pmap.h +++ b/sys/arm64/include/pmap.h @@ -177,7 +177,7 @@ int pmap_pinit_stage(pmap_t, enum pmap_stage, int); bool pmap_ps_enabled(pmap_t pmap); uint64_t pmap_to_ttbr0(pmap_t pmap); void pmap_disable_promotion(vm_offset_t sva, vm_size_t size); -#define pmap_map_delete(pmap, sva, eva) pmap_remove(pmap, sva, eva) +void pmap_map_delete(pmap_t, vm_offset_t, vm_offset_t); void *pmap_mapdev(vm_offset_t, vm_size_t); void *pmap_mapbios(vm_paddr_t, vm_size_t);