> On Nov 24, 2017, at 5:13 PM, Greg KH <gregkh@xxxxxxxxxxxxxxxxxxx> wrote:
>
> On Thu, Nov 23, 2017 at 03:51:53PM +0000, Jorgen S. Hansen wrote:
>> Hi,
>>
>> Customers running VMware Workstation on 4.4 kernels have been hitting a couple of bugs where net/vmw_vsock/af_vsock.c is calling functions that may sleep when not allowed to. These issues have already been fixed in later kernels, and we would like to request these fixes backported to 4.4 and 4.9 LTS branches.
>>
>> To resolve the above issue, we would like the following commit backported to 4.4 (it applies when using 3-way merge):
>>
>> commit 265563fc8f123641d006d65f26d18d0b24d3022d "AF_VSOCK: Shrink the area influenced by prepare_to_wait"
>
> ~/linux/work/torvalds $ git show 265563fc8f123641d006d65f26d18d0b24d3022d
> fatal: bad object 265563fc8f123641d006d65f26d18d0b24d3022d
>
>> and the following commit (that needs to be applied on top of the above) backported to both 4.4 and 4.9:
>>
>> commit 359669f3b8eab6cbfb83eb1a46ec6ba089d47d18 "vsock: use new wait API for vsock_stream_sendmsg()”
>
> ~/linux/work/torvalds $ git show 359669f3b8eab6cbfb83eb1a46ec6ba089d47d18
> fatal: bad object 359669f3b8eab6cbfb83eb1a46ec6ba089d47d18
>
> Also, when referring to git commits, the following alias is a good thing
> to use:
> git show -s --abbrev-commit --abbrev=12 --pretty=format:"%h (\"%s\")%n"
Sorry about the rookie mistakes - those commit hashes were from the test branch.
The commit we’d like backported to 4.4 (it applies when using 3-way merge) is:
f7f9b5e ("AF_VSOCK: Shrink the area influenced by prepare_to_wait”)
and the following commit backported to both 4.4 and 4.9:
499fde6 ("vsock: use new wait API for vsock_stream_sendmsg()”)
where 499fde6 should be applied on top of f7f9b5e
Thanks,
Jorgen