@@ -11,10 +11,10 @@ Subject: [PATCH] Patch from Clear Linux

  4 files changed, 6 insertions(+), 4 deletions(-)

 diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c

-index 4db10d7990c9..1f84959cc87e 100644

+index c910e74..59e1c7c 100644

 --- a/drivers/video/fbdev/core/fbcon.c

 +++ b/drivers/video/fbdev/core/fbcon.c

-@@ -146,7 +146,7 @@ static const struct consw fb_con;

+@@ -148,7 +148,7 @@ static const struct consw fb_con;

  static int fbcon_set_origin(struct vc_data *);

@@ -24,20 +24,20 @@ index 4db10d7990c9..1f84959cc87e 100644

  #define divides(a, b)	((!(a) || (b)%(a)) ? 0 : 1)

 diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h

-index f6a816129856..f4fb458a91dd 100644

+index 79226ca..9ae142f 100644

 --- a/include/linux/blkdev.h

 +++ b/include/linux/blkdev.h

-@@ -39,7 +39,7 @@ struct blk_flush_queue;

+@@ -47,7 +47,7 @@ struct blk_queue_stats;

  struct blk_stat_callback;

  #define BLKDEV_MIN_RQ	4

 -#define BLKDEV_MAX_RQ	128	/* Default maximum */

 +#define BLKDEV_MAX_RQ	4096	/* Default maximum */

- /* Must be consisitent with blk_mq_poll_stats_bkt() */

+ /* Must be consistent with blk_mq_poll_stats_bkt() */

  #define BLK_MQ_POLL_STATS_BKTS 16

 diff --git a/init/do_mounts.c b/init/do_mounts.c

-index dea5de95c2dd..da840946d90b 100644

+index 2c71dab..7f01625 100644

 --- a/init/do_mounts.c

 +++ b/init/do_mounts.c

 @@ -28,6 +28,7 @@

@@ -48,7 +48,7 @@ index dea5de95c2dd..da840946d90b 100644

  #include <linux/nfs_fs.h>

  #include <linux/nfs_fs_sb.h>

-@@ -563,7 +564,8 @@ void __init prepare_namespace(void)

+@@ -562,7 +563,8 @@ void __init prepare_namespace(void)

  	 * For example, it is not atypical to wait 5 seconds here

  	 * for the touchpad of a laptop to initialize.

  	 */

@@ -59,10 +59,10 @@ index dea5de95c2dd..da840946d90b 100644

  	md_run_setup();

 diff --git a/mm/vmstat.c b/mm/vmstat.c

-index 604f26a4f696..bfbbcd76df57 100644

+index 8ba0870..0c32523 100644

 --- a/mm/vmstat.c

 +++ b/mm/vmstat.c

-@@ -1549,7 +1549,7 @@ static const struct file_operations proc_vmstat_file_operations = {

+@@ -1730,7 +1730,7 @@ static const struct seq_operations vmstat_op = {

  #ifdef CONFIG_SMP

  static DEFINE_PER_CPU(struct delayed_work, vmstat_work);

@@ -71,6 +71,3 @@ index 604f26a4f696..bfbbcd76df57 100644

  #ifdef CONFIG_PROC_FS

  static void refresh_vm_stats(struct work_struct *work)

-2.11.0

-

@@ -11,10 +11,10 @@ Added pci=scan_all cmdline parameter to verify hardcodded pci values

  3 files changed, 377 insertions(+), 4 deletions(-)

 diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c

-index 6922964e3dff..e4db16e7c1d2 100644

+index 0abe286..22f1449 100644

 --- a/drivers/pci/pci.c

 +++ b/drivers/pci/pci.c

-@@ -5303,6 +5303,8 @@ static int __init pci_setup(char *str)

+@@ -5907,6 +5907,8 @@ static int __init pci_setup(char *str)

  				pcie_bus_config = PCIE_BUS_PEER2PEER;

  			} else if (!strncmp(str, "pcie_scan_all", 13)) {

  				pci_add_flags(PCI_SCAN_ALL_PCIE_DEVS);

@@ -24,10 +24,10 @@ index 6922964e3dff..e4db16e7c1d2 100644

  				printk(KERN_ERR "PCI: Unknown option `%s'\n",

  						str);

 diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h

-index a5d37f6a9fb5..aaa456c9bf95 100644

+index 0881725..562de76 100644

 --- a/drivers/pci/pci.h

 +++ b/drivers/pci/pci.h

-@@ -163,6 +163,8 @@ void pci_no_msi(void);

+@@ -145,6 +145,8 @@ void pci_no_msi(void);

  static inline void pci_no_msi(void) { }

  #endif

@@ -37,10 +37,10 @@ index a5d37f6a9fb5..aaa456c9bf95 100644

  {

  	u16 control;

 diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c

-index d266d800f246..11544ddd6e5c 100644

+index a1a243e..0f4172d 100644

 --- a/drivers/pci/probe.c

 +++ b/drivers/pci/probe.c

-@@ -163,6 +163,346 @@ static inline unsigned long decode_bar(struct pci_dev *dev, u32 bar)

+@@ -169,6 +169,346 @@ static inline unsigned long decode_bar(struct pci_dev *dev, u32 bar)

  #define PCI_COMMAND_DECODE_ENABLE	(PCI_COMMAND_MEMORY | PCI_COMMAND_IO)

@@ -385,9 +385,9 @@ index d266d800f246..11544ddd6e5c 100644

 +}

 +

  /**

-  * pci_read_base - read a PCI BAR

+  * pci_read_base - Read a PCI BAR

   * @dev: the PCI device

-@@ -175,13 +515,20 @@ static inline unsigned long decode_bar(struct pci_dev *dev, u32 bar)

+@@ -181,13 +521,20 @@ static inline unsigned long decode_bar(struct pci_dev *dev, u32 bar)

  int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,

  		    struct resource *res, unsigned int pos)

  {

@@ -409,7 +409,7 @@ index d266d800f246..11544ddd6e5c 100644

  	/* No printks while decoding is disabled! */

  	if (!dev->mmio_always_on) {

  		pci_read_config_word(dev, PCI_COMMAND, &orig_cmd);

-@@ -191,7 +538,6 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,

+@@ -197,7 +544,6 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,

  		}

  	}

@@ -417,7 +417,7 @@ index d266d800f246..11544ddd6e5c 100644

  	pci_read_config_dword(dev, pos, &l);

  	pci_write_config_dword(dev, pos, l | mask);

-@@ -207,6 +553,11 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,

+@@ -213,6 +559,11 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,

  	if (sz == 0xffffffff)

  		sz = 0;

@@ -429,13 +429,13 @@ index d266d800f246..11544ddd6e5c 100644

  	/*

  	 * I don't know how l can have all bits set.  Copied from old code.

  	 * Maybe it fixes a bug on some ancient platform.

-@@ -311,8 +662,19 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,

+@@ -317,8 +668,19 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,

  fail:

  	res->flags = 0;

  out:

 -	if (res->flags)

 +	if (res->flags) {

- 		dev_printk(KERN_DEBUG, &dev->dev, "reg 0x%x: %pR\n", pos, res);

+ 		pci_printk(KERN_DEBUG, dev, "reg 0x%x: %pR\n", pos, res);

 +		if (pci_scan_and_verify) {

 +			int bar = (pos - PCI_BASE_ADDRESS_0) >> 2;

 +			int maxbar = guess_bar_count(dev->class);

@@ -450,7 +450,7 @@ index d266d800f246..11544ddd6e5c 100644

  	return (res->flags & IORESOURCE_MEM_64) ? 1 : 0;

  }

-@@ -1265,7 +1627,14 @@ int pci_setup_device(struct pci_dev *dev)

+@@ -1630,7 +1992,13 @@ int pci_setup_device(struct pci_dev *dev)

  		if (class == PCI_CLASS_BRIDGE_PCI)

  			goto bad;

  		pci_read_irq(dev);

@@ -462,10 +462,6 @@ index d266d800f246..11544ddd6e5c 100644

 +			pci_read_bases(dev,

 +			guess_bar_count(dev->class),

 +			has_rom(dev->class, PCI_ROM_ADDRESS));

-+

- 		pci_read_config_word(dev, PCI_SUBSYSTEM_VENDOR_ID, &dev->subsystem_vendor);

- 		pci_read_config_word(dev, PCI_SUBSYSTEM_ID, &dev->subsystem_device);

-2.11.0

-

+ 		pci_subsystem_ids(dev, &dev->subsystem_vendor, &dev->subsystem_device);

+ 

@@ -8,12 +8,12 @@ Subject: [PATCH] x86/vmware: pv-ops clocksource

  1 file changed, 21 insertions(+)

 diff --git a/arch/x86/kernel/cpu/vmware.c b/arch/x86/kernel/cpu/vmware.c

-index 70b8c4614e22..987ac571d16c 100644

+index 1f22ed3..1eb5631 100644

 --- a/arch/x86/kernel/cpu/vmware.c

 +++ b/arch/x86/kernel/cpu/vmware.c

-@@ -155,6 +155,27 @@ static void __init vmware_cyc2ns_setup(void)

- 	pr_info("using clock offset of %llu ns\n", d->cyc2ns_offset);

- }

+@@ -90,6 +90,27 @@ static int vmw_sched_clock __initdata = 1;

+ static DEFINE_PER_CPU_DECRYPTED(struct vmware_steal_time, steal_time) __aligned(64);

+ static int has_steal_clock = 0;

 +static u64 vmware_clock_get_cycles(struct clocksource *cs)

 +{

@@ -36,10 +36,10 @@ index 70b8c4614e22..987ac571d16c 100644

 +	return &clocksource_vmware;

 +}

 +

- static uint64_t vmware_steal_clock(int cpu)

+ static __init int setup_vmw_sched_clock(char *s)

  {

- 	struct vmware_steal_time *steal;

-@@ -290,6 +310,7 @@ static void __init vmware_paravirt_ops_setup(void)

+ 	vmw_sched_clock = 0;

+@@ -313,6 +334,7 @@ static void __init vmware_paravirt_ops_setup(void)

  		vmware_guest_cpu_init();

  #endif

  	}

@@ -47,6 +47,3 @@ index 70b8c4614e22..987ac571d16c 100644

  }

  #else

  #define vmware_paravirt_ops_setup() do {} while (0)

-2.11.0

-

@@ -13,10 +13,10 @@ Subject: [PATCH] x86/vmware: pv-ops boot_clock

  6 files changed, 57 insertions(+), 1 deletion(-)

 diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h

-index ce932812f142..3d4ba2a999cb 100644

+index d49bbf4..e0e5b8e 100644

 --- a/arch/x86/include/asm/paravirt.h

 +++ b/arch/x86/include/asm/paravirt.h

-@@ -193,6 +193,11 @@ static inline u64 paravirt_steal_clock(int cpu)

+@@ -184,6 +184,11 @@ static inline u64 paravirt_steal_clock(int cpu)

  	return PVOP_CALL1(u64, pv_time_ops.steal_clock, cpu);

  }

@@ -29,21 +29,18 @@ index ce932812f142..3d4ba2a999cb 100644

  {

  	return PVOP_CALL1(u64, pv_cpu_ops.read_pmc, counter);

 diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/paravirt_types.h

-index 0f400c0e4979..5f09979f612d 100644

+index 180bc0b..b6280a9 100644

 --- a/arch/x86/include/asm/paravirt_types.h

 +++ b/arch/x86/include/asm/paravirt_types.h

-@@ -51,6 +51,10 @@ struct mm_struct;

+@@ -53,6 +53,7 @@ struct mm_struct;

  struct desc_struct;

  struct task_struct;

  struct cpumask;

-+#if __BITS_PER_LONG == 64

-+# define timespec64 timespec

-+#endif

 +struct timespec64;

  struct flush_tlb_info;

  /*

-@@ -96,6 +100,7 @@ struct pv_lazy_ops {

+@@ -99,6 +100,7 @@ struct pv_lazy_ops {

  struct pv_time_ops {

  	unsigned long long (*sched_clock)(void);

  	unsigned long long (*steal_clock)(int cpu);

@@ -52,27 +49,18 @@ index 0f400c0e4979..5f09979f612d 100644

  struct pv_cpu_ops {

 diff --git a/arch/x86/kernel/cpu/vmware.c b/arch/x86/kernel/cpu/vmware.c

-index 987ac571d16c..0e1fc6e17efc 100644

+index 20509ee..e299357 100644

 --- a/arch/x86/kernel/cpu/vmware.c

 +++ b/arch/x86/kernel/cpu/vmware.c

-@@ -124,6 +124,7 @@ static struct kmsg_dumper kmsg_dumper = {

- #ifdef CONFIG_PARAVIRT

- static struct cyc2ns_data vmware_cyc2ns __ro_after_init;

+@@ -101,6 +101,7 @@ static struct cyc2ns_data vmware_cyc2ns __ro_after_init;

  static int vmw_sched_clock __initdata = 1;

+ static DEFINE_PER_CPU_DECRYPTED(struct vmware_steal_time, steal_time) __aligned(64);

+ static int has_steal_clock = 0;

 +uint64_t __initdata tsc_at_head;

- static __init int setup_vmw_sched_clock(char *s)

- {

-@@ -145,7 +146,7 @@ static unsigned long long vmware_sched_clock(void)

- static void __init vmware_cyc2ns_setup(void)

+ static u64 vmware_clock_get_cycles(struct clocksource *cs)

  {

- 	struct cyc2ns_data *d = &vmware_cyc2ns;

--	unsigned long long tsc_now = rdtsc();

-+	unsigned long long tsc_now = tsc_at_head;

- 

- 	clocks_calc_mult_shift(&d->cyc2ns_mul, &d->cyc2ns_shift,

- 			       vmware_tsc_khz, NSEC_PER_MSEC, 0);

-@@ -175,6 +176,26 @@ struct clocksource * __init clocksource_default_clock(void)

+@@ -123,6 +124,26 @@ struct clocksource * __init clocksource_default_clock(void)

  	return &clocksource_vmware;

  }

@@ -96,10 +84,19 @@ index 987ac571d16c..0e1fc6e17efc 100644

 +	}

 +}

 +

- static uint64_t vmware_steal_clock(int cpu)

+ static __init int setup_vmw_sched_clock(char *s)

  {

- 	struct vmware_steal_time *steal;

-@@ -311,6 +332,7 @@ static void __init vmware_paravirt_ops_setup(void)

+ 	vmw_sched_clock = 0;

+@@ -143,7 +164,7 @@ static unsigned long long vmware_sched_clock(void)

+ static void __init vmware_cyc2ns_setup(void)

+ {

+ 	struct cyc2ns_data *d = &vmware_cyc2ns;

+-	unsigned long long tsc_now = rdtsc();

++	unsigned long long tsc_now = tsc_at_head;

+ 

+ 	clocks_calc_mult_shift(&d->cyc2ns_mul, &d->cyc2ns_shift,

+ 			       vmware_tsc_khz, NSEC_PER_MSEC, 0);

+@@ -347,6 +368,7 @@ static void __init vmware_paravirt_ops_setup(void)

  #endif

  	}

  	clocksource_register_khz(&clocksource_vmware, vmware_tsc_khz);

@@ -108,10 +105,10 @@ index 987ac571d16c..0e1fc6e17efc 100644

  #else

  #define vmware_paravirt_ops_setup() do {} while (0)

 diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S

-index b4421cc191b0..f7b8017fa90a 100644

+index 8344dd2..60ad9ac 100644

 --- a/arch/x86/kernel/head_64.S

 +++ b/arch/x86/kernel/head_64.S

-@@ -184,6 +184,14 @@ ENTRY(secondary_startup_64)

+@@ -107,6 +107,14 @@ ENTRY(secondary_startup_64)

  	 * after the boot processor executes this code.

  	 */

@@ -127,10 +124,10 @@ index b4421cc191b0..f7b8017fa90a 100644

  	call verify_cpu

 diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c

-index bbf3d5933eaa..10bbdb3e6651 100644

+index 930c883..f6b3799 100644

 --- a/arch/x86/kernel/paravirt.c

 +++ b/arch/x86/kernel/paravirt.c

-@@ -203,6 +203,12 @@ static u64 native_steal_clock(int cpu)

+@@ -219,6 +219,12 @@ static u64 native_steal_clock(int cpu)

  	return 0;

  }

@@ -143,7 +140,7 @@ index bbf3d5933eaa..10bbdb3e6651 100644

  /* These are in entry.S */

  extern void native_iret(void);

  extern void native_usergs_sysret64(void);

-@@ -310,6 +316,7 @@ struct pv_init_ops pv_init_ops = {

+@@ -326,6 +332,7 @@ struct pv_init_ops pv_init_ops = {

  struct pv_time_ops pv_time_ops = {

  	.sched_clock = native_sched_clock,

  	.steal_clock = native_steal_clock,

@@ -152,13 +149,14 @@ index bbf3d5933eaa..10bbdb3e6651 100644

  __visible struct pv_irq_ops pv_irq_ops = {

 diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c

-index 9c337b0e8ba7..67a42e58b118 100644

+index 74b4472..3a6ab94 100644

 --- a/arch/x86/kernel/setup.c

 +++ b/arch/x86/kernel/setup.c

-@@ -1302,3 +1302,12 @@ void arch_show_smap(struct seq_file *m, struct vm_area_struct *vma)

- 

- 	seq_printf(m, "ProtectionKey:  %8u\n", vma_pkey(vma));

+@@ -1318,3 +1318,13 @@ static int __init register_kernel_offset_dumper(void)

+ 	return 0;

  }

+ __initcall(register_kernel_offset_dumper);

++

 +

 +/* We need to define a real function for read_boot_clock64, to override the

 +   weak default version */

@@ -168,6 +166,3 @@ index 9c337b0e8ba7..67a42e58b118 100644

 +	paravirt_read_boot_clock64(ts);

 +}

 +#endif

-2.11.0

-

@@ -11,21 +11,21 @@ Subject: [PATCH] vmware only

  4 files changed, 10 insertions(+), 1 deletion(-)

 diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c

-index 4eece91ada37..5b8e45f48bf3 100644

+index 1ee8ea36..d72e63f 100644

 --- a/arch/x86/kernel/cpu/common.c

 +++ b/arch/x86/kernel/cpu/common.c

-@@ -1089,7 +1089,9 @@ static void identify_cpu(struct cpuinfo_x86 *c)

+@@ -1370,7 +1370,9 @@ static void identify_cpu(struct cpuinfo_x86 *c)

  	detect_ht(c);

  #endif

-+#if 0 /* disable rdrand probbing */

++#if 0 /* disable rdrand probing */

  	x86_init_rdrand(c);

 +#endif

  	x86_init_cache_qos(c);

  	setup_pku(c);

 diff --git a/arch/x86/kernel/cpu/rdrand.c b/arch/x86/kernel/cpu/rdrand.c

-index cfa97ff67bda..e31cfe683da2 100644

+index cfa97ff..e31cfe6 100644

 --- a/arch/x86/kernel/cpu/rdrand.c

 +++ b/arch/x86/kernel/cpu/rdrand.c

 @@ -32,6 +32,7 @@ static int __init x86_rdrand_setup(char *s)

@@ -42,18 +42,18 @@ index cfa97ff67bda..e31cfe683da2 100644

  #endif

 +#endif

 diff --git a/arch/x86/kernel/cpu/vmware.c b/arch/x86/kernel/cpu/vmware.c

-index 0e1fc6e17efc..59e2cc6a70d2 100644

+index e299357..38c14f5 100644

 --- a/arch/x86/kernel/cpu/vmware.c

 +++ b/arch/x86/kernel/cpu/vmware.c

-@@ -30,6 +30,7 @@

+@@ -32,6 +32,7 @@

  #include <asm/hypervisor.h>

  #include <asm/timer.h>

  #include <asm/apic.h>

 +#include <asm/pci_x86.h>

- #include <linux/sched.h>

- #include <linux/cpu.h>

  #include <linux/kmsg_dump.h>

-@@ -378,6 +379,10 @@ static void __init vmware_platform_setup(void)

+ #include <linux/frame.h>

+ 

+@@ -435,6 +436,10 @@ static void __init vmware_platform_setup(void)

  	vmware_set_capabilities();

  	kmsg_dump_register(&kmsg_dumper);

@@ -65,10 +65,10 @@ index 0e1fc6e17efc..59e2cc6a70d2 100644

  /*

 diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c

-index 36171bcd91f8..f7f3d0b4b882 100644

+index f02ecaf..98dc183 100644

 --- a/arch/x86/kernel/smpboot.c

 +++ b/arch/x86/kernel/smpboot.c

-@@ -683,7 +683,7 @@ wakeup_secondary_cpu_via_nmi(int apicid, unsigned long start_eip)

+@@ -706,7 +706,7 @@ wakeup_secondary_cpu_via_nmi(int apicid, unsigned long start_eip)

  	/*

  	 * Give the other CPU some time to accept the IPI.

  	 */

@@ -77,6 +77,3 @@ index 36171bcd91f8..f7f3d0b4b882 100644

  	if (APIC_INTEGRATED(boot_cpu_apic_version)) {

  		maxlvt = lapic_get_maxlvt();

  		if (maxlvt > 3)			/* Due to the Pentium erratum 3AP.  */

-2.11.0

-

new file mode 100644

@@ -0,0 +1,304 @@

+

+From 27e42c8321922ef76888db749f8f7d796b4a7c96 Mon Sep 17 00:00:00 2001

+From: Alexey Makhalov <amakhalov@vmware.com>

+Date: Mon, 24 Sep 2018 18:37:34 -0700

+Subject: [PATCH] x86/vmware: Steal time accounting support

+

+This patch implements the VMware steal time infrastructure.

+Steal time can be enabled by adding VM configuration option

+stealclock.enable = "TRUE". It is supported by VMs that run

+hardware version 13 or newer.

+

+[tomer: use READ_ONCE macros and 32bit guests support]

+

+Signed-off-by: Alexey Makhalov <amakhalov@vmware.com>

+Signed-off-by: Tomer Zeltzer <tomerr90@gmail.com>

+Signed-off-by: Nadav Amit <namit@vmware.com>

+---

+ Documentation/admin-guide/kernel-parameters.txt |   4 +-

+ arch/x86/kernel/cpu/vmware.c                    | 215 +++++++++++++++++++++++-

+ 2 files changed, 212 insertions(+), 7 deletions(-)

+

+diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt

+index 1370b42..ff55d00 100644

+--- a/Documentation/admin-guide/kernel-parameters.txt

+@@ -2855,8 +2855,8 @@

+ 			[X86,PV_OPS] Disable paravirtualized VMware scheduler

+ 			clock and use the default one.

+ 

+-	no-steal-acc	[X86,KVM] Disable paravirtualized steal time accounting.

+-			steal time is computed, but won't influence scheduler

++	no-steal-acc	[X86,PV_OPS] Disable paravirtualized steal time accounting.

++			Steal time is computed, but won't influence scheduler

+ 			behaviour

+ 

+ 	nolapic		[X86-32,APIC] Do not enable or use the local APIC.

+diff --git a/arch/x86/kernel/cpu/vmware.c b/arch/x86/kernel/cpu/vmware.c

+index eb8515b..3aac91c 100644

+--- a/arch/x86/kernel/cpu/vmware.c

+@@ -25,6 +25,8 @@

+ #include <linux/init.h>

+ #include <linux/export.h>

+ #include <linux/clocksource.h>

++#include <linux/cpu.h>

++#include <linux/reboot.h>

+ #include <asm/div64.h>

+ #include <asm/x86_init.h>

+ #include <asm/hypervisor.h>

+@@ -48,6 +50,10 @@

+ #define VMWARE_PORT_CMD_VCPU_RESERVED	31

+ #define VMWARE_PORT_CMD_MESSAGE		30

+ #define VMWARE_HB_PORT_CMD_MESSAGE	0

++#define VMWARE_PORT_CMD_STEALCLOCK	91

++# define STEALCLOCK_NOT_AVAILABLE	-1

++# define STEALCLOCK_DISABLED		0

++# define STEALCLOCK_ENABLED		1

+ 

+ #define VMWARE_PORT(cmd, eax, ebx, ecx, edx)				\

+ 	__asm__("inl (%%dx)" :						\

+@@ -57,6 +63,18 @@

+ 			"2"(VMWARE_HYPERVISOR_PORT), "3"(UINT_MAX) :	\

+ 			"memory");

+ 

++struct vmware_steal_time {

++	union {

++		uint64_t clock;	/* stolen time counter in units of vtsc */

++		struct {

++			/* only for little-endian */

++			uint32_t clock_low;

++			uint32_t clock_high;

++		};

++	};

++	uint64_t reserved[7];

++};

++

+ static unsigned long vmware_tsc_khz __ro_after_init;

+ 

+ static inline int __vmware_platform(void)

+@@ -81,6 +99,8 @@ static struct kmsg_dumper kmsg_dumper = {

+ #ifdef CONFIG_PARAVIRT

+ static struct cyc2ns_data vmware_cyc2ns __ro_after_init;

+ static int vmw_sched_clock __initdata = 1;

++static DEFINE_PER_CPU_DECRYPTED(struct vmware_steal_time, steal_time) __aligned(64);

++static int has_steal_clock = 0;

+ 

+ static __init int setup_vmw_sched_clock(char *s)

+ {

+@@ -99,7 +119,7 @@ static unsigned long long vmware_sched_clock(void)

+ 	return ns;

+ }

+ 

+-static void __init vmware_sched_clock_setup(void)

++static void __init vmware_cyc2ns_setup(void)

+ {

+ 	struct cyc2ns_data *d = &vmware_cyc2ns;

+ 	unsigned long long tsc_now = rdtsc();

+@@ -109,17 +129,202 @@ static void __init vmware_sched_clock_setup(void)

+ 	d->cyc2ns_offset = mul_u64_u32_shr(tsc_now, d->cyc2ns_mul,

+ 					   d->cyc2ns_shift);

+ 

+-	pv_time_ops.sched_clock = vmware_sched_clock;

+-	pr_info("using sched offset of %llu ns\n", d->cyc2ns_offset);

++	pr_info("using clock offset of %llu ns\n", d->cyc2ns_offset);

+ }

+ 

++static int vmware_cmd_stealclock(uint32_t arg1, uint32_t arg2)

++{

++	uint32_t result, info;

++

++	__asm__ __volatile__ ("inl (%%dx)"

++		:	"=a" (result),

++			"=c" (info)

++		:       "a"  (VMWARE_HYPERVISOR_MAGIC),

++			"c"  (VMWARE_PORT_CMD_STEALCLOCK),

++			"d"  (VMWARE_HYPERVISOR_PORT),

++			"b"  (0),

++			"S"  (arg1),

++			"D"  (arg2)

++		:	"memory");

++	return result;

++}

++

++static int stealclock_enable(phys_addr_t pa)

++{

++	return vmware_cmd_stealclock(pa >> 32, (u32)pa) == STEALCLOCK_ENABLED;

++}

++

++static int stealclock_disable(void)

++{

++	return vmware_cmd_stealclock(0, 1);

++}

++

++static int vmware_is_stealclock_available(void)

++{

++	return stealclock_disable() != STEALCLOCK_NOT_AVAILABLE;

++}

++

++/**

++ * vmware_steal_clock() - read the per-cpu steal clock

++ * @cpu:            the cpu number whose steal clock we want to read

++ *

++ * The function reads the steal clock if we are on a 64-bit system, otherwise

++ * reads it in parts, checking that the high part didn't change in the

++ * meantime.

++ *

++ * Return:

++ *      The steal clock reading in ns.

++ */

++static uint64_t vmware_steal_clock(int cpu)

++{

++	struct vmware_steal_time *steal = &per_cpu(steal_time, cpu);

++	uint64_t clock;

++

++#ifdef CONFIG_64BIT

++	clock = READ_ONCE(steal->clock);

++#else

++	uint32_t initial_high, low, high;

++

++	do {

++		initial_high = READ_ONCE(steal->clock_high);

++		low = READ_ONCE(steal->clock_low);

++		high = READ_ONCE(steal->clock_high);

++	} while (initial_high != high);

++

++	clock = ((uint64_t)high << 32) | low;

++#endif

++	return mul_u64_u32_shr(clock, vmware_cyc2ns.cyc2ns_mul,

++			     vmware_cyc2ns.cyc2ns_shift);

++}

++

++static void vmware_register_steal_time(void)

++{

++	int cpu = smp_processor_id();

++	struct vmware_steal_time *st = &per_cpu(steal_time, cpu);

++

++	if (!has_steal_clock)

++		return;

++

++	memset(st, 0, sizeof(*st));

++

++	if (!stealclock_enable(slow_virt_to_phys(st))) {

++		has_steal_clock = 0;

++		return;

++	}

++

++	pr_info("vmware-stealtime: cpu %d, pa %llx\n",

++		cpu, (unsigned long long) slow_virt_to_phys(st));

++}

++

++static void vmware_disable_steal_time(void)

++{

++	if (!has_steal_clock)

++		return;

++

++	stealclock_disable();

++}

++

++static void vmware_guest_cpu_init(void)

++{

++	if (has_steal_clock)

++		vmware_register_steal_time();

++}

++

++static void vmware_pv_guest_cpu_reboot(void *unused)

++{

++	vmware_disable_steal_time();

++}

++

++static int vmware_pv_reboot_notify(struct notifier_block *nb,

++				unsigned long code, void *unused)

++{

++	if (code == SYS_RESTART)

++		on_each_cpu(vmware_pv_guest_cpu_reboot, NULL, 1);

++	return NOTIFY_DONE;

++}

++

++static struct notifier_block vmware_pv_reboot_nb = {

++	.notifier_call = vmware_pv_reboot_notify,

++};

++

++#ifdef CONFIG_SMP

++static void __init vmware_smp_prepare_boot_cpu(void)

++{

++	vmware_guest_cpu_init();

++	native_smp_prepare_boot_cpu();

++}

++

++static int vmware_cpu_online(unsigned int cpu)

++{

++	local_irq_disable();

++	vmware_guest_cpu_init();

++	local_irq_enable();

++	return 0;

++}

++

++static int vmware_cpu_down_prepare(unsigned int cpu)

++{

++	local_irq_disable();

++	vmware_disable_steal_time();

++	local_irq_enable();

++	return 0;

++}

++#endif

++

++static int steal_acc __initdata = 1; /* steal time accounting */

++static __init int parse_no_stealacc(char *arg)

++{

++	steal_acc = 0;

++	return 0;

++}

++

++early_param("no-steal-acc", parse_no_stealacc);

++

++static __init int activate_jump_labels(void)

++{

++	if (has_steal_clock) {

++		static_key_slow_inc(&paravirt_steal_enabled);

++		if (steal_acc)

++			static_key_slow_inc(&paravirt_steal_rq_enabled);

++	}

++

++	return 0;

++}

++arch_initcall(activate_jump_labels);

++

++

+ static void __init vmware_paravirt_ops_setup(void)

+ {

+ 	pv_info.name = "VMware hypervisor";

+ 	pv_cpu_ops.io_delay = paravirt_nop;

+ 

+-	if (vmware_tsc_khz && vmw_sched_clock)

+-		vmware_sched_clock_setup();

++	if (vmware_tsc_khz == 0)

++		return;

++

++	vmware_cyc2ns_setup();

++

++	if (vmw_sched_clock)

++		pv_time_ops.sched_clock = vmware_sched_clock;

++

++	if (vmware_is_stealclock_available()) {

++		has_steal_clock = 1;

++		pv_time_ops.steal_clock = vmware_steal_clock;

++	}

++

++	if (has_steal_clock) {

++		/* We use reboot notifier only to disable steal clock */

++		register_reboot_notifier(&vmware_pv_reboot_nb);

++#ifdef CONFIG_SMP

++		smp_ops.smp_prepare_boot_cpu = vmware_smp_prepare_boot_cpu;

++		if (cpuhp_setup_state_nocalls(CPUHP_AP_ONLINE_DYN,

++					      "x86/vmware:online",

++					      vmware_cpu_online,

++					      vmware_cpu_down_prepare) < 0)

++			pr_err("vmware_guest: Failed to install cpu hotplug callbacks\n");

++#else

++		vmware_guest_cpu_init();

++#endif

++	}

+ }

+ #else

+ #define vmware_paravirt_ops_setup() do {} while (0)

@@ -134,7 +134,7 @@ CONFIG_TASKSTATS=y

 CONFIG_TASK_DELAY_ACCT=y

 CONFIG_TASK_XACCT=y

 CONFIG_TASK_IO_ACCOUNTING=y

-# CONFIG_CPU_ISOLATION is not set

+CONFIG_CPU_ISOLATION=y

 #

 # RCU Subsystem

@@ -307,7 +307,7 @@ CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y

 CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y

 CONFIG_HAVE_ARCH_SECCOMP_FILTER=y

 CONFIG_SECCOMP_FILTER=y

-CONFIG_PLUGIN_HOSTCC=""

+CONFIG_PLUGIN_HOSTCC="g++"

 CONFIG_HAVE_GCC_PLUGINS=y

 CONFIG_GCC_PLUGINS=y

 # CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set

@@ -1056,7 +1056,7 @@ CONFIG_NETFILTER_SYNPROXY=m

 CONFIG_NF_OSF=m

 CONFIG_NF_TABLES=m

 # CONFIG_NF_TABLES_SET is not set

-# CONFIG_NF_TABLES_INET is not set

+CONFIG_NF_TABLES_INET=y

 # CONFIG_NF_TABLES_NETDEV is not set

 CONFIG_NFT_NUMGEN=m

 CONFIG_NFT_CT=m

@@ -1071,6 +1071,7 @@ CONFIG_NFT_NAT=m

 CONFIG_NFT_QUEUE=m

 CONFIG_NFT_QUOTA=m

 CONFIG_NFT_REJECT=m

+CONFIG_NFT_REJECT_INET=m

 CONFIG_NFT_COMPAT=m

 CONFIG_NFT_HASH=m

 # CONFIG_NFT_SOCKET is not set

@@ -1236,14 +1237,21 @@ CONFIG_NF_DEFRAG_IPV4=m

 CONFIG_NF_CONNTRACK_IPV4=m

 # CONFIG_NF_SOCKET_IPV4 is not set

 CONFIG_NF_TPROXY_IPV4=m

-# CONFIG_NF_TABLES_IPV4 is not set

+CONFIG_NF_TABLES_IPV4=y

+# CONFIG_NFT_CHAIN_ROUTE_IPV4 is not set

+CONFIG_NFT_REJECT_IPV4=m

+CONFIG_NFT_DUP_IPV4=m

+# CONFIG_NFT_FIB_IPV4 is not set

 # CONFIG_NF_TABLES_ARP is not set

 CONFIG_NF_DUP_IPV4=m

 # CONFIG_NF_LOG_ARP is not set

 CONFIG_NF_LOG_IPV4=m

 CONFIG_NF_REJECT_IPV4=m

 CONFIG_NF_NAT_IPV4=m

+# CONFIG_NFT_CHAIN_NAT_IPV4 is not set

 CONFIG_NF_NAT_MASQUERADE_IPV4=y

+# CONFIG_NFT_MASQ_IPV4 is not set

+# CONFIG_NFT_REDIR_IPV4 is not set

 CONFIG_NF_NAT_SNMP_BASIC=m

 CONFIG_NF_NAT_PROTO_GRE=m

 CONFIG_NF_NAT_PPTP=m

@@ -1277,7 +1285,14 @@ CONFIG_NF_DEFRAG_IPV6=m

 CONFIG_NF_CONNTRACK_IPV6=m

 # CONFIG_NF_SOCKET_IPV6 is not set

 CONFIG_NF_TPROXY_IPV6=m

-# CONFIG_NF_TABLES_IPV6 is not set

+CONFIG_NF_TABLES_IPV6=y

+CONFIG_NFT_CHAIN_ROUTE_IPV6=m

+CONFIG_NFT_CHAIN_NAT_IPV6=m

+CONFIG_NFT_MASQ_IPV6=m

+CONFIG_NFT_REDIR_IPV6=m

+CONFIG_NFT_REJECT_IPV6=m

+CONFIG_NFT_DUP_IPV6=m

+# CONFIG_NFT_FIB_IPV6 is not set

 CONFIG_NF_DUP_IPV6=m

 CONFIG_NF_REJECT_IPV6=m

 CONFIG_NF_LOG_IPV6=m

@@ -1,6 +1,10 @@

 #

 # Automatically generated file; DO NOT EDIT.

-# Linux/x86 4.14.54 Kernel Configuration

+# Linux/x86 4.18.9 Kernel Configuration

+#

+

+#

+# Compiler: gcc (GCC) 7.3.0

 #

 CONFIG_64BIT=y

 CONFIG_X86_64=y

@@ -15,8 +19,6 @@ CONFIG_ARCH_MMAP_RND_BITS_MIN=28

 CONFIG_ARCH_MMAP_RND_BITS_MAX=32

 CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8

 CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=16

-CONFIG_NEED_DMA_MAP_STATE=y

-CONFIG_NEED_SG_DMA_LENGTH=y

 CONFIG_GENERIC_ISA_DMA=y

 CONFIG_GENERIC_BUG=y

 CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y

@@ -26,6 +28,7 @@ CONFIG_RWSEM_XCHGADD_ALGORITHM=y

 CONFIG_GENERIC_CALIBRATE_DELAY=y

 CONFIG_ARCH_HAS_CPU_RELAX=y

 CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y

+CONFIG_ARCH_HAS_FILTER_PGPROT=y

 CONFIG_HAVE_SETUP_PER_CPU_AREA=y

 CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y

 CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y

@@ -41,7 +44,9 @@ CONFIG_X86_64_SMP=y

 CONFIG_ARCH_SUPPORTS_UPROBES=y

 CONFIG_FIX_EARLYCON_MEM=y

 CONFIG_PGTABLE_LEVELS=4

-CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"

+CONFIG_CC_IS_GCC=y

+CONFIG_GCC_VERSION=70300

+CONFIG_CLANG_VERSION=0

 CONFIG_IRQ_WORK=y

 CONFIG_BUILDTIME_EXTABLE_SORT=y

 CONFIG_THREAD_INFO_IN_TASK=y

@@ -50,7 +55,6 @@ CONFIG_THREAD_INFO_IN_TASK=y

 # General setup

 #

 CONFIG_INIT_ENV_ARG_LIMIT=32

-CONFIG_CROSS_COMPILE=""

 # CONFIG_COMPILE_TEST is not set

 CONFIG_LOCALVERSION="-esx"

 # CONFIG_LOCALVERSION_AUTO is not set

@@ -73,7 +77,6 @@ CONFIG_SYSVIPC_SYSCTL=y

 CONFIG_POSIX_MQUEUE=y

 CONFIG_POSIX_MQUEUE_SYSCTL=y

 # CONFIG_CROSS_MEMORY_ATTACH is not set

-CONFIG_FHANDLE=y

 # CONFIG_USELIB is not set

 CONFIG_AUDIT=y

 CONFIG_HAVE_ARCH_AUDITSYSCALL=y

@@ -93,7 +96,8 @@ CONFIG_IRQ_DOMAIN=y

 CONFIG_IRQ_DOMAIN_HIERARCHY=y

 CONFIG_GENERIC_MSI_IRQ=y

 CONFIG_GENERIC_MSI_IRQ_DOMAIN=y

-# CONFIG_IRQ_DOMAIN_DEBUG is not set

+CONFIG_GENERIC_IRQ_MATRIX_ALLOCATOR=y

+CONFIG_GENERIC_IRQ_RESERVATION_MODE=y

 CONFIG_IRQ_FORCED_THREADING=y

 CONFIG_SPARSE_IRQ=y

 # CONFIG_GENERIC_IRQ_DEBUGFS is not set

@@ -129,6 +133,7 @@ CONFIG_TASKSTATS=y

 CONFIG_TASK_DELAY_ACCT=y

 CONFIG_TASK_XACCT=y

 CONFIG_TASK_IO_ACCOUNTING=y

+CONFIG_CPU_ISOLATION=y

 #

 # RCU Subsystem

@@ -137,10 +142,8 @@ CONFIG_TREE_RCU=y