Deleted Added
full compact
svm_softc.h (249967) svm_softc.h (259579)
1/*-
2 * Copyright (c) 2013 Anish Gupta (akgupt3@gmail.com)
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 9 unchanged lines hidden (view full) ---

18 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
19 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
20 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
21 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 *
1/*-
2 * Copyright (c) 2013 Anish Gupta (akgupt3@gmail.com)
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 9 unchanged lines hidden (view full) ---

18 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
19 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
20 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
21 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 *
26 * $FreeBSD: projects/bhyve_svm/sys/amd64/vmm/amd/svm_softc.h 249967 2013-04-27 04:49:51Z neel $
26 * $FreeBSD: projects/bhyve_svm/sys/amd64/vmm/amd/svm_softc.h 259579 2013-12-18 23:39:42Z grehan $
27 */
28
29#ifndef _SVM_SOFTC_H_
30#define _SVM_SOFTC_H_
31
32#define SVM_IO_BITMAP_SIZE (3 * PAGE_SIZE)
33#define SVM_MSR_BITMAP_SIZE (2 * PAGE_SIZE)
34

--- 22 unchanged lines hidden (view full) ---

57 * MSR permission bitmap, VMCB.ctrl.msrpm_base_pa should point to this.
58 * Two bits are used for each MSR with the LSB used for read access
59 * and the MSB used for write access. A value of '1' indicates that
60 * the operation is intercepted.
61 */
62 uint8_t msr_bitmap[SVM_MSR_BITMAP_SIZE];
63
64 /* Nested Paging */
27 */
28
29#ifndef _SVM_SOFTC_H_
30#define _SVM_SOFTC_H_
31
32#define SVM_IO_BITMAP_SIZE (3 * PAGE_SIZE)
33#define SVM_MSR_BITMAP_SIZE (2 * PAGE_SIZE)
34

--- 22 unchanged lines hidden (view full) ---

57 * MSR permission bitmap, VMCB.ctrl.msrpm_base_pa should point to this.
58 * Two bits are used for each MSR with the LSB used for read access
59 * and the MSB used for write access. A value of '1' indicates that
60 * the operation is intercepted.
61 */
62 uint8_t msr_bitmap[SVM_MSR_BITMAP_SIZE];
63
64 /* Nested Paging */
65 pml4_entry_t np_pml4[NPML4EPG];
65 vm_offset_t nptp;
66
67 /* Virtual machine pointer. */
68 struct vm *vm;
69
70 /* Guest VCPU h/w and s/w context. */
71 struct svm_vcpu vcpu[VM_MAXCPU];
72
73 uint32_t svm_feature; /* SVM features from CPUID.*/
74
75 int asid; /* Guest Address Space Identifier */
76 int vcpu_cnt; /* number of VCPUs for this guest.*/
77} __aligned(PAGE_SIZE);
78
66
67 /* Virtual machine pointer. */
68 struct vm *vm;
69
70 /* Guest VCPU h/w and s/w context. */
71 struct svm_vcpu vcpu[VM_MAXCPU];
72
73 uint32_t svm_feature; /* SVM features from CPUID.*/
74
75 int asid; /* Guest Address Space Identifier */
76 int vcpu_cnt; /* number of VCPUs for this guest.*/
77} __aligned(PAGE_SIZE);
78
79CTASSERT((offsetof(struct svm_softc, np_pml4) & PAGE_MASK) == 0);
79CTASSERT((offsetof(struct svm_softc, nptp) & PAGE_MASK) == 0);
80
81static __inline struct svm_vcpu *
82svm_get_vcpu(struct svm_softc *sc, int vcpu)
83{
84
85 return (&(sc->vcpu[vcpu]));
86}
87

--- 30 unchanged lines hidden ---
80
81static __inline struct svm_vcpu *
82svm_get_vcpu(struct svm_softc *sc, int vcpu)
83{
84
85 return (&(sc->vcpu[vcpu]));
86}
87

--- 30 unchanged lines hidden ---