Changeset 87728 in vbox for trunk/src/VBox/HostDrivers/linux

Timestamp:

Feb 12, 2021 2:24:07 AM (4 years ago)

Author:

vboxsync

Message:

SUPDrv,VMMR0,VBoxDDR0,++: More work on wrapper kmods. bugref:9937

File:

• trunk/src/VBox/HostDrivers/linux/Makefile (modified) (6 diffs)

trunk/src/VBox/HostDrivers/linux/Makefile

@@ -30 +30 @@
 
 obj-m = vboxdrv/
-ifneq ($(wildcard $(CURDIR)/vboxnetflt/Makefile),)
- obj-m += vboxnetflt/
-endif
-ifneq ($(wildcard $(CURDIR)/vboxnetadp/Makefile),)
- obj-m += vboxnetadp/
-endif
-ifneq ($(wildcard $(CURDIR)/vboxpci/Makefile),)
- obj-m += vboxpci/
-endif
+ ifneq ($(wildcard $(CURDIR)/vboxnetflt/Makefile),)
+obj-m += vboxnetflt/
+ endif
+ ifneq ($(wildcard $(CURDIR)/vboxnetadp/Makefile),)
+obj-m += vboxnetadp/
+ endif
+ ifneq ($(wildcard $(CURDIR)/vboxpci/Makefile),)
+obj-m += vboxpci/
+ endif
 
 else # ! KERNELRELEASE
@@ -45 +45 @@
 
 KBUILD_VERBOSE ?=
-KERN_VER ?= $(shell uname -r)
 .PHONY: all install clean check unload load \
     vboxdrv vboxnetflt vboxnetadp vboxpci \
@@ -54 +53 @@
 
 # We want to build on Linux 2.6.18 and later kernels.
-ifneq ($(filter-out 1.% 2.0.% 2.1.% 2.2.% 2.3.% 2.4.% 2.5.%,$(KERN_VER)),)
+KERN_VER ?= $(shell uname -r)
+ ifneq ($(filter-out 1.% 2.0.% 2.1.% 2.2.% 2.3.% 2.4.% 2.5.%,$(KERN_VER)),)
 
 vboxdrv:
@@ -115 +115 @@
 install: install-vboxdrv install-vboxnetflt install-vboxnetadp install-vboxpci
 
-else
+# Look for wrapper modules, sorting them so vmmr0 is first.
+VBOX_WRAPPER_DIRS := $(notdir $(wildcard $(CURDIR)/vbox_*))
+  ifneq ($(VBOX_WRAPPER_DIRS),)
+VBOX_WRAPPER_DIRS := $(filter vbox_vmmr0,$(VBOX_WRAPPER_DIRS)) $(sort $(filter-out vbox_vmmr0,$(VBOX_WRAPPER_DIRS)))
+  endif
+  define wrapper_template
+$(wrapper): $(subst $(wrapper),,vbox_vmmr0)
+        $$(MAKE) KBUILD_VERBOSE=$$(KBUILD_VERBOSE) -C $(wrapper)/
+
+load-$(wrapper): $(if $(eq $(wrapper),vbox_vmmr0),,load-vbox_vmmr0)
+        @if ! grep -q "^$(wrapper) " /proc/modules; then \
+        echo "Loading $(wrapper)..."; \
+                /sbin/insmod $(wrapper)/$(wrapper).ko; \
+        else \
+        echo "Skipping loading $(wrapper) module (already loaded)."; \
+        fi
+
+unload-$(wrapper):
+        @if grep -q "^$(wrapper) " /proc/modules; then \
+        echo "Unloading $(wrapper)..."; \
+                /sbin/rmmod $(wrapper)/$(wrapper).ko; \
+        fi
+  endef
+$(foreach wrapper,$(VBOX_WRAPPER_DIRS), $(eval $(wrapper_template)))
+
+wrappers:       $(VBOX_WRAPPER_DIRS)
+load-wrappers: $(addprefix load-,$(VBOX_WRAPPER_DIRS))
+unload-wrappers:
+        @for module in $(filter-out vbox_vmmr0,$(VBOX_WRAPPER_DIRS)) $(filter vbox_vmmr0,$(VBOX_WRAPPER_DIRS)); \
+        do \
+                if grep -q "^$${module} " /proc/modules; then \
+                        echo "Unloading $${module}..."; \
+                if \
+        done
+
+buildid:
+        @for module in $(foreach module,vboxdrv vboxnetflt vboxnetadp $(VBOX_WRAPPER_DIRS),$(module)/$(module).ko); \
+        do \
+                buildid=`readelf -n $${module} | sed -ne 's/^.*Build ID: *\([[:xdigit:]][[:xdigit:]]\)\(.*\)$$/\1\/\2/p' `; \
+                if [ -n "$${buildid}" ]; then \
+                        mkdir -p ~/.debug/.build-id/`dirname $${buildid}`; \
+                        ln -sfn -- "$(CURDIR)/$${module}" ~/.debug/.build-id/$${buildid}; \
+                else \
+                        echo "warning: No build ID for $${module}}"; \
+                fi \
+        done
+
+.PHONY: wrappers load-wrappers unload-wrappers buildid $(VBOX_WRAPPER_DIRS) \
+        $(addprefix load-,$(VBOX_WRAPPER_DIRS)) $(addprefix unload-,$(VBOX_WRAPPER_DIRS))
+
+ else # Too old:
+
+VBOX_WRAPPER_DIRS :=
 
 vboxdrv:
@@ -122 +174 @@
 vboxpci:
 install:
-
-endif
+wrappers:
+load-wrappers:
+unload-wrappers:
+buildid-wrappers:
+
+ endif
 
 clean-vboxdrv:
@@ -169 +225 @@
 
 endif # ! KERNELRELEASE
+