From owner-svn-src-all@freebsd.org Thu Feb 13 21:49:14 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id ACD60237270; Thu, 13 Feb 2020 21:49:14 +0000 (UTC) (envelope-from rpokala@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48JVXB45n9z4cyt; Thu, 13 Feb 2020 21:49:14 +0000 (UTC) (envelope-from rpokala@freebsd.org) Received: from [172.17.133.228] (unknown [12.202.168.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: rpokala) by smtp.freebsd.org (Postfix) with ESMTPSA id C3BA85C61; Thu, 13 Feb 2020 21:49:13 +0000 (UTC) (envelope-from rpokala@freebsd.org) User-Agent: Microsoft-MacOutlook/10.22.0.200209 Date: Thu, 13 Feb 2020 13:49:09 -0800 Subject: Re: svn commit: r357865 - in head/sys/amd64/vmm: . io From: Ravi Pokala To: Konstantin Belousov , , , Message-ID: <5C7C143D-5F7E-4B5E-933F-6AFD0C37BD88@panasas.com> Thread-Topic: svn commit: r357865 - in head/sys/amd64/vmm: . io References: <202002131903.01DJ3DDN044487@repo.freebsd.org> In-Reply-To: <202002131903.01DJ3DDN044487@repo.freebsd.org> Mime-version: 1.0 Content-type: text/plain; charset="UTF-8" Content-transfer-encoding: quoted-printable X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Feb 2020 21:49:14 -0000 Why "svm"? -Ravi (rpokala@) =EF=BB=BF-----Original Message----- From: on behalf of Konstantin Belousov <= kib@FreeBSD.org> Date: 2020-02-13, Thursday at 11:03 To: , , Subject: svn commit: r357865 - in head/sys/amd64/vmm: . io Author: kib Date: Thu Feb 13 19:03:12 2020 New Revision: 357865 URL: https://svnweb.freebsd.org/changeset/base/357865 =20 Log: vmm: Add Hygon Dhyana support. =20 Submitted by: Pu Wen Discussed with: grehan Reviewed by: jhb (previous version) MFC after: 1 week Differential revision: https://reviews.freebsd.org/D23553 =20 Modified: head/sys/amd64/vmm/io/iommu.c head/sys/amd64/vmm/vmm.c head/sys/amd64/vmm/vmm_stat.c head/sys/amd64/vmm/vmm_util.c head/sys/amd64/vmm/vmm_util.h head/sys/amd64/vmm/x86.c =20 Modified: head/sys/amd64/vmm/io/iommu.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D --- head/sys/amd64/vmm/io/iommu.c Thu Feb 13 18:37:17 2020 (r357864) +++ head/sys/amd64/vmm/io/iommu.c Thu Feb 13 19:03:12 2020 (r357865) @@ -184,7 +184,7 @@ iommu_init(void) =20 if (vmm_is_intel()) ops =3D &iommu_ops_intel; - else if (vmm_is_amd()) + else if (vmm_is_svm()) ops =3D &iommu_ops_amd; else ops =3D NULL; =20 Modified: head/sys/amd64/vmm/vmm.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D --- head/sys/amd64/vmm/vmm.c Thu Feb 13 18:37:17 2020 (r357864) +++ head/sys/amd64/vmm/vmm.c Thu Feb 13 19:03:12 2020 (r357865) @@ -347,7 +347,7 @@ vmm_init(void) if (vmm_is_intel()) ops =3D &vmm_ops_intel; - else if (vmm_is_amd()) + else if (vmm_is_svm()) ops =3D &vmm_ops_amd; else return (ENXIO); =20 Modified: head/sys/amd64/vmm/vmm_stat.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D --- head/sys/amd64/vmm/vmm_stat.c Thu Feb 13 18:37:17 2020 (r357864) +++ head/sys/amd64/vmm/vmm_stat.c Thu Feb 13 19:03:12 2020 (r357865) @@ -67,7 +67,7 @@ vmm_stat_register(void *arg) if (vst->scope =3D=3D VMM_STAT_SCOPE_INTEL && !vmm_is_intel()) return; =20 - if (vst->scope =3D=3D VMM_STAT_SCOPE_AMD && !vmm_is_amd()) + if (vst->scope =3D=3D VMM_STAT_SCOPE_AMD && !vmm_is_svm()) return; =20 if (vst_num_elems + vst->nelems >=3D MAX_VMM_STAT_ELEMS) { =20 Modified: head/sys/amd64/vmm/vmm_util.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D --- head/sys/amd64/vmm/vmm_util.c Thu Feb 13 18:37:17 2020 (r357864) +++ head/sys/amd64/vmm/vmm_util.c Thu Feb 13 19:03:12 2020 (r357865) @@ -46,9 +46,10 @@ vmm_is_intel(void) } =20 bool -vmm_is_amd(void) +vmm_is_svm(void) { - return (strcmp(cpu_vendor, "AuthenticAMD") =3D=3D 0); + return (strcmp(cpu_vendor, "AuthenticAMD") =3D=3D 0 || + strcmp(cpu_vendor, "HygonGenuine") =3D=3D 0); } =20 bool =20 Modified: head/sys/amd64/vmm/vmm_util.h =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D --- head/sys/amd64/vmm/vmm_util.h Thu Feb 13 18:37:17 2020 (r357864) +++ head/sys/amd64/vmm/vmm_util.h Thu Feb 13 19:03:12 2020 (r357865) @@ -34,7 +34,7 @@ struct trapframe; =20 bool vmm_is_intel(void); -bool vmm_is_amd(void); +bool vmm_is_svm(void); bool vmm_supports_1G_pages(void); =20 void dump_trapframe(struct trapframe *tf); =20 Modified: head/sys/amd64/vmm/x86.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D --- head/sys/amd64/vmm/x86.c Thu Feb 13 18:37:17 2020 (r357864) +++ head/sys/amd64/vmm/x86.c Thu Feb 13 19:03:12 2020 (r357865) @@ -135,7 +135,7 @@ x86_emulate_cpuid(struct vm *vm, int vcpu_id, break; case CPUID_8000_0008: cpuid_count(*eax, *ecx, regs); - if (vmm_is_amd()) { + if (vmm_is_svm()) { /* * As on Intel (0000_0007:0, EDX), mask out * unsupported or unsafe AMD extended features @@ -234,7 +234,7 @@ x86_emulate_cpuid(struct vm *vm, int vcpu_id, =20 case CPUID_8000_001D: /* AMD Cache topology, like 0000_0004 for Intel. */ - if (!vmm_is_amd()) + if (!vmm_is_svm()) goto default_leaf; =20 /* @@ -276,8 +276,11 @@ x86_emulate_cpuid(struct vm *vm, int vcpu_id, break; =20 case CPUID_8000_001E: - /* AMD Family 16h+ additional identifiers */ - if (!vmm_is_amd() || CPUID_TO_FAMILY(cpu_id) < 0x16) + /* + * AMD Family 16h+ and Hygon Family 18h additional + * identifiers. + */ + if (!vmm_is_svm() || CPUID_TO_FAMILY(cpu_id) < 0x16) goto default_leaf; =20 vm_get_topology(vm, &sockets, &cores, &threads, =20