mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-08-05 16:54:27 +00:00
77f183d151
-Wflex-array-member-not-at-end was introduced in GCC-14, and we are getting ready to enable it, globally. So, in order to avoid ending up with flexible-array members in the middle of other structs, we use the `struct_group_tagged()` helper to separate the flexible arrays from the rest of the members in the flexible structures. We then use the newly created tagged `struct nvif_ioctl_v0_hdr` and `struct nvif_ioctl_mthd_v0_hdr` to replace the type of the objects causing trouble in multiple structures. We also want to ensure that when new members need to be added to the flexible structures, they are always included within the newly created tagged structs. For this, we use `static_assert()`. This ensures that the memory layout for both the flexible structure and the new tagged struct is the same after any changes. So, with these changes, fix the following warnings: drivers/gpu/drm/nouveau/nvif/object.c:60:38: warning: structure containing a flexible array member is not at the end of another structure [-Wflex-array-member-not-at-end] drivers/gpu/drm/nouveau/nvif/object.c:233:38: warning: structure containing a flexible array member is not at the end of another structure [-Wflex-array-member-not-at-end] drivers/gpu/drm/nouveau/nvif/object.c:214:38: warning: structure containing a flexible array member is not at the end of another structure [-Wflex-array-member-not-at-end] drivers/gpu/drm/nouveau/nvif/object.c:152:38: warning: structure containing a flexible array member is not at the end of another structure [-Wflex-array-member-not-at-end] drivers/gpu/drm/nouveau/nvif/object.c:138:38: warning: structure containing a flexible array member is not at the end of another structure [-Wflex-array-member-not-at-end] drivers/gpu/drm/nouveau/nvif/object.c:104:38: warning: structure containing a flexible array member is not at the end of another structure [-Wflex-array-member-not-at-end] drivers/gpu/drm/nouveau/nouveau_svm.c:83:35: warning: structure containing a flexible array member is not at the end of another structure [-Wflex-array-member-not-at-end] drivers/gpu/drm/nouveau/nouveau_svm.c:82:30: warning: structure containing a flexible array member is not at the end of another structure [-Wflex-array-member-not-at-end] Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org> Acked-by: Dave Airlie <airlied@redhat.com> Signed-off-by: Danilo Krummrich <dakr@kernel.org> Link: https://patchwork.freedesktop.org/patch/msgid/Z6xjZhHxRp4Bu_SX@kspp
85 lines
2.5 KiB
C
85 lines
2.5 KiB
C
/* SPDX-License-Identifier: MIT */
|
|
#ifndef __NVIF_IOCTL_H__
|
|
#define __NVIF_IOCTL_H__
|
|
|
|
struct nvif_ioctl_v0 {
|
|
/* New members MUST be added within the struct_group() macro below. */
|
|
struct_group_tagged(nvif_ioctl_v0_hdr, __hdr,
|
|
__u8 version;
|
|
#define NVIF_IOCTL_V0_SCLASS 0x01
|
|
#define NVIF_IOCTL_V0_NEW 0x02
|
|
#define NVIF_IOCTL_V0_DEL 0x03
|
|
#define NVIF_IOCTL_V0_MTHD 0x04
|
|
#define NVIF_IOCTL_V0_MAP 0x07
|
|
#define NVIF_IOCTL_V0_UNMAP 0x08
|
|
__u8 type;
|
|
__u8 pad02[4];
|
|
#define NVIF_IOCTL_V0_OWNER_NVIF 0x00
|
|
#define NVIF_IOCTL_V0_OWNER_ANY 0xff
|
|
__u8 owner;
|
|
#define NVIF_IOCTL_V0_ROUTE_NVIF 0x00
|
|
#define NVIF_IOCTL_V0_ROUTE_HIDDEN 0xff
|
|
__u8 route;
|
|
__u64 token;
|
|
__u64 object;
|
|
);
|
|
__u8 data[]; /* ioctl data (below) */
|
|
};
|
|
static_assert(offsetof(struct nvif_ioctl_v0, data) == sizeof(struct nvif_ioctl_v0_hdr),
|
|
"struct member likely outside of struct_group()");
|
|
|
|
struct nvif_ioctl_sclass_v0 {
|
|
/* nvif_ioctl ... */
|
|
__u8 version;
|
|
__u8 count;
|
|
__u8 pad02[6];
|
|
struct nvif_ioctl_sclass_oclass_v0 {
|
|
__s32 oclass;
|
|
__s16 minver;
|
|
__s16 maxver;
|
|
} oclass[];
|
|
};
|
|
|
|
struct nvif_ioctl_new_v0 {
|
|
/* nvif_ioctl ... */
|
|
__u8 version;
|
|
__u8 pad01[6];
|
|
__u8 route;
|
|
__u64 token;
|
|
__u64 object;
|
|
__u32 handle;
|
|
__s32 oclass;
|
|
__u8 data[]; /* class data (class.h) */
|
|
};
|
|
|
|
struct nvif_ioctl_del {
|
|
};
|
|
|
|
struct nvif_ioctl_mthd_v0 {
|
|
/* New members MUST be added within the struct_group() macro below. */
|
|
struct_group_tagged(nvif_ioctl_mthd_v0_hdr, __hdr,
|
|
/* nvif_ioctl ... */
|
|
__u8 version;
|
|
__u8 method;
|
|
__u8 pad02[6];
|
|
);
|
|
__u8 data[]; /* method data (class.h) */
|
|
};
|
|
static_assert(offsetof(struct nvif_ioctl_mthd_v0, data) == sizeof(struct nvif_ioctl_mthd_v0_hdr),
|
|
"struct member likely outside of struct_group()");
|
|
|
|
struct nvif_ioctl_map_v0 {
|
|
/* nvif_ioctl ... */
|
|
__u8 version;
|
|
#define NVIF_IOCTL_MAP_V0_IO 0x00
|
|
#define NVIF_IOCTL_MAP_V0_VA 0x01
|
|
__u8 type;
|
|
__u8 pad02[6];
|
|
__u64 handle;
|
|
__u64 length;
|
|
__u8 data[];
|
|
};
|
|
|
|
struct nvif_ioctl_unmap {
|
|
};
|
|
#endif
|