* nvme_passthru_cmd64 has a 4 byte hole
@ 2019-10-30 4:43 Charles Machalow
2019-10-30 6:32 ` Keith Busch
0 siblings, 1 reply; 4+ messages in thread
From: Charles Machalow @ 2019-10-30 4:43 UTC (permalink / raw)
To: linux-nvme
Hey all,
I noticed (via some debug) that nvme_passthru_cmd64 seems to have a 4
byte hole that isn't currently accounted for in the struct:
From pahole:
struct nvme_passthru_cmd64 {
__u8 opcode; /* 0 1 */
__u8 flags; /* 1 1 */
__u16 rsvd1; /* 2 2 */
__u32 nsid; /* 4 4 */
__u32 cdw2; /* 8 4 */
__u32 cdw3; /* 12 4 */
__u64 metadata; /* 16 8 */
__u64 addr; /* 24 8 */
__u32 metadata_len; /* 32 4 */
__u32 data_len; /* 36 4 */
__u32 cdw10; /* 40 4 */
__u32 cdw11; /* 44 4 */
__u32 cdw12; /* 48 4 */
__u32 cdw13; /* 52 4 */
__u32 cdw14; /* 56 4 */
__u32 cdw15; /* 60 4 */
/* --- cacheline 1 boundary (64 bytes) --- */
__u32 timeout_ms; /* 64 4 */
/* XXX 4 bytes hole, try to pack */
__u64 result; /* 72 8 */
/* size: 80, cachelines: 2, members: 18 */
/* sum members: 76, holes: 1, sum holes: 4 */
/* last cacheline: 16 bytes */
};
(Since I doubt we can functionally change the structure at this
point...) can we add a second rsvd field to mark that hole? ...
something like this:
struct nvme_passthru_cmd64 {
__u8 opcode;
__u8 flags;
__u16 rsvd1;
__u32 nsid;
__u32 cdw2;
__u32 cdw3;
__u64 metadata;
__u64 addr;
__u32 metadata_len;
__u32 data_len;
__u32 cdw10;
__u32 cdw11;
__u32 cdw12;
__u32 cdw13;
__u32 cdw14;
__u32 cdw15;
__u32 timeout_ms;
__u32 rsvd2;
__u64 result;
};
I believe this is binary compatible with the current
nvme_passthru_cmd64, but may help people avoid nonobvious issues in
working with both nvme_passthru_cmd and nvme_passthru_cmd64 in the
same code base. (Since I originally thought I could just use the cmd64
struct for both the old/new ioctls, and then for the old ioctls just
take 32 bits of the result... not realizing there is an extra 32 bits
of implicit padding)
If this makes sense, I'd be happy to do a formal patch request. Just
trying to feel the waters first.
- Charlie Scott Machalow
_______________________________________________
Linux-nvme mailing list
Linux-nvme@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-nvme
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: nvme_passthru_cmd64 has a 4 byte hole
2019-10-30 4:43 nvme_passthru_cmd64 has a 4 byte hole Charles Machalow
@ 2019-10-30 6:32 ` Keith Busch
2019-10-30 14:08 ` Charles Machalow
0 siblings, 1 reply; 4+ messages in thread
From: Keith Busch @ 2019-10-30 6:32 UTC (permalink / raw)
To: Charles Machalow; +Cc: linux-nvme
On Tue, Oct 29, 2019 at 09:43:20PM -0700, Charles Machalow wrote:
> Hey all,
>
> I noticed (via some debug) that nvme_passthru_cmd64 seems to have a 4
> byte hole that isn't currently accounted for in the struct:
> From pahole:
>
> struct nvme_passthru_cmd64 {
> __u8 opcode; /* 0 1 */
> __u8 flags; /* 1 1 */
> __u16 rsvd1; /* 2 2 */
> __u32 nsid; /* 4 4 */
> __u32 cdw2; /* 8 4 */
> __u32 cdw3; /* 12 4 */
> __u64 metadata; /* 16 8 */
> __u64 addr; /* 24 8 */
> __u32 metadata_len; /* 32 4 */
> __u32 data_len; /* 36 4 */
> __u32 cdw10; /* 40 4 */
> __u32 cdw11; /* 44 4 */
> __u32 cdw12; /* 48 4 */
> __u32 cdw13; /* 52 4 */
> __u32 cdw14; /* 56 4 */
> __u32 cdw15; /* 60 4 */
> /* --- cacheline 1 boundary (64 bytes) --- */
> __u32 timeout_ms; /* 64 4 */
>
> /* XXX 4 bytes hole, try to pack */
>
> __u64 result; /* 72 8 */
>
> /* size: 80, cachelines: 2, members: 18 */
> /* sum members: 76, holes: 1, sum holes: 4 */
> /* last cacheline: 16 bytes */
> };
>
> (Since I doubt we can functionally change the structure at this
> point...)
Well, there is no official kernel release using this structure,
so I suppose even this late in the rc cycle, we can change it with
appropriate justification. I think an alternative to padding is to make
this a __u32[2] field, which should also be backward compatible with
the 4 byte result passthrough.
_______________________________________________
Linux-nvme mailing list
Linux-nvme@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-nvme
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: nvme_passthru_cmd64 has a 4 byte hole
2019-10-30 6:32 ` Keith Busch
@ 2019-10-30 14:08 ` Charles Machalow
2019-10-31 2:56 ` Charles Machalow
0 siblings, 1 reply; 4+ messages in thread
From: Charles Machalow @ 2019-10-30 14:08 UTC (permalink / raw)
To: Keith Busch; +Cc: linux-nvme
Ah yes. I'd greatly prefer that. That way the new structure can likely
even be used with the old Ioctls and the 2nd u32 should just stay not
get set if used in the old flow
- Charlie Scott Machalow
On Tue, Oct 29, 2019 at 11:32 PM Keith Busch <kbusch@kernel.org> wrote:
>
> On Tue, Oct 29, 2019 at 09:43:20PM -0700, Charles Machalow wrote:
> > Hey all,
> >
> > I noticed (via some debug) that nvme_passthru_cmd64 seems to have a 4
> > byte hole that isn't currently accounted for in the struct:
> > From pahole:
> >
> > struct nvme_passthru_cmd64 {
> > __u8 opcode; /* 0 1 */
> > __u8 flags; /* 1 1 */
> > __u16 rsvd1; /* 2 2 */
> > __u32 nsid; /* 4 4 */
> > __u32 cdw2; /* 8 4 */
> > __u32 cdw3; /* 12 4 */
> > __u64 metadata; /* 16 8 */
> > __u64 addr; /* 24 8 */
> > __u32 metadata_len; /* 32 4 */
> > __u32 data_len; /* 36 4 */
> > __u32 cdw10; /* 40 4 */
> > __u32 cdw11; /* 44 4 */
> > __u32 cdw12; /* 48 4 */
> > __u32 cdw13; /* 52 4 */
> > __u32 cdw14; /* 56 4 */
> > __u32 cdw15; /* 60 4 */
> > /* --- cacheline 1 boundary (64 bytes) --- */
> > __u32 timeout_ms; /* 64 4 */
> >
> > /* XXX 4 bytes hole, try to pack */
> >
> > __u64 result; /* 72 8 */
> >
> > /* size: 80, cachelines: 2, members: 18 */
> > /* sum members: 76, holes: 1, sum holes: 4 */
> > /* last cacheline: 16 bytes */
> > };
> >
> > (Since I doubt we can functionally change the structure at this
> > point...)
>
> Well, there is no official kernel release using this structure,
> so I suppose even this late in the rc cycle, we can change it with
> appropriate justification. I think an alternative to padding is to make
> this a __u32[2] field, which should also be backward compatible with
> the 4 byte result passthrough.
_______________________________________________
Linux-nvme mailing list
Linux-nvme@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-nvme
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: nvme_passthru_cmd64 has a 4 byte hole
2019-10-30 14:08 ` Charles Machalow
@ 2019-10-31 2:56 ` Charles Machalow
0 siblings, 0 replies; 4+ messages in thread
From: Charles Machalow @ 2019-10-31 2:56 UTC (permalink / raw)
To: Keith Busch; +Cc: linux-nvme
I think something like this might do it:
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index fa7ba09dc..80b17730b 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -1453,11 +1453,11 @@ static int nvme_user_cmd64(struct nvme_ctrl
*ctrl, struct nvme_ns *ns,
status = nvme_submit_user_cmd(ns ? ns->queue : ctrl->admin_q, &c,
(void __user *)(uintptr_t)cmd.addr, cmd.data_len,
(void __user *)(uintptr_t)cmd.metadata,
cmd.metadata_len,
- 0, &cmd.result, timeout);
+ 0, (u64*)&cmd.result, timeout);
nvme_passthru_end(ctrl, effects);
if (status >= 0) {
- if (put_user(cmd.result, &ucmd->result))
+ if (put_user(*(u64*)&cmd.result, (u64*)&ucmd->result))
return -EFAULT;
}
diff --git a/include/uapi/linux/nvme_ioctl.h b/include/uapi/linux/nvme_ioctl.h
index e168dc59e..4cb07bd6d 100644
--- a/include/uapi/linux/nvme_ioctl.h
+++ b/include/uapi/linux/nvme_ioctl.h
@@ -63,7 +63,7 @@ struct nvme_passthru_cmd64 {
__u32 cdw14;
__u32 cdw15;
__u32 timeout_ms;
- __u64 result;
+ __u32 result[2];
};
Need to do a couple manual checks to make sure the old/new ioclts both
work. If they do, does this seem like a valid patch?
- Charlie Scott Machalow
On Wed, Oct 30, 2019 at 7:08 AM Charles Machalow <csm10495@gmail.com> wrote:
>
> Ah yes. I'd greatly prefer that. That way the new structure can likely
> even be used with the old Ioctls and the 2nd u32 should just stay not
> get set if used in the old flow
>
> - Charlie Scott Machalow
>
> On Tue, Oct 29, 2019 at 11:32 PM Keith Busch <kbusch@kernel.org> wrote:
> >
> > On Tue, Oct 29, 2019 at 09:43:20PM -0700, Charles Machalow wrote:
> > > Hey all,
> > >
> > > I noticed (via some debug) that nvme_passthru_cmd64 seems to have a 4
> > > byte hole that isn't currently accounted for in the struct:
> > > From pahole:
> > >
> > > struct nvme_passthru_cmd64 {
> > > __u8 opcode; /* 0 1 */
> > > __u8 flags; /* 1 1 */
> > > __u16 rsvd1; /* 2 2 */
> > > __u32 nsid; /* 4 4 */
> > > __u32 cdw2; /* 8 4 */
> > > __u32 cdw3; /* 12 4 */
> > > __u64 metadata; /* 16 8 */
> > > __u64 addr; /* 24 8 */
> > > __u32 metadata_len; /* 32 4 */
> > > __u32 data_len; /* 36 4 */
> > > __u32 cdw10; /* 40 4 */
> > > __u32 cdw11; /* 44 4 */
> > > __u32 cdw12; /* 48 4 */
> > > __u32 cdw13; /* 52 4 */
> > > __u32 cdw14; /* 56 4 */
> > > __u32 cdw15; /* 60 4 */
> > > /* --- cacheline 1 boundary (64 bytes) --- */
> > > __u32 timeout_ms; /* 64 4 */
> > >
> > > /* XXX 4 bytes hole, try to pack */
> > >
> > > __u64 result; /* 72 8 */
> > >
> > > /* size: 80, cachelines: 2, members: 18 */
> > > /* sum members: 76, holes: 1, sum holes: 4 */
> > > /* last cacheline: 16 bytes */
> > > };
> > >
> > > (Since I doubt we can functionally change the structure at this
> > > point...)
> >
> > Well, there is no official kernel release using this structure,
> > so I suppose even this late in the rc cycle, we can change it with
> > appropriate justification. I think an alternative to padding is to make
> > this a __u32[2] field, which should also be backward compatible with
> > the 4 byte result passthrough.
_______________________________________________
Linux-nvme mailing list
Linux-nvme@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-nvme
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-10-31 2:57 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-30 4:43 nvme_passthru_cmd64 has a 4 byte hole Charles Machalow
2019-10-30 6:32 ` Keith Busch
2019-10-30 14:08 ` Charles Machalow
2019-10-31 2:56 ` Charles Machalow
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).