From nobody Thu Jan 26 22:11:37 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 4P2w0T3rR7z3c83Z; Thu, 26 Jan 2023 22:11:37 +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 4P2w0T3NYqz3tqn; Thu, 26 Jan 2023 22:11:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674771097; 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=WdxDGpyznFLpUXT6lBBS+z+Ll9g5CkRO7ehv6Y2ThBg=; b=jFFsoYLJjUn74FfHQGWmhnh0WKCHnkQHKOQNe4aOTM6vrN0qGHy0rSnWBE/lNRDnJF7tQJ CJfDeJOZw8VR2bFblNGRVocGIwIMPcu39Yp1DW0hB75+0xVZraGvfYT/Zdc96oxcX0bdez Aal2oe7+0R4q066M/yVt2Jll0l6FD5b4bGgMk3XMF6oXmrRZVr5YoDcfd6oTQtNSy2lfHF qOwZGtG9BvLNcFoRMN1+963/J2ITXb0V+7zfHtpb7Mv4r2gnIHXlee/Rs9C5+RFX1X1BT6 NDisYcOv6LbugR4UfQyTSXDB/s7zvoYOoeoIB+VrIpdCs0EfU0LjbMj+nH8FJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674771097; 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=WdxDGpyznFLpUXT6lBBS+z+Ll9g5CkRO7ehv6Y2ThBg=; b=FH4Zt7PCRKaDRMKg3H7zZ5lIXcr6xDxzduwzDlLq7/jj9aRff3iJFiAQ11+mDOvrGviXv2 ztr2CLB94Yg7cyAEuXnfWpmtCTRWqzeRxz/4PHTLD6QaLh07jDy+U6cNOATqUEU/r2O87k SnkimNF4PTQUjs7Js72ikKWlxpwrJkE2Mm50lrbJ08iZMq92CDc7QtRIUrReT0Lw+Lr/hI q/PyVzxEAQAFp4bgZLd6H4nsav+X8F+TsVCWF/6B0RDM9iRs/DpxnhEXLsjeBkpyDbMAAk Ei7lgrnpGjn4xDMYp6YZx9Ic9QqU/Fnjuc65vgtmpbChyiUHN19wGiuC/lViFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674771097; a=rsa-sha256; cv=none; b=UlU1WGATK4C7rzGvEVlHIa1qxlgv2XL9F6ruI6QRy6w9IeMxt5yRG2ov5h4E0EgcZOM3mA 0rbVZoKdHeEJezMm+MvGOUu8zYMTVaUuuWUU24wARbj24QzhqqQXy93ADSPkKhcCj3XD7X 9I5ntqXoXDx9H3cL9GdJOUV/L7c2QRtVS0K9oRvdIumSTEvo2y8RnTkadbR6AUYCbgw+Oe HV0v8FSGpfMbGSaubqW1AYVR1I374fdTz+4gzJivw3zij/YQC1v1l01CjR+goF/1wsBSim rbfMx6/Eu3OPga0+e/TuoJ9nkWRYoXYMD8wSNEzmKcCBiNPECycTgvT0y++aag== 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 4P2w0T2SmhzlVF; Thu, 26 Jan 2023 22:11:37 +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 30QMBbcV018505; Thu, 26 Jan 2023 22:11:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30QMBbvj018504; Thu, 26 Jan 2023 22:11:37 GMT (envelope-from git) Date: Thu, 26 Jan 2023 22:11:37 GMT Message-Id: <202301262211.30QMBbvj018504@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 5cf42db0f6b4 - stable/13 - vmm svm: Refactor per-vCPU data. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 5cf42db0f6b4d2fb4c581934b9eee643b6a5b698 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=5cf42db0f6b4d2fb4c581934b9eee643b6a5b698 commit 5cf42db0f6b4d2fb4c581934b9eee643b6a5b698 Author: John Baldwin AuthorDate: 2022-11-18 17:57:48 +0000 Commit: John Baldwin CommitDate: 2023-01-26 21:43:44 +0000 vmm svm: Refactor per-vCPU data. - Allocate VMCBs separately to avoid excessive padding in struct svm_vcpu. - Allocate APIC pages dynamically directly in struct vlapic. - Move vm_mtrr into struct svm_vcpu rather than using a separate parallel array. Reviewed by: corvink, markj Differential Revision: https://reviews.freebsd.org/D37148 (cherry picked from commit 215d2fd53f6c254cb900e1775abae86d3fdada65) --- sys/amd64/vmm/amd/svm.c | 17 +++++++++++++---- sys/amd64/vmm/amd/svm_msr.c | 4 ++-- sys/amd64/vmm/amd/svm_softc.h | 19 ++++++------------- 3 files changed, 21 insertions(+), 19 deletions(-) diff --git a/sys/amd64/vmm/amd/svm.c b/sys/amd64/vmm/amd/svm.c index 1a7990383b09..0db1e45594fa 100644 --- a/sys/amd64/vmm/amd/svm.c +++ b/sys/amd64/vmm/amd/svm.c @@ -565,8 +565,6 @@ svm_init(struct vm *vm, pmap_t pmap) uint16_t maxcpus; svm_sc = malloc(sizeof (*svm_sc), M_SVM, M_WAITOK | M_ZERO); - if (((uintptr_t)svm_sc & PAGE_MASK) != 0) - panic("malloc of svm_softc not aligned on page boundary"); svm_sc->msr_bitmap = contigmalloc(SVM_MSR_BITMAP_SIZE, M_SVM, M_WAITOK, 0, ~(vm_paddr_t)0, PAGE_SIZE, 0); @@ -619,9 +617,11 @@ svm_init(struct vm *vm, pmap_t pmap) maxcpus = vm_get_maxcpus(svm_sc->vm); for (i = 0; i < maxcpus; i++) { vcpu = svm_get_vcpu(svm_sc, i); + vcpu->vmcb = malloc_aligned(sizeof(struct vmcb), PAGE_SIZE, + M_SVM, M_WAITOK | M_ZERO); vcpu->nextrip = ~0; vcpu->lastcpu = NOCPU; - vcpu->vmcb_pa = vtophys(&vcpu->vmcb); + vcpu->vmcb_pa = vtophys(vcpu->vmcb); vmcb_init(svm_sc, i, iopm_pa, msrpm_pa, pml4_pa); svm_msr_guest_init(svm_sc, i); } @@ -2149,7 +2149,14 @@ static void svm_cleanup(void *arg) { struct svm_softc *sc = arg; + struct svm_vcpu *vcpu; + uint16_t i, maxcpus; + maxcpus = vm_get_maxcpus(sc->vm); + for (i = 0; i < maxcpus; i++) { + vcpu = svm_get_vcpu(sc, i); + free(vcpu->vmcb, M_SVM); + } contigfree(sc->iopm_bitmap, SVM_IO_BITMAP_SIZE, M_SVM); contigfree(sc->msr_bitmap, SVM_MSR_BITMAP_SIZE, M_SVM); free(sc, M_SVM); @@ -2400,7 +2407,8 @@ svm_vlapic_init(void *arg, int vcpuid) vlapic = malloc(sizeof(struct vlapic), M_SVM_VLAPIC, M_WAITOK | M_ZERO); vlapic->vm = svm_sc->vm; vlapic->vcpuid = vcpuid; - vlapic->apic_page = (struct LAPIC *)&svm_sc->apic_page[vcpuid]; + vlapic->apic_page = malloc_aligned(PAGE_SIZE, PAGE_SIZE, M_SVM_VLAPIC, + M_WAITOK | M_ZERO); vlapic_init(vlapic); @@ -2412,6 +2420,7 @@ svm_vlapic_cleanup(void *arg, struct vlapic *vlapic) { vlapic_cleanup(vlapic); + free(vlapic->apic_page, M_SVM_VLAPIC); free(vlapic, M_SVM_VLAPIC); } diff --git a/sys/amd64/vmm/amd/svm_msr.c b/sys/amd64/vmm/amd/svm_msr.c index 1a22f16cf48e..f0cea633a0cf 100644 --- a/sys/amd64/vmm/amd/svm_msr.c +++ b/sys/amd64/vmm/amd/svm_msr.c @@ -124,7 +124,7 @@ svm_rdmsr(struct svm_softc *sc, int vcpu, u_int num, uint64_t *result, case MSR_MTRR16kBase ... MSR_MTRR16kBase + 1: case MSR_MTRR64kBase: case MSR_MTRRVarBase ... MSR_MTRRVarBase + (VMM_MTRR_VAR_MAX * 2) - 1: - if (vm_rdmtrr(&sc->mtrr[vcpu], num, result) != 0) { + if (vm_rdmtrr(&sc->vcpu[vcpu].mtrr, num, result) != 0) { vm_inject_gp(sc->vm, vcpu); } break; @@ -156,7 +156,7 @@ svm_wrmsr(struct svm_softc *sc, int vcpu, u_int num, uint64_t val, bool *retu) case MSR_MTRR16kBase ... MSR_MTRR16kBase + 1: case MSR_MTRR64kBase: case MSR_MTRRVarBase ... MSR_MTRRVarBase + (VMM_MTRR_VAR_MAX * 2) - 1: - if (vm_wrmtrr(&sc->mtrr[vcpu], num, val) != 0) { + if (vm_wrmtrr(&sc->vcpu[vcpu].mtrr, num, val) != 0) { vm_inject_gp(sc->vm, vcpu); } break; diff --git a/sys/amd64/vmm/amd/svm_softc.h b/sys/amd64/vmm/amd/svm_softc.h index 5f6a267617d2..b9e53ac9d4a0 100644 --- a/sys/amd64/vmm/amd/svm_softc.h +++ b/sys/amd64/vmm/amd/svm_softc.h @@ -41,12 +41,8 @@ struct asid { uint32_t num; /* range is [1, nasid - 1] */ }; -/* - * XXX separate out 'struct vmcb' from 'svm_vcpu' to avoid wasting space - * due to VMCB alignment requirements. - */ struct svm_vcpu { - struct vmcb vmcb; /* hardware saved vcpu context */ + struct vmcb *vmcb; /* hardware saved vcpu context */ struct svm_regctx swctx; /* software saved vcpu context */ uint64_t vmcb_pa; /* VMCB physical address */ uint64_t nextrip; /* next instruction to be executed by guest */ @@ -54,23 +50,20 @@ struct svm_vcpu { uint32_t dirty; /* state cache bits that must be cleared */ long eptgen; /* pmap->pm_eptgen when the vcpu last ran */ struct asid asid; -} __aligned(PAGE_SIZE); + struct vm_mtrr mtrr; +}; /* * SVM softc, one per virtual machine. */ struct svm_softc { - uint8_t apic_page[VM_MAXCPU][PAGE_SIZE]; struct svm_vcpu vcpu[VM_MAXCPU]; vm_offset_t nptp; /* nested page table */ uint8_t *iopm_bitmap; /* shared by all vcpus */ uint8_t *msr_bitmap; /* shared by all vcpus */ struct vm *vm; - struct vm_mtrr mtrr[VM_MAXCPU]; }; -CTASSERT((offsetof(struct svm_softc, nptp) & PAGE_MASK) == 0); - static __inline struct svm_vcpu * svm_get_vcpu(struct svm_softc *sc, int vcpu) { @@ -82,21 +75,21 @@ static __inline struct vmcb * svm_get_vmcb(struct svm_softc *sc, int vcpu) { - return (&(sc->vcpu[vcpu].vmcb)); + return ((sc->vcpu[vcpu].vmcb)); } static __inline struct vmcb_state * svm_get_vmcb_state(struct svm_softc *sc, int vcpu) { - return (&(sc->vcpu[vcpu].vmcb.state)); + return (&(sc->vcpu[vcpu].vmcb->state)); } static __inline struct vmcb_ctrl * svm_get_vmcb_ctrl(struct svm_softc *sc, int vcpu) { - return (&(sc->vcpu[vcpu].vmcb.ctrl)); + return (&(sc->vcpu[vcpu].vmcb->ctrl)); } static __inline struct svm_regctx *