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

 Summary:        Kernel

 Name:           linux-esx

 Version:        4.9.74

-Release:        2%{?dist}

+Release:        3%{?dist}

 License:        GPLv2

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

 Group:          System Environment/Kernel

@@ -23,7 +23,7 @@ Patch6:         linux-4.9-sysctl-sched_weighted_cpuload_uses_rla.patch

 Patch7:         linux-4.9-watchdog-Disable-watchdog-on-virtual-machines.patch

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

 Patch10:        SUNRPC-xs_bind-uses-ip_local_reserved_ports.patch

-Patch11:        net-9p-vsock.patch

+Patch11:        vsock-transport-for-9p.patch

 Patch12:        x86-vmware-sta.patch

 # -esx

 Patch13:        serial-8250-do-not-probe-U6-16550A-fifo-size.patch

@@ -210,6 +210,8 @@ ln -sf linux-%{uname_r}.cfg /boot/photon.cfg

 /usr/src/linux-headers-%{uname_r}

 %changelog

+*   Thu Jan 04 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.9.74-3

+-   Update vsock transport for 9p with newer version.

 *   Wed Jan 03 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.9.74-2

 -   Fix SMB3 mount regression.

 *   Tue Jan 02 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.9.74-1

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

 Summary:        Kernel

 Name:           linux-secure

 Version:        4.9.74

-Release:        2%{?kat_build:.%kat_build}%{?dist}

+Release:        3%{?kat_build:.%kat_build}%{?dist}

 License:        GPLv2

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

 Group:          System Environment/Kernel

@@ -25,7 +25,7 @@ Patch6:         linux-4.9-sysctl-sched_weighted_cpuload_uses_rla.patch

 Patch7:         linux-4.9-watchdog-Disable-watchdog-on-virtual-machines.patch

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

 Patch10:        SUNRPC-xs_bind-uses-ip_local_reserved_ports.patch

-Patch11:        net-9p-vsock.patch

+Patch11:        vsock-transport-for-9p.patch

 Patch12:        x86-vmware-sta.patch

 # secure

 Patch13:        0001-NOWRITEEXEC-and-PAX-features-MPROTECT-EMUTRAMP.patch

@@ -296,6 +296,8 @@ ln -sf linux-%{uname_r}.cfg /boot/photon.cfg

 /usr/src/linux-headers-%{uname_r}

 %changelog

+*   Thu Jan 04 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.9.74-3

+-   Update vsock transport for 9p with newer version.

 *   Wed Jan 03 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.9.74-2

 -   Fix SMB3 mount regression.

 *   Tue Jan 02 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.9.74-1

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

 Summary:        Kernel

 Name:           linux

 Version:        4.9.74

-Release:        2%{?kat_build:.%kat_build}%{?dist}

+Release:        3%{?kat_build:.%kat_build}%{?dist}

 License:    	GPLv2

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

 Group:        	System Environment/Kernel

@@ -26,7 +26,7 @@ Patch6:         linux-4.9-sysctl-sched_weighted_cpuload_uses_rla.patch

 Patch7:         linux-4.9-watchdog-Disable-watchdog-on-virtual-machines.patch

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

 Patch10:        SUNRPC-xs_bind-uses-ip_local_reserved_ports.patch

-Patch11:        net-9p-vsock.patch

+Patch11:        vsock-transport-for-9p.patch

 Patch12:        x86-vmware-sta.patch

 #HyperV patches

 Patch13:        0004-vmbus-Don-t-spam-the-logs-with-unknown-GUIDs.patch

@@ -324,6 +324,8 @@ ln -sf %{name}-%{uname_r}.cfg /boot/photon.cfg

 /usr/share/doc/*

 %changelog

+*   Thu Jan 04 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.9.74-3

+-   Update vsock transport for 9p with newer version.

 *   Wed Jan 03 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.9.74-2

 -   Fix SMB3 mount regression.

 *   Tue Jan 02 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.9.74-1

deleted file mode 100644

@@ -1,117 +0,0 @@

-From 43b616d904088b830bdb42ed9c016ce5f239bc73 Mon Sep 17 00:00:00 2001

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

-Date: Tue, 9 May 2017 12:37:20 -0700

-Subject: [PATCH] net 9p vsock support

-

- net/9p/trans_fd.c | 45 +++++++++++++++++++++++++++++++++++++--------

- 1 file changed, 37 insertions(+), 8 deletions(-)

-

-diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c

-index 7bc2208b6cc4..4acfd8a7f52c 100644

-+++ b/net/9p/trans_fd.c

-@@ -37,6 +37,8 @@

- #include <linux/un.h>

- #include <linux/uaccess.h>

- #include <linux/inet.h>

-+#include <linux/vmw_vmci_defs.h>

-+#include <uapi/linux/vm_sockets.h>

- #include <linux/idr.h>

- #include <linux/file.h>

- #include <linux/parser.h>

-@@ -64,6 +66,7 @@ struct p9_fd_opts {

- 	int wfd;

- 	u16 port;

- 	int privport;

-+	int vsock;

- };

- 

- /*

-@@ -73,7 +76,7 @@ struct p9_fd_opts {

- 

- enum {

- 	/* Options that take integer arguments */

--	Opt_port, Opt_rfdno, Opt_wfdno, Opt_err,

-+	Opt_port, Opt_rfdno, Opt_wfdno, Opt_err, Opt_vsock,

- 	/* Options that take no arguments */

- 	Opt_privport,

- };

-@@ -83,6 +86,7 @@ static const match_table_t tokens = {

- 	{Opt_rfdno, "rfdno=%u"},

- 	{Opt_wfdno, "wfdno=%u"},

- 	{Opt_privport, "privport"},

-+	{Opt_vsock, "vsock=%d"},

- 	{Opt_err, NULL},

- };

- 

-@@ -739,6 +743,7 @@ static int parse_opts(char *params, struct p9_fd_opts *opts)

- 	opts->rfd = ~0;

- 	opts->wfd = ~0;

- 	opts->privport = 0;

-+	opts->vsock = 0;

- 

- 	if (!params)

- 		return 0;

-@@ -778,6 +783,9 @@ static int parse_opts(char *params, struct p9_fd_opts *opts)

- 		case Opt_privport:

- 			opts->privport = 1;

- 			break;

-+		case Opt_vsock:

-+			opts->vsock = option;

-+			break;

- 		default:

- 			continue;

- 		}

-@@ -942,11 +950,27 @@ p9_fd_create_tcp(struct p9_client *client, const char *addr, char *args)

- 

- 	csocket = NULL;

- 

--	sin_server.sin_family = AF_INET;

--	sin_server.sin_addr.s_addr = in_aton(addr);

--	sin_server.sin_port = htons(opts.port);

--	err = __sock_create(current->nsproxy->net_ns, PF_INET,

--			    SOCK_STREAM, IPPROTO_TCP, &csocket, 1);

-+	if (opts.vsock == 0) {

-+		sin_server.sin_family = AF_INET;

-+		sin_server.sin_addr.s_addr = in_aton(addr);

-+		sin_server.sin_port = htons(opts.port);

-+		err = __sock_create(current->nsproxy->net_ns, PF_INET,

-+		                    SOCK_STREAM, IPPROTO_TCP, &csocket, 1);

-+	} else {

-+		/*

-+		 * for vsock, addr is not used, but opts.vsock is the vsock address,

-+		 * where 2 means host (hypervisor), and other numbers mean the vmci id

-+		 * in the VMX file of this running VM

-+		 */

-+		struct sockaddr_vm *vsock_server = (struct sockaddr_vm*)&sin_server;

-+

-+		memset(vsock_server, 0, sizeof(struct sockaddr_vm));

-+		vsock_server->svm_family = AF_VSOCK;

-+		vsock_server->svm_port = opts.port;

-+		vsock_server->svm_cid = opts.vsock;

-+		err = __sock_create(current->nsproxy->net_ns, PF_VSOCK,

-+		                    SOCK_STREAM, 0, &csocket, 1);

-+	}

- 	if (err) {

- 		pr_err("%s (%d): problem creating socket\n",

- 		       __func__, task_pid_nr(current));

-@@ -967,8 +991,13 @@ p9_fd_create_tcp(struct p9_client *client, const char *addr, char *args)

- 				    (struct sockaddr *)&sin_server,

- 				    sizeof(struct sockaddr_in), 0);

- 	if (err < 0) {

--		pr_err("%s (%d): problem connecting socket to %s\n",

--		       __func__, task_pid_nr(current), addr);

-+		if (opts.vsock) {

-+			pr_err("%s (%d): problem connecting vmware vsock addr %d\n",

-+			       __func__, task_pid_nr(current), opts.vsock);

-+		} else {

-+			pr_err("%s (%d): problem connecting socket to %s\n",

-+			       __func__, task_pid_nr(current), addr);

-+		}

- 		sock_release(csocket);

- 		return err;

- 	}

-2.11.0

-

new file mode 100644

@@ -0,0 +1,125 @@

+From ae3d2a171fe2f091adf4d084962df7415a6845e8 Mon Sep 17 00:00:00 2001

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

+Date: Fri, 22 Dec 2017 15:13:17 -0800

+Subject: [PATCH] vsock transport for 9p

+

+This second and correct implementation of 9p support over vsock.

+Second implementation addresses the issue, described in PR 2007859.

+

+Author: Adrian Drzewiecki <adriand@vmware.com>

+

+Here's a patch which adds a new transport type instead, following the

+methods that are used for others. That is, instead of doing

+

+$ mount -t9p -ovsock=1234 fubar /mnt

+

+One would do:

+

+$ mount -t9p -otrans=vsock 1234 /mnt

+---

+ net/9p/trans_fd.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++++++

+ 1 file changed, 68 insertions(+)

+

+diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c

+index 985046ae..322a6bc8 100644

+--- a/net/9p/trans_fd.c

+@@ -37,6 +37,8 @@

+ #include <linux/un.h>

+ #include <linux/uaccess.h>

+ #include <linux/inet.h>

++#include <linux/vmw_vmci_defs.h>

++#include <uapi/linux/vm_sockets.h>

+ #include <linux/idr.h>

+ #include <linux/file.h>

+ #include <linux/parser.h>

+@@ -938,6 +940,59 @@ static int p9_bind_privport(struct socket *sock)

+ 	return err;

+ }

+ 

++static int

++p9_fd_create_vsock(struct p9_client *client, const char *addr, char *args)

++{

++	int err;

++	struct socket *csocket;

++	struct sockaddr_vm vsock_server;

++	struct p9_fd_opts opts;

++

++	err = parse_opts(args, &opts);

++	if (err < 0)

++		return err;

++

++	csocket = NULL;

++

++	memset(&vsock_server, 0, sizeof(struct sockaddr_vm));

++	vsock_server.svm_family = AF_VSOCK;

++	vsock_server.svm_port = opts.port;

++

++	err = kstrtou32(addr, 0, &vsock_server.svm_cid);

++	if (err < 0)

++		return err;

++

++	err = __sock_create(current->nsproxy->net_ns, PF_VSOCK,

++			    SOCK_STREAM, 0, &csocket, 1);

++	if (err) {

++		pr_err("%s (%d): problem creating socket\n",

++		       __func__, task_pid_nr(current));

++		return err;

++	}

++

++	/* XXX: applicable? */

++	if (opts.privport) {

++		err = p9_bind_privport(csocket);

++		if (err < 0) {

++			pr_err("%s (%d): problem binding to privport\n",

++			       __func__, task_pid_nr(current));

++			sock_release(csocket);

++			return err;

++		}

++	}

++

++	err = csocket->ops->connect(csocket,

++				    (struct sockaddr *)&vsock_server,

++				    sizeof(struct sockaddr_vm), 0);

++	if (err < 0) {

++		pr_err("%s (%d): problem connecting vmware vsock addr %s\n",

++		       __func__, task_pid_nr(current), addr);

++		sock_release(csocket);

++		return err;

++	}

++

++	return p9_socket_open(client, csocket);

++}

+ 

+ static int

+ p9_fd_create_tcp(struct p9_client *client, const char *addr, char *args)

+@@ -1053,6 +1108,18 @@ p9_fd_create(struct p9_client *client, const char *addr, char *args)

+ 	return 0;

+ }

+ 

++static struct p9_trans_module p9_vsock_trans = {

++	.name = "vsock",

++	.maxsize = MAX_SOCK_BUF,

++	.def = 0,

++	.create = p9_fd_create_vsock,

++	.close = p9_fd_close,

++	.request = p9_fd_request,

++	.cancel = p9_fd_cancel,

++	.cancelled = p9_fd_cancelled,

++	.owner = THIS_MODULE,

++};

++

+ static struct p9_trans_module p9_tcp_trans = {

+ 	.name = "tcp",

+ 	.maxsize = MAX_SOCK_BUF,

+@@ -1126,6 +1193,7 @@ static void p9_poll_workfn(struct work_struct *work)

+ 

+ int p9_trans_fd_init(void)

+ {

++	v9fs_register_trans(&p9_vsock_trans);

+ 	v9fs_register_trans(&p9_tcp_trans);

+ 	v9fs_register_trans(&p9_unix_trans);

+ 	v9fs_register_trans(&p9_fd_trans);

+-- 

+2.11.0

+