Message ID | 20180731135000.6114-4-eric.desrochers@canonical.com |
---|---|
State | New |
Headers | show |
Series | BUG: scheduling while atomic on VMware 6.0 and late. | expand |
On 07/31/18 15:50, Eric Desrochers wrote: > BugLink: https://bugs.launchpad.net/bugs/1780470 > > The check in vmci_transport_peer_detach_cb should only allow a > detach when the qp handle of the transport matches the one in > the detach message. > > Testing: Before this change, a detach from a peer on a different > socket would cause an active stream socket to register a detach. > > Reviewed-by: George Zhang <georgezhang@vmware.com> > Signed-off-by: Jorgen Hansen <jhansen@vmware.com> > Signed-off-by: David S. Miller <davem@davemloft.net> > (cherry picked from 8ab18d71de8b07d2c4d6f984b718418c09ea45c5) > Signed-off-by: Eric Desrochers <eric.desrochers@canonical.com> > --- > net/vmw_vsock/vmci_transport.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/net/vmw_vsock/vmci_transport.c b/net/vmw_vsock/vmci_transport.c > index 0d1fa05cc8ed..e0436a962789 100644 > --- a/net/vmw_vsock/vmci_transport.c > +++ b/net/vmw_vsock/vmci_transport.c > @@ -844,7 +844,7 @@ static void vmci_transport_peer_detach_cb(u32 sub_id, > * qp_handle. > */ > if (vmci_handle_is_invalid(e_payload->handle) || > - vmci_handle_is_equal(trans->qp_handle, e_payload->handle)) > + !vmci_handle_is_equal(trans->qp_handle, e_payload->handle)) > return; > > /* We don't ask for delayed CBs when we subscribe to this event (we > Any reason why the following part of the patch has been left out? @@ -2154,7 +2154,7 @@ module_exit(vmci_transport_exit); MODULE_AUTHOR("VMware, Inc."); MODULE_DESCRIPTION("VMCI transport for Virtual Sockets"); -MODULE_VERSION("1.0.2.0-k"); +MODULE_VERSION("1.0.3.0-k"); MODULE_LICENSE("GPL v2"); MODULE_ALIAS("vmware_vsock"); MODULE_ALIAS_NETPROTO(PF_VSOCK); If that change was on purpose it needs to be documented (changing "cherry picked from" to "backported from" and adding a backport note). Thanks, Kleber
I didn't want to introduce a new MODULE_VERSION inside an SRU on purpose. Yes, it's supposed to be a backport. Thanks, Eric On Tue, Aug 21, 2018 at 8:50 AM, Kleber Souza <kleber.souza@canonical.com> wrote: > On 07/31/18 15:50, Eric Desrochers wrote: > > BugLink: https://bugs.launchpad.net/bugs/1780470 > > > > The check in vmci_transport_peer_detach_cb should only allow a > > detach when the qp handle of the transport matches the one in > > the detach message. > > > > Testing: Before this change, a detach from a peer on a different > > socket would cause an active stream socket to register a detach. > > > > Reviewed-by: George Zhang <georgezhang@vmware.com> > > Signed-off-by: Jorgen Hansen <jhansen@vmware.com> > > Signed-off-by: David S. Miller <davem@davemloft.net> > > (cherry picked from 8ab18d71de8b07d2c4d6f984b718418c09ea45c5) > > Signed-off-by: Eric Desrochers <eric.desrochers@canonical.com> > > --- > > net/vmw_vsock/vmci_transport.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/net/vmw_vsock/vmci_transport.c b/net/vmw_vsock/vmci_ > transport.c > > index 0d1fa05cc8ed..e0436a962789 100644 > > --- a/net/vmw_vsock/vmci_transport.c > > +++ b/net/vmw_vsock/vmci_transport.c > > @@ -844,7 +844,7 @@ static void vmci_transport_peer_detach_cb(u32 > sub_id, > > * qp_handle. > > */ > > if (vmci_handle_is_invalid(e_payload->handle) || > > - vmci_handle_is_equal(trans->qp_handle, e_payload->handle)) > > + !vmci_handle_is_equal(trans->qp_handle, e_payload->handle)) > > return; > > > > /* We don't ask for delayed CBs when we subscribe to this event (we > > > > Any reason why the following part of the patch has been left out? > > @@ -2154,7 +2154,7 @@ module_exit(vmci_transport_exit); > > MODULE_AUTHOR("VMware, Inc."); > MODULE_DESCRIPTION("VMCI transport for Virtual Sockets"); > -MODULE_VERSION("1.0.2.0-k"); > +MODULE_VERSION("1.0.3.0-k"); > MODULE_LICENSE("GPL v2"); > MODULE_ALIAS("vmware_vsock"); > MODULE_ALIAS_NETPROTO(PF_VSOCK); > > > If that change was on purpose it needs to be documented (changing > "cherry picked from" to "backported from" and adding a backport note). > > > Thanks, > Kleber > <div dir="ltr">I didn't want to introduce a new MODULE_VERSION inside an SRU on purpose.<div>Yes, it's supposed to be a backport.</div><div><br></div><div>Thanks,</div><div>Eric</div></div><div class="gmail_extra"><br><div class="gmail_quote">On Tue, Aug 21, 2018 at 8:50 AM, Kleber Souza <span dir="ltr"><<a href="mailto:kleber.souza@canonical.com" target="_blank">kleber.souza@canonical.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div class="HOEnZb"><div class="h5">On 07/31/18 15:50, Eric Desrochers wrote:<br> > BugLink: <a href="https://bugs.launchpad.net/bugs/1780470" rel="noreferrer" target="_blank">https://bugs.launchpad.net/<wbr>bugs/1780470</a><br> > <br> > The check in vmci_transport_peer_detach_cb should only allow a<br> > detach when the qp handle of the transport matches the one in<br> > the detach message.<br> > <br> > Testing: Before this change, a detach from a peer on a different<br> > socket would cause an active stream socket to register a detach.<br> > <br> > Reviewed-by: George Zhang <<a href="mailto:georgezhang@vmware.com">georgezhang@vmware.com</a>><br> > Signed-off-by: Jorgen Hansen <<a href="mailto:jhansen@vmware.com">jhansen@vmware.com</a>><br> > Signed-off-by: David S. Miller <<a href="mailto:davem@davemloft.net">davem@davemloft.net</a>><br> > (cherry picked from 8ab18d71de8b07d2c4d6f984b71841<wbr>8c09ea45c5)<br> > Signed-off-by: Eric Desrochers <<a href="mailto:eric.desrochers@canonical.com">eric.desrochers@canonical.com</a><wbr>><br> > ---<br> > net/vmw_vsock/vmci_transport.c | 2 +-<br> > 1 file changed, 1 insertion(+), 1 deletion(-)<br> > <br> > diff --git a/net/vmw_vsock/vmci_<wbr>transport.c b/net/vmw_vsock/vmci_<wbr>transport.c<br> > index 0d1fa05cc8ed..e0436a962789 100644<br> > --- a/net/vmw_vsock/vmci_<wbr>transport.c<br> > +++ b/net/vmw_vsock/vmci_<wbr>transport.c<br> > @@ -844,7 +844,7 @@ static void vmci_transport_peer_detach_cb(<wbr>u32 sub_id,<br> > * qp_handle.<br> > */<br> > if (vmci_handle_is_invalid(e_<wbr>payload->handle) ||<br> > - vmci_handle_is_equal(trans-><wbr>qp_handle, e_payload->handle))<br> > + !vmci_handle_is_equal(trans-><wbr>qp_handle, e_payload->handle))<br> > return;<br> > <br> > /* We don't ask for delayed CBs when we subscribe to this event (we<br> > <br> <br> </div></div>Any reason why the following part of the patch has been left out?<br> <br> @@ -2154,7 +2154,7 @@ module_exit(vmci_transport_<wbr>exit);<br> <br> MODULE_AUTHOR("VMware, Inc.");<br> MODULE_DESCRIPTION("VMCI transport for Virtual Sockets");<br> -MODULE_VERSION("1.0.2.0-k");<br> +MODULE_VERSION("1.0.3.0-k");<br> MODULE_LICENSE("GPL v2");<br> MODULE_ALIAS("vmware_vsock");<br> MODULE_ALIAS_NETPROTO(PF_<wbr>VSOCK);<br> <br> <br> If that change was on purpose it needs to be documented (changing<br> "cherry picked from" to "backported from" and adding a backport note).<br> <br> <br> Thanks,<br> Kleber<br> </blockquote></div><br></div>
On 07/31/18 15:50, Eric Desrochers wrote: There's no "From ..." at the beginning of the body, so the authorship of the patch is wrongly assigned when applying it. I'll fix it. > BugLink: https://bugs.launchpad.net/bugs/1780470 > > The check in vmci_transport_peer_detach_cb should only allow a > detach when the qp handle of the transport matches the one in > the detach message. > > Testing: Before this change, a detach from a peer on a different > socket would cause an active stream socket to register a detach. > > Reviewed-by: George Zhang <georgezhang@vmware.com> > Signed-off-by: Jorgen Hansen <jhansen@vmware.com> > Signed-off-by: David S. Miller <davem@davemloft.net> > (cherry picked from 8ab18d71de8b07d2c4d6f984b718418c09ea45c5) > Signed-off-by: Eric Desrochers <eric.desrochers@canonical.com> > --- > net/vmw_vsock/vmci_transport.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/net/vmw_vsock/vmci_transport.c b/net/vmw_vsock/vmci_transport.c > index 0d1fa05cc8ed..e0436a962789 100644 > --- a/net/vmw_vsock/vmci_transport.c > +++ b/net/vmw_vsock/vmci_transport.c > @@ -844,7 +844,7 @@ static void vmci_transport_peer_detach_cb(u32 sub_id, > * qp_handle. > */ > if (vmci_handle_is_invalid(e_payload->handle) || > - vmci_handle_is_equal(trans->qp_handle, e_payload->handle)) > + !vmci_handle_is_equal(trans->qp_handle, e_payload->handle)) > return; > > /* We don't ask for delayed CBs when we subscribe to this event (we >
diff --git a/net/vmw_vsock/vmci_transport.c b/net/vmw_vsock/vmci_transport.c index 0d1fa05cc8ed..e0436a962789 100644 --- a/net/vmw_vsock/vmci_transport.c +++ b/net/vmw_vsock/vmci_transport.c @@ -844,7 +844,7 @@ static void vmci_transport_peer_detach_cb(u32 sub_id, * qp_handle. */ if (vmci_handle_is_invalid(e_payload->handle) || - vmci_handle_is_equal(trans->qp_handle, e_payload->handle)) + !vmci_handle_is_equal(trans->qp_handle, e_payload->handle)) return; /* We don't ask for delayed CBs when we subscribe to this event (we