From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B746A2D97A5 for ; Fri, 13 Feb 2026 10:04:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770977056; cv=none; b=QaLP7IGV6uzroGjq2pOlWSu2H1sPviy1N1HLlLHn+rsQYTyIoKV0UiY9Q/xdnn9QWMd2i7vd1jIYwNW3yoUbhgXjgnDYRNx+FBnJ1mJy0xGfx7NYu8S9CUsFPHs2+5owBOTdlww6yQhCePupwrxMeDwGjrm4HIuAc6UKClrz5ak= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770977056; c=relaxed/simple; bh=C953rTc1lmFvOuDMDuD8oay8gPLdtKZ6vlmgWR9M7Yo=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=boD8WsWJfWjZFOa5wfavaho79OAN0+Q34OOOUx5YYylHq4MOx4T6lq5YNgwoskTZ26pXNCUhQDQhkPwcVYrU/GlnZ0Ea9gSEBLa6PswSTSu0cDhYnv9jmVivFRXhZCncVld8yeE2JiiDLg9IusDmz9RnVgufJ6DK1kTFFGbKsbQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=O6D4bQCr; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=Z80J+QiA; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="O6D4bQCr"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="Z80J+QiA" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1770977053; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=OFaUQt8o2cm+tVon4w+y5pAdNpZ4dm7KtAjjkPonwIQ=; b=O6D4bQCrsoPNMrBzmw9aufr6Gp9nLxaluJA1lrQuE394SJ/TwGUEniwuRxLL/Yfm1gKhjD sqpSyR5JxStiiVA3BqABNhR7Q2exoBQ3M12IlDy/c6UYU5ZPe3LXJ9zXRvUw4MLSGmefyu i7/EaZvD4prhWPXrKKx+aK441U1uzME= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-451-wVCiwqpaOnuH5DH-AVKPIw-1; Fri, 13 Feb 2026 05:04:12 -0500 X-MC-Unique: wVCiwqpaOnuH5DH-AVKPIw-1 X-Mimecast-MFC-AGG-ID: wVCiwqpaOnuH5DH-AVKPIw_1770977051 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-435ab907109so560942f8f.3 for ; Fri, 13 Feb 2026 02:04:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1770977051; x=1771581851; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=OFaUQt8o2cm+tVon4w+y5pAdNpZ4dm7KtAjjkPonwIQ=; b=Z80J+QiAq6F/eusXxUcCSutPHaX3l6ZngTJjdVLirGhzjDQu+BpTAMGlixyOB0ko4W Z3UN0Biso+UhL7Jdkh2SQ4iVnSnKoDSUC02zrEt4d9kvlPllx6jCXPKgDPQXvVZCQ836 poyvn6HYQAa9h88O8g4ztN0RTlIziNv2SexrUliaewZaotgDNlqslWKzo3YvMmPJX5mx 75y2zjU7DWCJsEh/kFc0amFnkA6ujh3xQW7/Cz1eyYkadbqkPM2T7JJVQVAH9JhkJIGy dmhsDf0E0y1nFrxQuTzJ43QM4cbueMC+dV7VNIPlshSmaOXyWwgm7gQaJjsLibqKfakj sT7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770977051; x=1771581851; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-gg:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=OFaUQt8o2cm+tVon4w+y5pAdNpZ4dm7KtAjjkPonwIQ=; b=N/5N0MXVRXIWbgd5UCgiDKCyVDD5YrSrT0hMCksFF7gLXo8Va41b+sUg0i5qByN81O QIGMZ2sqQMU3/M2mpJ9mdKzFT8wHKj7mte6heUByyRipiUchACwmr1BeWra6gvItxRQR HQuLEKgkXUnGCSJ2nRh1/YPMbBdlsVJarQeiUuPZkkheg/hx/J3sODnUkc+JmHhFbatd vdrtf34sHgJh3w2VBQ64EtP/Vvi7hZqvP6zT8oXSBJVIdfkVM5QoBC6kW7ufr4h5s4+R EPkRXpQ2anbdx1eCZXqLDd/x7e4SHFdsbWSokRNP5o1aglzHvjqjbXrxZXq+qmKufxAE yGtw== X-Forwarded-Encrypted: i=1; AJvYcCXaEKYsn6K1WBgDG3jRJp/C7aOH+i0iYzuk6na5lnUCFH6IEAZxxgjn3HFlA0fmq8h57eL0uUlB4wtAghM=@vger.kernel.org X-Gm-Message-State: AOJu0YzxR9cIShR8PYXVDo07CZSTxlFbXJvhN8TGwG8mBm6KSbSLeC04 b+aJZ8vRpS4DLOPpeJa6UPRmMSprEZMPBQyFwUUnmmN5RPBTmG8o8oBHxrUB5c7fRgUoY1/jxNN AhSWq/QmM58CR0Q9S5+NPg/h6eF0ZJKd7HR4t1Cnx+Xp0PC5KvKlw+P85UQtvfJMfKg== X-Gm-Gg: AZuq6aLbjzP2OcfT0O0QO0VlBUxAntL3nSOXYcwRpw1hAlE+uBiRIOTFMOl3BCORFYI vHoRfvqWv1DA/7DvDYsdMIjXmfVaeHTA0q+jF9eCIqyVpIAsjbQscwsqXExdTf7qmHVJY2vW8xJ TuA60zESnDjUtHAIl1VzJ2G1m+Cjm7QdIWO95FeYcPW1T97dR4Z+0oi10FSOpZg4lPXiHuFy/Sy obxbsqMEapUEQqqXVHmVBz9tACmdUVE3GUL+u6Dvxoz3dAoZjYfVoIDztgj9JTDxV8U86D6Jo9H Uk60gfk6X79tdh5jkQcYAQwyKk1fYL6LVgoRGqGTfuhCeUg7DGmqwSc2U1PXzS7Y2uXAj07Pswx XBk4NVir67JFPTMOUnaYVgSu2ORT8xHEQU4nFaOBpwOXNVw== X-Received: by 2002:a05:6000:1843:b0:436:3707:2bf3 with SMTP id ffacd0b85a97d-437978dcf68mr2620803f8f.24.1770977051011; Fri, 13 Feb 2026 02:04:11 -0800 (PST) X-Received: by 2002:a05:6000:1843:b0:436:3707:2bf3 with SMTP id ffacd0b85a97d-437978dcf68mr2620741f8f.24.1770977050414; Fri, 13 Feb 2026 02:04:10 -0800 (PST) Received: from redhat.com (IGLD-80-230-34-155.inter.net.il. [80.230.34.155]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43796abe3b3sm5319158f8f.18.2026.02.13.02.04.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Feb 2026 02:04:09 -0800 (PST) Date: Fri, 13 Feb 2026 05:04:07 -0500 From: "Michael S. Tsirkin" To: Arnd Bergmann Cc: Jason Wang , Xie Yongji , Arnd Bergmann , Xuan Zhuo , Eugenio =?iso-8859-1?Q?P=E9rez?= , virtualization@lists.linux.dev, linux-kernel@vger.kernel.org Subject: Re: [PATCH 2/2] [v2] vduse: fix compat handling for VDUSE_IOTLB_GET_FD/VDUSE_VQ_GET_INFO Message-ID: <20260213050338-mutt-send-email-mst@kernel.org> References: <20260202224835.559538-1-arnd@kernel.org> <20260202224835.559538-2-arnd@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20260202224835.559538-2-arnd@kernel.org> On Mon, Feb 02, 2026 at 11:48:08PM +0100, Arnd Bergmann wrote: > From: Arnd Bergmann > > These two ioctls are incompatible on 32-bit x86 userspace, because > the data structures are shorter than they are on 64-bit. > > Add a proper .compat_ioctl handler for x86 that reads the structures > with the smaller padding before calling the internal handlers. > > Fixes: ad146355bfad ("vduse: Support querying information of IOVA regions") > Fixes: c8a6153b6c59 ("vduse: Introduce VDUSE - vDPA Device in Userspace") > Signed-off-by: Arnd Bergmann So patch 1 is in going upstream but I am still waiting for v3 of patch 1. > --- > The code is directly copied from the native ioctl handler, but I > did not test this with actual x86-32 userspace, so please review > carefully. > --- > drivers/vdpa/vdpa_user/vduse_dev.c | 123 ++++++++++++++++++++++++++++- > 1 file changed, 122 insertions(+), 1 deletion(-) > > diff --git a/drivers/vdpa/vdpa_user/vduse_dev.c b/drivers/vdpa/vdpa_user/vduse_dev.c > index 405d59610f76..3ada167ac260 100644 > --- a/drivers/vdpa/vdpa_user/vduse_dev.c > +++ b/drivers/vdpa/vdpa_user/vduse_dev.c > @@ -1618,6 +1618,127 @@ static long vduse_dev_ioctl(struct file *file, unsigned int cmd, > return ret; > } > > +/* > + * i386 has different alignment constraints than x86_64, > + * so there are only 3 bytes of padding instead of 7. > + */ > +struct compat_vduse_iotlb_entry { > + compat_u64 offset; > + compat_u64 start; > + compat_u64 last; > + __u8 perm; > + __u8 padding[__alignof__(compat_u64) - 1]; > +}; > +#define COMPAT_VDUSE_IOTLB_GET_FD _IOWR(VDUSE_BASE, 0x10, struct compat_vduse_iotlb_entry) > + > +struct compat_vduse_vq_info { > + __u32 index; > + __u32 num; > + compat_u64 desc_addr; > + compat_u64 driver_addr; > + compat_u64 device_addr; > + union { > + struct vduse_vq_state_split split; > + struct vduse_vq_state_packed packed; > + }; > + __u8 ready; > + __u8 padding[__alignof__(compat_u64) - 1]; > +} __uapi_arch_align; > +#define COMPAT_VDUSE_VQ_GET_INFO _IOWR(VDUSE_BASE, 0x15, struct compat_vduse_vq_info) > + > +static long vduse_dev_compat_ioctl(struct file *file, unsigned int cmd, > + unsigned long arg) > +{ > + struct vduse_dev *dev = file->private_data; > + void __user *argp = (void __user *)arg; > + int ret; > + > + if (!IS_ENABLED(CONFIG_X86_64)) > + return vduse_dev_ioctl(file, cmd, > + (unsigned long)compat_ptr(arg)); > + > + if (unlikely(dev->broken)) > + return -EPERM; > + > + switch (cmd) { > + case COMPAT_VDUSE_IOTLB_GET_FD: { > + struct vduse_iotlb_entry_v2 entry = {0}; > + struct file *f = NULL; > + > + ret = -EFAULT; > + if (copy_from_user(&entry, argp, _IOC_SIZE(cmd))) > + break; > + > + ret = vduse_dev_iotlb_entry(dev, &entry, &f, NULL); > + if (ret) > + break; > + > + ret = -EINVAL; > + if (!f) > + break; > + > + ret = copy_to_user(argp, &entry, _IOC_SIZE(cmd)); > + if (ret) { > + ret = -EFAULT; > + fput(f); > + break; > + } > + ret = receive_fd(f, NULL, perm_to_file_flags(entry.perm)); > + fput(f); > + break; > + } > + case COMPAT_VDUSE_VQ_GET_INFO: { > + struct vduse_vq_info vq_info = {}; > + struct vduse_virtqueue *vq; > + u32 index; > + > + ret = -EFAULT; > + if (copy_from_user(&vq_info, argp, > + sizeof(struct compat_vduse_vq_info))) > + break; > + > + ret = -EINVAL; > + if (vq_info.index >= dev->vq_num) > + break; > + > + index = array_index_nospec(vq_info.index, dev->vq_num); > + vq = dev->vqs[index]; > + vq_info.desc_addr = vq->desc_addr; > + vq_info.driver_addr = vq->driver_addr; > + vq_info.device_addr = vq->device_addr; > + vq_info.num = vq->num; > + > + if (dev->driver_features & BIT_ULL(VIRTIO_F_RING_PACKED)) { > + vq_info.packed.last_avail_counter = > + vq->state.packed.last_avail_counter; > + vq_info.packed.last_avail_idx = > + vq->state.packed.last_avail_idx; > + vq_info.packed.last_used_counter = > + vq->state.packed.last_used_counter; > + vq_info.packed.last_used_idx = > + vq->state.packed.last_used_idx; > + } else > + vq_info.split.avail_index = > + vq->state.split.avail_index; > + > + vq_info.ready = vq->ready; > + > + ret = -EFAULT; > + if (copy_to_user(argp, &vq_info, > + sizeof(struct compat_vduse_vq_info))) > + break; > + > + ret = 0; > + break; > + } > + default: > + ret = -ENOIOCTLCMD; > + break; > + } > + > + return vduse_dev_ioctl(file, cmd, (unsigned long)compat_ptr(arg)); > +} > + > static int vduse_dev_release(struct inode *inode, struct file *file) > { > struct vduse_dev *dev = file->private_data; > @@ -1678,7 +1799,7 @@ static const struct file_operations vduse_dev_fops = { > .write_iter = vduse_dev_write_iter, > .poll = vduse_dev_poll, > .unlocked_ioctl = vduse_dev_ioctl, > - .compat_ioctl = compat_ptr_ioctl, > + .compat_ioctl = PTR_IF(IS_ENABLED(CONFIG_COMPAT), vduse_dev_compat_ioctl), > .llseek = noop_llseek, > }; > > -- > 2.39.5