nvme: add a compat_ioctl handler for NVME_IOCTL_SUBMIT_IO
diff mbox series

Message ID c0d7091c43154d9ea7a978c42a78b01a@TGXML281.toshiba.local
State New, archived
Headers show
Series
  • nvme: add a compat_ioctl handler for NVME_IOCTL_SUBMIT_IO
Related show

Commit Message

masahiro31.yamada@kioxia.com March 2, 2020, 6:28 a.m. UTC
Currently 32 bit application gets ENOTTY when it calls
compat_ioctl with NVME_IOCTL_SUBMIT_IO in 64 bit kernel.

The cause is that the results of sizeof(struct nvme_user_io),
which is used to define NVME_IOCTL_SUBMIT_IO,
are not same between 32 bit compiler and 64 bit compiler.

* 32 bit: the result of sizeof nvme_user_io is 44.
* 64 bit: the result of sizeof nvme_user_io is 48.

64 bit compiler seems to add 32 bit padding for multiple of 8 bytes.

This patch adds a compat_ioctl handler.
The handler replaces NVME_IOCTL_SUBMIT_IO32 with NVME_IOCTL_SUBMIT_IO
in case 32 bit application calls compat_ioctl for submit in 64 bit kernel.
Then, it calls nvme_ioctl as usual.

Signed-off-by: Masahiro Yamada (KIOXIA) <masahiro31.yamada@kioxia.com>
---
 drivers/nvme/host/core.c        | 13 +++++++++++--
 include/uapi/linux/nvme_ioctl.h | 16 ++++++++++++++++
 2 files changed, 27 insertions(+), 2 deletions(-)

Comments

Christoph Hellwig March 4, 2020, 4:13 p.m. UTC | #1
> +static int nvme_compat_ioctl(struct block_device *bdev, fmode_t mode,
> +		unsigned int cmd, unsigned long arg)
> +{
> +	if (cmd == NVME_IOCTL_SUBMIT_IO32)
> +		return nvme_ioctl(bdev, mode, NVME_IOCTL_SUBMIT_IO, arg);

I think this really need a comment explaining what is going on, including
why not translating anything works in this specific case.

> +
> +	return nvme_ioctl(bdev, mode, cmd, arg);
> +}

This function should also be under CONFIG_COMPAT, with a

#define nvme_compat_ioctl	NULL

in the #else branch.

> index d99b5a772698..52699a26b9b3 100644
> --- a/include/uapi/linux/nvme_ioctl.h
> +++ b/include/uapi/linux/nvme_ioctl.h
> @@ -24,6 +24,21 @@ struct nvme_user_io {
>  	__u16	appmask;
>  };
>  
> +struct nvme_user_io32 {
> +	__u8	opcode;
> +	__u8	flags;
> +	__u16	control;
> +	__u16	nblocks;
> +	__u16	rsvd;
> +	__u64	metadata;
> +	__u64	addr;
> +	__u64	slba;
> +	__u32	dsmgmt;
> +	__u32	reftag;
> +	__u16	apptag;
> +	__u16	appmask;
> +} __attribute__((packed));

This should not be exposed in the UAPI header.  I think it should just
go into the #ifdef CONFIG_COMPAT block in core.c near the comment and
the compat_ioctl handler.
masahiro31.yamada@kioxia.com March 5, 2020, 11:04 a.m. UTC | #2
>This should not be exposed in the UAPI header.  I think it should just
>go into the #ifdef CONFIG_COMPAT block in core.c near the comment and
>the compat_ioctl handler.

Thank you. I tried to describe it.
Please correct me, if I am misunderstanding what you mean.

Patch
diff mbox series

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 641c07347e8d..7bc1e39b7cc9 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -1584,6 +1584,15 @@  static int nvme_ioctl(struct block_device *bdev, fmode_t mode,
 	return ret;
 }
 
+static int nvme_compat_ioctl(struct block_device *bdev, fmode_t mode,
+		unsigned int cmd, unsigned long arg)
+{
+	if (cmd == NVME_IOCTL_SUBMIT_IO32)
+		return nvme_ioctl(bdev, mode, NVME_IOCTL_SUBMIT_IO, arg);
+
+	return nvme_ioctl(bdev, mode, cmd, arg);
+}
+
 static int nvme_open(struct block_device *bdev, fmode_t mode)
 {
 	struct nvme_ns *ns = bdev->bd_disk->private_data;
@@ -2027,7 +2036,7 @@  EXPORT_SYMBOL_GPL(nvme_sec_submit);
 static const struct block_device_operations nvme_fops = {
 	.owner		= THIS_MODULE,
 	.ioctl		= nvme_ioctl,
-	.compat_ioctl	= nvme_ioctl,
+	.compat_ioctl	= nvme_compat_ioctl,
 	.open		= nvme_open,
 	.release	= nvme_release,
 	.getgeo		= nvme_getgeo,
@@ -2055,7 +2064,7 @@  const struct block_device_operations nvme_ns_head_ops = {
 	.open		= nvme_ns_head_open,
 	.release	= nvme_ns_head_release,
 	.ioctl		= nvme_ioctl,
-	.compat_ioctl	= nvme_ioctl,
+	.compat_ioctl	= nvme_compat_ioctl,
 	.getgeo		= nvme_getgeo,
 	.pr_ops		= &nvme_pr_ops,
 };
diff --git a/include/uapi/linux/nvme_ioctl.h b/include/uapi/linux/nvme_ioctl.h
index d99b5a772698..52699a26b9b3 100644
--- a/include/uapi/linux/nvme_ioctl.h
+++ b/include/uapi/linux/nvme_ioctl.h
@@ -24,6 +24,21 @@  struct nvme_user_io {
 	__u16	appmask;
 };
 
+struct nvme_user_io32 {
+	__u8	opcode;
+	__u8	flags;
+	__u16	control;
+	__u16	nblocks;
+	__u16	rsvd;
+	__u64	metadata;
+	__u64	addr;
+	__u64	slba;
+	__u32	dsmgmt;
+	__u32	reftag;
+	__u16	apptag;
+	__u16	appmask;
+} __attribute__((packed));
+
 struct nvme_passthru_cmd {
 	__u8	opcode;
 	__u8	flags;
@@ -72,6 +87,7 @@  struct nvme_passthru_cmd64 {
 #define NVME_IOCTL_ID		_IO('N', 0x40)
 #define NVME_IOCTL_ADMIN_CMD	_IOWR('N', 0x41, struct nvme_admin_cmd)
 #define NVME_IOCTL_SUBMIT_IO	_IOW('N', 0x42, struct nvme_user_io)
+#define NVME_IOCTL_SUBMIT_IO32	_IOW('N', 0x42, struct nvme_user_io32)
 #define NVME_IOCTL_IO_CMD	_IOWR('N', 0x43, struct nvme_passthru_cmd)
 #define NVME_IOCTL_RESET	_IO('N', 0x44)
 #define NVME_IOCTL_SUBSYS_RESET	_IO('N', 0x45)