* [PATCH 1/4] VSOCK: get rid of EXPORT_SYMTAB
2013-02-18 16:04 [PATCH 0/4] Minor vSockets fixes Andy King
@ 2013-02-18 16:04 ` Andy King
2013-02-18 16:04 ` Andy King
` (3 subsequent siblings)
4 siblings, 0 replies; 11+ messages in thread
From: Andy King @ 2013-02-18 16:04 UTC (permalink / raw)
To: netdev, linux-kernel, virtualization
Cc: davem, pv-drivers, kraxel, Dmitry Torokhov
From: Dmitry Torokhov <dtor@vmware.com>
This is the default behavior for a looooooong time.
Acked-by: Andy King <acking@vmware.com>
Signed-off-by: Dmitry Torokhov <dtor@vmware.com>
---
net/vmw_vsock/af_vsock.c | 2 --
net/vmw_vsock/vmci_transport.c | 2 --
2 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c
index 54bb7bd..a8efe5a 100644
--- a/net/vmw_vsock/af_vsock.c
+++ b/net/vmw_vsock/af_vsock.c
@@ -76,8 +76,6 @@
*/
#include <linux/types.h>
-
-#define EXPORT_SYMTAB
#include <linux/bitops.h>
#include <linux/cred.h>
#include <linux/init.h>
diff --git a/net/vmw_vsock/vmci_transport.c b/net/vmw_vsock/vmci_transport.c
index e8a87cf..a70ace8 100644
--- a/net/vmw_vsock/vmci_transport.c
+++ b/net/vmw_vsock/vmci_transport.c
@@ -14,8 +14,6 @@
*/
#include <linux/types.h>
-
-#define EXPORT_SYMTAB
#include <linux/bitops.h>
#include <linux/cred.h>
#include <linux/init.h>
--
1.7.4.1
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH 1/4] VSOCK: get rid of EXPORT_SYMTAB
@ 2013-02-18 16:04 ` Andy King
0 siblings, 0 replies; 11+ messages in thread
From: Andy King @ 2013-02-18 16:04 UTC (permalink / raw)
To: netdev, linux-kernel, virtualization; +Cc: pv-drivers, Dmitry Torokhov, davem
From: Dmitry Torokhov <dtor@vmware.com>
This is the default behavior for a looooooong time.
Acked-by: Andy King <acking@vmware.com>
Signed-off-by: Dmitry Torokhov <dtor@vmware.com>
---
net/vmw_vsock/af_vsock.c | 2 --
net/vmw_vsock/vmci_transport.c | 2 --
2 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c
index 54bb7bd..a8efe5a 100644
--- a/net/vmw_vsock/af_vsock.c
+++ b/net/vmw_vsock/af_vsock.c
@@ -76,8 +76,6 @@
*/
#include <linux/types.h>
-
-#define EXPORT_SYMTAB
#include <linux/bitops.h>
#include <linux/cred.h>
#include <linux/init.h>
diff --git a/net/vmw_vsock/vmci_transport.c b/net/vmw_vsock/vmci_transport.c
index e8a87cf..a70ace8 100644
--- a/net/vmw_vsock/vmci_transport.c
+++ b/net/vmw_vsock/vmci_transport.c
@@ -14,8 +14,6 @@
*/
#include <linux/types.h>
-
-#define EXPORT_SYMTAB
#include <linux/bitops.h>
#include <linux/cred.h>
#include <linux/init.h>
--
1.7.4.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 2/4] VSOCK: get rid of vsock_version.h
2013-02-18 16:04 [PATCH 0/4] Minor vSockets fixes Andy King
@ 2013-02-18 16:04 ` Andy King
2013-02-18 16:04 ` Andy King
` (3 subsequent siblings)
4 siblings, 0 replies; 11+ messages in thread
From: Andy King @ 2013-02-18 16:04 UTC (permalink / raw)
To: netdev, linux-kernel, virtualization
Cc: davem, pv-drivers, kraxel, Dmitry Torokhov
From: Dmitry Torokhov <dtor@vmware.com>
There isn't really a need to have a separate file for it.
Acked-by: Andy King <acking@vmware.com>
Signed-off-by: Dmitry Torokhov <dtor@vmware.com>
---
net/vmw_vsock/af_vsock.c | 3 +--
net/vmw_vsock/vsock_version.h | 22 ----------------------
2 files changed, 1 insertions(+), 24 deletions(-)
delete mode 100644 net/vmw_vsock/vsock_version.h
diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c
index a8efe5a..c1b9e55 100644
--- a/net/vmw_vsock/af_vsock.c
+++ b/net/vmw_vsock/af_vsock.c
@@ -98,7 +98,6 @@
#include <net/sock.h>
#include "af_vsock.h"
-#include "vsock_version.h"
static int __vsock_bind(struct sock *sk, struct sockaddr_vm *addr);
static void vsock_sk_destruct(struct sock *sk);
@@ -2009,5 +2008,5 @@ EXPORT_SYMBOL_GPL(vsock_core_exit);
MODULE_AUTHOR("VMware, Inc.");
MODULE_DESCRIPTION("VMware Virtual Socket Family");
-MODULE_VERSION(VSOCK_DRIVER_VERSION_STRING);
+MODULE_VERSION("1.0.0.0-k");
MODULE_LICENSE("GPL v2");
diff --git a/net/vmw_vsock/vsock_version.h b/net/vmw_vsock/vsock_version.h
deleted file mode 100644
index 4df7f5e..0000000
--- a/net/vmw_vsock/vsock_version.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * VMware vSockets Driver
- *
- * Copyright (C) 2011-2012 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 Free
- * Software Foundation version 2 and no later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- */
-
-#ifndef _VSOCK_VERSION_H_
-#define _VSOCK_VERSION_H_
-
-#define VSOCK_DRIVER_VERSION_PARTS { 1, 0, 0, 0 }
-#define VSOCK_DRIVER_VERSION_STRING "1.0.0.0-k"
-
-#endif /* _VSOCK_VERSION_H_ */
--
1.7.4.1
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH 2/4] VSOCK: get rid of vsock_version.h
@ 2013-02-18 16:04 ` Andy King
0 siblings, 0 replies; 11+ messages in thread
From: Andy King @ 2013-02-18 16:04 UTC (permalink / raw)
To: netdev, linux-kernel, virtualization; +Cc: pv-drivers, Dmitry Torokhov, davem
From: Dmitry Torokhov <dtor@vmware.com>
There isn't really a need to have a separate file for it.
Acked-by: Andy King <acking@vmware.com>
Signed-off-by: Dmitry Torokhov <dtor@vmware.com>
---
net/vmw_vsock/af_vsock.c | 3 +--
net/vmw_vsock/vsock_version.h | 22 ----------------------
2 files changed, 1 insertions(+), 24 deletions(-)
delete mode 100644 net/vmw_vsock/vsock_version.h
diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c
index a8efe5a..c1b9e55 100644
--- a/net/vmw_vsock/af_vsock.c
+++ b/net/vmw_vsock/af_vsock.c
@@ -98,7 +98,6 @@
#include <net/sock.h>
#include "af_vsock.h"
-#include "vsock_version.h"
static int __vsock_bind(struct sock *sk, struct sockaddr_vm *addr);
static void vsock_sk_destruct(struct sock *sk);
@@ -2009,5 +2008,5 @@ EXPORT_SYMBOL_GPL(vsock_core_exit);
MODULE_AUTHOR("VMware, Inc.");
MODULE_DESCRIPTION("VMware Virtual Socket Family");
-MODULE_VERSION(VSOCK_DRIVER_VERSION_STRING);
+MODULE_VERSION("1.0.0.0-k");
MODULE_LICENSE("GPL v2");
diff --git a/net/vmw_vsock/vsock_version.h b/net/vmw_vsock/vsock_version.h
deleted file mode 100644
index 4df7f5e..0000000
--- a/net/vmw_vsock/vsock_version.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * VMware vSockets Driver
- *
- * Copyright (C) 2011-2012 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 Free
- * Software Foundation version 2 and no later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- */
-
-#ifndef _VSOCK_VERSION_H_
-#define _VSOCK_VERSION_H_
-
-#define VSOCK_DRIVER_VERSION_PARTS { 1, 0, 0, 0 }
-#define VSOCK_DRIVER_VERSION_STRING "1.0.0.0-k"
-
-#endif /* _VSOCK_VERSION_H_ */
--
1.7.4.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 3/4] VSOCK: Remove hypervisor-only socket option
2013-02-18 16:04 [PATCH 0/4] Minor vSockets fixes Andy King
@ 2013-02-18 16:04 ` Andy King
2013-02-18 16:04 ` Andy King
` (3 subsequent siblings)
4 siblings, 0 replies; 11+ messages in thread
From: Andy King @ 2013-02-18 16:04 UTC (permalink / raw)
To: netdev, linux-kernel, virtualization; +Cc: davem, pv-drivers, kraxel, Andy King
Remove hypervisor-only socket option.
Reported-by: Gerd Hoffmann <kraxel@redhat.com>
Acked-by: Dmitry Torokhov <dtor@vmware.com>
Signed-off-by: Andy King <acking@vmware.com>
---
include/uapi/linux/vm_sockets.h | 8 --------
1 files changed, 0 insertions(+), 8 deletions(-)
diff --git a/include/uapi/linux/vm_sockets.h b/include/uapi/linux/vm_sockets.h
index f7f2e99..df91301 100644
--- a/include/uapi/linux/vm_sockets.h
+++ b/include/uapi/linux/vm_sockets.h
@@ -52,14 +52,6 @@
#define SO_VM_SOCKETS_PEER_HOST_VM_ID 3
-/* Option name for socket's service label. Use as the option name in
- * setsockopt(3) or getsockopt(3) to set or get the service label for a socket.
- * The service label is a C-style NUL-terminated string. Only available for
- * hypervisor endpoints.
- */
-
-#define SO_VM_SOCKETS_SERVICE_LABEL 4
-
/* Option name for determining if a socket is trusted. Use as the option name
* in getsockopt(3) to determine if a socket is trusted. The value is a
* signed integer.
--
1.7.4.1
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH 3/4] VSOCK: Remove hypervisor-only socket option
@ 2013-02-18 16:04 ` Andy King
0 siblings, 0 replies; 11+ messages in thread
From: Andy King @ 2013-02-18 16:04 UTC (permalink / raw)
To: netdev, linux-kernel, virtualization; +Cc: pv-drivers, Andy King, davem
Remove hypervisor-only socket option.
Reported-by: Gerd Hoffmann <kraxel@redhat.com>
Acked-by: Dmitry Torokhov <dtor@vmware.com>
Signed-off-by: Andy King <acking@vmware.com>
---
include/uapi/linux/vm_sockets.h | 8 --------
1 files changed, 0 insertions(+), 8 deletions(-)
diff --git a/include/uapi/linux/vm_sockets.h b/include/uapi/linux/vm_sockets.h
index f7f2e99..df91301 100644
--- a/include/uapi/linux/vm_sockets.h
+++ b/include/uapi/linux/vm_sockets.h
@@ -52,14 +52,6 @@
#define SO_VM_SOCKETS_PEER_HOST_VM_ID 3
-/* Option name for socket's service label. Use as the option name in
- * setsockopt(3) or getsockopt(3) to set or get the service label for a socket.
- * The service label is a C-style NUL-terminated string. Only available for
- * hypervisor endpoints.
- */
-
-#define SO_VM_SOCKETS_SERVICE_LABEL 4
-
/* Option name for determining if a socket is trusted. Use as the option name
* in getsockopt(3) to determine if a socket is trusted. The value is a
* signed integer.
--
1.7.4.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 4/4] VSOCK: Don't reject PF_VSOCK protocol
2013-02-18 16:04 [PATCH 0/4] Minor vSockets fixes Andy King
@ 2013-02-18 16:04 ` Andy King
2013-02-18 16:04 ` Andy King
` (3 subsequent siblings)
4 siblings, 0 replies; 11+ messages in thread
From: Andy King @ 2013-02-18 16:04 UTC (permalink / raw)
To: netdev, linux-kernel, virtualization; +Cc: davem, pv-drivers, kraxel, Andy King
Allow our own family as the protocol value for socket creation.
Reported-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Andy King <acking@vmware.com>
---
net/vmw_vsock/af_vsock.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c
index c1b9e55..ca511c4 100644
--- a/net/vmw_vsock/af_vsock.c
+++ b/net/vmw_vsock/af_vsock.c
@@ -1860,7 +1860,7 @@ static int vsock_create(struct net *net, struct socket *sock,
if (!sock)
return -EINVAL;
- if (protocol)
+ if (protocol && protocol != PF_VSOCK)
return -EPROTONOSUPPORT;
switch (sock->type) {
--
1.7.4.1
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH 4/4] VSOCK: Don't reject PF_VSOCK protocol
@ 2013-02-18 16:04 ` Andy King
0 siblings, 0 replies; 11+ messages in thread
From: Andy King @ 2013-02-18 16:04 UTC (permalink / raw)
To: netdev, linux-kernel, virtualization; +Cc: pv-drivers, Andy King, davem
Allow our own family as the protocol value for socket creation.
Reported-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Andy King <acking@vmware.com>
---
net/vmw_vsock/af_vsock.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c
index c1b9e55..ca511c4 100644
--- a/net/vmw_vsock/af_vsock.c
+++ b/net/vmw_vsock/af_vsock.c
@@ -1860,7 +1860,7 @@ static int vsock_create(struct net *net, struct socket *sock,
if (!sock)
return -EINVAL;
- if (protocol)
+ if (protocol && protocol != PF_VSOCK)
return -EPROTONOSUPPORT;
switch (sock->type) {
--
1.7.4.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH 0/4] Minor vSockets fixes
2013-02-18 16:04 [PATCH 0/4] Minor vSockets fixes Andy King
@ 2013-02-18 20:03 ` David Miller
2013-02-18 16:04 ` Andy King
` (3 subsequent siblings)
4 siblings, 0 replies; 11+ messages in thread
From: David Miller @ 2013-02-18 20:03 UTC (permalink / raw)
To: acking; +Cc: netdev, linux-kernel, virtualization, pv-drivers, kraxel
From: Andy King <acking@vmware.com>
Date: Mon, 18 Feb 2013 08:04:09 -0800
> Minor vSockets fixes, two of which were reported on LKML.
Series applied, thanks.
^ permalink raw reply [flat|nested] 11+ messages in thread