Skip to contentSkip to conversation

drm/i915: Use new i915_gem_object_pin_map for LRC

PATCH Superseded Tvrtko Ursulin 3 participants 13 messages Apr 12, 2016

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/i915: Use new i915_gem_object_pin_map for LRC

From: Tvrtko Ursulin <[email protected]>

We can use the new pin/lazy unpin API for simplicity and more performance in the execlist submission paths.

v2:
* Fix error handling and convert more users.
* Compact some names for readability.

---
 drivers/gpu/drm/i915/i915_gem_context.c |  2 +-
 drivers/gpu/drm/i915/intel_lrc.c        | 98 ++++++++++++++++++---------------
 drivers/gpu/drm/i915/intel_lrc.h        |  7 ++-
 3 files changed, 60 insertions(+), 47 deletions(-)
drivers/gpu/drm/i915/i915_gem_context.c +1 -1
index fe580cb9501a..91028d9c6269 100644
@@ -342,7 +342,7 @@ void i915_gem_context_reset(struct drm_device *dev)
 		struct intel_context *ctx;
 
 		list_for_each_entry(ctx, &dev_priv->context_list, link)
-			intel_lr_context_reset(dev, ctx);
+			intel_lr_context_reset(dev_priv, ctx);
 	}
 
 	for (i = 0; i < I915_NUM_ENGINES; i++) {
drivers/gpu/drm/i915/intel_lrc.c +54 -44

214 lines not on this page · raw message

drivers/gpu/drm/i915/intel_lrc.h +5 -2
index 0b0853eee91e..bfaa2f583d98 100644
@@ -103,8 +103,11 @@ int intel_lr_context_deferred_alloc(struct intel_context *ctx,
 				    struct intel_engine_cs *engine);
 void intel_lr_context_unpin(struct intel_context *ctx,
 			    struct intel_engine_cs *engine);
-void intel_lr_context_reset(struct drm_device *dev,
-			struct intel_context *ctx);
+
+struct drm_i915_private;
+
+void intel_lr_context_reset(struct drm_i915_private *dev_priv,
+			    struct intel_context *ctx);
 uint64_t intel_lr_context_descriptor(struct intel_context *ctx,
 				     struct intel_engine_cs *engine);
 
Signature · 6 lines
1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw

✗ Fi.CI.BAT: failure for drm/i915: Use new i915_gem_object_pin_map for LRC

== Series Details ==

== Series Details ==

Series: drm/i915: Use new i915_gem_object_pin_map for LRC
URL : https://patchwork.freedesktop.org/series/5580/
State : failure

== Summary ==

Series 5580v1 drm/i915: Use new i915_gem_object_pin_map for LRC
http://patchwork.freedesktop.org/api/1.0/series/5580/revisions/1/mbox/

Test drv_module_reload_basic:

                pass       -> DMESG-WARN (bsw-nuc-2)
                pass       -> DMESG-WARN (skl-nuci5)
                pass       -> DMESG-WARN (bdw-nuci7)
                pass       -> DMESG-WARN (skl-i7k-2)
                pass       -> DMESG-WARN (bdw-ultra)
Test gem_basic:
        Subgroup create-fd-close:
                incomplete -> PASS       (bsw-nuc-2)
Test gem_ctx_param_basic:
        Subgroup invalid-param-get:
                incomplete -> PASS       (bsw-nuc-2)
Test gem_exec_basic:
        Subgroup basic-bsd1:
                incomplete -> SKIP       (bsw-nuc-2)
Test gem_exec_store:
        Subgroup basic-bsd1:
                incomplete -> SKIP       (bsw-nuc-2)
        Subgroup basic-bsd2:
                incomplete -> SKIP       (bsw-nuc-2)
Test gem_ringfill:
        Subgroup basic-default-hang:
                dmesg-warn -> PASS       (bsw-nuc-2)
Test gem_storedw_loop:
        Subgroup basic-bsd2:
                incomplete -> SKIP       (bsw-nuc-2)
Test kms_addfb_basic:
        Subgroup bad-pitch-1024:
                dmesg-warn -> PASS       (bsw-nuc-2)
        Subgroup basic-y-tiled:
                incomplete -> PASS       (bsw-nuc-2)
        Subgroup small-bo:
                incomplete -> PASS       (bsw-nuc-2)
        Subgroup unused-handle:
                incomplete -> PASS       (bsw-nuc-2)
Test kms_pipe_crc_basic:
        Subgroup hang-read-crc-pipe-a:
                incomplete -> PASS       (snb-dellxps)
        Subgroup read-crc-pipe-a:
                incomplete -> SKIP       (bsw-nuc-2)
        Subgroup read-crc-pipe-b:
                incomplete -> SKIP       (bsw-nuc-2)
        Subgroup suspend-read-crc-pipe-a:
                pass       -> INCOMPLETE (hsw-gt2)
Test prime_self_import:
        Subgroup basic-with_one_bo:
                incomplete -> PASS       (bsw-nuc-2)
        Subgroup basic-with_two_bos:
                incomplete -> PASS       (bsw-nuc-2)
bdw-nuci7        total:202  pass:189  dwarn:1   dfail:0   fail:0   skip:12 
bdw-ultra        total:202  pass:178  dwarn:1   dfail:0   fail:0   skip:23 
bsw-nuc-2        total:201  pass:161  dwarn:1   dfail:0   fail:0   skip:39 
byt-nuc          total:201  pass:163  dwarn:0   dfail:0   fail:0   skip:38 
hsw-brixbox      total:202  pass:178  dwarn:0   dfail:0   fail:0   skip:24 
hsw-gt2          total:25   pass:22   dwarn:0   dfail:0   fail:0   skip:2  
ilk-hp8440p      total:202  pass:134  dwarn:0   dfail:0   fail:0   skip:68 
ivb-t430s        total:202  pass:174  dwarn:0   dfail:0   fail:0   skip:28 
skl-i7k-2        total:202  pass:176  dwarn:1   dfail:0   fail:0   skip:25 
skl-nuci5        total:202  pass:190  dwarn:1   dfail:0   fail:0   skip:11 
snb-dellxps      total:202  pass:164  dwarn:0   dfail:0   fail:0   skip:38 
snb-x220t        total:202  pass:164  dwarn:0   dfail:0   fail:1   skip:37 

Results at /archive/results/CI_IGT_test/Patchwork_1869/

dc5380b5263ebb0bf251bb09db542585702b528b drm-intel-nightly: 2016y-04m-11d-19h-43m-10s UTC integration manifest 91ffa2a drm/i915: Use new i915_gem_object_pin_map for LRC

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#2 lore raw

Re: ✗ Fi.CI.BAT: failure for drm/i915: Use new i915_gem_object_pin_map for LRC

Quoted 11 lines · Patchwork

== Series Details ==

Series: drm/i915: Use new i915_gem_object_pin_map for LRC
URL : https://patchwork.freedesktop.org/series/5580/
State : failure

== Summary ==

Series 5580v1 drm/i915: Use new i915_gem_object_pin_map for LRC
http://patchwork.freedesktop.org/api/1.0/series/5580/revisions/1/mbox/

Quoted 6 lines

Test drv_module_reload_basic:

                pass       -> DMESG-WARN (bsw-nuc-2)
                pass       -> DMESG-WARN (skl-nuci5)
                pass       -> DMESG-WARN (bdw-nuci7)
                pass       -> DMESG-WARN (skl-i7k-2)
                pass       -> DMESG-WARN (bdw-ultra)

Hmm, I guess we have a leak?
-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
Reviewed-by on v1 1/1
#3 lore raw
In reply to Tvrtko Ursulin
Quoted 11 lines · Tvrtko Ursulin

From: Tvrtko Ursulin <[email protected]>

We can use the new pin/lazy unpin API for simplicity and more performance in the execlist submission paths.

v2:
* Fix error handling and convert more users.
* Compact some names for readability.

Hmm, the stress tests that would exercise this are already currently fail (thinking of gem_ctx_create etc). But this should not excerbate it much!

drivers/gpu/drm/i915/intel_lrc.c static int intel_lr_context_do_pin(struct intel_context *ctx, · line 1108

Quoted 4 lines
drivers/gpu/drm/i915/intel_lrc.c +1 -3
-	lrc_state_page = i915_gem_object_get_dirty_page(ctx_obj, LRC_STATE_PN);
-	if (WARN_ON(!lrc_state_page)) {
-		ret = -ENODEV;
+	obj_addr = i915_gem_object_pin_map(ctx_obj);

Oops, there's a bug in pin_map in that we don't mark the object as dirty. Can you send a quick obj->dirty = true patch? -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
#4 lore raw
Quoted 10 lines · Chris Wilson
Quoted 9 lines · Tvrtko Ursulin

From: Tvrtko Ursulin <[email protected]>

We can use the new pin/lazy unpin API for simplicity and more performance in the execlist submission paths.

v2:
* Fix error handling and convert more users.
* Compact some names for readability.

Quoted 8 lines
Quoted 2 lines

Hmm, the stress tests that would exercise this are already currently fail (thinking of gem_ctx_create etc). But this should not excerbate it much!

Something is broken here as reported by the CI:

[  329.004489] ------------[ cut here ]------------
[  329.004508] WARNING: CPU: 1 PID: 7049 at drivers/gpu/drm/i915/i915_gem.c:4641 i915_gem_free_object+0x3bd/0x430 [i915]
[  329.004510] WARN_ON(obj->pages_pin_count)
[  329.004511] Modules linked in:
[  329.004512]  snd_hda_codec_hdmi x86_pkg_temp_thermal intel_powerclamp coretemp crct10dif_pclmul crc32_pclmul ghash_clmulni_intel snd_hda_codec_realtek snd_hda_codec_generic i915(-) snd_hda_codec snd_hwdep snd_hda_core mei_me lpc_ich snd_pcm mei i2c_hid i2c_designware_platform i2c_designware_core e1000e ptp pps_core sdhci_acpi sdhci mmc_core [last unloaded: snd_hda_intel]
[  329.004527] CPU: 1 PID: 7049 Comm: rmmod Tainted: G     U          4.6.0-rc3-gfxbench+ #1
[  329.004528] Hardware name:                  /NUC5i7RYB, BIOS RYBDWi35.86A.0249.2015.0529.1640 05/29/2015
[  329.004529]  0000000000000000 ffff880212f7bbe0 ffffffff81405fa5 ffff880212f7bc30
[  329.004531]  0000000000000000 ffff880212f7bc20 ffffffff81079c7c 0000122112f7bc28
[  329.004533]  ffff880211eaad90 ffff880211eaad40 ffff880211eaae30 ffff8800ceb70000
[  329.004535] Call Trace:
[  329.004539]  [<ffffffff81405fa5>] dump_stack+0x67/0x92
[  329.004541]  [<ffffffff81079c7c>] __warn+0xcc/0xf0
[  329.004542]  [<ffffffff81079cea>] warn_slowpath_fmt+0x4a/0x50
[  329.004555]  [<ffffffffa01f7ccd>] i915_gem_free_object+0x3bd/0x430 [i915]
[  329.004558]  [<ffffffff8151cffb>] drm_gem_object_free+0x2b/0x50
[  329.004570]  [<ffffffffa0208dd4>] intel_lr_context_free+0x74/0xd0 [i915]
[  329.004580]  [<ffffffffa01e25b3>] i915_gem_context_free+0x1a3/0x270 [i915]
[  329.004589]  [<ffffffffa01e2e6d>] i915_gem_context_fini+0x9d/0xd0 [i915]
[  329.004603]  [<ffffffffa0280bb9>] i915_driver_unload+0x119/0x1d0 [i915]
[  329.004605]  [<ffffffff81522524>] drm_dev_unregister+0x24/0xa0
[  329.004606]  [<ffffffff81522afe>] drm_put_dev+0x1e/0x60
[  329.004614]  [<ffffffffa01b82c0>] i915_pci_remove+0x10/0x20 [i915]
[  329.004616]  [<ffffffff8144efb4>] pci_device_remove+0x34/0xb0
[  329.004618]  [<ffffffff815467c5>] __device_release_driver+0x95/0x140
[  329.004619]  [<ffffffff81546966>] driver_detach+0xb6/0xc0
[  329.004620]  [<ffffffff815457c3>] bus_remove_driver+0x53/0xd0
[  329.004622]  [<ffffffff81547447>] driver_unregister+0x27/0x50
[  329.004623]  [<ffffffff8144e015>] pci_unregister_driver+0x25/0x70
[  329.004625]  [<ffffffff81524214>] drm_pci_exit+0x74/0x90
[  329.004638]  [<ffffffffa02812b5>] i915_exit+0x20/0x1a0 [i915]
[  329.004640]  [<ffffffff8110a47f>] SyS_delete_module+0x18f/0x1f0
[  329.004642]  [<ffffffff817d23a9>] entry_SYSCALL_64_fastpath+0x1c/0xac
[  329.004643] ---[ end trace f0bf445e9d9a7dbe ]---
[  329.004718] ------------[ cut here ]------------

It even happened in my local BAT run but I did not spot it due excessive eDP triggered WARNs. :(

Will look into it as soon as I stash the current work.

Quoted 7 lines

drivers/gpu/drm/i915/intel_lrc.c static int intel_lr_context_do_pin(struct intel_context *ctx, · line 1108

Quoted 4 lines
drivers/gpu/drm/i915/intel_lrc.c +1 -3
-	lrc_state_page = i915_gem_object_get_dirty_page(ctx_obj, LRC_STATE_PN);
-	if (WARN_ON(!lrc_state_page)) {
-		ret = -ENODEV;
+	obj_addr = i915_gem_object_pin_map(ctx_obj);

Oops, there's a bug in pin_map in that we don't mark the object as dirty. Can you send a quick obj->dirty = true patch?

I can if you are sure we want this. Callers might only want to read so I am not sure.

Regards,

Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#5 lore raw
Quoted 59 lines · Tvrtko Ursulin
Quoted 10 lines · Chris Wilson
Quoted 9 lines · Tvrtko Ursulin

From: Tvrtko Ursulin <[email protected]>

We can use the new pin/lazy unpin API for simplicity and more performance in the execlist submission paths.

v2:
* Fix error handling and convert more users.
* Compact some names for readability.

Quoted 8 lines
Quoted 2 lines

Hmm, the stress tests that would exercise this are already currently fail (thinking of gem_ctx_create etc). But this should not excerbate it much!

Something is broken here as reported by the CI:

[  329.004489] ------------[ cut here ]------------
[  329.004508] WARNING: CPU: 1 PID: 7049 at drivers/gpu/drm/i915/i915_gem.c:4641 i915_gem_free_object+0x3bd/0x430 [i915]
[  329.004510] WARN_ON(obj->pages_pin_count)
[  329.004511] Modules linked in:
[  329.004512]  snd_hda_codec_hdmi x86_pkg_temp_thermal intel_powerclamp coretemp crct10dif_pclmul crc32_pclmul ghash_clmulni_intel snd_hda_codec_realtek snd_hda_codec_generic i915(-) snd_hda_codec snd_hwdep snd_hda_core mei_me lpc_ich snd_pcm mei i2c_hid i2c_designware_platform i2c_designware_core e1000e ptp pps_core sdhci_acpi sdhci mmc_core [last unloaded: snd_hda_intel]
[  329.004527] CPU: 1 PID: 7049 Comm: rmmod Tainted: G     U          4.6.0-rc3-gfxbench+ #1
[  329.004528] Hardware name:                  /NUC5i7RYB, BIOS RYBDWi35.86A.0249.2015.0529.1640 05/29/2015
[  329.004529]  0000000000000000 ffff880212f7bbe0 ffffffff81405fa5 ffff880212f7bc30
[  329.004531]  0000000000000000 ffff880212f7bc20 ffffffff81079c7c 0000122112f7bc28
[  329.004533]  ffff880211eaad90 ffff880211eaad40 ffff880211eaae30 ffff8800ceb70000
[  329.004535] Call Trace:
[  329.004539]  [<ffffffff81405fa5>] dump_stack+0x67/0x92
[  329.004541]  [<ffffffff81079c7c>] __warn+0xcc/0xf0
[  329.004542]  [<ffffffff81079cea>] warn_slowpath_fmt+0x4a/0x50
[  329.004555]  [<ffffffffa01f7ccd>] i915_gem_free_object+0x3bd/0x430 [i915]
[  329.004558]  [<ffffffff8151cffb>] drm_gem_object_free+0x2b/0x50
[  329.004570]  [<ffffffffa0208dd4>] intel_lr_context_free+0x74/0xd0 [i915]
[  329.004580]  [<ffffffffa01e25b3>] i915_gem_context_free+0x1a3/0x270 [i915]
[  329.004589]  [<ffffffffa01e2e6d>] i915_gem_context_fini+0x9d/0xd0 [i915]
[  329.004603]  [<ffffffffa0280bb9>] i915_driver_unload+0x119/0x1d0 [i915]
[  329.004605]  [<ffffffff81522524>] drm_dev_unregister+0x24/0xa0
[  329.004606]  [<ffffffff81522afe>] drm_put_dev+0x1e/0x60
[  329.004614]  [<ffffffffa01b82c0>] i915_pci_remove+0x10/0x20 [i915]
[  329.004616]  [<ffffffff8144efb4>] pci_device_remove+0x34/0xb0
[  329.004618]  [<ffffffff815467c5>] __device_release_driver+0x95/0x140
[  329.004619]  [<ffffffff81546966>] driver_detach+0xb6/0xc0
[  329.004620]  [<ffffffff815457c3>] bus_remove_driver+0x53/0xd0
[  329.004622]  [<ffffffff81547447>] driver_unregister+0x27/0x50
[  329.004623]  [<ffffffff8144e015>] pci_unregister_driver+0x25/0x70
[  329.004625]  [<ffffffff81524214>] drm_pci_exit+0x74/0x90
[  329.004638]  [<ffffffffa02812b5>] i915_exit+0x20/0x1a0 [i915]
[  329.004640]  [<ffffffff8110a47f>] SyS_delete_module+0x18f/0x1f0
[  329.004642]  [<ffffffff817d23a9>] entry_SYSCALL_64_fastpath+0x1c/0xac
[  329.004643] ---[ end trace f0bf445e9d9a7dbe ]---
[  329.004718] ------------[ cut here ]------------
Quoted 1 line

It even happened in my local BAT run but I did not spot it due excessive eDP triggered WARNs. :(

I guess it is in the default context.

Quoted 11 lines

Will look into it as soon as I stash the current work.

Quoted 7 lines

drivers/gpu/drm/i915/intel_lrc.c static int intel_lr_context_do_pin(struct intel_context *ctx, · line 1108

Quoted 4 lines
drivers/gpu/drm/i915/intel_lrc.c +1 -3
-	lrc_state_page = i915_gem_object_get_dirty_page(ctx_obj, LRC_STATE_PN);
-	if (WARN_ON(!lrc_state_page)) {
-		ret = -ENODEV;
+	obj_addr = i915_gem_object_pin_map(ctx_obj);

Oops, there's a bug in pin_map in that we don't mark the object as dirty. Can you send a quick obj->dirty = true patch?

I can if you are sure we want this. Callers might only want to read so I am not sure.

I agree it is slightly presumptuous, but not marking the objects as dirty is a potential source of data loss, marking them as dirty even for pure reads is just a missed optimisation.
-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
#6 lore raw
In reply to Tvrtko Ursulin
Quoted 21 lines · Tvrtko Ursulin
drivers/gpu/drm/i915/intel_lrc.c +9 -8
-static void lrc_setup_hardware_status_page(struct intel_engine_cs *engine,
-					   struct drm_i915_gem_object *default_ctx_obj)
+static int
+lrc_setup_hws(struct intel_engine_cs *engine,
+	      struct drm_i915_gem_object *def_ctx_obj)
 {
 	struct drm_i915_private *dev_priv = engine->dev->dev_private;
-	struct page *page;
+	void *hws;
 
 	/* The HWSP is part of the default context object in LRC mode. */
-	engine->status_page.gfx_addr = i915_gem_obj_ggtt_offset(default_ctx_obj)
-			+ LRC_PPHWSP_PN * PAGE_SIZE;
-	page = i915_gem_object_get_page(default_ctx_obj, LRC_PPHWSP_PN);
-	engine->status_page.page_addr = kmap(page);
-	engine->status_page.obj = default_ctx_obj;
+	engine->status_page.gfx_addr = i915_gem_obj_ggtt_offset(def_ctx_obj) +
+				       LRC_PPHWSP_PN * PAGE_SIZE;
+	hws = i915_gem_object_pin_map(def_ctx_obj);
+	if (IS_ERR(hws))
+		return PTR_ERR(hws);

drivers/gpu/drm/i915/intel_lrc.c uint32_t intel_lr_context_size(struct intel_engine_cs *engine) · line 2618

Quoted 10 lines
drivers/gpu/drm/i915/intel_lrc.c +5 -1
+	engine->status_page.page_addr = hws + LRC_PPHWSP_PN * PAGE_SIZE;
+	engine->status_page.obj = def_ctx_obj;
 
 	I915_WRITE(RING_HWS_PGA(engine->mmio_base),
-			(u32)engine->status_page.gfx_addr);
+		   (u32)engine->status_page.gfx_addr);
 	POSTING_READ(RING_HWS_PGA(engine->mmio_base));
+
+	return 0;
 }

I don't see the corresonding change for tearing down the hws. -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
#7 lore raw
Quoted 25 lines · Chris Wilson
Quoted 24 lines · Tvrtko Ursulin
drivers/gpu/drm/i915/intel_lrc.c +11 -8
-static void lrc_setup_hardware_status_page(struct intel_engine_cs *engine,
-					   struct drm_i915_gem_object *default_ctx_obj)
+static int
+lrc_setup_hws(struct intel_engine_cs *engine,
+	      struct drm_i915_gem_object *def_ctx_obj)
  {
  	struct drm_i915_private *dev_priv = engine->dev->dev_private;
-	struct page *page;
+	void *hws;
 
  	/* The HWSP is part of the default context object in LRC mode. */
-	engine->status_page.gfx_addr = i915_gem_obj_ggtt_offset(default_ctx_obj)
-			+ LRC_PPHWSP_PN * PAGE_SIZE;
-	page = i915_gem_object_get_page(default_ctx_obj, LRC_PPHWSP_PN);
-	engine->status_page.page_addr = kmap(page);
-	engine->status_page.obj = default_ctx_obj;
+	engine->status_page.gfx_addr = i915_gem_obj_ggtt_offset(def_ctx_obj) +
+				       LRC_PPHWSP_PN * PAGE_SIZE;
+	hws = i915_gem_object_pin_map(def_ctx_obj);
+	if (IS_ERR(hws))
+		return PTR_ERR(hws);
+	engine->status_page.page_addr = hws + LRC_PPHWSP_PN * PAGE_SIZE;
+	engine->status_page.obj = def_ctx_obj;
Quoted 9 lines

drivers/gpu/drm/i915/intel_lrc.c uint32_t intel_lr_context_size(struct intel_engine_cs *engine) · line 2618

Quoted 7 lines

I915_WRITE(RING_HWS_PGA(engine->mmio_base),

drivers/gpu/drm/i915/intel_lrc.c +3 -1
-			(u32)engine->status_page.gfx_addr);
+		   (u32)engine->status_page.gfx_addr);
  	POSTING_READ(RING_HWS_PGA(engine->mmio_base));
+
+	return 0;
  }

I don't see the corresonding change for tearing down the hws.

It is where it was, in intel_logical_ring_cleanup. Missing was unpin_map in intel_lr_context_free. But still there is a leak somewhere. Triggered by BAT but not individual IGTs so far.

Regards,

Tvrtko

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#8 lore raw

PATCH v3 1/1 drm/i915: Use new i915_gem_object_pin_map for LRC

From: Tvrtko Ursulin <[email protected]>

We can use the new pin/lazy unpin API for simplicity and more performance in the execlist submission paths.

v2:
* Fix error handling and convert more users.
* Compact some names for readability.

v3:
* intel_lr_context_free was not unpinning.
* Special case for GPU reset which otherwise unbalances the HWS object pages pin count by running the engine initialization only (not destructors).

---
 drivers/gpu/drm/i915/i915_gem_context.c |   2 +-
 drivers/gpu/drm/i915/intel_lrc.c        | 107 +++++++++++++++++++-------------
 drivers/gpu/drm/i915/intel_lrc.h        |   7 ++-
 3 files changed, 69 insertions(+), 47 deletions(-)
drivers/gpu/drm/i915/i915_gem_context.c +1 -1
index fe580cb9501a..91028d9c6269 100644
@@ -342,7 +342,7 @@ void i915_gem_context_reset(struct drm_device *dev)
 		struct intel_context *ctx;
 
 		list_for_each_entry(ctx, &dev_priv->context_list, link)
-			intel_lr_context_reset(dev, ctx);
+			intel_lr_context_reset(dev_priv, ctx);
 	}
 
 	for (i = 0; i < I915_NUM_ENGINES; i++) {
drivers/gpu/drm/i915/intel_lrc.c +63 -44

229 lines not on this page · raw message

drivers/gpu/drm/i915/intel_lrc.h +5 -2
index 0b0853eee91e..bfaa2f583d98 100644
@@ -103,8 +103,11 @@ int intel_lr_context_deferred_alloc(struct intel_context *ctx,
 				    struct intel_engine_cs *engine);
 void intel_lr_context_unpin(struct intel_context *ctx,
 			    struct intel_engine_cs *engine);
-void intel_lr_context_reset(struct drm_device *dev,
-			struct intel_context *ctx);
+
+struct drm_i915_private;
+
+void intel_lr_context_reset(struct drm_i915_private *dev_priv,
+			    struct intel_context *ctx);
 uint64_t intel_lr_context_descriptor(struct intel_context *ctx,
 				     struct intel_engine_cs *engine);
 
Signature · 6 lines
1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#9 lore raw
Quoted 9 lines · Tvrtko Ursulin

From: Tvrtko Ursulin <[email protected]>

We can use the new pin/lazy unpin API for simplicity and more performance in the execlist submission paths.

v2:
* Fix error handling and convert more users.
* Compact some names for readability.

Quoted 5 lines

v3:
* intel_lr_context_free was not unpinning.
* Special case for GPU reset which otherwise unbalances the HWS object pages pin count by running the engine initialization only (not destructors).

Ah! Light dawns...

Should we not just separate out the hws setup and hws hw_init?

Quoted 72 lines
drivers/gpu/drm/i915/intel_lrc.c +22 -18
-static void lrc_setup_hardware_status_page(struct intel_engine_cs *engine,
-					   struct drm_i915_gem_object *default_ctx_obj)
+static int
+lrc_setup_hws(struct intel_engine_cs *engine,
+	      struct drm_i915_gem_object *def_ctx_obj)
 {
 	struct drm_i915_private *dev_priv = engine->dev->dev_private;
-	struct page *page;
+	void *hws;
 
 	/* The HWSP is part of the default context object in LRC mode. */
-	engine->status_page.gfx_addr = i915_gem_obj_ggtt_offset(default_ctx_obj)
-			+ LRC_PPHWSP_PN * PAGE_SIZE;
-	page = i915_gem_object_get_page(default_ctx_obj, LRC_PPHWSP_PN);
-	engine->status_page.page_addr = kmap(page);
-	engine->status_page.obj = default_ctx_obj;
+	engine->status_page.gfx_addr = i915_gem_obj_ggtt_offset(def_ctx_obj) +
+				       LRC_PPHWSP_PN * PAGE_SIZE;
+	hws = i915_gem_object_pin_map(def_ctx_obj);
+	if (IS_ERR(hws))
+		return PTR_ERR(hws);
+	engine->status_page.page_addr = hws + LRC_PPHWSP_PN * PAGE_SIZE;
+	engine->status_page.obj = def_ctx_obj;
 
 	I915_WRITE(RING_HWS_PGA(engine->mmio_base),
-			(u32)engine->status_page.gfx_addr);
+		   (u32)engine->status_page.gfx_addr);
 	POSTING_READ(RING_HWS_PGA(engine->mmio_base));
+
+	return 0;
 }
 
 /**
@@ -2688,10 +2700,9 @@ error_deref_obj:
 	return ret;
 }
 
-void intel_lr_context_reset(struct drm_device *dev,
-			struct intel_context *ctx)
+void intel_lr_context_reset(struct drm_i915_private *dev_priv,
+			    struct intel_context *ctx)
 {
-	struct drm_i915_private *dev_priv = dev->dev_private;
 	struct intel_engine_cs *engine;
 
 	for_each_engine(engine, dev_priv) {
@@ -2699,23 +2710,31 @@ void intel_lr_context_reset(struct drm_device *dev,
 				ctx->engine[engine->id].state;
 		struct intel_ringbuffer *ringbuf =
 				ctx->engine[engine->id].ringbuf;
+		void *obj_addr;
 		uint32_t *reg_state;
-		struct page *page;
 
 		if (!ctx_obj)
 			continue;
 
-		if (i915_gem_object_get_pages(ctx_obj)) {
-			WARN(1, "Failed get_pages for context obj\n");
+		obj_addr = i915_gem_object_pin_map(ctx_obj);
+		if (WARN_ON(IS_ERR(obj_addr)))
 			continue;
-		}
-		page = i915_gem_object_get_dirty_page(ctx_obj, LRC_STATE_PN);
-		reg_state = kmap_atomic(page);
+
+		reg_state = obj_addr + LRC_STATE_PN * PAGE_SIZE;
+		ctx_obj->dirty = true;
 
 		reg_state[CTX_RING_HEAD+1] = 0;
 		reg_state[CTX_RING_TAIL+1] = 0;
 

drivers/gpu/drm/i915/intel_lrc.c void intel_lr_context_reset(struct drm_device *dev, · line 2737

Quoted 10 lines
drivers/gpu/drm/i915/intel_lrc.c +9 -1
-		kunmap_atomic(reg_state);
+		i915_gem_object_unpin_map(ctx_obj);
+
+		/*
+		 * Kernel context will pin_map the HWS after reset so we
+		 * have to drop the pin count here in order ->pages_pin_count
+		 * remains balanced.
+		 */
+		if (ctx == dev_priv->kernel_context)
+			i915_gem_object_unpin_map(engine->status_page.obj);

Then we wouldn't have this kludge. That's going to be worth the time and we can then split out the bug fix for the current code. -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
#10 lore raw
Quoted 16 lines · Chris Wilson
Quoted 9 lines · Tvrtko Ursulin

From: Tvrtko Ursulin <[email protected]>

We can use the new pin/lazy unpin API for simplicity and more performance in the execlist submission paths.

v2:
* Fix error handling and convert more users.
* Compact some names for readability.

Quoted 5 lines

v3:
* intel_lr_context_free was not unpinning.
* Special case for GPU reset which otherwise unbalances the HWS object pages pin count by running the engine initialization only (not destructors).

Quoted 3 lines

Ah! Light dawns...

Should we not just separate out the hws setup and hws hw_init?

Okay...

Quoted 10 lines
Quoted 10 lines
drivers/gpu/drm/i915/intel_lrc.c +4 -3
-static void lrc_setup_hardware_status_page(struct intel_engine_cs *engine,
-					   struct drm_i915_gem_object *default_ctx_obj)
+static int
+lrc_setup_hws(struct intel_engine_cs *engine,
+	      struct drm_i915_gem_object *def_ctx_obj)
  {
  	struct drm_i915_private *dev_priv = engine->dev->dev_private;
-	struct page *page;
+	void *hws;
Quoted 13 lines

drivers/gpu/drm/i915/intel_lrc.c uint32_t intel_lr_context_size(struct intel_engine_cs *engine) · line 2612

Quoted 13 lines

/* The HWSP is part of the default context object in LRC mode. */

drivers/gpu/drm/i915/intel_lrc.c +7 -5
-	engine->status_page.gfx_addr = i915_gem_obj_ggtt_offset(default_ctx_obj)
-			+ LRC_PPHWSP_PN * PAGE_SIZE;
-	page = i915_gem_object_get_page(default_ctx_obj, LRC_PPHWSP_PN);
-	engine->status_page.page_addr = kmap(page);
-	engine->status_page.obj = default_ctx_obj;
+	engine->status_page.gfx_addr = i915_gem_obj_ggtt_offset(def_ctx_obj) +
+				       LRC_PPHWSP_PN * PAGE_SIZE;
+	hws = i915_gem_object_pin_map(def_ctx_obj);
+	if (IS_ERR(hws))
+		return PTR_ERR(hws);
+	engine->status_page.page_addr = hws + LRC_PPHWSP_PN * PAGE_SIZE;
+	engine->status_page.obj = def_ctx_obj;

... so above here is setup and below is init, correct?

Quoted 47 lines
Quoted 47 lines

I915_WRITE(RING_HWS_PGA(engine->mmio_base),

drivers/gpu/drm/i915/intel_lrc.c +11 -10
-			(u32)engine->status_page.gfx_addr);
+		   (u32)engine->status_page.gfx_addr);
  	POSTING_READ(RING_HWS_PGA(engine->mmio_base));
+
+	return 0;
  }
  /**
@@ -2688,10 +2700,9 @@ error_deref_obj:
  	return ret;
  }
 
-void intel_lr_context_reset(struct drm_device *dev,
-			struct intel_context *ctx)
+void intel_lr_context_reset(struct drm_i915_private *dev_priv,
+			    struct intel_context *ctx)
  {
-	struct drm_i915_private *dev_priv = dev->dev_private;
  	struct intel_engine_cs *engine;
 
  	for_each_engine(engine, dev_priv) {
@@ -2699,23 +2710,31 @@ void intel_lr_context_reset(struct drm_device *dev,
  				ctx->engine[engine->id].state;
  		struct intel_ringbuffer *ringbuf =
  				ctx->engine[engine->id].ringbuf;
+		void *obj_addr;
  		uint32_t *reg_state;
-		struct page *page;
 
  		if (!ctx_obj)
  			continue;
 
-		if (i915_gem_object_get_pages(ctx_obj)) {
-			WARN(1, "Failed get_pages for context obj\n");
+		obj_addr = i915_gem_object_pin_map(ctx_obj);
+		if (WARN_ON(IS_ERR(obj_addr)))
  			continue;
-		}
-		page = i915_gem_object_get_dirty_page(ctx_obj, LRC_STATE_PN);
-		reg_state = kmap_atomic(page);
+
+		reg_state = obj_addr + LRC_STATE_PN * PAGE_SIZE;
+		ctx_obj->dirty = true;
 
  		reg_state[CTX_RING_HEAD+1] = 0;
  		reg_state[CTX_RING_TAIL+1] = 0;
 
Quoted 13 lines

drivers/gpu/drm/i915/intel_lrc.c void intel_lr_context_reset(struct drm_device *dev, · line 2737

Quoted 10 lines
drivers/gpu/drm/i915/intel_lrc.c +9 -1
-		kunmap_atomic(reg_state);
+		i915_gem_object_unpin_map(ctx_obj);
+
+		/*
+		 * Kernel context will pin_map the HWS after reset so we
+		 * have to drop the pin count here in order ->pages_pin_count
+		 * remains balanced.
+		 */
+		if (ctx == dev_priv->kernel_context)
+			i915_gem_object_unpin_map(engine->status_page.obj);

Then we wouldn't have this kludge. That's going to be worth the time and we can then split out the bug fix for the current code.

Yes should not be adding more mines to the minefield. :)

Regards,

Tvrtko

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#11 lore raw
Quoted 34 lines · Tvrtko Ursulin
Quoted 16 lines · Chris Wilson
Quoted 9 lines · Tvrtko Ursulin

From: Tvrtko Ursulin <[email protected]>

We can use the new pin/lazy unpin API for simplicity and more performance in the execlist submission paths.

v2:
* Fix error handling and convert more users.
* Compact some names for readability.

Quoted 5 lines

v3:
* intel_lr_context_free was not unpinning.
* Special case for GPU reset which otherwise unbalances the HWS object pages pin count by running the engine initialization only (not destructors).

Quoted 3 lines

Ah! Light dawns...

Should we not just separate out the hws setup and hws hw_init?

Okay...

Quoted 10 lines
Quoted 10 lines
drivers/gpu/drm/i915/intel_lrc.c +4 -3
-static void lrc_setup_hardware_status_page(struct intel_engine_cs *engine,
-					   struct drm_i915_gem_object *default_ctx_obj)
+static int
+lrc_setup_hws(struct intel_engine_cs *engine,
+	      struct drm_i915_gem_object *def_ctx_obj)
 {
 	struct drm_i915_private *dev_priv = engine->dev->dev_private;
-	struct page *page;
+	void *hws;
Quoted 16 lines
Quoted 5 lines
Quoted 5 lines
drivers/gpu/drm/i915/intel_lrc.c +0 -4
 	/* The HWSP is part of the default context object in LRC mode. */
-	engine->status_page.gfx_addr = i915_gem_obj_ggtt_offset(default_ctx_obj)
-			+ LRC_PPHWSP_PN * PAGE_SIZE;
-	page = i915_gem_object_get_page(default_ctx_obj, LRC_PPHWSP_PN);
-	engine->status_page.page_addr = kmap(page);
Quoted 8 lines

drivers/gpu/drm/i915/intel_lrc.c uint32_t intel_lr_context_size(struct intel_engine_cs *engine) · line 2612

Quoted 8 lines
drivers/gpu/drm/i915/intel_lrc.c +7 -1
-	engine->status_page.obj = default_ctx_obj;
+	engine->status_page.gfx_addr = i915_gem_obj_ggtt_offset(def_ctx_obj) +
+				       LRC_PPHWSP_PN * PAGE_SIZE;
+	hws = i915_gem_object_pin_map(def_ctx_obj);
+	if (IS_ERR(hws))
+		return PTR_ERR(hws);
+	engine->status_page.page_addr = hws + LRC_PPHWSP_PN * PAGE_SIZE;
+	engine->status_page.obj = def_ctx_obj;

... so above here is setup and below is init, correct?

Yes, allocating the mapping is setup; writing the register is hw_init. -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
#12 lore raw

✗ Fi.CI.BAT: failure for drm/i915: Use new i915_gem_object_pin_map for LRC (rev2)

In reply to Tvrtko Ursulin
== Series Details ==

== Series Details ==

Series: drm/i915: Use new i915_gem_object_pin_map for LRC (rev2)
URL : https://patchwork.freedesktop.org/series/5580/
State : failure

== Summary ==

Series 5580v2 drm/i915: Use new i915_gem_object_pin_map for LRC
http://patchwork.freedesktop.org/api/1.0/series/5580/revisions/2/mbox/

Test drv_hangman:

        Subgroup error-state-basic:
                pass       -> SKIP       (bsw-nuc-2)
                fail       -> PASS       (ilk-hp8440p)
Test drv_module_reload_basic:
                pass       -> DMESG-WARN (bsw-nuc-2)
                pass       -> DMESG-WARN (skl-nuci5)
                pass       -> DMESG-WARN (bdw-nuci7)
                pass       -> DMESG-WARN (skl-i7k-2)
                pass       -> DMESG-WARN (bdw-ultra)
Test gem_ctx_param_basic:
        Subgroup invalid-size-set:
                pass       -> DMESG-WARN (bsw-nuc-2)
Test gem_exec_basic:
        Subgroup gtt-vebox:
                pass       -> SKIP       (bsw-nuc-2)
        Subgroup readonly-default:
                pass       -> SKIP       (bsw-nuc-2)
Test gem_mmap_gtt:
        Subgroup basic-write-no-prefault:
                pass       -> DMESG-WARN (bsw-nuc-2)
Test gem_ringfill:
        Subgroup basic-default-forked:
                pass       -> SKIP       (bsw-nuc-2)
        Subgroup basic-default-interruptible:
                pass       -> SKIP       (bsw-nuc-2)
Test kms_addfb_basic:
        Subgroup basic-x-tiled:
                pass       -> DMESG-WARN (bsw-nuc-2)
        Subgroup bo-too-small:
                pass       -> DMESG-WARN (bsw-nuc-2)
        Subgroup bo-too-small-due-to-tiling:
                pass       -> DMESG-WARN (bsw-nuc-2)
        Subgroup small-bo:
                pass       -> DMESG-WARN (bsw-nuc-2)
        Subgroup unused-pitches:
                pass       -> DMESG-WARN (bsw-nuc-2)
Test kms_flip:
        Subgroup basic-flip-vs-dpms:
                dmesg-warn -> PASS       (ilk-hp8440p) UNSTABLE
        Subgroup basic-flip-vs-modeset:
                pass       -> DMESG-WARN (ilk-hp8440p) UNSTABLE
        Subgroup basic-flip-vs-wf_vblank:
                pass       -> DMESG-FAIL (bsw-nuc-2)
        Subgroup basic-plain-flip:
                pass       -> DMESG-FAIL (bsw-nuc-2)
Test pm_rpm:
        Subgroup basic-pci-d3-state:
                pass       -> DMESG-WARN (bsw-nuc-2)
        Subgroup basic-rte:
                dmesg-warn -> PASS       (byt-nuc) UNSTABLE
Test prime_self_import:
        Subgroup basic-with_one_bo_two_files:
                pass       -> DMESG-WARN (bsw-nuc-2)
bdw-nuci7        total:203  pass:190  dwarn:1   dfail:0   fail:0   skip:12 
bdw-ultra        total:203  pass:179  dwarn:1   dfail:0   fail:0   skip:23 
bsw-nuc-2        total:202  pass:146  dwarn:10  dfail:2   fail:0   skip:44 
byt-nuc          total:202  pass:164  dwarn:0   dfail:0   fail:0   skip:38 
hsw-brixbox      total:203  pass:179  dwarn:0   dfail:0   fail:0   skip:24 
hsw-gt2          total:203  pass:184  dwarn:0   dfail:0   fail:0   skip:19 
ilk-hp8440p      total:203  pass:134  dwarn:1   dfail:0   fail:0   skip:68 
ivb-t430s        total:203  pass:175  dwarn:0   dfail:0   fail:0   skip:28 
skl-i7k-2        total:203  pass:177  dwarn:1   dfail:0   fail:0   skip:25 
skl-nuci5        total:203  pass:191  dwarn:1   dfail:0   fail:0   skip:11 
snb-x220t        total:203  pass:165  dwarn:0   dfail:0   fail:1   skip:37 

BOOT FAILED for snb-dellxps

Results at /archive/results/CI_IGT_test/Patchwork_1870/

8f2e41ba8d25b39e6a057d3244481771f6054764 drm-intel-nightly: 2016y-04m-12d-12h-14m-24s UTC integration manifest d321b00 drm/i915: Use new i915_gem_object_pin_map for LRC

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx