Request vsock and hv_sock patches to be backported for linux-5.2.y, linux-4.19.y and linux-4.14.y
Hi, Sunil Muthuswamy sunilmut@microsoft.com made some important fixes for hv_sock recently. I and Sunil think it would be great to backport the fixes to the longterm stable kernels.
Since hv_sock was firstly introduced in v4.14, we only care about v4.14, v4.19 and v5.2.
For linux-5.2.y (currently it's v5.2.4), only one patch is missing. The mainline commit ID is: d5afa82c977e ("vsock: correct removal of socket from the list") It can be cleanly cherry-picked from the mainline.
For linux-4.19.y (currently it's v4.19.62), 3 patches are missing. The mainline commit IDs are: cb359b604167 ("hvsock: fix epollout hang from race condition") a9eeb998c28d ("hv_sock: Add support for delayed close") d5afa82c977e ("vsock: correct removal of socket from the list") They can be cleanly cherry-picked from the mainline, in the listed order here. Note: it looks the first commit (cb359b604167) has been queued.
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.
Please let me know, if any clarification is needed.
Thanks! -- Dexuan
On Wed, Jul 31, 2019 at 06:41:10AM +0000, Dexuan Cui wrote:
For linux-4.19.y (currently it's v4.19.62), 3 patches are missing. The mainline commit IDs are: cb359b604167 ("hvsock: fix epollout hang from race condition")
This commit is already in 4.19.63 and 4.14.135 :)
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: 3b4477d2dcf2 ("VSOCK: use TCP state constants for sk_state")
That commit is too much to backport, sorry. Other people have referenced it in 4.14, so if you "need" it, you can do what they did in the past with the backport.
thanks,
greg k-h
On Wed, Jul 31, 2019 at 06:41:10AM +0000, Dexuan Cui wrote:
Hi, Sunil Muthuswamy sunilmut@microsoft.com made some important fixes for hv_sock recently. I and Sunil think it would be great to backport the fixes to the longterm stable kernels.
Since hv_sock was firstly introduced in v4.14, we only care about v4.14, v4.19 and v5.2.
For linux-5.2.y (currently it's v5.2.4), only one patch is missing. The mainline commit ID is: d5afa82c977e ("vsock: correct removal of socket from the list") It can be cleanly cherry-picked from the mainline.
For linux-4.19.y (currently it's v4.19.62), 3 patches are missing. The mainline commit IDs are: cb359b604167 ("hvsock: fix epollout hang from race condition") a9eeb998c28d ("hv_sock: Add support for delayed close") d5afa82c977e ("vsock: correct removal of socket from the list") They can be cleanly cherry-picked from the mainline, in the listed order here. Note: it looks the first commit (cb359b604167) has been queued.
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?
The other ones are now queued up, please let me know if I have messed anythign up.
thanks,
greg k-h
From: Greg Kroah-Hartman gregkh@linuxfoundation.org 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.
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.
The other ones are now queued up, please let me know if I have messed anythign up.
greg k-h
Thanks a lot, Greg!
Thanks, -- Dexuan
On Wed, Jul 31, 2019 at 08:13:24PM +0000, Dexuan Cui wrote:
From: Greg Kroah-Hartman gregkh@linuxfoundation.org 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
From: Greg Kroah-Hartman gregkh@linuxfoundation.org Sent: Wednesday, July 31, 2019 11:21 PM
On Wed, Jul 31, 2019 at 08:13:24PM +0000, Dexuan Cui wrote:
From: Greg Kroah-Hartman gregkh@linuxfoundation.org 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? greg k-h
I checked today's linux-stable-rc.git and now we have all we need.
Thank you, Greg!
Thanks, -- Dexuan
linux-stable-mirror@lists.linaro.org
-
Dexuan Cui -
Greg Kroah-Hartman