* [PATCH 0/2] drm/i915: Annotate flexible array members with __counted_by() attribute
@ 2026-11-19 14:35 Krzysztof Karas
2026-11-19 14:35 ` [PATCH 1/2] drm/i915: Annotate flexible array members that require minimal changes Krzysztof Karas
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Krzysztof Karas @ 2026-11-19 14:35 UTC (permalink / raw)
To: intel-gfx
Cc: Andi Shyti, Janusz Krzysztofik, Sebastian Brzezinka,
Krzysztof Niemiec, Krzysztof Karas
Annotate i915 flexible array members with __counted_by() so
supported compilers can use their element counts for
CONFIG_FORTIFY_SOURCE and CONFIG_UBSAN_BOUNDS instrumentation.
Entries that could be modified with straightforward code changes
have been selected.
The first patch covers arrays whose counters can be maintained
with minimal changes. The second covers the UAPI query result
arrays: the query handlers now build the variable-length results
in kernel buffers. This provides bounds information for
kernel-side writes to the annotated arrays.
Krzysztof Karas (2):
drm/i915: Annotate flexible array members that require minimal changes
drm/i915/query: Use __counted_by() to annotate flexible arrays
drivers/gpu/drm/i915/display/intel_bios.c | 8 +-
drivers/gpu/drm/i915/gem/i915_gem_context.c | 6 +-
.../gpu/drm/i915/gem/i915_gem_context_types.h | 2 +-
.../gpu/drm/i915/gem/selftests/mock_dmabuf.h | 2 +-
.../drm/i915/gt/intel_execlists_submission.c | 6 +-
drivers/gpu/drm/i915/i915_query.c | 101 +++++++++---------
include/uapi/drm/i915_drm.h | 9 +-
7 files changed, 76 insertions(+), 58 deletions(-)
--
2.34.1
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/2] drm/i915: Annotate flexible array members that require minimal changes
2026-11-19 14:35 [PATCH 0/2] drm/i915: Annotate flexible array members with __counted_by() attribute Krzysztof Karas
@ 2026-11-19 14:35 ` Krzysztof Karas
2026-11-19 14:44 ` Ville Syrjälä
2026-11-19 14:35 ` [PATCH 2/2] drm/i915/query: Use __counted_by() to annotate flexible arrays Krzysztof Karas
2026-11-19 16:50 ` ✓ i915.CI.BAT: success for drm/i915: Annotate flexible array members with __counted_by() attribute Patchwork
2 siblings, 1 reply; 6+ messages in thread
From: Krzysztof Karas @ 2026-11-19 14:35 UTC (permalink / raw)
To: intel-gfx
Cc: Andi Shyti, Janusz Krzysztofik, Sebastian Brzezinka,
Krzysztof Niemiec, Krzysztof Karas
Annotate flexible array members with __counted_by() attribute.
For starters, follow path of least resistance and pick the
entries that require minimal changes to the code.
Signed-off-by: Krzysztof Karas <krzysztof.karas@intel.com>
---
drivers/gpu/drm/i915/display/intel_bios.c | 8 ++++++--
drivers/gpu/drm/i915/gem/i915_gem_context.c | 6 ++++--
drivers/gpu/drm/i915/gem/i915_gem_context_types.h | 2 +-
drivers/gpu/drm/i915/gem/selftests/mock_dmabuf.h | 2 +-
drivers/gpu/drm/i915/gt/intel_execlists_submission.c | 6 ++++--
5 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c
index 7b6a6f8c3cf19..4c14593b7a000 100644
--- a/drivers/gpu/drm/i915/display/intel_bios.c
+++ b/drivers/gpu/drm/i915/display/intel_bios.c
@@ -148,7 +148,8 @@ static u32 raw_block_offset(const void *bdb, enum bdb_block_id section_id)
struct bdb_block_entry {
struct list_head node;
enum bdb_block_id section_id;
- u8 data[];
+ size_t data_size;
+ u8 data[] __counted_by(data_size);
};
static const void *
@@ -468,6 +469,7 @@ init_bdb_block(struct intel_display *display,
void *temp_block = NULL;
const void *block;
size_t block_size;
+ size_t data_size;
block = find_raw_section(bdb, section_id);
@@ -492,12 +494,14 @@ init_bdb_block(struct intel_display *display,
if (section_id == BDB_MIPI_SEQUENCE && *(const u8 *)block >= 3)
block_size += 5;
- entry = kzalloc_flex(*entry, data, max(min_size, block_size) + 3);
+ data_size = max(min_size, block_size) + 3;
+ entry = kzalloc_flex(*entry, data, data_size);
if (!entry) {
kfree(temp_block);
return;
}
+ entry->data_size = data_size;
entry->section_id = section_id;
memcpy(entry->data, block - 3, block_size + 3);
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_context.c b/drivers/gpu/drm/i915/gem/i915_gem_context.c
index c58ffa5a8fa6f..2efcc5d5d5ac1 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_context.c
@@ -1114,6 +1114,7 @@ static struct i915_gem_engines *alloc_engines(unsigned int count)
if (!e)
return NULL;
+ e->num_engines = count;
i915_sw_fence_init(&e->fence, engines_notify);
return e;
}
@@ -1124,6 +1125,7 @@ static struct i915_gem_engines *default_engines(struct i915_gem_context *ctx,
const unsigned int max = I915_NUM_ENGINES;
struct intel_engine_cs *engine;
struct i915_gem_engines *e, *err;
+ unsigned int num_engines = 0;
e = alloc_engines(max);
if (!e)
@@ -1147,7 +1149,7 @@ static struct i915_gem_engines *default_engines(struct i915_gem_context *ctx,
}
e->engines[engine->legacy_idx] = ce;
- e->num_engines = max(e->num_engines, engine->legacy_idx + 1);
+ num_engines = max(num_engines, engine->legacy_idx + 1);
if (engine->class == RENDER_CLASS)
sseu = rcs_sseu;
@@ -1159,6 +1161,7 @@ static struct i915_gem_engines *default_engines(struct i915_gem_context *ctx,
}
}
+ e->num_engines = num_engines;
return e;
@@ -1211,7 +1214,6 @@ static struct i915_gem_engines *user_engines(struct i915_gem_context *ctx,
e = alloc_engines(num_engines);
if (!e)
return ERR_PTR(-ENOMEM);
- e->num_engines = num_engines;
for (n = 0; n < num_engines; n++) {
struct intel_context *ce, *child;
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_context_types.h b/drivers/gpu/drm/i915/gem/i915_gem_context_types.h
index 0267c924634b0..951b46ae559fc 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_context_types.h
+++ b/drivers/gpu/drm/i915/gem/i915_gem_context_types.h
@@ -51,7 +51,7 @@ struct i915_gem_engines {
unsigned int num_engines;
/** @engines: Array of engines */
- struct intel_context *engines[];
+ struct intel_context *engines[] __counted_by(num_engines);
};
/**
diff --git a/drivers/gpu/drm/i915/gem/selftests/mock_dmabuf.h b/drivers/gpu/drm/i915/gem/selftests/mock_dmabuf.h
index 22818bbb139d5..1bee91df73ea8 100644
--- a/drivers/gpu/drm/i915/gem/selftests/mock_dmabuf.h
+++ b/drivers/gpu/drm/i915/gem/selftests/mock_dmabuf.h
@@ -11,7 +11,7 @@
struct mock_dmabuf {
int npages;
- struct page *pages[];
+ struct page *pages[] __counted_by(npages);
};
static inline struct mock_dmabuf *to_mock(struct dma_buf *buf)
diff --git a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
index 841f719326756..ed3fc9b84f219 100644
--- a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
+++ b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
@@ -201,7 +201,7 @@ struct virtual_engine {
/* And finally, which physical engines this virtual engine maps onto. */
unsigned int num_siblings;
- struct intel_engine_cs *siblings[];
+ struct intel_engine_cs *siblings[] __counted_by(num_siblings);
};
static struct virtual_engine *to_virtual_engine(struct intel_engine_cs *engine)
@@ -3931,6 +3931,7 @@ execlists_create_virtual(struct intel_engine_cs **siblings, unsigned int count,
if (!ve)
goto err;
+ ve->num_siblings = 0;
ve->base.i915 = i915;
ve->base.gt = siblings[0]->gt;
ve->base.uncore = siblings[0]->uncore;
@@ -4009,7 +4010,8 @@ execlists_create_virtual(struct intel_engine_cs **siblings, unsigned int count,
GEM_BUG_ON(RB_EMPTY_NODE(&ve->nodes[sibling->id].rb));
RB_CLEAR_NODE(&ve->nodes[sibling->id].rb);
- ve->siblings[ve->num_siblings++] = sibling;
+ ve->num_siblings++;
+ ve->siblings[ve->num_siblings - 1] = sibling;
ve->base.mask |= sibling->mask;
ve->base.logical_mask |= sibling->logical_mask;
--
2.34.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/2] drm/i915/query: Use __counted_by() to annotate flexible arrays
2026-11-19 14:35 [PATCH 0/2] drm/i915: Annotate flexible array members with __counted_by() attribute Krzysztof Karas
2026-11-19 14:35 ` [PATCH 1/2] drm/i915: Annotate flexible array members that require minimal changes Krzysztof Karas
@ 2026-11-19 14:35 ` Krzysztof Karas
2026-11-19 14:42 ` sashiko-bot
2026-11-19 16:50 ` ✓ i915.CI.BAT: success for drm/i915: Annotate flexible array members with __counted_by() attribute Patchwork
2 siblings, 1 reply; 6+ messages in thread
From: Krzysztof Karas @ 2026-11-19 14:35 UTC (permalink / raw)
To: intel-gfx
Cc: Andi Shyti, Janusz Krzysztofik, Sebastian Brzezinka,
Krzysztof Niemiec, Krzysztof Karas
Annotate flexible array members to facilitate bounds-checking
coverage (memcpy() - CONFIG_FORTIFY_SOURCE) and enable
array-bounds sanitizer (CONFIG_UBSAN_BOUNDS).
Use temporary buffers to allow compiler bound instrumentation.
Signed-off-by: Krzysztof Karas <krzysztof.karas@intel.com>
---
drivers/gpu/drm/i915/i915_query.c | 101 ++++++++++++++++--------------
include/uapi/drm/i915_drm.h | 9 ++-
2 files changed, 60 insertions(+), 50 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_query.c b/drivers/gpu/drm/i915/i915_query.c
index 11157fb14db31..46fee1591e489 100644
--- a/drivers/gpu/drm/i915/i915_query.c
+++ b/drivers/gpu/drm/i915/i915_query.c
@@ -132,12 +132,11 @@ query_engine_info(struct drm_i915_private *i915,
{
struct drm_i915_query_engine_info __user *query_ptr =
u64_to_user_ptr(query_item->data_ptr);
- struct drm_i915_engine_info __user *info_ptr;
- struct drm_i915_query_engine_info query;
- struct drm_i915_engine_info info = { };
+ struct drm_i915_query_engine_info *query;
+ struct drm_i915_query_engine_info hdr;
unsigned int num_uabi_engines = 0;
struct intel_engine_cs *engine;
- int len, ret;
+ int len, ret, n = 0;
if (query_item->flags)
return -EINVAL;
@@ -145,35 +144,37 @@ query_engine_info(struct drm_i915_private *i915,
for_each_uabi_engine(engine, i915)
num_uabi_engines++;
- len = struct_size(query_ptr, engines, num_uabi_engines);
+ len = struct_size(query, engines, num_uabi_engines);
- ret = copy_query_item(&query, sizeof(query), len, query_item);
+ ret = copy_query_item(&hdr, sizeof(hdr), len, query_item);
if (ret != 0)
return ret;
- if (query.num_engines || query.rsvd[0] || query.rsvd[1] ||
- query.rsvd[2])
+ if (hdr.num_engines || hdr.rsvd[0] || hdr.rsvd[1] || hdr.rsvd[2])
return -EINVAL;
- info_ptr = &query_ptr->engines[0];
+ query = kzalloc_flex(*query, engines, num_uabi_engines);
+ if (!query)
+ return -ENOMEM;
- for_each_uabi_engine(engine, i915) {
- info.engine.engine_class = engine->uabi_class;
- info.engine.engine_instance = engine->uabi_instance;
- info.flags = I915_ENGINE_INFO_HAS_LOGICAL_INSTANCE;
- info.capabilities = engine->uabi_capabilities;
- info.logical_instance = ilog2(engine->logical_mask);
+ query->num_engines = num_uabi_engines;
- if (copy_to_user(info_ptr, &info, sizeof(info)))
- return -EFAULT;
+ for_each_uabi_engine(engine, i915) {
+ struct drm_i915_engine_info *info = &query->engines[n++];
- query.num_engines++;
- info_ptr++;
+ info->engine.engine_class = engine->uabi_class;
+ info->engine.engine_instance = engine->uabi_instance;
+ info->flags = I915_ENGINE_INFO_HAS_LOGICAL_INSTANCE;
+ info->capabilities = engine->uabi_capabilities;
+ info->logical_instance = ilog2(engine->logical_mask);
}
- if (copy_to_user(query_ptr, &query, sizeof(query)))
+ if (copy_to_user(query_ptr, query, len)) {
+ kfree(query);
return -EFAULT;
+ }
+ kfree(query);
return len;
}
@@ -466,70 +467,74 @@ static int query_memregion_info(struct drm_i915_private *i915,
{
struct drm_i915_query_memory_regions __user *query_ptr =
u64_to_user_ptr(query_item->data_ptr);
- struct drm_i915_memory_region_info __user *info_ptr =
- &query_ptr->regions[0];
- struct drm_i915_memory_region_info info = { };
- struct drm_i915_query_memory_regions query;
+ struct drm_i915_query_memory_regions *query;
+ struct drm_i915_query_memory_regions hdr;
struct intel_memory_region *mr;
+ unsigned int num_regions = 0;
+ int ret, id, i, n = 0;
u32 total_length;
- int ret, id, i;
if (query_item->flags != 0)
return -EINVAL;
- total_length = sizeof(query);
for_each_memory_region(mr, i915, id) {
if (mr->private)
continue;
- total_length += sizeof(info);
+ num_regions++;
}
+ total_length = struct_size(query, regions, num_regions);
- ret = copy_query_item(&query, sizeof(query), total_length, query_item);
+ ret = copy_query_item(&hdr, sizeof(hdr), total_length, query_item);
if (ret != 0)
return ret;
- if (query.num_regions)
+ if (hdr.num_regions)
return -EINVAL;
- for (i = 0; i < ARRAY_SIZE(query.rsvd); i++) {
- if (query.rsvd[i])
+ for (i = 0; i < ARRAY_SIZE(hdr.rsvd); i++) {
+ if (hdr.rsvd[i])
return -EINVAL;
}
+ query = kzalloc_flex(*query, regions, num_regions);
+ if (!query)
+ return -ENOMEM;
+
+ query->num_regions = num_regions;
+
for_each_memory_region(mr, i915, id) {
+ struct drm_i915_memory_region_info *info = &query->regions[n++];
+
if (mr->private)
continue;
- info.region.memory_class = mr->type;
- info.region.memory_instance = mr->instance;
- info.probed_size = mr->total;
+ info->region.memory_class = mr->type;
+ info->region.memory_instance = mr->instance;
+ info->probed_size = mr->total;
if (mr->type == INTEL_MEMORY_LOCAL)
- info.probed_cpu_visible_size = resource_size(&mr->io);
+ info->probed_cpu_visible_size = resource_size(&mr->io);
else
- info.probed_cpu_visible_size = mr->total;
+ info->probed_cpu_visible_size = mr->total;
if (perfmon_capable()) {
intel_memory_region_avail(mr,
- &info.unallocated_size,
- &info.unallocated_cpu_visible_size);
+ &info->unallocated_size,
+ &info->unallocated_cpu_visible_size);
} else {
- info.unallocated_size = info.probed_size;
- info.unallocated_cpu_visible_size =
- info.probed_cpu_visible_size;
+ info->unallocated_size = info->probed_size;
+ info->unallocated_cpu_visible_size =
+ info->probed_cpu_visible_size;
}
-
- if (__copy_to_user(info_ptr, &info, sizeof(info)))
- return -EFAULT;
-
- query.num_regions++;
- info_ptr++;
}
- if (__copy_to_user(query_ptr, &query, sizeof(query)))
+ if (copy_to_user(query_ptr, query, total_length)) {
+ kfree(query);
return -EFAULT;
+ }
+ kfree(query);
return total_length;
}
diff --git a/include/uapi/drm/i915_drm.h b/include/uapi/drm/i915_drm.h
index 535cb68fdb5c4..e9b7076640736 100644
--- a/include/uapi/drm/i915_drm.h
+++ b/include/uapi/drm/i915_drm.h
@@ -29,6 +29,11 @@
#include "drm.h"
+/* Non-Linux builds of drm.h do not pull in linux/stddef.h. */
+#ifndef __counted_by
+#define __counted_by(m)
+#endif
+
#if defined(__cplusplus)
extern "C" {
#endif
@@ -3381,7 +3386,7 @@ struct drm_i915_query_engine_info {
__u32 rsvd[3];
/** @engines: Marker for drm_i915_engine_info structures. */
- struct drm_i915_engine_info engines[];
+ struct drm_i915_engine_info engines[] __counted_by(num_engines);
};
/**
@@ -3617,7 +3622,7 @@ struct drm_i915_query_memory_regions {
__u32 rsvd[3];
/** @regions: Info about each supported region */
- struct drm_i915_memory_region_info regions[];
+ struct drm_i915_memory_region_info regions[] __counted_by(num_regions);
};
/**
--
2.34.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] drm/i915/query: Use __counted_by() to annotate flexible arrays
2026-11-19 14:35 ` [PATCH 2/2] drm/i915/query: Use __counted_by() to annotate flexible arrays Krzysztof Karas
@ 2026-11-19 14:42 ` sashiko-bot
0 siblings, 0 replies; 6+ messages in thread
From: sashiko-bot @ 2026-11-19 14:42 UTC (permalink / raw)
To: Krzysztof Karas, intel-gfx
Thank you for your contribution! Sashiko AI review found 1 potential
issue to consider:
- [High] drm/i915/query: out-of-bounds regions[] access in
query_memregion_info()
--
commit b2640bf13b3424df44fa1f7fb0465d67b8308127
Author: Krzysztof Karas <krzysztof.karas@intel.com>
drm/i915/query: Use __counted_by() to annotate flexible arrays
This commit annotates flexible array members in struct
drm_i915_query_engine_info and struct drm_i915_query_memory_regions with
__counted_by(), and allocates temporary kernel buffers in
query_engine_info() and query_memregion_info() before copying the results
to user space.
> diff --git a/drivers/gpu/drm/i915/i915_query.c b/drivers/gpu/drm/i915/i915_query.c
> index 11157fb14db31..46fee1591e489 100644
> --- a/drivers/gpu/drm/i915/i915_query.c
> +++ b/drivers/gpu/drm/i915/i915_query.c
[ ... ]
> @@ -466,70 +467,74 @@ static int query_memregion_info(struct drm_i915_private *i915,
> {
> struct drm_i915_query_memory_regions __user *query_ptr =
> u64_to_user_ptr(query_item->data_ptr);
> - struct drm_i915_memory_region_info __user *info_ptr =
> - &query_ptr->regions[0];
> - struct drm_i915_memory_region_info info = { };
> - struct drm_i915_query_memory_regions query;
> + struct drm_i915_query_memory_regions *query;
> + struct drm_i915_query_memory_regions hdr;
> struct intel_memory_region *mr;
> + unsigned int num_regions = 0;
> + int ret, id, i, n = 0;
> u32 total_length;
> - int ret, id, i;
>
> if (query_item->flags != 0)
> return -EINVAL;
>
> - total_length = sizeof(query);
> for_each_memory_region(mr, i915, id) {
> if (mr->private)
> continue;
>
> - total_length += sizeof(info);
> + num_regions++;
> }
> + total_length = struct_size(query, regions, num_regions);
>
> - ret = copy_query_item(&query, sizeof(query), total_length, query_item);
> + ret = copy_query_item(&hdr, sizeof(hdr), total_length, query_item);
> if (ret != 0)
> return ret;
>
> - if (query.num_regions)
> + if (hdr.num_regions)
> return -EINVAL;
>
> - for (i = 0; i < ARRAY_SIZE(query.rsvd); i++) {
> - if (query.rsvd[i])
> + for (i = 0; i < ARRAY_SIZE(hdr.rsvd); i++) {
> + if (hdr.rsvd[i])
> return -EINVAL;
> }
>
> + query = kzalloc_flex(*query, regions, num_regions);
> + if (!query)
> + return -ENOMEM;
> +
> + query->num_regions = num_regions;
> +
> for_each_memory_region(mr, i915, id) {
> + struct drm_i915_memory_region_info *info = &query->regions[n++];
> +
> if (mr->private)
> continue;
[Severity: High]
Can indexing query->regions[n++] before checking mr->private access past
the end of query->regions[]?
num_regions only counts non-private regions, so when the second loop hits
a private stolen memory region (set up with mem->private = true in
i915_gem_stolen_smem_setup() or i915_gem_stolen_lmem_setup()), n is
incremented on the skipped region and &query->regions[n++] indexes
query->regions[num_regions], triggering a CONFIG_UBSAN_BOUNDS splat (or
writing past the end of the kzalloc_flex() buffer if a non-private region
follows a private one).
--
Sashiko AI review · https://sashiko.dev/#/patchset/20261119143510.2971237-1-krzysztof.karas@intel.com?part=2
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] drm/i915: Annotate flexible array members that require minimal changes
2026-11-19 14:35 ` [PATCH 1/2] drm/i915: Annotate flexible array members that require minimal changes Krzysztof Karas
@ 2026-11-19 14:44 ` Ville Syrjälä
0 siblings, 0 replies; 6+ messages in thread
From: Ville Syrjälä @ 2026-11-19 14:44 UTC (permalink / raw)
To: Krzysztof Karas
Cc: intel-gfx, Andi Shyti, Janusz Krzysztofik, Sebastian Brzezinka,
Krzysztof Niemiec
On Thu, Nov 19, 2026 at 02:35:09PM +0000, Krzysztof Karas wrote:
> Annotate flexible array members with __counted_by() attribute.
> For starters, follow path of least resistance and pick the
> entries that require minimal changes to the code.
>
> Signed-off-by: Krzysztof Karas <krzysztof.karas@intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_bios.c | 8 ++++++--
Display stuff should be in a patch of its own.
> drivers/gpu/drm/i915/gem/i915_gem_context.c | 6 ++++--
> drivers/gpu/drm/i915/gem/i915_gem_context_types.h | 2 +-
> drivers/gpu/drm/i915/gem/selftests/mock_dmabuf.h | 2 +-
> drivers/gpu/drm/i915/gt/intel_execlists_submission.c | 6 ++++--
> 5 files changed, 16 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c
> index 7b6a6f8c3cf19..4c14593b7a000 100644
> --- a/drivers/gpu/drm/i915/display/intel_bios.c
> +++ b/drivers/gpu/drm/i915/display/intel_bios.c
> @@ -148,7 +148,8 @@ static u32 raw_block_offset(const void *bdb, enum bdb_block_id section_id)
> struct bdb_block_entry {
> struct list_head node;
> enum bdb_block_id section_id;
> - u8 data[];
> + size_t data_size;
> + u8 data[] __counted_by(data_size);
> };
>
> static const void *
> @@ -468,6 +469,7 @@ init_bdb_block(struct intel_display *display,
> void *temp_block = NULL;
> const void *block;
> size_t block_size;
> + size_t data_size;
>
> block = find_raw_section(bdb, section_id);
>
> @@ -492,12 +494,14 @@ init_bdb_block(struct intel_display *display,
> if (section_id == BDB_MIPI_SEQUENCE && *(const u8 *)block >= 3)
> block_size += 5;
>
> - entry = kzalloc_flex(*entry, data, max(min_size, block_size) + 3);
> + data_size = max(min_size, block_size) + 3;
> + entry = kzalloc_flex(*entry, data, data_size);
> if (!entry) {
> kfree(temp_block);
> return;
> }
>
> + entry->data_size = data_size;
Are we actually going to do something with this, or what's point?
> entry->section_id = section_id;
> memcpy(entry->data, block - 3, block_size + 3);
>
> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_context.c b/drivers/gpu/drm/i915/gem/i915_gem_context.c
> index c58ffa5a8fa6f..2efcc5d5d5ac1 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gem_context.c
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_context.c
> @@ -1114,6 +1114,7 @@ static struct i915_gem_engines *alloc_engines(unsigned int count)
> if (!e)
> return NULL;
>
> + e->num_engines = count;
> i915_sw_fence_init(&e->fence, engines_notify);
> return e;
> }
> @@ -1124,6 +1125,7 @@ static struct i915_gem_engines *default_engines(struct i915_gem_context *ctx,
> const unsigned int max = I915_NUM_ENGINES;
> struct intel_engine_cs *engine;
> struct i915_gem_engines *e, *err;
> + unsigned int num_engines = 0;
>
> e = alloc_engines(max);
> if (!e)
> @@ -1147,7 +1149,7 @@ static struct i915_gem_engines *default_engines(struct i915_gem_context *ctx,
> }
>
> e->engines[engine->legacy_idx] = ce;
> - e->num_engines = max(e->num_engines, engine->legacy_idx + 1);
> + num_engines = max(num_engines, engine->legacy_idx + 1);
>
> if (engine->class == RENDER_CLASS)
> sseu = rcs_sseu;
> @@ -1159,6 +1161,7 @@ static struct i915_gem_engines *default_engines(struct i915_gem_context *ctx,
> }
>
> }
> + e->num_engines = num_engines;
>
> return e;
>
> @@ -1211,7 +1214,6 @@ static struct i915_gem_engines *user_engines(struct i915_gem_context *ctx,
> e = alloc_engines(num_engines);
> if (!e)
> return ERR_PTR(-ENOMEM);
> - e->num_engines = num_engines;
>
> for (n = 0; n < num_engines; n++) {
> struct intel_context *ce, *child;
> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_context_types.h b/drivers/gpu/drm/i915/gem/i915_gem_context_types.h
> index 0267c924634b0..951b46ae559fc 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gem_context_types.h
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_context_types.h
> @@ -51,7 +51,7 @@ struct i915_gem_engines {
> unsigned int num_engines;
>
> /** @engines: Array of engines */
> - struct intel_context *engines[];
> + struct intel_context *engines[] __counted_by(num_engines);
> };
>
> /**
> diff --git a/drivers/gpu/drm/i915/gem/selftests/mock_dmabuf.h b/drivers/gpu/drm/i915/gem/selftests/mock_dmabuf.h
> index 22818bbb139d5..1bee91df73ea8 100644
> --- a/drivers/gpu/drm/i915/gem/selftests/mock_dmabuf.h
> +++ b/drivers/gpu/drm/i915/gem/selftests/mock_dmabuf.h
> @@ -11,7 +11,7 @@
>
> struct mock_dmabuf {
> int npages;
> - struct page *pages[];
> + struct page *pages[] __counted_by(npages);
> };
>
> static inline struct mock_dmabuf *to_mock(struct dma_buf *buf)
> diff --git a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
> index 841f719326756..ed3fc9b84f219 100644
> --- a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
> +++ b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
> @@ -201,7 +201,7 @@ struct virtual_engine {
>
> /* And finally, which physical engines this virtual engine maps onto. */
> unsigned int num_siblings;
> - struct intel_engine_cs *siblings[];
> + struct intel_engine_cs *siblings[] __counted_by(num_siblings);
> };
>
> static struct virtual_engine *to_virtual_engine(struct intel_engine_cs *engine)
> @@ -3931,6 +3931,7 @@ execlists_create_virtual(struct intel_engine_cs **siblings, unsigned int count,
> if (!ve)
> goto err;
>
> + ve->num_siblings = 0;
> ve->base.i915 = i915;
> ve->base.gt = siblings[0]->gt;
> ve->base.uncore = siblings[0]->uncore;
> @@ -4009,7 +4010,8 @@ execlists_create_virtual(struct intel_engine_cs **siblings, unsigned int count,
> GEM_BUG_ON(RB_EMPTY_NODE(&ve->nodes[sibling->id].rb));
> RB_CLEAR_NODE(&ve->nodes[sibling->id].rb);
>
> - ve->siblings[ve->num_siblings++] = sibling;
> + ve->num_siblings++;
> + ve->siblings[ve->num_siblings - 1] = sibling;
> ve->base.mask |= sibling->mask;
> ve->base.logical_mask |= sibling->logical_mask;
>
> --
> 2.34.1
--
Ville Syrjälä
Intel
^ permalink raw reply [flat|nested] 6+ messages in thread
* ✓ i915.CI.BAT: success for drm/i915: Annotate flexible array members with __counted_by() attribute
2026-11-19 14:35 [PATCH 0/2] drm/i915: Annotate flexible array members with __counted_by() attribute Krzysztof Karas
2026-11-19 14:35 ` [PATCH 1/2] drm/i915: Annotate flexible array members that require minimal changes Krzysztof Karas
2026-11-19 14:35 ` [PATCH 2/2] drm/i915/query: Use __counted_by() to annotate flexible arrays Krzysztof Karas
@ 2026-11-19 16:50 ` Patchwork
2 siblings, 0 replies; 6+ messages in thread
From: Patchwork @ 2026-11-19 16:50 UTC (permalink / raw)
To: Krzysztof Karas; +Cc: intel-gfx
[-- Attachment #1: Type: text/plain, Size: 7231 bytes --]
== Series Details ==
Series: drm/i915: Annotate flexible array members with __counted_by() attribute
URL : https://patchwork.freedesktop.org/series/179077/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_19566 -> Patchwork_179077v1
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_179077v1/index.html
Participating hosts (37 -> 38)
------------------------------
Additional (2): bat-rpls-4 fi-skl-6600u
Missing (1): bat-dg2-13
Known issues
------------
Here are the changes found in Patchwork_179077v1 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_huc_copy@huc-copy:
- fi-skl-6600u: NOTRUN -> [SKIP][1] ([i915#2190])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_179077v1/fi-skl-6600u/igt@gem_huc_copy@huc-copy.html
* igt@gem_lmem_swapping@basic:
- bat-rpls-4: NOTRUN -> [SKIP][2] ([i915#4613]) +3 other tests skip
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_179077v1/bat-rpls-4/igt@gem_lmem_swapping@basic.html
* igt@gem_lmem_swapping@random-engines:
- fi-skl-6600u: NOTRUN -> [SKIP][3] ([i915#4613]) +3 other tests skip
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_179077v1/fi-skl-6600u/igt@gem_lmem_swapping@random-engines.html
* igt@gem_tiled_pread_basic@basic:
- bat-rpls-4: NOTRUN -> [SKIP][4] ([i915#15656])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_179077v1/bat-rpls-4/igt@gem_tiled_pread_basic@basic.html
* igt@i915_pm_rpm@module-reload:
- fi-tgl-1115g4: [PASS][5] -> [FAIL][6] ([i915#17751])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_19566/fi-tgl-1115g4/igt@i915_pm_rpm@module-reload.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_179077v1/fi-tgl-1115g4/igt@i915_pm_rpm@module-reload.html
* igt@intel_hwmon@hwmon-read:
- fi-skl-6600u: NOTRUN -> [SKIP][7] ([i915#11680]) +1 other test skip
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_179077v1/fi-skl-6600u/igt@intel_hwmon@hwmon-read.html
* igt@intel_hwmon@hwmon-write:
- bat-rpls-4: NOTRUN -> [SKIP][8] ([i915#7707]) +1 other test skip
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_179077v1/bat-rpls-4/igt@intel_hwmon@hwmon-write.html
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic:
- bat-rpls-4: NOTRUN -> [SKIP][9] ([i915#4103]) +1 other test skip
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_179077v1/bat-rpls-4/igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic.html
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy:
- fi-skl-6600u: NOTRUN -> [SKIP][10] ([i915#17457]) +1 other test skip
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_179077v1/fi-skl-6600u/igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy.html
* igt@kms_dsc@dsc-basic:
- bat-rpls-4: NOTRUN -> [SKIP][11] ([i915#16361])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_179077v1/bat-rpls-4/igt@kms_dsc@dsc-basic.html
- fi-skl-6600u: NOTRUN -> [SKIP][12] ([i915#17458])
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_179077v1/fi-skl-6600u/igt@kms_dsc@dsc-basic.html
* igt@kms_force_connector_basic@force-load-detect:
- bat-rpls-4: NOTRUN -> [SKIP][13] ([i915#17452])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_179077v1/bat-rpls-4/igt@kms_force_connector_basic@force-load-detect.html
- fi-skl-6600u: NOTRUN -> [SKIP][14] ([i915#17465])
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_179077v1/fi-skl-6600u/igt@kms_force_connector_basic@force-load-detect.html
* igt@kms_pipe_crc_basic@compare-crc-sanitycheck-nv12@pipe-c-edp-1:
- fi-skl-6600u: NOTRUN -> [SKIP][15] ([i915#17461]) +3 other tests skip
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_179077v1/fi-skl-6600u/igt@kms_pipe_crc_basic@compare-crc-sanitycheck-nv12@pipe-c-edp-1.html
* igt@kms_pm_backlight@basic-brightness:
- bat-rpls-4: NOTRUN -> [SKIP][16] ([i915#5354])
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_179077v1/bat-rpls-4/igt@kms_pm_backlight@basic-brightness.html
* igt@kms_psr@psr-sprite-plane-onoff:
- bat-rpls-4: NOTRUN -> [SKIP][17] ([i915#1072] / [i915#9732]) +3 other tests skip
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_179077v1/bat-rpls-4/igt@kms_psr@psr-sprite-plane-onoff.html
* igt@kms_setmode@basic-clone-single-crtc:
- bat-rpls-4: NOTRUN -> [SKIP][18] ([i915#3555])
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_179077v1/bat-rpls-4/igt@kms_setmode@basic-clone-single-crtc.html
- fi-skl-6600u: NOTRUN -> [SKIP][19] ([i915#17463])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_179077v1/fi-skl-6600u/igt@kms_setmode@basic-clone-single-crtc.html
* igt@prime_vgem@basic-read:
- bat-rpls-4: NOTRUN -> [SKIP][20] ([i915#17448] / [i915#3708]) +2 other tests skip
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_179077v1/bat-rpls-4/igt@prime_vgem@basic-read.html
[i915#1072]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/1072
[i915#11680]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/11680
[i915#15656]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/15656
[i915#16361]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/16361
[i915#17448]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/17448
[i915#17452]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/17452
[i915#17457]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/17457
[i915#17458]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/17458
[i915#17461]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/17461
[i915#17463]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/17463
[i915#17465]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/17465
[i915#17751]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/17751
[i915#2190]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/2190
[i915#3555]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/3555
[i915#3708]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/3708
[i915#4103]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/4103
[i915#4613]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/4613
[i915#5354]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/5354
[i915#7707]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/7707
[i915#9732]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/9732
Build changes
-------------
* Linux: CI_DRM_19566 -> Patchwork_179077v1
CI-20190529: 20190529
CI_DRM_19566: d05450d36ef3d0f6e4ce4b26a831003847a7e75d @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_9198: 9198
Patchwork_179077v1: d05450d36ef3d0f6e4ce4b26a831003847a7e75d @ git://anongit.freedesktop.org/gfx-ci/linux
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_179077v1/index.html
[-- Attachment #2: Type: text/html, Size: 8301 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2026-11-19 16:50 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-11-19 14:35 [PATCH 0/2] drm/i915: Annotate flexible array members with __counted_by() attribute Krzysztof Karas
2026-11-19 14:35 ` [PATCH 1/2] drm/i915: Annotate flexible array members that require minimal changes Krzysztof Karas
2026-11-19 14:44 ` Ville Syrjälä
2026-11-19 14:35 ` [PATCH 2/2] drm/i915/query: Use __counted_by() to annotate flexible arrays Krzysztof Karas
2026-11-19 14:42 ` sashiko-bot
2026-11-19 16:50 ` ✓ i915.CI.BAT: success for drm/i915: Annotate flexible array members with __counted_by() attribute Patchwork
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox