On Wed, Jul 31, 2019 at 08:13:24PM +0000, Dexuan Cui wrote:
> > From: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
> > Sent: Wednesday, July 31, 2019 2:31 AM
> > On Wed, Jul 31, 2019 at 06:41:10AM +0000, Dexuan Cui wrote:
> > > For linux-4.14.y (currently it's v4.14.134), 4 patches are missing.
> > > The mainline commit IDs are:
> > > cb359b604167 ("hvsock: fix epollout hang from race condition")
> > > 3b4477d2dcf2 ("VSOCK: use TCP state constants for sk_state")
> > > a9eeb998c28d ("hv_sock: Add support for delayed close")
> > > d5afa82c977e ("vsock: correct removal of socket from the list")
> > > The third patch (a9eeb998c28d) needs small manual adjustments, and please
> > > use the attached backported patch for it; the other 3 patches can be cleanly
> > > cherry-picked from the mainline, in the listed order here.
> > > Note: it looks the first commit (cb359b604167) has been queued.
> >
> > I have not taken 3b4477d2dcf2 ("VSOCK: use TCP state constants for
> > sk_state") for 4.14.y as it doesn't look like you really needed it. Are
> > you sure you did?
>
> For linux-4.14.y:
> Without 3b4477d2dcf2, there would be a conflict when we apply a9eeb998c28d.
Didn't happen, look at the tree for proof of that :)
> And, without 3b4477d2dcf2, I think actually we should not apply:
> c9d3fe9da094 ("VSOCK: fix outdated sk_state value in hvs_release()"),
> but c9d3fe9da094 was already applied into linux-4.14.y on Feb 25, 2018.
>
> I just checked 4.14.136-rc1 and found 3b4477d2dcf2 is queued. This is great! :-)
>
> So the only missing thing is: we need to cherry pick
> a9eeb998c28d ("hv_sock: Add support for delayed close")
> onto 4.14.136-rc1.
Now queued up.
Can you test all of these to verify I got it right?
thanks,
greg k-h
