mkubecek · powellnorma · Jul 11, 2025 · Jul 11, 2025
diff --git a/Makefile b/Makefile
@@ -2,7 +2,7 @@ MODULES = vmmon vmnet
 SUBDIRS = $(MODULES:%=%-only)
 TARBALLS = $(MODULES:%=%.tar)
 MODFILES = $(foreach mod,$(MODULES),$(mod)-only/$(mod).ko)
-VM_UNAME = $(shell uname -r)
+VM_UNAME ?= $(shell uname -r)
 MODDIR = /lib/modules/$(VM_UNAME)/misc
 
 MODINFO = /sbin/modinfo

diff --git a/dkms.conf b/dkms.conf
@@ -0,0 +1,11 @@
+PACKAGE_NAME="vmware-host-modules"
+PACKAGE_VERSION="17.6.0"
+MAKE="VM_UNAME=$kernelver make"
+CLEAN="make clean"
+BUILT_MODULE_NAME[0]="vmmon"
+BUILT_MODULE_NAME[1]="vmnet"
+BUILT_MODULE_LOCATION[0]="vmmon-only"
+BUILT_MODULE_LOCATION[1]="vmnet-only"
+DEST_MODULE_LOCATION[0]="/extra"
+DEST_MODULE_LOCATION[1]="/extra"
+AUTOINSTALL="yes"
diff --git a/vmmon-only/Makefile b/vmmon-only/Makefile
@@ -43,7 +43,7 @@ INCLUDE      += -I$(SRCROOT)/shared
 endif
 
 
-VM_UNAME = $(shell uname -r)
+VM_UNAME ?= $(shell uname -r)
 
 # Header directory for the running kernel
 ifdef LINUXINCLUDE
@@ -122,7 +122,7 @@ endif
 
 vm_check_build = $(shell if $(CC) $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) \
 	$(CPPFLAGS) $(CFLAGS) $(CFLAGS_KERNEL) $(LINUXINCLUDE) \
-	$(EXTRA_CFLAGS) -Iinclude2/asm/mach-default \
+	$(ccflags-y) -Iinclude2/asm/mach-default \
 	-DKBUILD_BASENAME=\"$(DRIVER)\" \
 	-Werror -S -o /dev/null -xc $(1) \
 	> /dev/null 2>&1; then echo "$(2)"; else echo "$(3)"; fi)

diff --git a/vmmon-only/Makefile.kernel b/vmmon-only/Makefile.kernel
@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 ##########################################################
-# Copyright (C) 1998,2015,2020 VMware, Inc. All rights reserved.
+# Copyright (c) 1998-2024 Broadcom. All Rights Reserved.
+# The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
 #
 # This program is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by the
@@ -20,7 +21,7 @@
 CC_OPTS += -DVMMON -DVMCORE
 
 INCLUDE := -I$(SRCROOT)/include -I$(SRCROOT)/include/x86 -I$(SRCROOT)/common -I$(SRCROOT)/linux
-EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
+ccflags-y := $(CC_OPTS) $(INCLUDE)
 
 obj-m += $(DRIVER).o
 

diff --git a/vmmon-only/Makefile.normal b/vmmon-only/Makefile.normal
@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 ##########################################################
-# Copyright (C) 1998,2015,2017,2020 VMware, Inc. All rights reserved.
+# Copyright (c) 1998-2024 Broadcom. All Rights Reserved.
+# The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
 #
 # This program is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by the

diff --git a/vmmon-only/bootstrap/bootstrap.c b/vmmon-only/bootstrap/bootstrap.c
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 2015 VMware, Inc. All rights reserved.
+ * Copyright (C) 2015,2023 VMware, Inc. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
@@ -19,10 +19,11 @@
 /*
  * bootstrap.c --
  *
- *    Implements the early VMM bootstraping code that is executed
- *    by the host (vmmon/VMKernel) to create the VMM context.
+ *      Implements the early VMM bootstraping code that is executed
+ *      by the host (vmmon/VMKernel) to create the VMM context.
  */
 
+#if !defined VMKERNEL || defined VMK_HAS_VMM
 #include "vm_basic_types.h"
 #include "vm_basic_defs.h"
 #include "bootstrap_vmm.h"
@@ -51,3 +52,4 @@ BSVMM_Validate(void *buf, uint32 nbytes)
    }
    return bsParams;
 }
+#endif
diff --git a/vmmon-only/bootstrap/monLoader.c b/vmmon-only/bootstrap/monLoader.c
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (c) 2015-2022 VMware, Inc. All rights reserved.
+ * Copyright (c) 2015-2023 VMware, Inc. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
@@ -53,6 +53,7 @@
 #error MonLoader cannot be built as part of this environment
 #endif
 
+#if !defined VMKERNEL || defined VMK_HAS_VMM
 #include "vm_basic_types.h"
 #include "monLoader.h"
 #include "vcpuid.h"
@@ -914,3 +915,4 @@ MonLoader_Process(MonLoaderHeader  *header,   // IN/OUT
    MonLoaderCallout_CleanUp(ctx.envCtx);
    return ret;
 }
+#endif
diff --git a/vmmon-only/bootstrap/monLoaderVmmon.c b/vmmon-only/bootstrap/monLoaderVmmon.c
@@ -1,5 +1,6 @@
 /*********************************************************
- * Copyright (c) 2016-2020 VMware, Inc. All rights reserved.
+ * Copyright (c) 2016-2024 Broadcom. All Rights Reserved.
+ * The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the

diff --git a/vmmon-only/bootstrap/vmmblob.c b/vmmon-only/bootstrap/vmmblob.c
@@ -1,5 +1,6 @@
 /*********************************************************
- * Copyright (C) 2017-2020, 2022 VMware, Inc. All rights reserved.
+ * Copyright (c) 2017-2024 Broadcom. All Rights Reserved.
+ * The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the

diff --git a/vmmon-only/common/apic.c b/vmmon-only/common/apic.c
@@ -1,5 +1,6 @@
 /*********************************************************
- * Copyright (c) 2011, 2016, 2018,2020 VMware, Inc. All rights reserved.
+ * Copyright (c) 2011-2024 Broadcom. All Rights Reserved.
+ * The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the

diff --git a/vmmon-only/common/apic.h b/vmmon-only/common/apic.h
@@ -1,5 +1,6 @@
 /*********************************************************
- * Copyright (C) 2011 VMware, Inc. All rights reserved.
+ * Copyright (c) 2011-2024 Broadcom. All Rights Reserved.
+ * The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the

diff --git a/vmmon-only/common/comport.c b/vmmon-only/common/comport.c
@@ -1,5 +1,6 @@
 /*********************************************************
- * Copyright (C) 2006,2016,2021 VMware, Inc. All rights reserved.
+ * Copyright (c) 2006-2024 Broadcom. All Rights Reserved.
+ * The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the

diff --git a/vmmon-only/common/cpuid.c b/vmmon-only/common/cpuid.c
@@ -1,5 +1,6 @@
 /*********************************************************
- * Copyright (c) 1998, 2016-2022 VMware, Inc. All rights reserved.
+ * Copyright (c) 1998-2024 Broadcom. All Rights Reserved.
+ * The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the

diff --git a/vmmon-only/common/cpuid.h b/vmmon-only/common/cpuid.h
@@ -1,5 +1,6 @@
 /*********************************************************
- * Copyright (c) 1998, 2016-2019 VMware, Inc. All rights reserved.
+ * Copyright (c) 1998-2024 Broadcom. All Rights Reserved.
+ * The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the

diff --git a/vmmon-only/common/crosspage.c b/vmmon-only/common/crosspage.c
@@ -1,5 +1,6 @@
 /*********************************************************
- * Copyright (C) 2016-2022 VMware, Inc. All rights reserved.
+ * Copyright (c) 2016-2024 Broadcom. All Rights Reserved.
+ * The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
@@ -59,7 +60,7 @@
 #include "segs.h"
 #include "x86_basic_defs.h"
 #include "vm_basic_defs.h"
-#include "vm_idt_x86.h"
+#include "vm_idt.h"
 #include "crosspage.h"
 
 /*
@@ -93,10 +94,6 @@
 
 #define NOT_REACHED_MINIMAL __builtin_unreachable
 
-#ifndef ASM_RET
-#define ASM_RET "ret\n"
-#endif
-
 void VmmToHost(void);
 void SwitchDBHandler(void);
 void SwitchUDHandler(void);
@@ -240,6 +237,38 @@ CrossPageInitSwitchIDTs(struct VMCrossPageData *cpData)
                           CrossPageVmmCodeVA(SwitchMCEHandler));
 }
 
+/*
+ *---------------------------------------------------------------------------
+ *
+ * SwitchExcGetCrossPageData --
+ *
+ *      Common code for the exception handlers to locate the data
+ *      crosspage so they can record their respective events.  In order to
+ *      reach this code an exception had to vector through the IDT.  The IDT
+ *      is known to be in the data page.  Therefore, the data page can be
+ *      found by accessing IDTR and rounding down to page alignment.
+ *
+ * Input:
+ *     None
+ *
+ * Output:
+ *     %rax = Page aligned address of the current crosspage data area.
+ *
+ * Note:
+ *     %rax (return value) and %rflags are destroyed, all other registers
+ *     are preserved.  Since this is only called by exception handlers, the
+ *     CPU has already saved %rflags so no additional handling is required.
+ *
+ *---------------------------------------------------------------------------
+ */
+
+#define SwitchExcGetCrossPageData              \
+   "subq            $0x10,            %%rsp\n" \
+   "sidt            0(%%rsp)\n"                \
+   "movq            2(%%rsp),         %%rax\n" /* DTR.offset */ \
+   "addq            $0x10,            %%rsp\n" \
+   "andq            %[PageAlignMask], %%rax\n"
+
 
 /*
  *-----------------------------------------------------------------------------
@@ -303,7 +332,9 @@ CrossPage_CodePage(void)
    EXPORTED_ASM_SYMBOL(SwitchDBHandler)
    ASM_ENDBR
    "pushq        %%rax\n"
-   "call         SwitchExcGetCrossPageData\n"
+
+   SwitchExcGetCrossPageData
+
    "addq         %[wsExceptionDB], %%rax\n"
    "movb         $1,               (%%rax)\n" /* log EXC_DB */
    "popq         %%rax\n"
@@ -344,7 +375,9 @@ CrossPage_CodePage(void)
    "pushq        %%rax\n"
    "pushq        %%rbx\n"
    "pushq        %%rcx\n"
-   "call         SwitchExcGetCrossPageData\n"
+
+   SwitchExcGetCrossPageData
+
    "movl         %[wsExceptionUD],      %%ecx\n"    /* log EXC_UD */
    "movb         $1,                    (%%rax, %%rcx)\n"
    /* Check if the exception came from a monitor RIP. */
@@ -411,7 +444,9 @@ CrossPage_CodePage(void)
    EXPORTED_ASM_SYMBOL(SwitchNMIHandler)
    ASM_ENDBR
    "pushq        %%rax\n"
-   "call         SwitchExcGetCrossPageData\n"
+
+   SwitchExcGetCrossPageData
+
    "addq         %[wsExceptionNMI], %%rax\n"
    "movb         $1,                (%%rax)\n" /* log EXC_NMI */
    "popq         %%rax\n"
@@ -447,7 +482,9 @@ CrossPage_CodePage(void)
    EXPORTED_ASM_SYMBOL(SwitchMCEHandler)
    ASM_ENDBR
    "pushq        %%rax\n"
-   "call         SwitchExcGetCrossPageData\n"
+
+   SwitchExcGetCrossPageData
+
    "addq         %[wsExceptionMC], %%rax\n"
    "movb         $1,              (%%rax)\n" /* log EXC_MC */
    "popq         %%rax\n"
@@ -617,40 +654,6 @@ CrossPage_CodePage(void)
    "cld\n"
    "lretq\n"
 
-   /*
-    *---------------------------------------------------------------------------
-    *
-    * SwitchExcGetCrossPageData --
-    *
-    *      Common function for the exception handlers to locate the data
-    *      crosspage so they can record their respective events.  In order to
-    *      reach this code an exception had to vector through the IDT.  The IDT
-    *      is known to be in the data page.  Therefore, the data page can be
-    *      found by accessing IDTR and rounding down to page alignment.
-    *
-    * Input:
-    *     None
-    *
-    * Output:
-    *     %rax = Page aligned address of the current crosspage data area.
-    *
-    * Note:
-    *     %rax (return value) and %rflags are destroyed, all other registers
-    *     are preserved.  Since this is only called by exception handlers, the
-    *     CPU has already saved %rflags so no additional handling is required.
-    *
-    *---------------------------------------------------------------------------
-    */
-
-   ".p2align 4\n"
-   "SwitchExcGetCrossPageData:\n"
-   "subq            $0x10,            %%rsp\n"
-   "sidt            0(%%rsp)\n"
-   "movq            2(%%rsp),         %%rax\n" /* DTR.offset */
-   "addq            $0x10,            %%rsp\n"
-   "andq            %[PageAlignMask], %%rax\n"
-   ASM_RET
-
    EXPORTED_ASM_SYMBOL(CrossPage_CodeEnd)
 
    : /* No output list, this is not really C code. */

diff --git a/vmmon-only/common/crosspage.h b/vmmon-only/common/crosspage.h
@@ -1,5 +1,6 @@
 /*********************************************************
- * Copyright (C) 2020 VMware, Inc. All rights reserved.
+ * Copyright (c) 2020-2024 Broadcom. All Rights Reserved.
+ * The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the

diff --git a/vmmon-only/common/hostKernel.h b/vmmon-only/common/hostKernel.h
@@ -1,5 +1,6 @@
 /*********************************************************
- * Copyright (C) 1998,2019 VMware, Inc. All rights reserved.
+ * Copyright (c) 1998-2024 Broadcom. All Rights Reserved.
+ * The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the

diff --git a/vmmon-only/common/hostif.h b/vmmon-only/common/hostif.h
@@ -1,5 +1,6 @@
 /*********************************************************
- * Copyright (c) 1998-2021 VMware, Inc. All rights reserved.
+ * Copyright (c) 1998-2024 Broadcom. All Rights Reserved.
+ * The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the

diff --git a/vmmon-only/common/hostifGlobalLock.h b/vmmon-only/common/hostifGlobalLock.h
@@ -1,5 +1,6 @@
 /*********************************************************
- * Copyright (C) 1998 VMware, Inc. All rights reserved.
+ * Copyright (c) 1998-2024 Broadcom. All Rights Reserved.
+ * The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the

diff --git a/vmmon-only/common/hostifMem.h b/vmmon-only/common/hostifMem.h
@@ -1,5 +1,6 @@
 /*********************************************************
- * Copyright (c) 1998, 2008, 2018 VMware, Inc. All rights reserved.
+ * Copyright (c) 1998-2024 Broadcom. All Rights Reserved.
+ * The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the

diff --git a/vmmon-only/common/memtrack.c b/vmmon-only/common/memtrack.c
@@ -1,5 +1,6 @@
 /*********************************************************
- * Copyright (C) 1998-2018,2020 VMware, Inc. All rights reserved.
+ * Copyright (c) 1998-2024 Broadcom. All Rights Reserved.
+ * The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the

diff --git a/vmmon-only/common/memtrack.h b/vmmon-only/common/memtrack.h
@@ -1,5 +1,6 @@
 /*********************************************************
- * Copyright (C) 1998,2017-2018,2020 VMware, Inc. All rights reserved.
+ * Copyright (c) 1998-2024 Broadcom. All Rights Reserved.
+ * The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the

diff --git a/vmmon-only/common/moduleloop.c b/vmmon-only/common/moduleloop.c
@@ -1,5 +1,6 @@
 /*********************************************************
- * Copyright (C) 1998-2020 VMware, Inc. All rights reserved.
+ * Copyright (c) 1998-2024 Broadcom. All Rights Reserved.
+ * The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the

diff --git a/vmmon-only/common/phystrack.c b/vmmon-only/common/phystrack.c
@@ -1,5 +1,6 @@
 /*********************************************************
- * Copyright (C) 1998,2014,2019-2021 VMware, Inc. All rights reserved.
+ * Copyright (c) 1998-2024 Broadcom. All Rights Reserved.
+ * The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the

diff --git a/vmmon-only/common/phystrack.h b/vmmon-only/common/phystrack.h
@@ -1,5 +1,6 @@
 /*********************************************************
- * Copyright (C) 1998,2019 VMware, Inc. All rights reserved.
+ * Copyright (c) 1998-2024 Broadcom. All Rights Reserved.
+ * The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the