Commit 46625b8a authored by Stefano Stabellini's avatar Stefano Stabellini Committed by Greg Kroah-Hartman
Browse files

pvcalls-back: set -ENOTCONN in pvcalls_conn_back_read

[ Upstream commit e6587cdb

 ]

When a connection is closing we receive on pvcalls_sk_state_change
notification. Instead of setting the connection as closed immediately
(-ENOTCONN), let's read one more time from it: pvcalls_conn_back_read
will set the connection as closed when necessary.

That way, we avoid races between pvcalls_sk_state_change and
pvcalls_back_ioworker.
Signed-off-by: default avatarStefano Stabellini <stefanos@xilinx.com>
Reviewed-by: default avatarBoris Ostrovsky <boris.ostrovsky@oracle.com>
Signed-off-by: default avatarBoris Ostrovsky <boris.ostrovsky@oracle.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 368a5c8b
...@@ -164,9 +164,10 @@ static void pvcalls_conn_back_read(void *opaque) ...@@ -164,9 +164,10 @@ static void pvcalls_conn_back_read(void *opaque)
/* write the data, then modify the indexes */ /* write the data, then modify the indexes */
virt_wmb(); virt_wmb();
if (ret < 0) if (ret < 0) {
atomic_set(&map->read, 0);
intf->in_error = ret; intf->in_error = ret;
else } else
intf->in_prod = prod + ret; intf->in_prod = prod + ret;
/* update the indexes, then notify the other end */ /* update the indexes, then notify the other end */
virt_wmb(); virt_wmb();
...@@ -296,7 +297,7 @@ static void pvcalls_sk_state_change(struct sock *sock) ...@@ -296,7 +297,7 @@ static void pvcalls_sk_state_change(struct sock *sock)
return; return;
intf = map->ring; intf = map->ring;
intf->in_error = -ENOTCONN; atomic_inc(&map->read);
notify_remote_via_irq(map->irq); notify_remote_via_irq(map->irq);
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment