* [Intel-gfx] [CI] agp/intel: Fix a memory leak on module initialisation failure
@ 2020-05-22 8:34 Chris Wilson
2020-05-22 9:05 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Chris Wilson @ 2020-05-22 8:34 UTC (permalink / raw)
To: intel-gfx
From: Qiushi Wu <wu000273@umn.edu>
In intel_gtt_setup_scratch_page(), pointer "page" is not released if
pci_dma_mapping_error() return an error, leading to a memory leak on
module intialisation failure. Simply fix this issue by freeing "page"
before return.
Fixes: 0e87d2b06cb46 ("intel-gtt: initialize our own scratch page")
Signed-off-by: Qiushi Wu <wu000273@umn.edu>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
drivers/char/agp/intel-gtt.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c
index 4b34a5195c65..5bfdf222d5f9 100644
--- a/drivers/char/agp/intel-gtt.c
+++ b/drivers/char/agp/intel-gtt.c
@@ -304,8 +304,10 @@ static int intel_gtt_setup_scratch_page(void)
if (intel_private.needs_dmar) {
dma_addr = pci_map_page(intel_private.pcidev, page, 0,
PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);
- if (pci_dma_mapping_error(intel_private.pcidev, dma_addr))
+ if (pci_dma_mapping_error(intel_private.pcidev, dma_addr)) {
+ __free_page(page);
return -EINVAL;
+ }
intel_private.scratch_page_dma = dma_addr;
} else
--
2.20.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 4+ messages in thread* [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for agp/intel: Fix a memory leak on module initialisation failure 2020-05-22 8:34 [Intel-gfx] [CI] agp/intel: Fix a memory leak on module initialisation failure Chris Wilson @ 2020-05-22 9:05 ` Patchwork 2020-05-22 9:27 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork 2020-05-23 1:24 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork 2 siblings, 0 replies; 4+ messages in thread From: Patchwork @ 2020-05-22 9:05 UTC (permalink / raw) To: Chris Wilson; +Cc: intel-gfx == Series Details == Series: agp/intel: Fix a memory leak on module initialisation failure URL : https://patchwork.freedesktop.org/series/77550/ State : warning == Summary == $ dim checkpatch origin/drm-tip 118686605b3f agp/intel: Fix a memory leak on module initialisation failure -:8: WARNING:TYPO_SPELLING: 'intialisation' may be misspelled - perhaps 'initialisation'? #8: module intialisation failure. Simply fix this issue by freeing "page" total: 0 errors, 1 warnings, 0 checks, 11 lines checked _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 4+ messages in thread
* [Intel-gfx] ✓ Fi.CI.BAT: success for agp/intel: Fix a memory leak on module initialisation failure 2020-05-22 8:34 [Intel-gfx] [CI] agp/intel: Fix a memory leak on module initialisation failure Chris Wilson 2020-05-22 9:05 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for " Patchwork @ 2020-05-22 9:27 ` Patchwork 2020-05-23 1:24 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork 2 siblings, 0 replies; 4+ messages in thread From: Patchwork @ 2020-05-22 9:27 UTC (permalink / raw) To: Chris Wilson; +Cc: intel-gfx == Series Details == Series: agp/intel: Fix a memory leak on module initialisation failure URL : https://patchwork.freedesktop.org/series/77550/ State : success == Summary == CI Bug Log - changes from CI_DRM_8524 -> Patchwork_17756 ==================================================== Summary ------- **SUCCESS** No regressions found. External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17756/index.html Known issues ------------ Here are the changes found in Patchwork_17756 that come from known issues: ### IGT changes ### #### Warnings #### * igt@i915_pm_rpm@module-reload: - fi-kbl-x1275: [FAIL][1] ([i915#62] / [i915#95]) -> [FAIL][2] ([i915#62]) [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8524/fi-kbl-x1275/igt@i915_pm_rpm@module-reload.html [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17756/fi-kbl-x1275/igt@i915_pm_rpm@module-reload.html [i915#62]: https://gitlab.freedesktop.org/drm/intel/issues/62 [i915#95]: https://gitlab.freedesktop.org/drm/intel/issues/95 Participating hosts (45 -> 40) ------------------------------ Missing (5): fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-bwr-2160 fi-byt-clapper Build changes ------------- * Linux: CI_DRM_8524 -> Patchwork_17756 CI-20190529: 20190529 CI_DRM_8524: 14a61eda3439d0655e4438f77310479a6da8c583 @ git://anongit.freedesktop.org/gfx-ci/linux IGT_5673: f37cd37470612616f65914bca35497ca13aeb11a @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools Patchwork_17756: 118686605b3f2e1282b5842c05c1afb086057936 @ git://anongit.freedesktop.org/gfx-ci/linux == Linux commits == 118686605b3f agp/intel: Fix a memory leak on module initialisation failure == Logs == For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17756/index.html _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 4+ messages in thread
* [Intel-gfx] ✓ Fi.CI.IGT: success for agp/intel: Fix a memory leak on module initialisation failure 2020-05-22 8:34 [Intel-gfx] [CI] agp/intel: Fix a memory leak on module initialisation failure Chris Wilson 2020-05-22 9:05 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for " Patchwork 2020-05-22 9:27 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork @ 2020-05-23 1:24 ` Patchwork 2 siblings, 0 replies; 4+ messages in thread From: Patchwork @ 2020-05-23 1:24 UTC (permalink / raw) To: Chris Wilson; +Cc: intel-gfx == Series Details == Series: agp/intel: Fix a memory leak on module initialisation failure URL : https://patchwork.freedesktop.org/series/77550/ State : success == Summary == CI Bug Log - changes from CI_DRM_8524_full -> Patchwork_17756_full ==================================================== Summary ------- **SUCCESS** No regressions found. Known issues ------------ Here are the changes found in Patchwork_17756_full that come from known issues: ### IGT changes ### #### Issues hit #### * igt@gem_workarounds@suspend-resume-context: - shard-apl: [PASS][1] -> [DMESG-WARN][2] ([i915#180]) [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8524/shard-apl3/igt@gem_workarounds@suspend-resume-context.html [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17756/shard-apl4/igt@gem_workarounds@suspend-resume-context.html * igt@gen9_exec_parse@allowed-all: - shard-skl: [PASS][3] -> [DMESG-WARN][4] ([i915#1436] / [i915#716]) [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8524/shard-skl4/igt@gen9_exec_parse@allowed-all.html [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17756/shard-skl9/igt@gen9_exec_parse@allowed-all.html * igt@i915_suspend@forcewake: - shard-skl: [PASS][5] -> [INCOMPLETE][6] ([i915#69]) [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8524/shard-skl7/igt@i915_suspend@forcewake.html [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17756/shard-skl2/igt@i915_suspend@forcewake.html * igt@kms_big_fb@y-tiled-64bpp-rotate-0: - shard-glk: [PASS][7] -> [FAIL][8] ([i915#1119] / [i915#118] / [i915#95]) [7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8524/shard-glk4/igt@kms_big_fb@y-tiled-64bpp-rotate-0.html [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17756/shard-glk8/igt@kms_big_fb@y-tiled-64bpp-rotate-0.html * igt@kms_flip_tiling@flip-changes-tiling-yf: - shard-apl: [PASS][9] -> [FAIL][10] ([i915#95]) [9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8524/shard-apl2/igt@kms_flip_tiling@flip-changes-tiling-yf.html [10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17756/shard-apl3/igt@kms_flip_tiling@flip-changes-tiling-yf.html * igt@kms_pipe_crc_basic@read-crc-pipe-b-frame-sequence: - shard-skl: [PASS][11] -> [FAIL][12] ([i915#53]) [11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8524/shard-skl4/igt@kms_pipe_crc_basic@read-crc-pipe-b-frame-sequence.html [12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17756/shard-skl4/igt@kms_pipe_crc_basic@read-crc-pipe-b-frame-sequence.html * igt@kms_plane@plane-panning-bottom-right-suspend-pipe-b-planes: - shard-kbl: [PASS][13] -> [DMESG-WARN][14] ([i915#180]) +2 similar issues [13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8524/shard-kbl3/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-b-planes.html [14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17756/shard-kbl6/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-b-planes.html * igt@kms_plane_alpha_blend@pipe-c-constant-alpha-min: - shard-skl: [PASS][15] -> [FAIL][16] ([fdo#108145] / [i915#265]) +1 similar issue [15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8524/shard-skl1/igt@kms_plane_alpha_blend@pipe-c-constant-alpha-min.html [16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17756/shard-skl2/igt@kms_plane_alpha_blend@pipe-c-constant-alpha-min.html * igt@kms_psr@psr2_cursor_render: - shard-iclb: [PASS][17] -> [SKIP][18] ([fdo#109441]) +1 similar issue [17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8524/shard-iclb2/igt@kms_psr@psr2_cursor_render.html [18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17756/shard-iclb4/igt@kms_psr@psr2_cursor_render.html #### Possible fixes #### * {igt@gem_exec_balancer@bonded-true-hang}: - shard-tglb: [TIMEOUT][19] -> [PASS][20] [19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8524/shard-tglb5/igt@gem_exec_balancer@bonded-true-hang.html [20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17756/shard-tglb7/igt@gem_exec_balancer@bonded-true-hang.html * igt@gem_tiled_swapping@non-threaded: - shard-apl: [DMESG-WARN][21] ([i915#183]) -> [PASS][22] [21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8524/shard-apl3/igt@gem_tiled_swapping@non-threaded.html [22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17756/shard-apl2/igt@gem_tiled_swapping@non-threaded.html * igt@gen9_exec_parse@allowed-all: - shard-apl: [DMESG-WARN][23] ([i915#1436] / [i915#716]) -> [PASS][24] [23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8524/shard-apl7/igt@gen9_exec_parse@allowed-all.html [24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17756/shard-apl7/igt@gen9_exec_parse@allowed-all.html * igt@i915_suspend@fence-restore-untiled: - shard-skl: [INCOMPLETE][25] ([i915#69]) -> [PASS][26] [25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8524/shard-skl4/igt@i915_suspend@fence-restore-untiled.html [26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17756/shard-skl4/igt@i915_suspend@fence-restore-untiled.html * igt@kms_big_fb@x-tiled-32bpp-rotate-180: - shard-kbl: [FAIL][27] ([i915#1119] / [i915#93] / [i915#95]) -> [PASS][28] [27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8524/shard-kbl6/igt@kms_big_fb@x-tiled-32bpp-rotate-180.html [28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17756/shard-kbl6/igt@kms_big_fb@x-tiled-32bpp-rotate-180.html * {igt@kms_flip@flip-vs-expired-vblank-interruptible@a-hdmi-a2}: - shard-glk: [FAIL][29] ([i915#79]) -> [PASS][30] [29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8524/shard-glk4/igt@kms_flip@flip-vs-expired-vblank-interruptible@a-hdmi-a2.html [30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17756/shard-glk8/igt@kms_flip@flip-vs-expired-vblank-interruptible@a-hdmi-a2.html * {igt@kms_flip@flip-vs-suspend@a-dp1}: - shard-kbl: [DMESG-WARN][31] ([i915#180] / [i915#93] / [i915#95]) -> [PASS][32] [31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8524/shard-kbl4/igt@kms_flip@flip-vs-suspend@a-dp1.html [32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17756/shard-kbl1/igt@kms_flip@flip-vs-suspend@a-dp1.html * igt@kms_frontbuffer_tracking@fbc-2p-scndscrn-spr-indfb-move: - shard-glk: [FAIL][33] -> [PASS][34] [33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8524/shard-glk2/igt@kms_frontbuffer_tracking@fbc-2p-scndscrn-spr-indfb-move.html [34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17756/shard-glk1/igt@kms_frontbuffer_tracking@fbc-2p-scndscrn-spr-indfb-move.html * igt@kms_frontbuffer_tracking@fbc-suspend: - shard-apl: [DMESG-WARN][35] ([i915#180] / [i915#95]) -> [PASS][36] [35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8524/shard-apl6/igt@kms_frontbuffer_tracking@fbc-suspend.html [36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17756/shard-apl6/igt@kms_frontbuffer_tracking@fbc-suspend.html * igt@kms_hdr@bpc-switch-dpms: - shard-skl: [FAIL][37] ([i915#1188]) -> [PASS][38] [37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8524/shard-skl6/igt@kms_hdr@bpc-switch-dpms.html [38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17756/shard-skl8/igt@kms_hdr@bpc-switch-dpms.html * igt@kms_plane@plane-panning-bottom-right-suspend-pipe-b-planes: - shard-apl: [DMESG-WARN][39] ([i915#180]) -> [PASS][40] [39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8524/shard-apl4/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-b-planes.html [40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17756/shard-apl8/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-b-planes.html * igt@kms_psr@psr2_sprite_plane_move: - shard-iclb: [SKIP][41] ([fdo#109441]) -> [PASS][42] +2 similar issues [41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8524/shard-iclb7/igt@kms_psr@psr2_sprite_plane_move.html [42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17756/shard-iclb2/igt@kms_psr@psr2_sprite_plane_move.html * igt@kms_vblank@pipe-a-ts-continuation-suspend: - shard-kbl: [DMESG-WARN][43] ([i915#180]) -> [PASS][44] +2 similar issues [43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8524/shard-kbl7/igt@kms_vblank@pipe-a-ts-continuation-suspend.html [44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17756/shard-kbl7/igt@kms_vblank@pipe-a-ts-continuation-suspend.html #### Warnings #### * igt@i915_pm_dc@dc6-dpms: - shard-tglb: [SKIP][45] ([i915#468]) -> [FAIL][46] ([i915#454]) [45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8524/shard-tglb2/igt@i915_pm_dc@dc6-dpms.html [46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17756/shard-tglb7/igt@i915_pm_dc@dc6-dpms.html * igt@kms_content_protection@atomic: - shard-apl: [FAIL][47] ([fdo#110321] / [fdo#110336]) -> [TIMEOUT][48] ([i915#1319]) [47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8524/shard-apl1/igt@kms_content_protection@atomic.html [48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17756/shard-apl6/igt@kms_content_protection@atomic.html * igt@kms_content_protection@lic: - shard-kbl: [TIMEOUT][49] ([i915#1319]) -> [FAIL][50] ([fdo#110321] / [i915#93] / [i915#95]) [49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8524/shard-kbl6/igt@kms_content_protection@lic.html [50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17756/shard-kbl2/igt@kms_content_protection@lic.html {name}: This element is suppressed. This means it is ignored when computing the status of the difference (SUCCESS, WARNING, or FAILURE). [fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145 [fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441 [fdo#110321]: https://bugs.freedesktop.org/show_bug.cgi?id=110321 [fdo#110336]: https://bugs.freedesktop.org/show_bug.cgi?id=110336 [i915#1119]: https://gitlab.freedesktop.org/drm/intel/issues/1119 [i915#118]: https://gitlab.freedesktop.org/drm/intel/issues/118 [i915#1188]: https://gitlab.freedesktop.org/drm/intel/issues/1188 [i915#1319]: https://gitlab.freedesktop.org/drm/intel/issues/1319 [i915#1436]: https://gitlab.freedesktop.org/drm/intel/issues/1436 [i915#1542]: https://gitlab.freedesktop.org/drm/intel/issues/1542 [i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180 [i915#1823]: https://gitlab.freedesktop.org/drm/intel/issues/1823 [i915#1829]: https://gitlab.freedesktop.org/drm/intel/issues/1829 [i915#183]: https://gitlab.freedesktop.org/drm/intel/issues/183 [i915#265]: https://gitlab.freedesktop.org/drm/intel/issues/265 [i915#454]: https://gitlab.freedesktop.org/drm/intel/issues/454 [i915#468]: https://gitlab.freedesktop.org/drm/intel/issues/468 [i915#53]: https://gitlab.freedesktop.org/drm/intel/issues/53 [i915#69]: https://gitlab.freedesktop.org/drm/intel/issues/69 [i915#716]: https://gitlab.freedesktop.org/drm/intel/issues/716 [i915#79]: https://gitlab.freedesktop.org/drm/intel/issues/79 [i915#93]: https://gitlab.freedesktop.org/drm/intel/issues/93 [i915#95]: https://gitlab.freedesktop.org/drm/intel/issues/95 Participating hosts (11 -> 11) ------------------------------ No changes in participating hosts Build changes ------------- * Linux: CI_DRM_8524 -> Patchwork_17756 CI-20190529: 20190529 CI_DRM_8524: 14a61eda3439d0655e4438f77310479a6da8c583 @ git://anongit.freedesktop.org/gfx-ci/linux IGT_5673: f37cd37470612616f65914bca35497ca13aeb11a @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools Patchwork_17756: 118686605b3f2e1282b5842c05c1afb086057936 @ git://anongit.freedesktop.org/gfx-ci/linux piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit == Logs == For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17756/index.html _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-05-23 1:24 UTC | newest] Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2020-05-22 8:34 [Intel-gfx] [CI] agp/intel: Fix a memory leak on module initialisation failure Chris Wilson 2020-05-22 9:05 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for " Patchwork 2020-05-22 9:27 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork 2020-05-23 1:24 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).