| Message ID | 1450402547-38599-1-git-send-email-aik@ozlabs.ru (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Dec 18, 2015 at 12:35:47PM +1100, Alexey Kardashevskiy wrote: > The vfio_iommu_spapr_tce_create struct has 4x32bit and 2x64bit fields > which should have resulted in sizeof(fio_iommu_spapr_tce_create) equal > to 32 bytes. However due to the gcc's default alignment, the actual > size of this struct is 40 bytes. > > This fills gaps with __resv1/2 fields. > > This should not cause any change in behavior. > > Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru> Oops, that was a bit sloppy. Oh well. Acked-by: David Gibson <david@gibson.dropbear.id.au> > --- > include/uapi/linux/vfio.h | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/include/uapi/linux/vfio.h b/include/uapi/linux/vfio.h > index 9fd7b5d..d117233 100644 > --- a/include/uapi/linux/vfio.h > +++ b/include/uapi/linux/vfio.h > @@ -568,8 +568,10 @@ struct vfio_iommu_spapr_tce_create { > __u32 flags; > /* in */ > __u32 page_shift; > + __u32 __resv1; > __u64 window_size; > __u32 levels; > + __u32 __resv2; > /* out */ > __u64 start_addr; > };
On Fri, 2015-12-18 at 12:35 +1100, Alexey Kardashevskiy wrote: > The vfio_iommu_spapr_tce_create struct has 4x32bit and 2x64bit fields > which should have resulted in sizeof(fio_iommu_spapr_tce_create) > equal > to 32 bytes. However due to the gcc's default alignment, the actual > size of this struct is 40 bytes. > > This fills gaps with __resv1/2 fields. > > This should not cause any change in behavior. > > Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru> > --- Applied to next for v4.5 with David's ack. Thanks! Alex > include/uapi/linux/vfio.h | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/include/uapi/linux/vfio.h b/include/uapi/linux/vfio.h > index 9fd7b5d..d117233 100644 > --- a/include/uapi/linux/vfio.h > +++ b/include/uapi/linux/vfio.h > @@ -568,8 +568,10 @@ struct vfio_iommu_spapr_tce_create { > __u32 flags; > /* in */ > __u32 page_shift; > + __u32 __resv1; > __u64 window_size; > __u32 levels; > + __u32 __resv2; > /* out */ > __u64 start_addr; > }; -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/include/uapi/linux/vfio.h b/include/uapi/linux/vfio.h index 9fd7b5d..d117233 100644 --- a/include/uapi/linux/vfio.h +++ b/include/uapi/linux/vfio.h @@ -568,8 +568,10 @@ struct vfio_iommu_spapr_tce_create { __u32 flags; /* in */ __u32 page_shift; + __u32 __resv1; __u64 window_size; __u32 levels; + __u32 __resv2; /* out */ __u64 start_addr; };
The vfio_iommu_spapr_tce_create struct has 4x32bit and 2x64bit fields which should have resulted in sizeof(fio_iommu_spapr_tce_create) equal to 32 bytes. However due to the gcc's default alignment, the actual size of this struct is 40 bytes. This fills gaps with __resv1/2 fields. This should not cause any change in behavior. Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru> --- include/uapi/linux/vfio.h | 2 ++ 1 file changed, 2 insertions(+)