From: "Ville Syrjälä" <ville.syrjala@linux.intel.com>
To: Gustavo Sousa <gustavo.sousa@intel.com>
Cc: intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org,
Jani Nikula <jani.nikula@intel.com>
Subject: Re: [PATCH 1/3] drm/i915/display: Do not assume zero offset when duplicating global state
Date: Fri, 20 Dec 2024 11:11:57 +0200 [thread overview]
Message-ID: <Z2U03bMgwHMvapu-@intel.com> (raw)
In-Reply-To: <20241219214909.104869-2-gustavo.sousa@intel.com>
On Thu, Dec 19, 2024 at 06:48:36PM -0300, Gustavo Sousa wrote:
> The current intel_*_duplicate_state() functions assume the offset for
> the base member of their state structures is zero when calling
> kmemdup(). While that is true today, such assumption should not be made
> and proper offset must be applied when calling kmemdup(), otherwise we
> will be duplicating the wrong memory area if, for some reason, the
> offset is changed in the future.
All kms objects we use make that same assumption. I think the correct
thing to do is to just throw in some BUILD_BUG_ON()/etc. to make the
thing not build if that doesn't hold. I had a patch like that ages
ago, but it's no doubt 110% stale by now.
I suppose no real harm if avoiding that assumption in spots like
this, but the &foo->base==NULL <-> foo==NULL assumptions we have
all over the place are the far bigger issue.
>
> As such, update each of those functions to use its respective
> to_*_state() as the parameter to kmemdup().
>
> Signed-off-by: Gustavo Sousa <gustavo.sousa@intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_bw.c | 4 ++--
> drivers/gpu/drm/i915/display/intel_cdclk.c | 4 ++--
> drivers/gpu/drm/i915/display/intel_pmdemand.c | 4 ++--
> drivers/gpu/drm/i915/display/skl_watermark.c | 4 ++--
> 4 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_bw.c b/drivers/gpu/drm/i915/display/intel_bw.c
> index 08e8a67ca74c..30236010e0ed 100644
> --- a/drivers/gpu/drm/i915/display/intel_bw.c
> +++ b/drivers/gpu/drm/i915/display/intel_bw.c
> @@ -1425,9 +1425,9 @@ int intel_bw_atomic_check(struct intel_atomic_state *state)
> static struct intel_global_state *
> intel_bw_duplicate_state(struct intel_global_obj *obj)
> {
> - struct intel_bw_state *state;
> + struct intel_bw_state *state = to_intel_bw_state(obj->state);
>
> - state = kmemdup(obj->state, sizeof(*state), GFP_KERNEL);
> + state = kmemdup(state, sizeof(*state), GFP_KERNEL);
> if (!state)
> return NULL;
>
> diff --git a/drivers/gpu/drm/i915/display/intel_cdclk.c b/drivers/gpu/drm/i915/display/intel_cdclk.c
> index 3506e576bf6b..fc084e2a4c6a 100644
> --- a/drivers/gpu/drm/i915/display/intel_cdclk.c
> +++ b/drivers/gpu/drm/i915/display/intel_cdclk.c
> @@ -3130,9 +3130,9 @@ static int fixed_modeset_calc_cdclk(struct intel_atomic_state *state)
>
> static struct intel_global_state *intel_cdclk_duplicate_state(struct intel_global_obj *obj)
> {
> - struct intel_cdclk_state *cdclk_state;
> + struct intel_cdclk_state *cdclk_state = to_intel_cdclk_state(obj->state);
>
> - cdclk_state = kmemdup(obj->state, sizeof(*cdclk_state), GFP_KERNEL);
> + cdclk_state = kmemdup(cdclk_state, sizeof(*cdclk_state), GFP_KERNEL);
> if (!cdclk_state)
> return NULL;
>
> diff --git a/drivers/gpu/drm/i915/display/intel_pmdemand.c b/drivers/gpu/drm/i915/display/intel_pmdemand.c
> index cdd314956a31..1f71efb7d04d 100644
> --- a/drivers/gpu/drm/i915/display/intel_pmdemand.c
> +++ b/drivers/gpu/drm/i915/display/intel_pmdemand.c
> @@ -18,9 +18,9 @@
> static struct intel_global_state *
> intel_pmdemand_duplicate_state(struct intel_global_obj *obj)
> {
> - struct intel_pmdemand_state *pmdemand_state;
> + struct intel_pmdemand_state *pmdemand_state = to_intel_pmdemand_state(obj->state);
>
> - pmdemand_state = kmemdup(obj->state, sizeof(*pmdemand_state), GFP_KERNEL);
> + pmdemand_state = kmemdup(pmdemand_state, sizeof(*pmdemand_state), GFP_KERNEL);
> if (!pmdemand_state)
> return NULL;
>
> diff --git a/drivers/gpu/drm/i915/display/skl_watermark.c b/drivers/gpu/drm/i915/display/skl_watermark.c
> index 29e8ea91c858..b3d38e09df5a 100644
> --- a/drivers/gpu/drm/i915/display/skl_watermark.c
> +++ b/drivers/gpu/drm/i915/display/skl_watermark.c
> @@ -3291,9 +3291,9 @@ static void skl_setup_wm_latency(struct drm_i915_private *i915)
>
> static struct intel_global_state *intel_dbuf_duplicate_state(struct intel_global_obj *obj)
> {
> - struct intel_dbuf_state *dbuf_state;
> + struct intel_dbuf_state *dbuf_state = to_intel_dbuf_state(obj->state);
>
> - dbuf_state = kmemdup(obj->state, sizeof(*dbuf_state), GFP_KERNEL);
> + dbuf_state = kmemdup(dbuf_state, sizeof(*dbuf_state), GFP_KERNEL);
> if (!dbuf_state)
> return NULL;
>
> --
> 2.47.1
--
Ville Syrjälä
Intel
next prev parent reply other threads:[~2024-12-20 9:12 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-12-19 21:48 [PATCH 0/3] drm/i915/display: Reduce global state funcs boilerplate Gustavo Sousa
2024-12-19 21:48 ` [PATCH 1/3] drm/i915/display: Do not assume zero offset when duplicating global state Gustavo Sousa
2024-12-19 22:43 ` Cavitt, Jonathan
2024-12-20 9:11 ` Ville Syrjälä [this message]
2024-12-20 13:37 ` Gustavo Sousa
2024-12-19 21:48 ` [PATCH 2/3] drm/i915/display: Add infra to reduce global state funcs boilerplate Gustavo Sousa
2024-12-19 22:44 ` Cavitt, Jonathan
2024-12-20 13:43 ` Gustavo Sousa
2024-12-20 8:50 ` Jani Nikula
2024-12-20 13:54 ` Gustavo Sousa
2024-12-20 8:51 ` Jani Nikula
2024-12-20 13:56 ` Gustavo Sousa
2024-12-20 9:23 ` Ville Syrjälä
2024-12-20 14:02 ` Gustavo Sousa
2024-12-19 21:48 ` [PATCH 3/3] drm/i915/display: Use INTEL_GLOBAL_STATE_DEFAULTS Gustavo Sousa
2024-12-19 22:45 ` Cavitt, Jonathan
2024-12-20 14:08 ` Gustavo Sousa
2024-12-19 22:51 ` ✓ CI.Patch_applied: success for drm/i915/display: Reduce global state funcs boilerplate Patchwork
2024-12-19 22:51 ` ✗ CI.checkpatch: warning " Patchwork
2024-12-19 22:53 ` ✓ CI.KUnit: success " Patchwork
2024-12-19 23:13 ` ✓ CI.Build: " Patchwork
2024-12-19 23:15 ` ✓ CI.Hooks: " Patchwork
2024-12-19 23:17 ` ✗ CI.checksparse: warning " Patchwork
2024-12-19 23:52 ` ✓ Xe.CI.BAT: success " Patchwork
2024-12-20 22:48 ` ✗ Xe.CI.Full: failure " 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=Z2U03bMgwHMvapu-@intel.com \
--to=ville.syrjala@linux.intel.com \
--cc=gustavo.sousa@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=intel-xe@lists.freedesktop.org \
--cc=jani.nikula@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