Page MenuHomeFreeBSD
Differential D37147

vmm: Use vm_get_maxcpus() instead of VM_MAXCPU in various places.
ClosedPublic
Actions

Authored by jhb on Oct 27 2022, 3:02 PM.
Tags
None
Referenced Files
Unknown Object (File)
Sun, Mar 16, 1:27 AM
Unknown Object (File)
Sat, Feb 22, 2:26 PM
Unknown Object (File)
Sat, Feb 22, 2:05 PM
Unknown Object (File)
Sat, Feb 22, 1:42 PM
Unknown Object (File)
Sat, Feb 22, 1:38 PM
Unknown Object (File)
Jan 30 2025, 8:11 AM
Unknown Object (File)
Jan 24 2025, 5:46 PM
Unknown Object (File)
Jan 23 2025, 6:28 PM
View All 70 Files
Subscribers
bcran
imp
rgrimes

Details

Reviewers
markj
corvink
manu
Group Reviewers
bhyve
Commits
rG80cce0a3610b: vmm: Use vm_get_maxcpus() instead of VM_MAXCPU in various places.
rG35abc6c238e9: vmm: Use vm_get_maxcpus() instead of VM_MAXCPU in various places.
Summary

Mostly these are loops that iterate over all possible vCPU IDs for a
specific virtual machine.

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

jhb created this revision.Oct 27 2022, 3:02 PM
Herald added a reviewer: bhyve. · View Herald TranscriptOct 27 2022, 3:02 PM
Herald added subscribers: bcran, rgrimes, imp. · View Herald Transcript
jhb requested review of this revision.Oct 27 2022, 3:02 PM
jhb added a parent revision: D37146: vmm: Simplify saving of absolute TSC values in snapshots..
jhb added a child revision: D37148: vmm svm: Refactor per-vCPU data..
Harbormaster completed remote builds in B48019: Diff 112256.Oct 27 2022, 3:03 PM
markj accepted this revision as: markj.Nov 2 2022, 2:21 PM
markj added inline comments.
sys/amd64/vmm/intel/vmx.c
1037

I'd just allocate this dynamically, it doesn't seem too painful to do so?

This revision is now accepted and ready to land.Nov 2 2022, 2:21 PM
jhb added inline comments.Nov 3 2022, 10:36 PM
sys/amd64/vmm/intel/vmx.c
1037

It goes away in later commits in this series.

jhb added a child revision: D37258: vmm svm: Use malloc_aligned() instead of contigmalloc()..Nov 3 2022, 11:19 PM
jhb removed a child revision: D37148: vmm svm: Refactor per-vCPU data..
corvink accepted this revision.Nov 4 2022, 6:01 AM
corvink added a reviewer: manu.Nov 4 2022, 7:02 AM
Closed by commit rG35abc6c238e9: vmm: Use vm_get_maxcpus() instead of VM_MAXCPU in various places. (authored by jhb). · Explain WhyNov 18 2022, 6:26 PM
This revision was automatically updated to reflect the committed changes.
jhb added a commit: rG35abc6c238e9: vmm: Use vm_get_maxcpus() instead of VM_MAXCPU in various places..
jhb added a commit: rG80cce0a3610b: vmm: Use vm_get_maxcpus() instead of VM_MAXCPU in various places..Jan 26 2023, 10:11 PM

Revision Contents
Changeset List

PathSize
sys/
amd64/
vmm/
amd/
5 lines
4 lines
intel/
12 lines
io/
6 lines
19 lines

Diff 113286

View Options

sys/amd64/vmm/amd/svm.c

Show First 20 Lines • Show All 200 Lines • ▼ Show 20 Lines
PLIST_SUB+= ARCH="${KMK_ARCH}" PLIST_SUB+= ARCH="${KMK_ARCH}"
KMK_BUILDDIR= ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE} KMK_BUILDDIR= ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}
KMK_CONFIG= VBOX_LIBPATH_X11=${LOCALBASE} VBOX_FREEBSD_SRC=${SRC_BASE}/sys KMK_CONFIG= VBOX_LIBPATH_X11=${LOCALBASE} VBOX_FREEBSD_SRC=${SRC_BASE}/sys
KMK_FLAGS+= -j${MAKE_JOBS_NUMBER} KMK_FLAGS+= -j${MAKE_JOBS_NUMBER}
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.if ${OPSYS} == FreeBSD .if ${CHOSEN_COMPILER_TYPE} == clang && ${OPSYS} == FreeBSD && \
.if ${OSVERSION} >= 1400059 (${OSVERSION} < 1302505 || (${OSVERSION} >= 1400000 && ${OSVERSION} < 1400079))
BROKEN= Fails to compile with libc++ 14.0.3 # llvm 13 and 14 included in FreeBSD fails to compile this legacy version of
.elif ${OSVERSION} >= 1301000 && ${OSVERSION} < 1400000 # virtualbox-ose, force llvm 15 on all versions of the FreeBSD except lastest 13
BROKEN= Fails to compile: error: ran out of registers during register allocation # and 14 where the llvm 15 is included: PR#265539.
.endif # Keep possibility to define different llvm via VBOX_LLVM_VER in make.conf.
.endif
.if ${CHOSEN_COMPILER_TYPE} == clang && ${OPSYS} == FreeBSD && ${OSVERSION} > 1400022
# clang > 11 included in FreeBSD 14 fails to compile this legacy version
# of virtualbox-ose, force clang 11 on FreeBSD 14 where a newer clang is
# included.
BUILD_DEPENDS+= clang${VBOX_LLVM_VER}:devel/llvm${VBOX_LLVM_VER} BUILD_DEPENDS+= clang${VBOX_LLVM_VER}:devel/llvm${VBOX_LLVM_VER}
CC= clang${VBOX_LLVM_VER} CC= clang${VBOX_LLVM_VER}
CXX= clang++${VBOX_LLVM_VER} CXX= clang++${VBOX_LLVM_VER}
VBOX_LLVM_VER?= 11 VBOX_LLVM_VER?= 15
.endif .endif
.if ${PYTHON_MAJOR_VER} >= 3 .if ${PYTHON_MAJOR_VER} >= 3
PLIST_SUB+= PYTHON_PYCDIR=/__pycache__/ \ PLIST_SUB+= PYTHON_PYCDIR=/__pycache__/ \
PYTHON_PYCEXT=.cpython-${PYTHON_SUFFIX}.pyc PYTHON_PYCEXT=.cpython-${PYTHON_SUFFIX}.pyc
.else .else
PLIST_SUB+= PYTHON_PYCDIR=/ \ PLIST_SUB+= PYTHON_PYCDIR=/ \
PYTHON_PYCEXT=.pyc PYTHON_PYCEXT=.pyc
▲ Show 20 Lines • Show All 199 Lines • Show Last 20 Lines
View Options

sys/amd64/vmm/amd/vmcb.c

Show First 20 Lines • Show All 200 Lines • ▼ Show 20 Lines
PLIST_SUB+= ARCH="${KMK_ARCH}" PLIST_SUB+= ARCH="${KMK_ARCH}"
KMK_BUILDDIR= ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE} KMK_BUILDDIR= ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}
KMK_CONFIG= VBOX_LIBPATH_X11=${LOCALBASE} VBOX_FREEBSD_SRC=${SRC_BASE}/sys KMK_CONFIG= VBOX_LIBPATH_X11=${LOCALBASE} VBOX_FREEBSD_SRC=${SRC_BASE}/sys
KMK_FLAGS+= -j${MAKE_JOBS_NUMBER} KMK_FLAGS+= -j${MAKE_JOBS_NUMBER}
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.if ${OPSYS} == FreeBSD .if ${CHOSEN_COMPILER_TYPE} == clang && ${OPSYS} == FreeBSD && \
.if ${OSVERSION} >= 1400059 (${OSVERSION} < 1302505 || (${OSVERSION} >= 1400000 && ${OSVERSION} < 1400079))
BROKEN= Fails to compile with libc++ 14.0.3 # llvm 13 and 14 included in FreeBSD fails to compile this legacy version of
.elif ${OSVERSION} >= 1301000 && ${OSVERSION} < 1400000 # virtualbox-ose, force llvm 15 on all versions of the FreeBSD except lastest 13
BROKEN= Fails to compile: error: ran out of registers during register allocation # and 14 where the llvm 15 is included: PR#265539.
.endif # Keep possibility to define different llvm via VBOX_LLVM_VER in make.conf.
.endif
.if ${CHOSEN_COMPILER_TYPE} == clang && ${OPSYS} == FreeBSD && ${OSVERSION} > 1400022
# clang > 11 included in FreeBSD 14 fails to compile this legacy version
# of virtualbox-ose, force clang 11 on FreeBSD 14 where a newer clang is
# included.
BUILD_DEPENDS+= clang${VBOX_LLVM_VER}:devel/llvm${VBOX_LLVM_VER} BUILD_DEPENDS+= clang${VBOX_LLVM_VER}:devel/llvm${VBOX_LLVM_VER}
CC= clang${VBOX_LLVM_VER} CC= clang${VBOX_LLVM_VER}
CXX= clang++${VBOX_LLVM_VER} CXX= clang++${VBOX_LLVM_VER}
VBOX_LLVM_VER?= 11 VBOX_LLVM_VER?= 15
.endif .endif
.if ${PYTHON_MAJOR_VER} >= 3 .if ${PYTHON_MAJOR_VER} >= 3
PLIST_SUB+= PYTHON_PYCDIR=/__pycache__/ \ PLIST_SUB+= PYTHON_PYCDIR=/__pycache__/ \
PYTHON_PYCEXT=.cpython-${PYTHON_SUFFIX}.pyc PYTHON_PYCEXT=.cpython-${PYTHON_SUFFIX}.pyc
.else .else
PLIST_SUB+= PYTHON_PYCDIR=/ \ PLIST_SUB+= PYTHON_PYCDIR=/ \
PYTHON_PYCEXT=.pyc PYTHON_PYCEXT=.pyc
▲ Show 20 Lines • Show All 199 Lines • Show Last 20 Lines
View Options

sys/amd64/vmm/intel/vmx.c

Show First 20 Lines • Show All 200 Lines • ▼ Show 20 Lines
PLIST_SUB+= ARCH="${KMK_ARCH}" PLIST_SUB+= ARCH="${KMK_ARCH}"
KMK_BUILDDIR= ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE} KMK_BUILDDIR= ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}
KMK_CONFIG= VBOX_LIBPATH_X11=${LOCALBASE} VBOX_FREEBSD_SRC=${SRC_BASE}/sys KMK_CONFIG= VBOX_LIBPATH_X11=${LOCALBASE} VBOX_FREEBSD_SRC=${SRC_BASE}/sys
KMK_FLAGS+= -j${MAKE_JOBS_NUMBER} KMK_FLAGS+= -j${MAKE_JOBS_NUMBER}
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.if ${OPSYS} == FreeBSD .if ${CHOSEN_COMPILER_TYPE} == clang && ${OPSYS} == FreeBSD && \
.if ${OSVERSION} >= 1400059 (${OSVERSION} < 1302505 || (${OSVERSION} >= 1400000 && ${OSVERSION} < 1400079))
BROKEN= Fails to compile with libc++ 14.0.3 # llvm 13 and 14 included in FreeBSD fails to compile this legacy version of
.elif ${OSVERSION} >= 1301000 && ${OSVERSION} < 1400000 # virtualbox-ose, force llvm 15 on all versions of the FreeBSD except lastest 13
BROKEN= Fails to compile: error: ran out of registers during register allocation # and 14 where the llvm 15 is included: PR#265539.
.endif # Keep possibility to define different llvm via VBOX_LLVM_VER in make.conf.
.endif
.if ${CHOSEN_COMPILER_TYPE} == clang && ${OPSYS} == FreeBSD && ${OSVERSION} > 1400022
# clang > 11 included in FreeBSD 14 fails to compile this legacy version
# of virtualbox-ose, force clang 11 on FreeBSD 14 where a newer clang is
# included.
BUILD_DEPENDS+= clang${VBOX_LLVM_VER}:devel/llvm${VBOX_LLVM_VER} BUILD_DEPENDS+= clang${VBOX_LLVM_VER}:devel/llvm${VBOX_LLVM_VER}
CC= clang${VBOX_LLVM_VER} CC= clang${VBOX_LLVM_VER}
CXX= clang++${VBOX_LLVM_VER} CXX= clang++${VBOX_LLVM_VER}
VBOX_LLVM_VER?= 11 VBOX_LLVM_VER?= 15
.endif .endif
.if ${PYTHON_MAJOR_VER} >= 3 .if ${PYTHON_MAJOR_VER} >= 3
PLIST_SUB+= PYTHON_PYCDIR=/__pycache__/ \ PLIST_SUB+= PYTHON_PYCDIR=/__pycache__/ \
PYTHON_PYCEXT=.cpython-${PYTHON_SUFFIX}.pyc PYTHON_PYCEXT=.cpython-${PYTHON_SUFFIX}.pyc
.else .else
PLIST_SUB+= PYTHON_PYCDIR=/ \ PLIST_SUB+= PYTHON_PYCDIR=/ \
PYTHON_PYCEXT=.pyc PYTHON_PYCEXT=.pyc
▲ Show 20 Lines • Show All 199 Lines • Show Last 20 Lines
View Options

sys/amd64/vmm/io/vlapic.c

Show First 20 Lines • Show All 200 Lines • ▼ Show 20 Lines
PLIST_SUB+= ARCH="${KMK_ARCH}" PLIST_SUB+= ARCH="${KMK_ARCH}"
KMK_BUILDDIR= ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE} KMK_BUILDDIR= ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}
KMK_CONFIG= VBOX_LIBPATH_X11=${LOCALBASE} VBOX_FREEBSD_SRC=${SRC_BASE}/sys KMK_CONFIG= VBOX_LIBPATH_X11=${LOCALBASE} VBOX_FREEBSD_SRC=${SRC_BASE}/sys
KMK_FLAGS+= -j${MAKE_JOBS_NUMBER} KMK_FLAGS+= -j${MAKE_JOBS_NUMBER}
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.if ${OPSYS} == FreeBSD .if ${CHOSEN_COMPILER_TYPE} == clang && ${OPSYS} == FreeBSD && \
.if ${OSVERSION} >= 1400059 (${OSVERSION} < 1302505 || (${OSVERSION} >= 1400000 && ${OSVERSION} < 1400079))
BROKEN= Fails to compile with libc++ 14.0.3 # llvm 13 and 14 included in FreeBSD fails to compile this legacy version of
.elif ${OSVERSION} >= 1301000 && ${OSVERSION} < 1400000 # virtualbox-ose, force llvm 15 on all versions of the FreeBSD except lastest 13
BROKEN= Fails to compile: error: ran out of registers during register allocation # and 14 where the llvm 15 is included: PR#265539.
.endif # Keep possibility to define different llvm via VBOX_LLVM_VER in make.conf.
.endif
.if ${CHOSEN_COMPILER_TYPE} == clang && ${OPSYS} == FreeBSD && ${OSVERSION} > 1400022
# clang > 11 included in FreeBSD 14 fails to compile this legacy version
# of virtualbox-ose, force clang 11 on FreeBSD 14 where a newer clang is
# included.
BUILD_DEPENDS+= clang${VBOX_LLVM_VER}:devel/llvm${VBOX_LLVM_VER} BUILD_DEPENDS+= clang${VBOX_LLVM_VER}:devel/llvm${VBOX_LLVM_VER}
CC= clang${VBOX_LLVM_VER} CC= clang${VBOX_LLVM_VER}
CXX= clang++${VBOX_LLVM_VER} CXX= clang++${VBOX_LLVM_VER}
VBOX_LLVM_VER?= 11 VBOX_LLVM_VER?= 15
.endif .endif
.if ${PYTHON_MAJOR_VER} >= 3 .if ${PYTHON_MAJOR_VER} >= 3
PLIST_SUB+= PYTHON_PYCDIR=/__pycache__/ \ PLIST_SUB+= PYTHON_PYCDIR=/__pycache__/ \
PYTHON_PYCEXT=.cpython-${PYTHON_SUFFIX}.pyc PYTHON_PYCEXT=.cpython-${PYTHON_SUFFIX}.pyc
.else .else
PLIST_SUB+= PYTHON_PYCDIR=/ \ PLIST_SUB+= PYTHON_PYCDIR=/ \
PYTHON_PYCEXT=.pyc PYTHON_PYCEXT=.pyc
▲ Show 20 Lines • Show All 199 Lines • Show Last 20 Lines
View Options

sys/amd64/vmm/vmm.c

Loading...