@@ -1,7 +1,7 @@

 From 6021a95a6b7ffb8df8823337d4ca05807c2eb6e5 Mon Sep 17 00:00:00 2001

 From: Alexey Makhalov <amakhalov@vmware.com>

 Date: Wed, 30 Sep 2015 23:00:00 +0000

-Subject: [PATCH 01/13] Measure correct boot time.

+Subject: [PATCH 01/14] Measure correct boot time.

 ---

  arch/x86/Kconfig          |  8 ++++++++

@@ -98,7 +98,7 @@ index 9e64d70..ccc9a22 100644

 From 1dc2e9f9a9d8d8065fa096b5551ca646086a72ed Mon Sep 17 00:00:00 2001

 From: Alexey Makhalov <amakhalov@vmware.com>

 Date: Fri, 2 Oct 2015 20:00:06 +0000

-Subject: [PATCH 02/13] PV io_delay for VMware guest.

+Subject: [PATCH 02/14] PV io_delay for VMware guest.

 ---

  arch/x86/kernel/cpu/vmware.c | 13 +++++++++++++

@@ -149,7 +149,7 @@ index 628a059..8fdd031 100644

 From faf39d20732abb865f003b46a567ea42d0841e92 Mon Sep 17 00:00:00 2001

 From: Alexey Makhalov <amakhalov@vmware.com>

 Date: Wed, 7 Oct 2015 22:53:18 +0000

-Subject: [PATCH 03/13] Improved tsc based sched_clock & clocksource.

+Subject: [PATCH 03/14] Improved tsc based sched_clock & clocksource.

 ---

  arch/x86/Kconfig             |  1 +

@@ -327,7 +327,7 @@ index caf4041..86d8a78 100644

 From 543bcc0aa46846859c92be5effde0d900a456c2a Mon Sep 17 00:00:00 2001

 From: Alexey Makhalov <amakhalov@vmware.com>

 Date: Mon, 12 Oct 2015 22:43:38 +0000

-Subject: [PATCH 04/13] Move read_boot_clock64 into pv_time_ops.

+Subject: [PATCH 04/14] Move read_boot_clock64 into pv_time_ops.

 ---

  arch/x86/Kconfig                      | 14 ++++++--

@@ -635,7 +635,7 @@ index 86d8a78..377ab5a 100644

 From f832fc949c5e97799fc977a317025a721d87bb68 Mon Sep 17 00:00:00 2001

 From: Alexey Makhalov <amakhalov@vmware.com>

 Date: Thu, 5 Nov 2015 21:02:52 +0000

-Subject: [PATCH 05/13] Fix clocksource_vmware issue in VM version <= 10

+Subject: [PATCH 05/14] Fix clocksource_vmware issue in VM version <= 10

 ---

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

@@ -733,7 +733,7 @@ index 1bf1fe3..0b89bb9 100644

 From 15e6d2cc5239e58ab805f882650ad7de9b163228 Mon Sep 17 00:00:00 2001

 From: Alexey Makhalov <amakhalov@vmware.com>

 Date: Tue, 10 Nov 2015 11:46:57 +0000

-Subject: [PATCH 06/13] Get lapic timer frequency from HV, skip calibration

+Subject: [PATCH 06/14] Get lapic timer frequency from HV, skip calibration

 ---

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

@@ -823,7 +823,7 @@ index 0b89bb9..b16618b 100644

 From 10ebf94df7ed241429a04b2cc3c2d590dd97d7dd Mon Sep 17 00:00:00 2001

 From: Alexey Makhalov <amakhalov@vmware.com>

 Date: Tue, 15 Dec 2015 21:31:18 +0000

-Subject: [PATCH 07/13] Skip rdrand reseed

+Subject: [PATCH 07/14] Skip rdrand reseed

 ---

  arch/x86/kernel/cpu/common.c | 2 ++

@@ -868,7 +868,7 @@ index 136ac74..0685891 100644

 From 237e42455bd98cf6e0e0725d35bba1b6d0d04822 Mon Sep 17 00:00:00 2001

 From: Alexey Makhalov <amakhalov@vmware.com>

 Date: Thu, 3 Dec 2015 00:46:46 +0000

-Subject: [PATCH 08/13] STA implementation. first version.

+Subject: [PATCH 08/14] STA implementation. first version.

 ---

  arch/x86/kernel/cpu/vmware.c | 163 +++++++++++++++++++++++++++++++++++++++++++

@@ -1093,7 +1093,7 @@ index b16618b..cf1fb64 100644

 From 21249118757b7232948c8401ba5d0b039cd0fa35 Mon Sep 17 00:00:00 2001

 From: Alexey Makhalov <amakhalov@vmware.com>

 Date: Wed, 13 Jan 2016 22:54:04 +0000

-Subject: [PATCH 09/13] STA. updated version

+Subject: [PATCH 09/14] STA. updated version

 ---

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

@@ -1182,7 +1182,7 @@ index cf1fb64..196703c 100644

 From 7061430a3c8906e67978da76a73967b0b26aece7 Mon Sep 17 00:00:00 2001

 From: Alexey Makhalov <amakhalov@vmware.com>

 Date: Tue, 15 Mar 2016 22:29:23 +0000

-Subject: [PATCH 10/13] STA: version with a single backdoor command.

+Subject: [PATCH 10/14] STA: version with a single backdoor command.

 ---

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

@@ -1273,7 +1273,7 @@ index 196703c..743b8ad 100644

 From ee3ab56a4bdca7e514b4d07b6a70f724cde7f0f5 Mon Sep 17 00:00:00 2001

 From: Alexey Makhalov <amakhalov@vmware.com>

 Date: Fri, 25 Mar 2016 01:14:17 +0000

-Subject: [PATCH 11/13] Remove delays for smpboot

+Subject: [PATCH 11/14] Remove delays for smpboot

 ---

  arch/x86/kernel/smpboot.c | 2 +-

@@ -1299,7 +1299,7 @@ index fbabe4f..5a18dd6 100644

 From c6ade3b8c3db962d24e07ff9a483d26e46a41bb0 Mon Sep 17 00:00:00 2001

 From: Alexey Makhalov <amakhalov@vmware.com>

 Date: Tue, 29 Mar 2016 21:14:46 +0000

-Subject: [PATCH 12/13] kmsg_dumper to vmware.log

+Subject: [PATCH 12/14] kmsg_dumper to vmware.log

 ---

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

@@ -1492,7 +1492,7 @@ index 743b8ad..e9f7d52 100644

 From 9edf1bf3a56c8c8048d2958d13283df5a283acd1 Mon Sep 17 00:00:00 2001

 From: Alexey Makhalov <amakhalov@vmware.com>

 Date: Mon, 9 May 2016 04:14:03 -0700

-Subject: [PATCH 13/13] __native_read_tsc() -> rdtsc()

+Subject: [PATCH 13/14] __native_read_tsc() -> rdtsc()

 ---

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

@@ -1541,3 +1541,57 @@ index e9f7d52..57cef56 100644

 -- 

 1.9.1

+

+From 42ac37f4ec59aee6b37b7beed93c7e1055d14522 Mon Sep 17 00:00:00 2001

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

+Date: Thu, 6 Oct 2016 11:24:55 -0700

+Subject: [PATCH 14/14] Fix lapic_timer_frequency

+

+---

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

+ 1 file changed, 9 insertions(+), 6 deletions(-)

+

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

+index 57cef56..63fe6c8 100644

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

+@@ -291,7 +291,7 @@ arch_initcall(activate_jump_labels);

+ static void __init paravirt_ops_setup(void)

+ {

+ 	pv_info.name = "VMware";

+-	pv_cpu_ops.io_delay = paravirt_nop,

++	pv_cpu_ops.io_delay = paravirt_nop;

+ 	pv_time_ops.sched_clock = vmware_sched_clock;

+ 	pv_time_ops.read_boot_clock64 = vmware_read_boot_clock64;

+ 

+@@ -319,8 +319,15 @@ static void __init vmware_platform_setup(void)

+ 

+ 	VMWARE_PORT(GETHZ, eax, ebx, ecx, edx);

+ 

+-	if (ebx != UINT_MAX)

++	if (ebx != UINT_MAX) {

+ 		x86_platform.calibrate_tsc = vmware_get_tsc_khz;

++#ifdef CONFIG_X86_LOCAL_APIC

++		/* Skip lapic calibration since we know the bus frequency. */

++		lapic_timer_frequency = ecx / HZ;

++		pr_info("Host bus clock speed read from hypervisor : %u Hz\n",

++			ecx);

++#endif

++	}

+ 	else

+ 		printk(KERN_WARNING

+ 		       "Failed to get TSC freq from the hypervisor\n");

+@@ -330,10 +337,6 @@ static void __init vmware_platform_setup(void)

+ 	printk(KERN_INFO "Pre Kernel boot time: %dms\n",

+ 		(unsigned int) (tsc_at_head / vtsc_khz));

+ 

+-#ifdef CONFIG_X86_LOCAL_APIC

+-	/* Skip lapic calibration since we know bus frequency. */

+-	lapic_timer_frequency = ecx;

+-#endif

+ 	vmware_cyc2ns.cyc2ns_mul =

+ 		DIV_ROUND_CLOSEST(NSEC_PER_MSEC << CYC2NS_SCALE_FACTOR,

+ 				  vtsc_khz);

+-- 

+1.9.1

+

@@ -1,7 +1,17 @@

-diff -Naur a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c

-+++ b/net/sunrpc/xprtsock.c	2016-09-01 15:08:07.579462068 -0700

-@@ -1791,9 +1791,11 @@

+From 5ff0b9e728e23e54001c2bb6df29d85ac2c5e08f Mon Sep 17 00:00:00 2001

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

+Date: Fri, 25 Mar 2016 21:51:12 +0000

+Subject: [PATCH] sunrpc: xs_bind uses ip_local_reserved_ports

+

+---

+ net/sunrpc/xprtsock.c | 7 ++++++-

+ 1 file changed, 6 insertions(+), 1 deletion(-)

+

+diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c

+index 2ffaf6a..90543d6 100644

+--- a/net/sunrpc/xprtsock.c

+@@ -1798,9 +1798,11 @@ static unsigned short xs_next_srcport(struct sock_xprt *transport, unsigned shor

  static int xs_bind(struct sock_xprt *transport, struct socket *sock)

  {

  	struct sockaddr_storage myaddr;

@@ -14,7 +24,7 @@ diff -Naur a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c

  	/*

  	 * If we are asking for any ephemeral port (i.e. port == 0 &&

-@@ -1815,6 +1817,8 @@

+@@ -1822,6 +1824,8 @@ static int xs_bind(struct sock_xprt *transport, struct socket *sock)

  	memcpy(&myaddr, &transport->srcaddr, transport->xprt.addrlen);

  	do {

@@ -23,7 +33,7 @@ diff -Naur a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c

  		rpc_set_port((struct sockaddr *)&myaddr, port);

  		err = kernel_bind(sock, (struct sockaddr *)&myaddr,

  				transport->xprt.addrlen);

-@@ -1822,6 +1826,7 @@

+@@ -1829,6 +1833,7 @@ static int xs_bind(struct sock_xprt *transport, struct socket *sock)

  			transport->srcport = port;

  			break;

  		}

@@ -31,3 +41,6 @@ diff -Naur a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c

  		last = port;

  		port = xs_next_srcport(transport, port);

  		if (port > last)

+-- 

+1.9.1

+

@@ -1465,6 +1465,7 @@ CONFIG_FUSION_MAX_SGE=128

 # CONFIG_FIREWIRE_NOSY is not set

 # CONFIG_MACINTOSH_DRIVERS is not set

 CONFIG_NETDEVICES=y

+CONFIG_MII=m

 CONFIG_NET_CORE=y

 # CONFIG_BONDING is not set

 CONFIG_DUMMY=m

@@ -1500,7 +1501,9 @@ CONFIG_ETHERNET=y

 # CONFIG_NET_VENDOR_AGERE is not set

 # CONFIG_NET_VENDOR_ALTEON is not set

 # CONFIG_ALTERA_TSE is not set

-# CONFIG_NET_VENDOR_AMD is not set

+CONFIG_NET_VENDOR_AMD=y

+# CONFIG_AMD8111_ETH is not set

+CONFIG_PCNET32=m

 # CONFIG_NET_VENDOR_ARC is not set

 # CONFIG_NET_VENDOR_ATHEROS is not set

 # CONFIG_NET_VENDOR_AURORA is not set

@@ -1530,7 +1533,7 @@ CONFIG_E1000E=m

 # CONFIG_I40E is not set

 # CONFIG_I40EVF is not set

 # CONFIG_FM10K is not set

-CONFIG_NET_VENDOR_I825XX=y

+# CONFIG_NET_VENDOR_I825XX is not set

 # CONFIG_JME is not set

 # CONFIG_NET_VENDOR_MARVELL is not set

 # CONFIG_NET_VENDOR_MELLANOX is not set

@@ -2,7 +2,7 @@

 Summary:       Kernel

 Name:          linux-esx

 Version:       4.4.20

-Release:       4%{?dist}

+Release:       5%{?dist}

 License:       GPLv2

 URL:           http://www.kernel.org/

 Group:         System Environment/Kernel

@@ -33,6 +33,8 @@ Patch17:       vmxnet3-1.4.7.0-set-CHECKSUM_UNNECESSARY-for-IPv6-packets.patch

 Patch18:       vmxnet3-1.4.8.0-segCnt-can-be-1-for-LRO-packets.patch

 #fixes CVE-2016-0758

 Patch19:       keys-fix-asn.1-indefinite-length-object-parsing.patch

+Patch20:       vmci-1.1.4.0-use-32bit-atomics-for-queue-headers.patch

+Patch21:       vmci-1.1.5.0-doorbell-create-and-destroy-fixes.patch

 BuildRequires: bc

 BuildRequires: kbd

 BuildRequires: kmod

@@ -87,8 +89,13 @@ The Linux package contains the Linux kernel doc files

 %patch17 -p1

 %patch18 -p1

 %patch19 -p1

+%patch20 -p1

+%patch21 -p1

 %build

+# patch vmw_balloon driver

+sed -i 's/module_init/late_initcall/' drivers/misc/vmw_balloon.c

+

 make mrproper

 cp %{SOURCE1} .config

 make LC_ALL= oldconfig

@@ -155,6 +162,12 @@ ln -sf %{name}-%{version}-%{release}.cfg /boot/photon.cfg

 /usr/src/%{name}-headers-%{version}-%{release}

 %changelog

+*   Thu Oct  6 2016 Alexey Makhalov <amakhalov@vmware.com> 4.4.20-5

+-   .config: added ADM PCnet32 support

+-   vmci-1.1.4.0-use-32bit-atomics-for-queue-headers.patch

+-   vmci-1.1.5.0-doorbell-create-and-destroy-fixes.patch

+-   late_initcall for vmw_balloon driver

+-   Minor fixed in pv-ops patchset

 *   Mon Oct  3 2016 Alexey Makhalov <amakhalov@vmware.com> 4.4.20-4

 -   Package vmlinux with PROGBITS sections in -debuginfo subpackage

 *   Wed Sep 21 2016 Alexey Makhalov <amakhalov@vmware.com> 4.4.20-3

@@ -198,7 +211,7 @@ ln -sf %{name}-%{version}-%{release}.cfg /boot/photon.cfg

 -   Apply photon8 config (+stack protector regular)

 -   pv-ops patch: added STA support

 -   Added patches from generic kernel

-*   Tue Mar 09 2016 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 4.2.0-17

+*   Wed Mar 09 2016 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 4.2.0-17

 -   Enable ACPI hotplug support in kernel config

 *   Sun Feb 14 2016 Alexey Makhalov <amakhalov@vmware.com> 4.2.0-16

 -   veth patch: don’t modify ip_summed

new file mode 100644

@@ -0,0 +1,92 @@

+diff --git a/drivers/misc/vmw_vmci/vmci_driver.c b/drivers/misc/vmw_vmci/vmci_driver.c

+index b823f9a..896be15 100644

+--- a/drivers/misc/vmw_vmci/vmci_driver.c

+@@ -113,5 +113,5 @@ module_exit(vmci_drv_exit);

+ 

+ MODULE_AUTHOR("VMware, Inc.");

+ MODULE_DESCRIPTION("VMware Virtual Machine Communication Interface.");

+-MODULE_VERSION("1.1.3.0-k");

++MODULE_VERSION("1.1.4.0-k");

+ MODULE_LICENSE("GPL v2");

+diff --git a/include/linux/vmw_vmci_defs.h b/include/linux/vmw_vmci_defs.h

+index 65ac54c..1bd31a3 100644

+--- a/include/linux/vmw_vmci_defs.h

+@@ -734,6 +734,41 @@ static inline void *vmci_event_data_payload(struct vmci_event_data *ev_data)

+ }

+ 

+ /*

++ * Helper to read a value from a head or tail pointer. For X86_32, the

++ * pointer is treated as a 32bit value, since the pointer value

++ * never exceeds a 32bit value in this case. Also, doing an

++ * atomic64_read on X86_32 uniprocessor systems may be implemented

++ * as a non locked cmpxchg8b, that may end up overwriting updates done

++ * by the VMCI device to the memory location. On 32bit SMP, the lock

++ * prefix will be used, so correctness isn't an issue, but using a

++ * 64bit operation still adds unnecessary overhead.

++ */

++static inline u64 vmci_q_read_pointer(atomic64_t *var)

++{

++#if defined(CONFIG_X86_32)

++	return atomic_read((atomic_t *)var);

++#else

++	return atomic64_read(var);

++#endif

++}

++

++/*

++ * Helper to set the value of a head or tail pointer. For X86_32, the

++ * pointer is treated as a 32bit value, since the pointer value

++ * never exceeds a 32bit value in this case. On 32bit SMP, using a

++ * locked cmpxchg8b adds unnecessary overhead.

++ */

++static inline void vmci_q_set_pointer(atomic64_t *var,

++				      u64 new_val)

++{

++#if defined(CONFIG_X86_32)

++	return atomic_set((atomic_t *)var, (u32)new_val);

++#else

++	return atomic64_set(var, new_val);

++#endif

++}

++

++/*

+  * Helper to add a given offset to a head or tail pointer. Wraps the

+  * value of the pointer around the max size of the queue.

+  */

+@@ -741,14 +776,14 @@ static inline void vmci_qp_add_pointer(atomic64_t *var,

+ 				       size_t add,

+ 				       u64 size)

+ {

+-	u64 new_val = atomic64_read(var);

++	u64 new_val = vmci_q_read_pointer(var);

+ 

+ 	if (new_val >= size - add)

+ 		new_val -= size;

+ 

+ 	new_val += add;

+ 

+-	atomic64_set(var, new_val);

++	vmci_q_set_pointer(var, new_val);

+ }

+ 

+ /*

+@@ -758,7 +793,7 @@ static inline u64

+ vmci_q_header_producer_tail(const struct vmci_queue_header *q_header)

+ {

+ 	struct vmci_queue_header *qh = (struct vmci_queue_header *)q_header;

+-	return atomic64_read(&qh->producer_tail);

++	return vmci_q_read_pointer(&qh->producer_tail);

+ }

+ 

+ /*

+@@ -768,7 +803,7 @@ static inline u64

+ vmci_q_header_consumer_head(const struct vmci_queue_header *q_header)

+ {

+ 	struct vmci_queue_header *qh = (struct vmci_queue_header *)q_header;

+-	return atomic64_read(&qh->consumer_head);

++	return vmci_q_read_pointer(&qh->consumer_head);

+ }

+ 

+ /*

new file mode 100644

@@ -0,0 +1,44 @@

+---

+ drivers/misc/vmw_vmci/vmci_doorbell.c |    8 +++++++-

+ drivers/misc/vmw_vmci/vmci_driver.c   |    2 +-

+ 2 files changed, 8 insertions(+), 2 deletions(-)

+

+diff --git a/drivers/misc/vmw_vmci/vmci_doorbell.c b/drivers/misc/vmw_vmci/vmci_doorbell.c

+index a8cee33..b3fa738 100644

+--- a/drivers/misc/vmw_vmci/vmci_doorbell.c

+@@ -431,6 +431,12 @@ int vmci_doorbell_create(struct vmci_handle *handle,

+ 	if (vmci_handle_is_invalid(*handle)) {

+ 		u32 context_id = vmci_get_context_id();

+ 

++		if (context_id == VMCI_INVALID_ID) {

++			pr_warn("Failed to get context ID\n");

++			result = VMCI_ERROR_NO_RESOURCES;

++			goto free_mem;

++		}

++

+ 		/* Let resource code allocate a free ID for us */

+ 		new_handle = vmci_make_handle(context_id, VMCI_INVALID_ID);

+ 	} else {

+@@ -525,7 +531,7 @@ int vmci_doorbell_destroy(struct vmci_handle handle)

+ 

+ 	entry = container_of(resource, struct dbell_entry, resource);

+ 

+-	if (vmci_guest_code_active()) {

++	if (!hlist_unhashed(&entry->node)) {

+ 		int result;

+ 

+ 		dbell_index_table_remove(entry);

+diff --git a/drivers/misc/vmw_vmci/vmci_driver.c b/drivers/misc/vmw_vmci/vmci_driver.c

+index 896be15..d7eaf1e 100644

+--- a/drivers/misc/vmw_vmci/vmci_driver.c

+@@ -113,5 +113,5 @@ module_exit(vmci_drv_exit);

+ 

+ MODULE_AUTHOR("VMware, Inc.");

+ MODULE_DESCRIPTION("VMware Virtual Machine Communication Interface.");

+-MODULE_VERSION("1.1.4.0-k");

++MODULE_VERSION("1.1.5.0-k");

+ MODULE_LICENSE("GPL v2");

+-- 

+1.7.0