drm/i915: Do not leak dev_priv->l3_parity.remap_info[]
Subsystems (2)
Joonas Lahtinen
maintainerPATCH 1/1 drm/i915: Do not leak dev_priv->l3_parity.remap_info[]
Add intel_irq_fini() for placing the deinitialization code, starting with freeing dev_priv->l3_parity.remap_info[].
--- drivers/gpu/drm/i915/i915_drv.c | 6 ++++-- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/i915_irq.c | 20 +++++++++++++++++++- drivers/gpu/drm/i915/i915_sysfs.c | 23 ++++++++++++----------- 4 files changed, 36 insertions(+), 14 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +4 -2
@@ -856,7 +856,7 @@ static int i915_driver_init_early(struct drm_i915_private *dev_priv,intel_init_audio_hooks (dev_priv); ret =i915_gem_load_init (dev_priv);if (ret <0 ) - goto err_workqueues; + goto err_irq;intel_display_crc_init (dev_priv);
@@ -868,7 +868,8 @@ static int i915_driver_init_early(struct drm_i915_private *dev_priv,return 0 ; -err_workqueues: +err_irq: +intel_irq_fini (dev_priv);i915_workqueues_cleanup (dev_priv); err_engines:i915_engines_cleanup (dev_priv);
@@ -883,6 +884,7 @@ static void i915_driver_cleanup_early(struct drm_i915_private *dev_priv) {i915_perf_fini (dev_priv);i915_gem_load_cleanup (dev_priv); +intel_irq_fini (dev_priv);i915_workqueues_cleanup (dev_priv);i915_engines_cleanup (dev_priv); }
drivers/gpu/drm/i915/i915_drv.h +1 -0
@@ -3060,6 +3060,7 @@ void i915_handle_error(struct drm_i915_private *dev_priv, const char *fmt, ...);extern void intel_irq_init (struct drm_i915_private *dev_priv); +extern void intel_irq_fini (struct drm_i915_private *dev_priv);int intel_irq_install (struct drm_i915_private *dev_priv);void intel_irq_uninstall (struct drm_i915_private *dev_priv);
drivers/gpu/drm/i915/i915_irq.c +19 -1
@@ -1236,7 +1236,7 @@ static void gen6_pm_rps_work(struct work_struct *work)static void ivybridge_parity_work (struct work_struct *work) {struct drm_i915_private *dev_priv = - container_of(work, struct drm_i915_private, l3_parity.error_work); +container_of (work,typeof (*dev_priv), l3_parity.error_work);u32 error_status, row, bank, subbank;char *parity_event[6 ];uint32_t misccpctl;
@@ -4233,11 +4233,15 @@ static void i965_irq_uninstall(struct drm_device * dev)void intel_irq_init (struct drm_i915_private *dev_priv) {struct drm_device *dev = &dev_priv->drm; +int i;intel_hpd_init_work (dev_priv);INIT_WORK (&dev_priv->rps.work, gen6_pm_rps_work); +INIT_WORK (&dev_priv->l3_parity.error_work, ivybridge_parity_work); +for (i =0 ; i <MAX_L3_SLICES ; ++i) + dev_priv->l3_parity.remap_info[i] =NULL ;if (HAS_GUC_SCHED (dev_priv)) dev_priv->pm_guc_events =GEN9_GUC_TO_HOST_INT_EVENT ;
@@ -4363,6 +4367,20 @@ void intel_irq_init(struct drm_i915_private *dev_priv) }/** +* intel_irq_fini - deinitializes IRQ support +* @i915: i915 device instance +* +* This function deinitializes all the IRQ support. +*/ +void intel_irq_fini (struct drm_i915_private *i915) +{ +int i; + +for (i =0 ; i <MAX_L3_SLICES ; ++i) +kfree (i915->l3_parity.remap_info[i]); +} + +/** * intel_irq_install - enables the hardware interrupt * @dev_priv: i915 device instance *
drivers/gpu/drm/i915/i915_sysfs.c +12 -11
@@ -181,8 +181,8 @@ i915_l3_write(struct file *filp, struct kobject *kobj,struct drm_i915_private *dev_priv =kdev_minor_to_i915 (kdev);struct drm_device *dev = &dev_priv->drm;struct i915_gem_context *ctx; -u32 *temp =NULL ;/* Just here to make handling failures easy */ int slice = (int )(uintptr_t )attr->private; +u32 **remap_info;int ret;if (!HAS_HW_CONTEXTS (dev_priv))
@@ -196,11 +196,12 @@ i915_l3_write(struct file *filp, struct kobject *kobj,if (ret)return ret; -if (!dev_priv->l3_parity.remap_info[slice]) { - temp =kzalloc (GEN7_L3LOG_SIZE ,GFP_KERNEL ); -if (!temp) { -mutex_unlock (&dev->struct_mutex); -return -ENOMEM ; + remap_info = &dev_priv->l3_parity.remap_info[slice]; +if (!*remap_info) { + *remap_info =kzalloc (GEN7_L3LOG_SIZE ,GFP_KERNEL ); +if (!*remap_info) { + ret = -ENOMEM ; + goto out; } }
@@ -208,18 +209,18 @@ i915_l3_write(struct file *filp, struct kobject *kobj,* aren't propagated. Since I cannot find a stable way to reset the GPU * at this point it is left as a TODO. */ -if (temp) - dev_priv->l3_parity.remap_info[slice] = temp; - -memcpy (dev_priv->l3_parity.remap_info[slice] + (offset/4 ), buf, count); +memcpy (*remap_info + (offset/4 ), buf, count);/* NB: We defer the remapping until we switch to the context */ list_for_each_entry (ctx, &dev_priv->context_list, link) ctx->remap_slice |= (1 <<slice); + ret = count; + +out:mutex_unlock (&dev->struct_mutex); -return count; +return ret; }static struct bin_attribute dpf_attrs = {
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 7 lines · Joonas Lahtinen
Add
intel_irq_fini()for placing the deinitialization code, starting with freeing dev_priv->l3_parity.remap_info[].Signed-off-by Joonas Lahtinen <[email protected]>Cc Chris Wilson <[email protected]>Cc Tvrtko Ursulin <[email protected]>Cc Mika Kuoppala <[email protected]>
Couldn't spot anything broken, so
-Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for drm/i915: Do not leak dev_priv->l3_parity.remap_info[]
In reply to Joonas Lahtinen== Series Details ==
== Series Details ==
Series: drm/i915: Do not leak dev_priv->l3_parity.remap_info[]
URL : https://patchwork.freedesktop.org/series/23679/
State : success
== Summary ==
Series 23679v1 drm/i915: Do not leak dev_priv->l3_parity.remap_info[]
https://patchwork.freedesktop.org/api/1.0/series/23679/revisions/1/mbox/
fi-bdw-5557u total:278 pass:267 dwarn:0 dfail:0 fail:0 skip:11 time:428s fi-bsw-n3050 total:278 pass:242 dwarn:0 dfail:0 fail:0 skip:36 time:579s fi-bxt-j4205 total:278 pass:259 dwarn:0 dfail:0 fail:0 skip:19 time:517s fi-bxt-t5700 total:278 pass:258 dwarn:0 dfail:0 fail:0 skip:20 time:558s fi-byt-j1900 total:278 pass:254 dwarn:0 dfail:0 fail:0 skip:24 time:497s fi-byt-n2820 total:278 pass:250 dwarn:0 dfail:0 fail:0 skip:28 time:479s fi-hsw-4770 total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time:412s fi-hsw-4770r total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time:401s fi-ilk-650 total:278 pass:228 dwarn:0 dfail:0 fail:0 skip:50 time:414s fi-ivb-3520m total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time:495s fi-ivb-3770 total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time:466s fi-kbl-7500u total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time:460s fi-kbl-7560u total:278 pass:267 dwarn:1 dfail:0 fail:0 skip:10 time:574s fi-skl-6260u total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time:450s fi-skl-6700hq total:278 pass:261 dwarn:0 dfail:0 fail:0 skip:17 time:570s fi-skl-6700k total:278 pass:256 dwarn:4 dfail:0 fail:0 skip:18 time:466s fi-skl-6770hq total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time:496s fi-skl-gvtdvm total:278 pass:265 dwarn:0 dfail:0 fail:0 skip:13 time:430s fi-snb-2520m total:278 pass:250 dwarn:0 dfail:0 fail:0 skip:28 time:531s fi-snb-2600 total:278 pass:249 dwarn:0 dfail:0 fail:0 skip:29 time:407s
fi-bdw-gvtdvm failed to collect. IGT log at Patchwork_4574/fi-bdw-gvtdvm/igt.log
86cc4197d2fa4c45b75bf54026765d27d86b84c8 drm-tip: 2017y-04m-28d-09h-14m-47s UTC integration manifest 38aca2b drm/i915: Do not leak dev_priv->l3_parity.remap_info[]
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_4574/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Joonas Lahtinen
maintainerRe: ✓ Fi.CI.BAT: success for drm/i915: Do not leak dev_priv->l3_parity.remap_info[]
Quoted 5 lines · Patchwork
== Series Details ==
Series: drm/i915: Do not leak dev_priv->l3_parity.remap_info[] URL : https://patchwork.freedesktop.org/series/23679/
State : success
Merged the patch. Thanks for the review.
Quoted 33 lines
== Summary ==
Series 23679v1 drm/i915: Do not leak dev_priv->l3_parity.remap_info[]
https://patchwork.freedesktop.org/api/1.0/series/23679/revisions/1/mbox/fi-bdw-5557u total:278 pass:267 dwarn:0 dfail:0 fail:0 skip:11 time:428s fi-bsw-n3050 total:278 pass:242 dwarn:0 dfail:0 fail:0 skip:36 time:579s fi-bxt-j4205 total:278 pass:259 dwarn:0 dfail:0 fail:0 skip:19 time:517s fi-bxt-t5700 total:278 pass:258 dwarn:0 dfail:0 fail:0 skip:20 time:558s fi-byt-j1900 total:278 pass:254 dwarn:0 dfail:0 fail:0 skip:24 time:497s fi-byt-n2820 total:278 pass:250 dwarn:0 dfail:0 fail:0 skip:28 time:479s fi-hsw-4770 total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time:412s fi-hsw-4770r total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time:401s fi-ilk-650 total:278 pass:228 dwarn:0 dfail:0 fail:0 skip:50 time:414s fi-ivb-3520m total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time:495s fi-ivb-3770 total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time:466s fi-kbl-7500u total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time:460s fi-kbl-7560u total:278 pass:267 dwarn:1 dfail:0 fail:0 skip:10 time:574s fi-skl-6260u total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time:450s fi-skl-6700hq total:278 pass:261 dwarn:0 dfail:0 fail:0 skip:17 time:570s fi-skl-6700k total:278 pass:256 dwarn:4 dfail:0 fail:0 skip:18 time:466s fi-skl-6770hq total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time:496s fi-skl-gvtdvm total:278 pass:265 dwarn:0 dfail:0 fail:0 skip:13 time:430s fi-snb-2520m total:278 pass:250 dwarn:0 dfail:0 fail:0 skip:28 time:531s fi-snb-2600 total:278 pass:249 dwarn:0 dfail:0 fail:0 skip:29 time:407s fi-bdw-gvtdvm failed to collect. IGT log at Patchwork_4574/fi-bdw-gvtdvm/igt.log
86cc4197d2fa4c45b75bf54026765d27d86b84c8drm-tip: 2017y-04m-28d-09h-14m-47s UTC integration manifest 38aca2b drm/i915: Do not leak dev_priv->l3_parity.remap_info[]== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_4574/
Signature · 7 lines
Joonas Lahtinen Open Source Technology Center Intel Corporation _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx