| Message ID | 20170831102334.DA30.E1E9C6FF@jp.fujitsu.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Make sure you also put "ndctl:" in your subject lines so that it appears in the git commit message. Also include Jerry on any future version of these patches. On Wed, Aug 30, 2017 at 6:23 PM, Yasunori Goto <y-goto@jp.fujitsu.com> wrote: > > This patch introduces libndctl-nfit.h. > > Since these command can be executed via ND_CMD_CALL, > libndctl.h which is shared between ndctl command and kernel does not > have to include these defintions. > > So, libndctl-nfit.h, which is defined for only ndctl, is created instead, > and move definitions from ndctl.h to it. > > > Signed-off-by: Yasunori Goto <y-goto@jp.fujitsu.com> > > --- > ndctl/lib/libndctl-nfit.h | 61 +++++++++++++++++++++++++++++++++++++++++++++++ Lets put this one level up in the directory hierarchy next to libndctl.h.in, that also governs where it gets installed when generating the devel package. > ndctl/ndctl.h | 37 ---------------------------- > 2 files changed, 61 insertions(+), 37 deletions(-) > > diff --git a/ndctl/lib/libndctl-nfit.h b/ndctl/lib/libndctl-nfit.h > new file mode 100644 > index 0000000..1398662 > --- /dev/null > +++ b/ndctl/lib/libndctl-nfit.h > @@ -0,0 +1,61 @@ > +/* > + * This program is free software; you can redistribute it and/or modify it > + * under the terms and conditions of the GNU Lesser General Public License, > + * version 2.1, as published by the Free Software Foundation. > + * > + * This program is distributed in the hope it will be useful, but WITHOUT ANY > + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS > + * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for > + * more details. > + */ > +#ifndef __LIBNDCTL_NFIT_H__ > +#define __LIBNDCTL_NFIT_H__ > + > +#define ND_TRANSLATE_SPA_STATUS_INVALID_SPA 2 > + > +/* bus passthru commands */ > +enum { > + NFIT_CMD_TRANSLATE_SPA = 5, > + NFIT_CMD_ARS_INJECT_SET = 7, > + NFIT_CMD_ARS_INJECT_CLEAR = 8, > + NFIT_CMD_ARS_INJECT_GET = 9, > +}; > + > +struct nd_cmd_translate_spa { > + __u64 spa; > + __u32 status; > + __u8 flags; > + __u8 _reserved[3]; > + __u64 translate_length; > + __u32 num_nvdimms; > + struct nd_nvdimm_device { > + __u32 nfit_device_handle; > + __u32 _reserved; > + __u64 dpa; > + } __attribute__((packed)) devices[0]; > + > +} __attribute__((packed)); > + > +struct nd_cmd_ars_err_inj { > + __u64 err_inj_spa_range_base; > + __u64 err_inj_spa_range_length; > + __u8 err_inj_options; > + __u32 status; > +} __attribute__((packed)); > + > +struct nd_cmd_ars_err_inj_clr { > + __u64 err_inj_clr_spa_range_base; > + __u64 err_inj_clr_spa_range_length; > + __u32 status; > +} __attribute__((packed)); > + > +struct nd_cmd_ars_err_inj_stat { > + __u32 status; > + __u32 inj_err_rec_count; > + struct nd_error_stat_query_record { > + __u64 err_inj_stat_spa_range_base; > + __u64 err_inj_stat_spa_range_length; > + } __attribute__((packed)) record[0]; > +} __attribute__((packed)); I noticed when trying to push ndctl into the kernel tree that it warns about structures like this one that are needlessly packed. At some point I am going to turn on "-Wpacked" for the build, but in the meantime remove this "__attribute__((packed));" statement and just have a comment that says "/* naturally packed */" so no one tries to add it back in the future. I'll work on cleaning up the other needlessly packed structures. The other ones in this file *do* need the annotation.
diff --git a/ndctl/lib/libndctl-nfit.h b/ndctl/lib/libndctl-nfit.h new file mode 100644 index 0000000..1398662 --- /dev/null +++ b/ndctl/lib/libndctl-nfit.h @@ -0,0 +1,61 @@ +/* + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU Lesser General Public License, + * version 2.1, as published by the Free Software Foundation. + * + * This program is distributed in the hope it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for + * more details. + */ +#ifndef __LIBNDCTL_NFIT_H__ +#define __LIBNDCTL_NFIT_H__ + +#define ND_TRANSLATE_SPA_STATUS_INVALID_SPA 2 + +/* bus passthru commands */ +enum { + NFIT_CMD_TRANSLATE_SPA = 5, + NFIT_CMD_ARS_INJECT_SET = 7, + NFIT_CMD_ARS_INJECT_CLEAR = 8, + NFIT_CMD_ARS_INJECT_GET = 9, +}; + +struct nd_cmd_translate_spa { + __u64 spa; + __u32 status; + __u8 flags; + __u8 _reserved[3]; + __u64 translate_length; + __u32 num_nvdimms; + struct nd_nvdimm_device { + __u32 nfit_device_handle; + __u32 _reserved; + __u64 dpa; + } __attribute__((packed)) devices[0]; + +} __attribute__((packed)); + +struct nd_cmd_ars_err_inj { + __u64 err_inj_spa_range_base; + __u64 err_inj_spa_range_length; + __u8 err_inj_options; + __u32 status; +} __attribute__((packed)); + +struct nd_cmd_ars_err_inj_clr { + __u64 err_inj_clr_spa_range_base; + __u64 err_inj_clr_spa_range_length; + __u32 status; +} __attribute__((packed)); + +struct nd_cmd_ars_err_inj_stat { + __u32 status; + __u32 inj_err_rec_count; + struct nd_error_stat_query_record { + __u64 err_inj_stat_spa_range_base; + __u64 err_inj_stat_spa_range_length; + } __attribute__((packed)) record[0]; +} __attribute__((packed)); + +#endif /* __LIBNDCTL_NFIT_H__ */ diff --git a/ndctl/ndctl.h b/ndctl/ndctl.h index d70b97d..2dd461b 100644 --- a/ndctl/ndctl.h +++ b/ndctl/ndctl.h @@ -145,43 +145,6 @@ struct nd_cmd_clear_error { __u64 cleared; } __attribute__((packed)); -struct nd_cmd_trans_spa { - __u64 spa; - __u32 status; - __u8 flags; - __u8 _reserved[3]; - __u64 trans_length; - __u32 num_nvdimms; - struct nd_nvdimm_device { - __u32 nfit_device_handle; - __u32 _reserved; - __u64 dpa; - } __attribute__((packed)) devices[0]; - -} __attribute__((packed)); - -struct nd_cmd_ars_err_inj { - __u64 err_inj_spa_range_base; - __u64 err_inj_spa_range_length; - __u8 err_inj_options; - __u32 status; -} __attribute__((packed)); - -struct nd_cmd_ars_err_inj_clr { - __u64 err_inj_clr_spa_range_base; - __u64 err_inj_clr_spa_range_length; - __u32 status; -} __attribute__((packed)); - -struct nd_cmd_ars_err_inj_stat { - __u32 status; - __u32 inj_err_rec_count; - struct nd_error_stat_query_record { - __u64 err_inj_stat_spa_range_base; - __u64 err_inj_stat_spa_range_length; - } __attribute__((packed)) record[0]; -} __attribute__((packed)); - enum { ND_CMD_IMPLEMENTED = 0,
This patch introduces libndctl-nfit.h. Since these command can be executed via ND_CMD_CALL, libndctl.h which is shared between ndctl command and kernel does not have to include these defintions. So, libndctl-nfit.h, which is defined for only ndctl, is created instead, and move definitions from ndctl.h to it. Signed-off-by: Yasunori Goto <y-goto@jp.fujitsu.com> --- ndctl/lib/libndctl-nfit.h | 61 +++++++++++++++++++++++++++++++++++++++++++++++ ndctl/ndctl.h | 37 ---------------------------- 2 files changed, 61 insertions(+), 37 deletions(-)