mark branch workstation-15.5.1 as retired

vmnet: convert VNetBridge debugging code to ktime_get_ns()
Starting with commit c766d1472c70 ("y2038: hide timeval/timespec/itimerval/itimerspec types") in v5.6-rc3, struct timeval should no longer be used in kernel code. Convert the do_gettimeofday() relics in VNetBridge (which are only compiled with LOGLEVEL >= 4) completely to ktime based interface.
2020-08-20 10:16:40 +02:00 · 2020-02-24 11:13:13 +01:00 · 2020-02-05 07:29:14 +01:00 · 2020-01-28 07:16:30 +01:00 · 2019-11-25 08:19:03 +01:00 · 2019-11-14 08:06:57 +01:00
4 changed files with 41 additions and 20 deletions
@@ -1,5 +1,5 @@
 *-----------------------------------------------------------------------------
-* Branch workstation-15.5.2 has been retired on 2020-08-20 and has not been
+* Branch workstation-15.5.1 has been retired on 2020-08-20 and has not been
 * receiving any updates since. Please switch to latest 15.5.x version
 * available.
 *
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 1998-2020 VMware, Inc. All rights reserved.
+ * Copyright (C) 1998-2019 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
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 1998-2013, 2020 VMware, Inc. All rights reserved.
+ * Copyright (C) 1998-2013 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
@@ -137,7 +137,6 @@ VNetProcShow(struct seq_file *p, // IN:
 }


-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 18, 0)
 /*
 *----------------------------------------------------------------------
 *
@@ -162,6 +161,14 @@ VNetProcOpen(struct inode *inode,   // IN:
 }

 /* Our procfs callbacks.  We only need to specialize open. */
+#ifdef DEFINE_PROC_SHOW_ATTRIBUTE
+static const struct proc_ops fops = {
+   .proc_open    = VNetProcOpen,
+   .proc_read    = seq_read,
+   .proc_lseek   = seq_lseek,
+   .proc_release = single_release,
+};
+#else
 static struct file_operations fops = {
   .open    = VNetProcOpen,
   .read    = seq_read,
@@ -205,12 +212,7 @@ VNetProcMakeEntryInt(VNetProcEntry   *parent,   // IN:
      } else {
         ent->data   = data;
         ent->fn     = fn;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 18, 0)
-         ent->pde    = proc_create_single_data(name, mode, parent->pde,
-                                               VNetProcShow, ent);
-#else
         ent->pde    = proc_create_data(name, mode, parent->pde, &fops, ent);
-#endif
      }
      if (ent->pde != NULL) {
         *ret = ent;
@@ -78,14 +78,32 @@ static int  VNetUserIfSetUplinkState(VNetPort *port, uint8 linkUp);
 extern unsigned int  vnet_max_qlen;

 #if COMPAT_LINUX_VERSION_CHECK_LT(3, 2, 0)
-#   define skb_frag_page(frag) (frag)->page
-#   define skb_frag_size(frag) (frag)->size
+#   define compat_kmap_frag(frag) kmap((frag)->page)
+#   define compat_kunmap_frag(page) kunmap((frag)->page)
+#else
+#   define compat_kmap_frag(frag) kmap(skb_frag_page(frag))
+#   define compat_kunmap_frag(frag) kunmap(skb_frag_page(frag))
 #endif
+
+static unsigned int compat_skb_frag_size(const skb_frag_t *frag)
+{
+#if COMPAT_LINUX_VERSION_CHECK_LT(3, 2, 0)
+	return frag->size;
+#else
+	return skb_frag_size(frag);
+#endif
+}
+
+static unsigned int compat_skb_frag_off(const skb_frag_t *frag)
+{
 #if COMPAT_LINUX_VERSION_CHECK_LT(5, 4, 0) && \
-    !(defined(CONFIG_SUSE_VERSION) && CONFIG_SUSE_VERSION == 15 && \
-      defined(CONFIG_SUSE_PATCHLEVEL) && CONFIG_SUSE_PATCHLEVEL >= 2)
-#   define skb_frag_off(frag) (frag)->page_offset
+	!(defined(CONFIG_SUSE_VERSION) && CONFIG_SUSE_VERSION == 15 && \
+	  defined(CONFIG_SUSE_PATCHLEVEL) && CONFIG_SUSE_PATCHLEVEL >= 2)
+	return frag->page_offset;
+#else
+	return skb_frag_off(frag);
 #endif
+}

 /*
 *-----------------------------------------------------------------------------
@@ -570,20 +588,21 @@ VNetCsumCopyDatagram(const struct sk_buff *skb,	// IN: skb to copy
   for (frag = skb_shinfo(skb)->frags;
 	frag != skb_shinfo(skb)->frags + skb_shinfo(skb)->nr_frags;
 	frag++) {
-      if (skb_frag_size(frag) > 0) {
+      if (compat_skb_frag_size(frag) > 0) {
 	 unsigned int tmpCsum;
 	 const void *vaddr;

-	 vaddr = kmap(skb_frag_page(frag));
-	 tmpCsum = csum_and_copy_to_user(vaddr + skb_frag_off(frag),
-					 curr, skb_frag_size(frag), 0, &err);
-	 kunmap(skb_frag_page(frag));
+	 vaddr = compat_kmap_frag(frag);
+	 tmpCsum = csum_and_copy_to_user(vaddr + compat_skb_frag_off(frag),
+					 curr, compat_skb_frag_size(frag), 0,
+					 &err);
+	 compat_kunmap_frag(frag);

 	 if (err) {
 	    return err;
 	 }
 	 csum = csum_block_add(csum, tmpCsum, curr - buf);
-	 curr += skb_frag_size(frag);
+	 curr += compat_skb_frag_size(frag);
      }
   }
Author	SHA1	Message	Date
Michal Kubecek	5443b2f66a	mark branch workstation-15.5.1 as retired	2020-08-20 10:16:40 +02:00
Michal Kubecek	118123b68c	vmnet: convert VNetBridge debugging code to ktime_get_ns() Starting with commit c766d1472c70 ("y2038: hide timeval/timespec/itimerval/itimerspec types") in v5.6-rc3, struct timeval should no longer be used in kernel code. Convert the do_gettimeofday() relics in VNetBridge (which are only compiled with LOGLEVEL >= 4) completely to ktime based interface.	2020-02-24 11:13:13 +01:00
Michal Kubecek	d8e6c50b73	vmnet: convert from file_operations to proc_ops Manline commit 97a32539b956 ("proc: convert everything to "struct proc_ops"") in v5.6-rc1 introduces struct proc_ops and converts procfs file operations to it. Convert vmnet to do the same. As the same commit also introduces DEFINE_PROC_SHOW_ATTRIBUTE macro, we can use it for detection rather than rely on version comparison.	2020-02-05 07:29:14 +01:00
Michal Kubecek	d74ce8b7b4	vmmon: replace ioremap_nocache() with ioremap() Mainline commit 4bdc0d676a64 ("remove ioremap_nocache and devm_ioremap_nocache") in v5.6-rc1 removes ioremap_nocache() and replaces all uses with ioremap(). As the commit message says that "ioremap has provided non-cached semantics by default since the Linux 2.6", do the same unconditionally.	2020-01-28 07:16:30 +01:00
Michal Kubecek	41bfaa9de7	vmnet: work around skb_frag_t build failure for SLE15-SP2 and openSUSE-15.2 The kernels used in (upcoming) SLE15 SP2 and openSUSE Leap 15.2 are based on upstream version 5.3 but have a backport of the skb_frag_t conversion to bio_vec which reached mainline in v5.4-rc1. As we cannot easily check availability compat_skb_frag_off() (which was also added in v5.4-rc1) and have to resort to version check, add an exception for SLE15-SP2 and openSUSE-15.2 kernels.	2019-11-25 08:19:03 +01:00
Michal Kubecek	50d6105ced	vmnet: handle switch of skb_frag_t to bio_vec The switch from custom skb_frag_t implementation to bio_vec in v5.4-rc1 is mostly transparent for modules which use accessor for skb_frag_t members. Unfortunately many users access the members directly and function VNetCsumCopyDatagram() in vmnet is one of those. Use accessors everywhere so that vmnet code is compatible with kernel 5.4 and newer. Use "compat_" prefix to avoid clashes with backports adding the accessors to older codebase.	2019-11-14 08:06:57 +01:00
Michal Kubecek	525d443329	vmmon: use standard definition of MSR_TSX_FORCE_ABORT if available The MSR_TSX_FORCE_ABORT macro is defined in mainline since commit 52f64909409c ("x86: Add TSX Force Abort CPUID/MSR") in v5.1-rc1.	2019-11-14 08:06:57 +01:00
Michal Kubecek	ca784dc94e	vmnet: bring back the do_gettimeofday() helper The do_gettimeofday() helper was removed by commit e4b92b108c6c ("timekeeping: remove obsolete time accessors") in v5.0-rc1. Bring it back for users in vmnet-only/bridge.c Note that Workstation/Player 15.1.0 did in fact resolve the absence of do_gettimeofday() in kernel 5.0 and newer but it did so only for calls in vmmon-only/linux/hostif.c. Calls in vmnet-only/bridge.c were left in place as those are only compiled when building with LOGLEVEL >= 4.	2019-11-14 08:06:57 +01:00
Michal Kubecek	821a4a5d76	vmmon: check presence of file_operations::poll() Commit 11c5ad0ec441 ("eventpoll: switch to ->poll_mask") in v4.18-rc1, made eventpoll switch from ->poll() to ->poll_mask(), resulting in a null pointer dereference as vmmon calls the callback directly without checking its availability. Rather than calling the callback directly (which would result in null pointer dereference), use vfs_poll() wrapper. As this wrapper is only available since 4.18-rc1 cycle as well, provide a copy to use when building against older kernels. Note: even if the commit revealing the problem was reverted in 4.18-rc3 (and is unlikely to go back in the same form) so that vmmon no longer crashes with 4.18 kernel, calling the callback without a check is a bad practice so let's keep the patch in place.	2019-11-14 08:06:57 +01:00
Michal Kubecek	829e2f4f9a	vmmon: fix indirect call with retpoline build Build against kernel with retpoline support issues warning objtool: Task_Switch()+0x425: indirect call found in RETPOLINE build This is because an indirect call in TaskSwitchToMonitor() is encoded using inline assembler so that it bypasses retpoline generation. For this purpose, macro CALL_NOSPEC exists since v4.15-rc8 (and has been backported into some distribution kernels with the rest of retpoline support). Use the macro if available and fallback to the original code if not.	2019-11-14 08:06:57 +01:00
Michal Kubecek	f647af56af	vmmon: fix always_inline attribute usage Function declared with __attribute__((always_inline)) should also be declared as inline, otherwise gcc issues a warning "always_inline function might not be inlinable". It's just cosmetic but getting rid of known harmless warnings makes it easier to spot actual problems. Use the __always_inline macro for LinuxDriverSyncReadTSCs() as this is how always inline functions should be declared in kernel code.	2019-11-14 08:06:57 +01:00
Michal Kubecek	b4de1e2436	vmmon: use standard definition of MSR_K7_HWCR_SMMLOCK if available The MSR_K7_HWCR_SMMLOCK macro is defined in mainline since commit 18c71ce9c882 ("x86/CPU/AMD: Add the Secure Encrypted Virtualization CPU feature") in v4.16-rc1.	2019-11-14 08:06:57 +01:00
Theo Bertacchini	8893d11a72	modules: remove .cache.mk on make clean Remove .cache.mk inside vmmon-only and vmnet-only when executing "make clean". This file can cause issues when upgrading gcc as make will still look for includes inside older gcc includes directory. File .cache.mk with cache of generated variables was created by build since kernel v4.15-rc1, commit 3298b690b21c ("kbuild: Add a cache for generated variables") until the feature was removed in v4.18-rc1, commit e08d6de4e532 ("kbuild: remove kbuild cache").	2019-11-14 08:06:57 +01:00
Michal Kubecek	fca70ebea0	vmmon: quick workaround for objtool warnings As discussed in https://bugzilla.suse.com/show_bug.cgi?id=1059674 the reason for multiple objtool warnings is the fact that vmmon module defines its own Panic() function which never returns. While it is marked as such which is used by the compiler for optimization, there is no way to find this from object file. While this seems innocuous, it might result in problems with unwinder later. The quickest way around is to replace vmmon's own Panic() with standard kernel panic() until a cleaner solution is found.	2019-11-14 08:06:57 +01:00
Michal Kubecek	ef8704d97d	vmmon: use standard definition of CR3_PCID_MASK if available The CR3_PCID_MASK is defined in mainline asm/processor-flags.h since commit 6c690ee1039b ("x86/mm: Split read_cr3() into read_cr3_pa() and __read_cr3()") in v4.13-rc1.	2019-11-14 08:06:57 +01:00
Michal Kubecek	38c3889146	vmmon: use standard definition of MSR_MISC_FEATURES_ENABLES if available The MSR_MISC_FEATURES_ENABLES macro is defined in mainline since commit ab6d9468631a ("x86/msr: Rename MISC_FEATURE_ENABLES to MISC_FEATURES_ENABLES") in v4.12-rc1. The MSR_MISC_FEATURES_ENABLES_CPUID_FAULT macro is defined in mainline since commit e9ea1e7f53b8 ("x86/arch_prctl: Add ARCH_[GET\|SET]_CPUID") in v4.12-rc1.	2019-11-14 08:06:54 +01:00
Michal Kubecek	e056593a8b	vmnet: use standard definition of PCI_VENDOR_ID_VMWARE_VMXNET3 if available The PCI_DEVICE_ID_VMWARE_VMXNET3 macro is defined in mainline pci_ids.h since commit b1226c7db1d9 ("vmxnet3: Move PCI Id to pci_ids.h") in v4.10-rc1.	2019-11-14 08:02:08 +01:00
Michal Kubecek	1390fbdb75	vmnet: use standard definition of PCI_VENDOR_ID_VMWARE if available The PCI_VENDOR_ID_VMWARE macro is defined in mainline pci_ids.h since commit 94e57fea6202 ("PCI: Move PCI_VENDOR_ID_VMWARE to pci_ids.h") in v3.18-rc1.	2019-11-14 08:02:08 +01:00
Michal Kubecek	4b2c2a0bca	modules: do not override CC command line options Workstation/Player 15.5.0 tries to guess the right retpoline (Spectre) related compiler command line options, resulting in objtool warnings like warning: objtool: .text.__x86_indirect_thunk_rbp+0x0: unsupported intra-function call warning: objtool: If this is a retpoline, please patch it in with alternatives and annotate e.g. in vmmon-only/common/memtrack.o (but also many others). This seems wrong; out-of-tree modules should be built with the same compiler options that were used to build the kernel they are built against. Distribution kernel devel packages usually make sure this is the way so let them do their job.	2019-11-14 08:02:08 +01:00
Michal Kubecek	5fa25885c8	vmmon: fix wrong VMX86_DEVEL test If VMX86_DEVEL macro is not defined, preprocessor warns when it is tested with "#if" in vmmon-only/linux/driver.c. As VMX86_DEVEL is tested with "#ifdef" everywhere else, change this one test to match the rest.	2019-11-14 08:02:08 +01:00