[VirtualBox-kmod] Add fixes for kernel 4.15

commit 537199a60822fa58d937f09f56a1f5f5a861a1c1 Author: Sérgio M. Basto <sergio(a)serjux.com&gt; Date: Sun Dec 3 16:46:06 2017 +0000 Add fixes for kernel 4.15 Patch_for_kernel_4.15-rc1.patch | 219 ++++++++++++++++++++++++++++++++++++++++ VirtualBox-kmod.spec | 7 +- 2 files changed, 225 insertions(+), 1 deletion(-) --- diff --git a/Patch_for_kernel_4.15-rc1.patch b/Patch_for_kernel_4.15-rc1.patch new file mode 100644 index 0000000..2a73c5c --- /dev/null +++ b/Patch_for_kernel_4.15-rc1.patch @@ -0,0 +1,219 @@ +This patch file makes the necessary changes to the VirtualBox 5.1.30 sources +to allow the kernel modules to build with kernel 4.15. + +The API changes are of several types: + +1. The timer initialization routine init_timer_pinned() no longer exists, and + is replaced by timer_setup(). +2. The timer callback routine calling sequence is changed as is the technique + for getting the timer information from the callback parameters. +3. The calling sequence for drm_encoder_find() is changed. +4. The calling sequence for the .get and .set members of the module_param_call() + calls have changed. + +This patch is released under the MIT license when appropriate, GPLv2 otherwise. + +Signed-off-by: Larry Finger <Larry.Finger(a)lwfinger.net&gt; + +--- ./VirtualBox-kmod-5.1.30/vboxdrv/r0drv/linux/timer-r0drv-linux.c.orig 2017-12-01 19:02:19.075998155 +0000 ++++ ./VirtualBox-kmod-5.1.30/vboxdrv/r0drv/linux/timer-r0drv-linux.c 2017-12-01 19:06:14.396334418 +0000 +@@ -715,6 +715,14 @@ static enum hrtimer_restart rtTimerLinux + #endif /* RTTIMER_LINUX_WITH_HRTIMER */ + + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) ++/** ++ * Timer callback for kernels 4.15 and later ++ */ ++static void rtTimerLinuxStdCallback(struct timer_list *t) ++{ ++ PRTTIMERLNXSUBTIMER pSubTimer = from_timer(pSubTimer, t, u.Std.LnxTimer); ++#else + /** + * Timer callback function for standard timers. + * +@@ -723,6 +731,7 @@ static enum hrtimer_restart rtTimerLinux + static void rtTimerLinuxStdCallback(unsigned long ulUser) + { + PRTTIMERLNXSUBTIMER pSubTimer = (PRTTIMERLNXSUBTIMER)ulUser; ++#endif + PRTTIMER pTimer = pSubTimer->pParent; + + RTTIMERLNX_LOG(("stdcallback %p\n", pTimer)); +@@ -1584,13 +1593,17 @@ RTDECL(int) RTTimerCreateEx(PRTTIMER *pp + else + #endif + { +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) ++ timer_setup(&pTimer->aSubTimers[iCpu].u.Std.LnxTimer,rtTimerLinuxStdCallback, TIMER_PINNED); ++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) + init_timer_pinned(&pTimer->aSubTimers[iCpu].u.Std.LnxTimer); + #else + init_timer(&pTimer->aSubTimers[iCpu].u.Std.LnxTimer); + #endif ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) + pTimer->aSubTimers[iCpu].u.Std.LnxTimer.data = (unsigned long)&pTimer->aSubTimers[iCpu]; + pTimer->aSubTimers[iCpu].u.Std.LnxTimer.function = rtTimerLinuxStdCallback; ++#endif + pTimer->aSubTimers[iCpu].u.Std.LnxTimer.expires = jiffies; + pTimer->aSubTimers[iCpu].u.Std.u64NextTS = 0; + } +--- ./VirtualBox-kmod-5.1.30/vboxguest/r0drv/linux/timer-r0drv-linux.c.orig 2017-12-01 19:02:19.075998155 +0000 ++++ ./VirtualBox-kmod-5.1.30/vboxguest/r0drv/linux/timer-r0drv-linux.c 2017-12-01 19:06:14.396334418 +0000 +@@ -715,6 +715,14 @@ static enum hrtimer_restart rtTimerLinux + #endif /* RTTIMER_LINUX_WITH_HRTIMER */ + + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) ++/** ++ * Timer callback for kernels 4.15 and later ++ */ ++static void rtTimerLinuxStdCallback(struct timer_list *t) ++{ ++ PRTTIMERLNXSUBTIMER pSubTimer = from_timer(pSubTimer, t, u.Std.LnxTimer); ++#else + /** + * Timer callback function for standard timers. + * +@@ -723,6 +731,7 @@ static enum hrtimer_restart rtTimerLinux + static void rtTimerLinuxStdCallback(unsigned long ulUser) + { + PRTTIMERLNXSUBTIMER pSubTimer = (PRTTIMERLNXSUBTIMER)ulUser; ++#endif + PRTTIMER pTimer = pSubTimer->pParent; + + RTTIMERLNX_LOG(("stdcallback %p\n", pTimer)); +@@ -1584,13 +1593,17 @@ RTDECL(int) RTTimerCreateEx(PRTTIMER *pp + else + #endif + { +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) ++ timer_setup(&pTimer->aSubTimers[iCpu].u.Std.LnxTimer,rtTimerLinuxStdCallback, TIMER_PINNED); ++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) + init_timer_pinned(&pTimer->aSubTimers[iCpu].u.Std.LnxTimer); + #else + init_timer(&pTimer->aSubTimers[iCpu].u.Std.LnxTimer); + #endif ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) + pTimer->aSubTimers[iCpu].u.Std.LnxTimer.data = (unsigned long)&pTimer->aSubTimers[iCpu]; + pTimer->aSubTimers[iCpu].u.Std.LnxTimer.function = rtTimerLinuxStdCallback; ++#endif + pTimer->aSubTimers[iCpu].u.Std.LnxTimer.expires = jiffies; + pTimer->aSubTimers[iCpu].u.Std.u64NextTS = 0; + } +--- ./VirtualBox-kmod-5.1.30/vboxguest/VBoxGuest-linux.c.orig ++++ ./VirtualBox-kmod-5.1.30/vboxguest/VBoxGuest-linux.c +@@ -958,7 +958,11 @@ EXPORT_SYMBOL(VBoxGuestIDCCall); + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0) + + /** log and dbg_log parameter setter. */ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) ++static int vgdrvLinuxParamLogGrpSet(const char *pszValue, const struct kernel_param *pParam) ++#else + static int vgdrvLinuxParamLogGrpSet(const char *pszValue, struct kernel_param *pParam) ++#endif + { + if (g_fLoggerCreated) + { +@@ -973,7 +973,11 @@ static int vgdrvLinuxParamLogGrpSet(cons + } + + /** log and dbg_log parameter getter. */ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) ++static int vgdrvLinuxParamLogGrpGet(char *pszBuf, const struct kernel_param *pParam) ++#else + static int vgdrvLinuxParamLogGrpGet(char *pszBuf, struct kernel_param *pParam) ++#endif + { + PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() : RTLogRelGetDefaultInstance(); + *pszBuf = '\0'; +@@ -984,7 +984,11 @@ static int vgdrvLinuxParamLogGrpGet(char + + + /** log and dbg_log_flags parameter setter. */ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) ++static int vgdrvLinuxParamLogFlagsSet(const char *pszValue, const struct kernel_param *pParam) ++#else + static int vgdrvLinuxParamLogFlagsSet(const char *pszValue, struct kernel_param *pParam) ++#endif + { + if (g_fLoggerCreated) + { +@@ -998,7 +998,11 @@ static int vgdrvLinuxParamLogFlagsSet(co + } + + /** log and dbg_log_flags parameter getter. */ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) ++static int vgdrvLinuxParamLogFlagsGet(char *pszBuf, const struct kernel_param *pParam) ++#else + static int vgdrvLinuxParamLogFlagsGet(char *pszBuf, struct kernel_param *pParam) ++#endif + { + PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() : RTLogRelGetDefaultInstance(); + *pszBuf = '\0'; +@@ -1009,7 +1009,11 @@ static int vgdrvLinuxParamLogFlagsGet(ch + + + /** log and dbg_log_dest parameter setter. */ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) ++static int vgdrvLinuxParamLogDstSet(const char *pszValue, const struct kernel_param *pParam) ++#else + static int vgdrvLinuxParamLogDstSet(const char *pszValue, struct kernel_param *pParam) ++#endif + { + if (g_fLoggerCreated) + { +@@ -1023,7 +1023,11 @@ static int vgdrvLinuxParamLogDstSet(cons + } + + /** log and dbg_log_dest parameter getter. */ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) ++static int vgdrvLinuxParamLogDstGet(char *pszBuf, const struct kernel_param *pParam) ++#else + static int vgdrvLinuxParamLogDstGet(char *pszBuf, struct kernel_param *pParam) ++#endif + { + PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() : RTLogRelGetDefaultInstance(); + *pszBuf = '\0'; +@@ -1034,7 +1034,11 @@ static int vgdrvLinuxParamLogDstGet(char + + + /** r3_log_to_host parameter setter. */ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) ++static int vgdrvLinuxParamR3LogToHostSet(const char *pszValue, const struct kernel_param *pParam) ++#else + static int vgdrvLinuxParamR3LogToHostSet(const char *pszValue, struct kernel_param *pParam) ++#endif + { + if ( pszValue == NULL + || *pszValue == '\0' +@@ -1052,7 +1052,11 @@ static int vgdrvLinuxParamR3LogToHostSet + } + + /** r3_log_to_host parameter getter. */ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) ++static int vgdrvLinuxParamR3LogToHostGet(char *pszBuf, const struct kernel_param *pParam) ++#else + static int vgdrvLinuxParamR3LogToHostGet(char *pszBuf, struct kernel_param *pParam) ++#endif + { + strcpy(pszBuf, g_DevExt.fLoggingEnabled ? "enabled" : "disabled"); + return strlen(pszBuf); +--- ./VirtualBox-kmod-5.1.30/vboxvideo/vbox_mode.c.orig ++++ ./VirtualBox-kmod-5.1.30/vboxvideo/vbox_mode.c +@@ -369,7 +369,12 @@ static struct drm_encoder *vbox_best_sin + LogFunc(("vboxvideo: %d: connector=%p\n", __LINE__, connector)); + /* pick the encoder ids */ + if (enc_id) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) ++ return drm_encoder_find(connector->dev, NULL, enc_id); ++#else + return drm_encoder_find(connector->dev, enc_id); ++#endif ++ + LogFunc(("vboxvideo: %d\n", __LINE__)); + return NULL; + } + diff --git a/VirtualBox-kmod.spec b/VirtualBox-kmod.spec index 0832488..b29f920 100644 --- a/VirtualBox-kmod.spec +++ b/VirtualBox-kmod.spec @@ -29,7 +29,7 @@ Name: VirtualBox-kmod Version: 5.1.30 #Release: 1%%{?prerel:.%%{prerel}}%%{?dist} -Release: 3%{?dist} +Release: 4%{?dist} Summary: Kernel module for VirtualBox Group: System Environment/Kernel @@ -38,6 +38,7 @@ URL: http://www.virtualbox.org/wiki/VirtualBox # This filters out the XEN kernel, since we don't run on XEN Source1: VirtualBox-kmod-excludekernel-filter.txt Patch1: fixes_for_4.14.patch +Patch2: Patch_for_kernel_4.15-rc1.patch %global AkmodsBuildRequires %{_bindir}/kmodtool, VirtualBox-kmodsrc >= %{version}%{vboxreltag}, xz, time BuildRequires: %{AkmodsBuildRequires} @@ -61,6 +62,7 @@ Kernel module for VirtualBox %setup -T -c tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{version}.tar.xz %patch1 -p1 -b .kernel_4.14 +%patch2 -p1 -b .kernel_4.15 # error out if there was something wrong with kmodtool %{?kmodtool_check} @@ -109,6 +111,9 @@ DIRS=$(ls %{name}-%{version} |wc -l) %changelog +* Fri Dec 01 2017 Sérgio Basto <sergio(a)serjux.com&gt; - 5.1.30-4 +- Add fixes for kernel 4.15 + * Sun Nov 19 2017 Sérgio Basto <sergio(a)serjux.com&gt; - 5.1.30-3 - Add more fixes for kernel 4.14