| Message ID | 1496431915-20774-7-git-send-email-sstabellini@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 02/06/17 21:31, Stefano Stabellini wrote: > Just reply with success to the other end for now. Delay the allocation > of the actual socket to bind and/or connect. > > Signed-off-by: Stefano Stabellini <stefano@aporeto.com> > CC: boris.ostrovsky@oracle.com > CC: jgross@suse.com > --- > drivers/xen/pvcalls-back.c | 29 ++++++++++++++++++++++++++++- > 1 file changed, 28 insertions(+), 1 deletion(-) > > diff --git a/drivers/xen/pvcalls-back.c b/drivers/xen/pvcalls-back.c > index 6057533..1f2bb26 100644 > --- a/drivers/xen/pvcalls-back.c > +++ b/drivers/xen/pvcalls-back.c > @@ -12,12 +12,17 @@ > * GNU General Public License for more details. > */ > > +#include <linux/inet.h> > #include <linux/kthread.h> > #include <linux/list.h> > #include <linux/radix-tree.h> > #include <linux/module.h> > #include <linux/semaphore.h> > #include <linux/wait.h> > +#include <net/sock.h> > +#include <net/inet_common.h> > +#include <net/inet_connection_sock.h> > +#include <net/request_sock.h> > > #include <xen/events.h> > #include <xen/grant_table.h> > @@ -54,7 +59,29 @@ struct pvcalls_fedata { > static int pvcalls_back_socket(struct xenbus_device *dev, > struct xen_pvcalls_request *req) > { > - return 0; > + struct pvcalls_fedata *priv; > + int ret; > + struct xen_pvcalls_response *rsp; > + > + priv = dev_get_drvdata(&dev->dev); > + > + if (req->u.socket.domain != AF_INET || > + req->u.socket.type != SOCK_STREAM || > + (req->u.socket.protocol != IPPROTO_IP && > + req->u.socket.protocol != AF_INET)) > + ret = -EAFNOSUPPORT; > + else > + ret = 0; > + > + /* leave the actual socket allocation for later */ > + > + rsp = RING_GET_RESPONSE(&priv->ring, priv->ring.rsp_prod_pvt++); > + rsp->req_id = req->req_id; > + rsp->cmd = req->cmd; > + rsp->u.socket.id = req->u.socket.id; > + rsp->ret = ret; > + > + return ret; So if ret != 0 this will omit the call of RING_PUSH_RESPONSES_AND_CHECK_NOTIFY() in pvcalls_back_work(). I think you want to return 0. Juergen
On Tue, 13 Jun 2017, Juergen Gross wrote: > On 02/06/17 21:31, Stefano Stabellini wrote: > > Just reply with success to the other end for now. Delay the allocation > > of the actual socket to bind and/or connect. > > > > Signed-off-by: Stefano Stabellini <stefano@aporeto.com> > > CC: boris.ostrovsky@oracle.com > > CC: jgross@suse.com > > --- > > drivers/xen/pvcalls-back.c | 29 ++++++++++++++++++++++++++++- > > 1 file changed, 28 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/xen/pvcalls-back.c b/drivers/xen/pvcalls-back.c > > index 6057533..1f2bb26 100644 > > --- a/drivers/xen/pvcalls-back.c > > +++ b/drivers/xen/pvcalls-back.c > > @@ -12,12 +12,17 @@ > > * GNU General Public License for more details. > > */ > > > > +#include <linux/inet.h> > > #include <linux/kthread.h> > > #include <linux/list.h> > > #include <linux/radix-tree.h> > > #include <linux/module.h> > > #include <linux/semaphore.h> > > #include <linux/wait.h> > > +#include <net/sock.h> > > +#include <net/inet_common.h> > > +#include <net/inet_connection_sock.h> > > +#include <net/request_sock.h> > > > > #include <xen/events.h> > > #include <xen/grant_table.h> > > @@ -54,7 +59,29 @@ struct pvcalls_fedata { > > static int pvcalls_back_socket(struct xenbus_device *dev, > > struct xen_pvcalls_request *req) > > { > > - return 0; > > + struct pvcalls_fedata *priv; > > + int ret; > > + struct xen_pvcalls_response *rsp; > > + > > + priv = dev_get_drvdata(&dev->dev); > > + > > + if (req->u.socket.domain != AF_INET || > > + req->u.socket.type != SOCK_STREAM || > > + (req->u.socket.protocol != IPPROTO_IP && > > + req->u.socket.protocol != AF_INET)) > > + ret = -EAFNOSUPPORT; > > + else > > + ret = 0; > > + > > + /* leave the actual socket allocation for later */ > > + > > + rsp = RING_GET_RESPONSE(&priv->ring, priv->ring.rsp_prod_pvt++); > > + rsp->req_id = req->req_id; > > + rsp->cmd = req->cmd; > > + rsp->u.socket.id = req->u.socket.id; > > + rsp->ret = ret; > > + > > + return ret; > > So if ret != 0 this will omit the call of > RING_PUSH_RESPONSES_AND_CHECK_NOTIFY() in pvcalls_back_work(). > > I think you want to return 0. Yes, you are right, thanks!
diff --git a/drivers/xen/pvcalls-back.c b/drivers/xen/pvcalls-back.c index 6057533..1f2bb26 100644 --- a/drivers/xen/pvcalls-back.c +++ b/drivers/xen/pvcalls-back.c @@ -12,12 +12,17 @@ * GNU General Public License for more details. */ +#include <linux/inet.h> #include <linux/kthread.h> #include <linux/list.h> #include <linux/radix-tree.h> #include <linux/module.h> #include <linux/semaphore.h> #include <linux/wait.h> +#include <net/sock.h> +#include <net/inet_common.h> +#include <net/inet_connection_sock.h> +#include <net/request_sock.h> #include <xen/events.h> #include <xen/grant_table.h> @@ -54,7 +59,29 @@ struct pvcalls_fedata { static int pvcalls_back_socket(struct xenbus_device *dev, struct xen_pvcalls_request *req) { - return 0; + struct pvcalls_fedata *priv; + int ret; + struct xen_pvcalls_response *rsp; + + priv = dev_get_drvdata(&dev->dev); + + if (req->u.socket.domain != AF_INET || + req->u.socket.type != SOCK_STREAM || + (req->u.socket.protocol != IPPROTO_IP && + req->u.socket.protocol != AF_INET)) + ret = -EAFNOSUPPORT; + else + ret = 0; + + /* leave the actual socket allocation for later */ + + rsp = RING_GET_RESPONSE(&priv->ring, priv->ring.rsp_prod_pvt++); + rsp->req_id = req->req_id; + rsp->cmd = req->cmd; + rsp->u.socket.id = req->u.socket.id; + rsp->ret = ret; + + return ret; } static int pvcalls_back_connect(struct xenbus_device *dev,
Just reply with success to the other end for now. Delay the allocation of the actual socket to bind and/or connect. Signed-off-by: Stefano Stabellini <stefano@aporeto.com> CC: boris.ostrovsky@oracle.com CC: jgross@suse.com --- drivers/xen/pvcalls-back.c | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-)