* [PATCH] vhost: add vsock compat ioctl
@ 2018-03-14 17:26 Sonny Rao
2018-03-14 19:05 ` Michael S. Tsirkin
0 siblings, 1 reply; 3+ messages in thread
From: Sonny Rao @ 2018-03-14 17:26 UTC (permalink / raw)
To: kvm
Cc: Stefan Hajnoczi, Michael S . Tsirkin, Jason Wang, virtualization,
netdev, linux-kernel
This will allow usage of vsock from 32-bit binaries on a 64-bit
kernel.
Signed-off-by: Sonny Rao <sonnyrao@chromium.org>
---
drivers/vhost/vsock.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/vhost/vsock.c b/drivers/vhost/vsock.c
index 0d14e2ff19f16..d0e65e92110e5 100644
--- a/drivers/vhost/vsock.c
+++ b/drivers/vhost/vsock.c
@@ -705,6 +705,7 @@ static const struct file_operations vhost_vsock_fops = {
.release = vhost_vsock_dev_release,
.llseek = noop_llseek,
.unlocked_ioctl = vhost_vsock_dev_ioctl,
+ .compat_ioctl = vhost_vsock_dev_ioctl,
};
static struct miscdevice vhost_vsock_misc = {
--
2.13.5
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] vhost: add vsock compat ioctl
2018-03-14 17:26 [PATCH] vhost: add vsock compat ioctl Sonny Rao
@ 2018-03-14 19:05 ` Michael S. Tsirkin
2018-03-14 20:39 ` Sonny Rao
0 siblings, 1 reply; 3+ messages in thread
From: Michael S. Tsirkin @ 2018-03-14 19:05 UTC (permalink / raw)
To: Sonny Rao
Cc: kvm, Stefan Hajnoczi, Jason Wang, virtualization, netdev,
linux-kernel
On Wed, Mar 14, 2018 at 10:26:05AM -0700, Sonny Rao wrote:
> This will allow usage of vsock from 32-bit binaries on a 64-bit
> kernel.
>
> Signed-off-by: Sonny Rao <sonnyrao@chromium.org>
I think you need to convert the pointer argument though.
Something along the lines of:
#ifdef CONFIG_COMPAT
static long vhost_vsock_dev_compat_ioctl(struct file *f, unsigned int ioctl,
unsigned long arg)
{
return vhost_vsock_dev_ioctl(f, ioctl, (unsigned long)compat_ptr(arg));
}
#endif
> ---
> drivers/vhost/vsock.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/vhost/vsock.c b/drivers/vhost/vsock.c
> index 0d14e2ff19f16..d0e65e92110e5 100644
> --- a/drivers/vhost/vsock.c
> +++ b/drivers/vhost/vsock.c
> @@ -705,6 +705,7 @@ static const struct file_operations vhost_vsock_fops = {
> .release = vhost_vsock_dev_release,
> .llseek = noop_llseek,
> .unlocked_ioctl = vhost_vsock_dev_ioctl,
> + .compat_ioctl = vhost_vsock_dev_ioctl,
> };
>
> static struct miscdevice vhost_vsock_misc = {
> --
> 2.13.5
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] vhost: add vsock compat ioctl
2018-03-14 19:05 ` Michael S. Tsirkin
@ 2018-03-14 20:39 ` Sonny Rao
0 siblings, 0 replies; 3+ messages in thread
From: Sonny Rao @ 2018-03-14 20:39 UTC (permalink / raw)
To: Michael S. Tsirkin
Cc: kvm, Stefan Hajnoczi, Jason Wang, virtualization, netdev,
linux-kernel
On Wed, Mar 14, 2018 at 12:05 PM, Michael S. Tsirkin <mst@redhat.com> wrote:
> On Wed, Mar 14, 2018 at 10:26:05AM -0700, Sonny Rao wrote:
>> This will allow usage of vsock from 32-bit binaries on a 64-bit
>> kernel.
>>
>> Signed-off-by: Sonny Rao <sonnyrao@chromium.org>
>
> I think you need to convert the pointer argument though.
> Something along the lines of:
>
> #ifdef CONFIG_COMPAT
> static long vhost_vsock_dev_compat_ioctl(struct file *f, unsigned int ioctl,
> unsigned long arg)
> {
> return vhost_vsock_dev_ioctl(f, ioctl, (unsigned long)compat_ptr(arg));
> }
> #endif
Ok, thanks for pointing that out -- it has worked for me so far, but
I'll re-spin as you suggested.
>
>
>
>> ---
>> drivers/vhost/vsock.c | 1 +
>> 1 file changed, 1 insertion(+)
>>
>> diff --git a/drivers/vhost/vsock.c b/drivers/vhost/vsock.c
>> index 0d14e2ff19f16..d0e65e92110e5 100644
>> --- a/drivers/vhost/vsock.c
>> +++ b/drivers/vhost/vsock.c
>> @@ -705,6 +705,7 @@ static const struct file_operations vhost_vsock_fops = {
>> .release = vhost_vsock_dev_release,
>> .llseek = noop_llseek,
>> .unlocked_ioctl = vhost_vsock_dev_ioctl,
>> + .compat_ioctl = vhost_vsock_dev_ioctl,
>> };
>>
>> static struct miscdevice vhost_vsock_misc = {
>> --
>> 2.13.5
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-03-14 20:39 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-03-14 17:26 [PATCH] vhost: add vsock compat ioctl Sonny Rao
2018-03-14 19:05 ` Michael S. Tsirkin
2018-03-14 20:39 ` Sonny Rao
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).