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

 From d5e7229bec41406a4040a1ac9131e24cb1f8768d 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/11] Measure correct boot time.

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

 ---

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

@@ -98,7 +98,7 @@ index 5650655..c386186 100644

 From 500436e32d4dffae5d78f12be72c2e6784ab8cfb 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/11] PV io_delay for VMware guest.

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

 ---

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

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

 From adff5db39b45d8adef2b4579ec46ab1bb721a81f 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/11] Improved tsc based sched_clock & clocksource.

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

 ---

  arch/x86/Kconfig             |  1 +

@@ -327,7 +327,7 @@ index c0a2051..284a7ba 100644

 From 3bd5760c3b1f6cb39568361561d7d1e5440f1109 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/11] Move read_boot_clock64 into pv_time_ops.

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

 ---

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

@@ -635,7 +635,7 @@ index 284a7ba..615aeb4 100644

 From aa93eaec3f709633007ab6ce3ddbb8aaa455b557 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/11] Fix clocksource_vmware issue in VM version <= 10

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

 ---

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

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

 From 245c6ff168fabde177b5b6023356b6005b0efbef 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/11] Get lapic timer frequency from HV, skip calibration

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

 ---

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

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

 From 23055114ca27a04044ebbe38853834e0aa869da0 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/11] Skip rdrand reseed

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

 ---

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

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

 From bd806a16d202bf9dc41fbe3f8e39545e704adf9e 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/11] STA implementation. first version.

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

 ---

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

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

 From 8496145f4f5fcd430e5d8f493066a8e54aaaf96b 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/11] STA. updated version

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

 ---

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

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

 From a8f165433de453994aef84a9d6bf1704a18b3a95 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/11] STA: version with a single backdoor command.

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

 ---

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

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

 From 27b9b08cf68f55fbfa297eb047f7d1309e0a60cf 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/11] Remove delays for smpboot

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

 ---

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

@@ -1313,3 +1313,196 @@ index b1f3ed9..8f0be52 100644

 -- 

 1.9.1

+

+From 3fe2ad9c5031e059849ba0970ccee95ce07f8239 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/12] kmsg_dumper to vmware.log

+

+---

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

+ 1 file changed, 139 insertions(+), 4 deletions(-)

+

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

+index 743b8ad..e9f7d52 100644

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

+@@ -30,10 +30,12 @@

+ #include <linux/sched.h>

+ #include <linux/cpu.h>

+ #include <asm/pci_x86.h>

++#include <linux/kmsg_dump.h>

+ 

+-#define CPUID_VMWARE_INFO_LEAF	0x40000000

+-#define VMWARE_HYPERVISOR_MAGIC	0x564D5868

+-#define VMWARE_HYPERVISOR_PORT	0x5658

++#define CPUID_VMWARE_INFO_LEAF		0x40000000

++#define VMWARE_HYPERVISOR_MAGIC		0x564D5868

++#define VMWARE_HYPERVISOR_PORT		0x5658

++#define VMWARE_HYPERVISOR_HB_PORT	0x5659

+ 

+ #define VMWARE_PORT_CMD_GETVERSION	10

+ #define VMWARE_PORT_CMD_GETHZ		45

+@@ -44,7 +46,8 @@

+ # define STEALCLOCK_IS_NOT_AVALIABLE	-1

+ # define STEALCLOCK_IS_DISABLED		0

+ # define STEALCLOCK_IS_ENABLED		1

+-

++#define VMWARE_PORT_CMD_MESSAGE		30

++#define VMWARE_HB_PORT_CMD_MESSAGE	0

+ 

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

+ 	VMWARE_PORT2(cmd, eax, ebx, ecx, edx, UINT_MAX)

+@@ -303,6 +306,13 @@ static void __init paravirt_ops_setup(void)

+ 

+ }

+ 

++static void kmsg_dumper_vmware_log(struct kmsg_dumper *dumper,

++				enum kmsg_dump_reason reason);

++

++static struct kmsg_dumper kmsg_dumper = {

++	.dump = kmsg_dumper_vmware_log

++};

++

+ static void __init vmware_platform_setup(void)

+ {

+ 	uint32_t eax, ebx, ecx, edx;

+@@ -348,6 +358,7 @@ static void __init vmware_platform_setup(void)

+ 	/* PCI BIOS service won't work from a PV guest. */

+ 	pci_probe &= ~PCI_PROBE_BIOS;

+ #endif

++	kmsg_dump_register(&kmsg_dumper);

+ }

+ 

+ /*

+@@ -410,3 +421,127 @@ const __refconst struct hypervisor_x86 x86_hyper_vmware = {

+ 	.x2apic_available	= vmware_legacy_x2apic_available,

+ };

+ EXPORT_SYMBOL(x86_hyper_vmware);

++

++#define MESSAGE_STATUS_SUCCESS  (0x01 << 16)

++#define MESSAGE_STATUS_CPT      (0x10 << 16)

++#define MESSAGE_STATUS_HB       (0x80 << 16)

++

++#define RPCI_PROTOCOL_NUM       0x49435052 /* 'RPCI' */

++#define GUESTMSG_FLAG_COOKIE    0x80000000

++

++#define MESSAGE_TYPE_OPEN	(0 << 16)

++#define MESSAGE_TYPE_SENDSIZE	(1 << 16)

++#define MESSAGE_TYPE_CLOSE	(6 << 16)

++

++typedef struct {

++	uint32_t id;

++	uint32_t cookieHigh;

++	uint32_t cookieLow;

++} vmw_msg;

++

++static int

++vmware_log_open(vmw_msg *msg) {

++	uint32_t result, info, dx, si, di;

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

++		:	"=a" (result),

++			"=c" (info),

++			"=d" (dx),

++			"=S" (si),

++			"=D" (di)

++		:       "a"  (VMWARE_HYPERVISOR_MAGIC),

++			"c"  (VMWARE_PORT_CMD_MESSAGE | MESSAGE_TYPE_OPEN),

++			"d"  (VMWARE_HYPERVISOR_PORT),

++			"b"  (RPCI_PROTOCOL_NUM | GUESTMSG_FLAG_COOKIE));

++

++	if ((info & MESSAGE_STATUS_SUCCESS) == 0)

++		return 1;

++

++	msg->id = dx & 0xffff0000;

++	msg->cookieHigh = si;

++	msg->cookieLow = di;

++	return 0;

++}

++

++static int

++vmware_log_close(vmw_msg *msg) {

++	uint32_t result, info;

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

++		:	"=a" (result),

++			"=c" (info)

++		:       "a"  (VMWARE_HYPERVISOR_MAGIC),

++			"c"  (VMWARE_PORT_CMD_MESSAGE | MESSAGE_TYPE_CLOSE),

++			"d"  (VMWARE_HYPERVISOR_PORT | msg->id),

++			"b"  (0),

++			"S"  (msg->cookieHigh),

++			"D"  (msg->cookieLow));

++

++	if ((info & MESSAGE_STATUS_SUCCESS) == 0)

++		return 1;

++	return 0;

++}

++

++static int

++vmware_log_send(vmw_msg *msg, const char *string) {

++	uint32_t result, info;

++	uint32_t len = strlen(string);

++

++retry:

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

++		:	"=a" (result),

++			"=c" (info)

++		:       "a"  (VMWARE_HYPERVISOR_MAGIC),

++			"c"  (VMWARE_PORT_CMD_MESSAGE | MESSAGE_TYPE_SENDSIZE),

++			"d"  (VMWARE_HYPERVISOR_PORT | msg->id),

++			"b"  (len),

++			"S"  (msg->cookieHigh),

++			"D"  (msg->cookieLow));

++

++	if ((info & MESSAGE_STATUS_SUCCESS) == 0 ||

++	    (info & MESSAGE_STATUS_HB) == 0)

++		/* Expected success + high-bandwidth. Give up. */

++		return 1;

++

++	__asm__ __volatile__ ("pushq %%rbp\n\t"

++			      "movl %[rbp], %%ebp\n\t"

++			      "cld\n\t"

++			      "rep; outsb\n\t"

++			      "popq %%rbp\n\t"

++		:	"=a" (result),

++			"=b" (info)

++		:       "a"  (VMWARE_HYPERVISOR_MAGIC),

++			"c"  (len),

++			"d"  (VMWARE_HYPERVISOR_HB_PORT | msg->id),

++			"b"  (VMWARE_HB_PORT_CMD_MESSAGE | MESSAGE_STATUS_SUCCESS),

++			"S"  (string),

++		  [rbp] "r"  (msg->cookieHigh),

++			"D"  (msg->cookieLow));

++

++	if ((info & MESSAGE_STATUS_SUCCESS) == 0) {

++		if (info & MESSAGE_STATUS_CPT)

++			/* A checkpoint occurred. Retry. */

++			goto retry;

++		return 1;

++	}

++	return 0;

++}

++

++static void kmsg_dumper_vmware_log(struct kmsg_dumper *dumper,

++				enum kmsg_dump_reason reason)

++{

++	vmw_msg msg;

++	static char line[1024];

++	size_t len = 0;

++

++	line[0] = 'l';

++	line[1] = 'o';

++	line[2] = 'g';

++	line[3] = ' ';

++

++	while (kmsg_dump_get_line(dumper, true, line + 4, sizeof(line) - 4, &len)) {

++		line[len + 4] = '\0';

++		if (vmware_log_open(&msg) ||

++		    vmware_log_send(&msg, line) ||

++		    vmware_log_close(&msg))

++			break;

++	}

++}

+-- 

+1.9.1

+

new file mode 100644

@@ -0,0 +1,46 @@

+From ffc0634118254dde4449900a65fc8bdb3d7a52d0 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 0030376..c58db46 100644

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

+@@ -1690,9 +1690,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;

+-	int err, nloop = 0;

++	int err = -EADDRINUSE;

++	int nloop = 0;

+ 	unsigned short port = xs_get_srcport(transport);

+ 	unsigned short last;

++	struct net *net = transport->xprt.xprt_net;

+ 

+ 	/*

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

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

+ 

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

+ 	do {

++		if (inet_is_local_reserved_port(net, port))

++			goto next_port;

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

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

+ 				transport->xprt.addrlen);

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

+ 			transport->srcport = port;

+ 			break;

+ 		}

++next_port:

+ 		last = port;

+ 		port = xs_next_srcport(transport, port);

+ 		if (port > last)

+-- 

+1.9.1

+

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

 Summary:       Kernel

 Name:          linux-esx

 Version:       4.2.0

-Release:       18%{?dist}

+Release:       19%{?dist}

 License:       GPLv2

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

 Group:         System Environment/Kernel

@@ -25,6 +25,7 @@ Patch10:       02-pci-probe.patch

 Patch11:       03-poweroff.patch

 Patch12:       04-quiet-boot.patch

 Patch13:       05-pv-ops.patch

+Patch14:       06-sunrpc.patch

 BuildRequires: bc 

 BuildRequires: kbd

 BuildRequires: kmod

@@ -73,6 +74,7 @@ The Linux package contains the Linux kernel doc files

 %patch11 -p1

 %patch12 -p1

 %patch13 -p1

+%patch14 -p1

 %build

 make mrproper

@@ -138,6 +140,9 @@ ln -sf %{name}-%{version}-%{release}.cfg /boot/photon.cfg

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

 %changelog

+*   Tue Mar 29 2016 Alexey Makhalov <amakhalov@vmware.com> 4.2.0-19

+-   Support kmsg dumping to vmware.log on panic

+-   sunrpc: xs_bind uses ip_local_reserved_ports

 *   Thu Mar 24 2016 Alexey Makhalov <amakhalov@vmware.com> 4.2.0-18

 -   Apply photon8 config (+stack protector regular)

 -   pv-ops patch: added STA support

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

 Summary:        Kernel

 Name:           linux

 Version:    	4.2.0

-Release:    	23%{?dist}

+Release:    	24%{?dist}

 License:    	GPLv2

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

 Group:        	System Environment/Kernel

@@ -20,6 +20,8 @@ Patch5:         sysctl-sched_weighted_cpuload_uses_rla.patch

 Patch6:         watchdog-Disable-watchdog-on-virtual-machines.patch

 Patch7:         SUNRPC-Ensure-that-we-wait-for-connections-to-comple.patch

 Patch8:         SUNRPC-Do-not-reuse-srcport-for-TIME_WAIT-socket.patch

+Patch9:         06-sunrpc.patch

+Patch10:        vmware-log-kmsg-dump-on-panic.patch

 BuildRequires:  bc

 BuildRequires:  kbd

 BuildRequires:  kmod

@@ -84,6 +86,8 @@ Kernel driver for oprofile, a statistical profiler for Linux systems

 %patch6 -p1

 %patch7 -p1

 %patch8 -p1

+%patch9 -p1

+%patch10 -p1

 %build

 make mrproper

@@ -174,6 +178,9 @@ ln -sf %{name}-%{version}-%{release}.cfg /boot/photon.cfg

 /lib/modules/%{version}/kernel/arch/x86/oprofile/

 %changelog

+*   Tue Mar 29 2016 Alexey Makhalov <amakhalov@vmware.com> 4.2.0-24

+-   Support kmsg dumping to vmware.log on panic

+-   sunrpc: xs_bind uses ip_local_reserved_ports

 *   Mon Mar 28 2016 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 4.2.0-23

 -   Enabled Regular stack protection in Linux kernel in config

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

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

 -   Added rpcsec_gss_krb5 and nfs_fscache

 *   Mon Feb 22 2016 Alexey Makhalov <amakhalov@vmware.com> 4.2.0-17

 -   Added sysctl param to control weighted_cpuload() behavior

-*   Sun Feb 18 2016 Divya Thaluru <dthaluru@vmware.com> 4.2.0-16

+*   Thu Feb 18 2016 Divya Thaluru <dthaluru@vmware.com> 4.2.0-16

 -   Disabling network renaming

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

 -   veth patch: don’t modify ip_summed

new file mode 100644

@@ -0,0 +1,179 @@

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

+index 628a059..a964013 100644

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

+@@ -26,16 +26,20 @@

+ #include <asm/div64.h>

+ #include <asm/x86_init.h>

+ #include <asm/hypervisor.h>

++#include <linux/kmsg_dump.h>

+ 

+-#define CPUID_VMWARE_INFO_LEAF	0x40000000

+-#define VMWARE_HYPERVISOR_MAGIC	0x564D5868

+-#define VMWARE_HYPERVISOR_PORT	0x5658

++#define CPUID_VMWARE_INFO_LEAF		0x40000000

++#define VMWARE_HYPERVISOR_MAGIC		0x564D5868

++#define VMWARE_HYPERVISOR_PORT		0x5658

++#define VMWARE_HYPERVISOR_HB_PORT	0x5659

+ 

+ #define VMWARE_PORT_CMD_GETVERSION	10

+ #define VMWARE_PORT_CMD_GETHZ		45

+ #define VMWARE_PORT_CMD_GETVCPU_INFO	68

+ #define VMWARE_PORT_CMD_LEGACY_X2APIC	3

+ #define VMWARE_PORT_CMD_VCPU_RESERVED	31

++#define VMWARE_PORT_CMD_MESSAGE		30

++#define VMWARE_HB_PORT_CMD_MESSAGE	0

+ 

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

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

+@@ -75,6 +79,13 @@ static unsigned long vmware_get_tsc_khz(void)

+ 	return tsc_hz;

+ }

+ 

++static void kmsg_dumper_vmware_log(struct kmsg_dumper *dumper,

++				enum kmsg_dump_reason reason);

++

++static struct kmsg_dumper kmsg_dumper = {

++	.dump = kmsg_dumper_vmware_log

++};

++

+ static void __init vmware_platform_setup(void)

+ {

+ 	uint32_t eax, ebx, ecx, edx;

+@@ -86,6 +97,8 @@ static void __init vmware_platform_setup(void)

+ 	else

+ 		printk(KERN_WARNING

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

++

++	kmsg_dump_register(&kmsg_dumper);

+ }

+ 

+ /*

+@@ -145,3 +158,127 @@ const __refconst struct hypervisor_x86 x86_hyper_vmware = {

+ 	.x2apic_available	= vmware_legacy_x2apic_available,

+ };

+ EXPORT_SYMBOL(x86_hyper_vmware);

++

++#define MESSAGE_STATUS_SUCCESS  (0x01 << 16)

++#define MESSAGE_STATUS_CPT      (0x10 << 16)

++#define MESSAGE_STATUS_HB       (0x80 << 16)

++

++#define RPCI_PROTOCOL_NUM       0x49435052 /* 'RPCI' */

++#define GUESTMSG_FLAG_COOKIE    0x80000000

++

++#define MESSAGE_TYPE_OPEN	(0 << 16)

++#define MESSAGE_TYPE_SENDSIZE	(1 << 16)

++#define MESSAGE_TYPE_CLOSE	(6 << 16)

++

++typedef struct {

++	uint32_t id;

++	uint32_t cookieHigh;

++	uint32_t cookieLow;

++} vmw_msg;

++

++static int

++vmware_log_open(vmw_msg *msg) {

++	uint32_t result, info, dx, si, di;

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

++		:	"=a" (result),

++			"=c" (info),

++			"=d" (dx),

++			"=S" (si),

++			"=D" (di)

++		:       "a"  (VMWARE_HYPERVISOR_MAGIC),

++			"c"  (VMWARE_PORT_CMD_MESSAGE | MESSAGE_TYPE_OPEN),

++			"d"  (VMWARE_HYPERVISOR_PORT),

++			"b"  (RPCI_PROTOCOL_NUM | GUESTMSG_FLAG_COOKIE));

++

++	if ((info & MESSAGE_STATUS_SUCCESS) == 0)

++		return 1;

++

++	msg->id = dx & 0xffff0000;

++	msg->cookieHigh = si;

++	msg->cookieLow = di;

++	return 0;

++}

++

++static int

++vmware_log_close(vmw_msg *msg) {

++	uint32_t result, info;

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

++		:	"=a" (result),

++			"=c" (info)

++		:       "a"  (VMWARE_HYPERVISOR_MAGIC),

++			"c"  (VMWARE_PORT_CMD_MESSAGE | MESSAGE_TYPE_CLOSE),

++			"d"  (VMWARE_HYPERVISOR_PORT | msg->id),

++			"b"  (0),

++			"S"  (msg->cookieHigh),

++			"D"  (msg->cookieLow));

++

++	if ((info & MESSAGE_STATUS_SUCCESS) == 0)

++		return 1;

++	return 0;

++}

++

++static int

++vmware_log_send(vmw_msg *msg, const char *string) {

++	uint32_t result, info;

++	uint32_t len = strlen(string);

++

++retry:

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

++		:	"=a" (result),

++			"=c" (info)

++		:       "a"  (VMWARE_HYPERVISOR_MAGIC),

++			"c"  (VMWARE_PORT_CMD_MESSAGE | MESSAGE_TYPE_SENDSIZE),

++			"d"  (VMWARE_HYPERVISOR_PORT | msg->id),

++			"b"  (len),

++			"S"  (msg->cookieHigh),

++			"D"  (msg->cookieLow));

++

++	if ((info & MESSAGE_STATUS_SUCCESS) == 0 ||

++	    (info & MESSAGE_STATUS_HB) == 0)

++		/* Expected success + high-bandwidth. Give up. */

++		return 1;

++

++	__asm__ __volatile__ ("pushq %%rbp\n\t"

++			      "movl %[rbp], %%ebp\n\t"

++			      "cld\n\t"

++			      "rep; outsb\n\t"

++			      "popq %%rbp\n\t"

++		:	"=a" (result),

++			"=b" (info)

++		:       "a"  (VMWARE_HYPERVISOR_MAGIC),

++			"c"  (len),

++			"d"  (VMWARE_HYPERVISOR_HB_PORT | msg->id),

++			"b"  (VMWARE_HB_PORT_CMD_MESSAGE | MESSAGE_STATUS_SUCCESS),

++			"S"  (string),

++		  [rbp] "r"  (msg->cookieHigh),

++			"D"  (msg->cookieLow));

++

++	if ((info & MESSAGE_STATUS_SUCCESS) == 0) {

++		if (info & MESSAGE_STATUS_CPT)

++			/* A checkpoint occurred. Retry. */

++			goto retry;

++		return 1;

++	}

++	return 0;

++}

++

++static void kmsg_dumper_vmware_log(struct kmsg_dumper *dumper,

++				enum kmsg_dump_reason reason)

++{

++	vmw_msg msg;

++	static char line[1024];

++	size_t len = 0;

++

++	line[0] = 'l';

++	line[1] = 'o';

++	line[2] = 'g';

++	line[3] = ' ';

++

++	while (kmsg_dump_get_line(dumper, true, line + 4, sizeof(line) - 4, &len)) {

++		line[len + 4] = '\0';

++		if (vmware_log_open(&msg) ||

++		    vmware_log_send(&msg, line) ||

++		    vmware_log_close(&msg))

++			break;

++	}

++}