From nobody Wed Sep 11 08:44:25 2024 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 4X3Yyy1KvMz5W7py; Wed, 11 Sep 2024 08:44:26 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4X3Yyy0HB0z41Nk; Wed, 11 Sep 2024 08:44:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726044266; 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=g+YxKgxPF8VCRRT4r4lUF22AKsE+DQknGl8nXjf78Fc=; b=aK/J5LarBuKARxkpkiQ4uZI0s6YFxKAvSD1QFJor6WnZqvo/DYqdppEVT/7J7RNzIl2KzR E4DrAvPhL5ZkHWN/9loap1WLULgl5NcKWQHd8wpOoNV0uNBhi9M4f8iO0hkRNqZmbM3BcG IsfgmNFv2noMV+v0nrTIRA2QpcECvTdhMifPahqa+DZyVD+iPugYPBXkPF00cuT4GA8MxO XwwxwCVTHkxBAX7UNgRafvFLMiIBl9VBW4uH2pgu/MioV8s5OjdmhehQiw0SfEzN30wZtI waQ6DTFKHCipHXv0iw+QbQVNiwFF5eshNXBS+1T3nmQh+C7NTuiyQWK73t962g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726044266; a=rsa-sha256; cv=none; b=s4IgKFxArJuRzwDewkvKJ9BhV3VZ/r2X8eUjROASTqzkduuhT4206Mj0X0ydKweEtA3pNC EdnLBBOIpEw3Yz1ykwTQ/HCfW4rYAsZzVaJsW2ALSFZWvqgjJ4xacel9COSzmtW1b8+4qx LxLMS3LAwEkdu45Oi/xMQSzH/xr+UkKPOWUP0VHJnSMcCykg7jihZqDC+KJN+KbGClz3ng 1xIQi0X1kh6MZCGNv5HdyEg32TOH1vwwfi6FR4uJPWlc7HH3t5D27G72uz+TGZCbFlZuzi ZGLasRVAZFAiuInc+rEMBIcWSydfh21bHDAQmsYN3gaVwC4PmvSXNz91x+AXBg== 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=1726044266; 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=g+YxKgxPF8VCRRT4r4lUF22AKsE+DQknGl8nXjf78Fc=; b=OLqI2ylRE6MAWL5JJ1SIuC/W3aC7w4yJUgWYAbqM7u1phB3u8wSCFzPjrTAYwCFZbDcuXv n59UaK2HfJ9euTMfkv5mmyyBHlrgYba1BGNjn/xvtgpWEyAVU8K/OwMQ5iOTSNG/EXWKnK zjrEjylobLjXfFricOPTiLIXdD2hLsxfzumfL0gANGmkwKiElWVaIUtRoqEcF+13e0sXFZ 776LgqsdpisCFAd1Vh1g71arXPCC1gWNM/EEN0p0meltMy+5PFUmDkdX0NvVA6uqBXBvC7 PLudSKE+l+TURn/WPDhZHqo193hsiXbkWD4f7/4EXKEC0MNEWvU2zAY7AVq3BQ== 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 4X3Yyx71WzzPMg; Wed, 11 Sep 2024 08:44:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48B8iPXb007539; Wed, 11 Sep 2024 08:44:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48B8iPEa007536; Wed, 11 Sep 2024 08:44:25 GMT (envelope-from git) Date: Wed, 11 Sep 2024 08:44:25 GMT Message-Id: <202409110844.48B8iPEa007536@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: 93865104f762 - stable/14 - DMAR: rename domain_{alloc,free}_pgtbl to domain_domain_$1_pgtbl 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: 93865104f7620542fadb2f43baa6f50b3ecd4946 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=93865104f7620542fadb2f43baa6f50b3ecd4946 commit 93865104f7620542fadb2f43baa6f50b3ecd4946 Author: Konstantin Belousov AuthorDate: 2024-06-30 03:52:52 +0000 Commit: Konstantin Belousov CommitDate: 2024-09-11 08:43:59 +0000 DMAR: rename domain_{alloc,free}_pgtbl to domain_domain_$1_pgtbl (cherry picked from commit 23145534154c279e3e8cbcd17d155f7ee67d8aa9) --- sys/x86/iommu/intel_ctx.c | 4 ++-- sys/x86/iommu/intel_dmar.h | 4 ++-- sys/x86/iommu/intel_idpgtbl.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/x86/iommu/intel_ctx.c b/sys/x86/iommu/intel_ctx.c index 62e4e17e5d9b..082c05ff4c83 100644 --- a/sys/x86/iommu/intel_ctx.c +++ b/sys/x86/iommu/intel_ctx.c @@ -425,7 +425,7 @@ dmar_domain_alloc(struct dmar_unit *dmar, bool id_mapped) } domain->iodom.flags |= IOMMU_DOMAIN_IDMAP; } else { - error = domain_alloc_pgtbl(domain); + error = dmar_domain_alloc_pgtbl(domain); if (error != 0) goto fail; /* Disable local apic region access */ @@ -511,7 +511,7 @@ dmar_domain_destroy(struct dmar_domain *domain) if ((domain->iodom.flags & IOMMU_DOMAIN_PGTBL_INITED) != 0) { if (domain->pgtbl_obj != NULL) DMAR_DOMAIN_PGLOCK(domain); - domain_free_pgtbl(domain); + dmar_domain_free_pgtbl(domain); } iommu_domain_fini(iodom); dmar = DOM2DMAR(domain); diff --git a/sys/x86/iommu/intel_dmar.h b/sys/x86/iommu/intel_dmar.h index 8a815d5cfca6..7b4a7900fa25 100644 --- a/sys/x86/iommu/intel_dmar.h +++ b/sys/x86/iommu/intel_dmar.h @@ -240,8 +240,8 @@ vm_object_t domain_get_idmap_pgtbl(struct dmar_domain *domain, void put_idmap_pgtbl(vm_object_t obj); void domain_flush_iotlb_sync(struct dmar_domain *domain, iommu_gaddr_t base, iommu_gaddr_t size); -int domain_alloc_pgtbl(struct dmar_domain *domain); -void domain_free_pgtbl(struct dmar_domain *domain); +int dmar_domain_alloc_pgtbl(struct dmar_domain *domain); +void dmar_domain_free_pgtbl(struct dmar_domain *domain); extern const struct iommu_domain_map_ops dmar_domain_map_ops; int dmar_dev_depth(device_t child); diff --git a/sys/x86/iommu/intel_idpgtbl.c b/sys/x86/iommu/intel_idpgtbl.c index deee50858dd2..79e184035b23 100644 --- a/sys/x86/iommu/intel_idpgtbl.c +++ b/sys/x86/iommu/intel_idpgtbl.c @@ -697,7 +697,7 @@ domain_unmap_buf(struct iommu_domain *iodom, iommu_gaddr_t base, } int -domain_alloc_pgtbl(struct dmar_domain *domain) +dmar_domain_alloc_pgtbl(struct dmar_domain *domain) { vm_page_t m; @@ -719,7 +719,7 @@ domain_alloc_pgtbl(struct dmar_domain *domain) } void -domain_free_pgtbl(struct dmar_domain *domain) +dmar_domain_free_pgtbl(struct dmar_domain *domain) { vm_object_t obj; vm_page_t m;