Intel-GFX Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: "Ville Syrjälä" <ville.syrjala@linux.intel.com>
To: Krzysztof Karas <krzysztof.karas@intel.com>
Cc: intel-gfx@lists.freedesktop.org,
	Andi Shyti <andi.shyti@linux.intel.com>,
	Janusz Krzysztofik <janusz.krzysztofik@linux.intel.com>,
	Sebastian Brzezinka <sebastian.brzezinka@intel.com>,
	Krzysztof Niemiec <krzysztof.niemiec@intel.com>
Subject: Re: [PATCH 1/2] drm/i915: Annotate flexible array members that require minimal changes
Date: Thu, 19 Nov 2026 16:44:27 +0200	[thread overview]
Message-ID: <av8LS_GQwNClLaJ0@intel.com> (raw)
In-Reply-To: <20261119143510.2971237-2-krzysztof.karas@intel.com>

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

  reply	other threads:[~2026-11-19 14:44 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
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ä [this message]
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

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=av8LS_GQwNClLaJ0@intel.com \
    --to=ville.syrjala@linux.intel.com \
    --cc=andi.shyti@linux.intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=janusz.krzysztofik@linux.intel.com \
    --cc=krzysztof.karas@intel.com \
    --cc=krzysztof.niemiec@intel.com \
    --cc=sebastian.brzezinka@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox