Attachment 140479 Details for Bug 106832 – draft one fix patch on kernel 4.14

[patch] draft one fix patch on kernel 4.14

0001-fix-the-system-hang-issue-caused-by-a-forced-GPU-res.patch (text/plain), 4.95 KB, created by Owen Zhang on 2018-07-06 02:26:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Owen Zhang

Created: 2018-07-06 02:26:41 UTC

Size: 4.95 KB

patch

obsolete

>From e61a9cd76a2538f613069a725d0436a5a6942274 Mon Sep 17 00:00:00 2001
>From: Owen Zhang <owen.zhang@intel.com>
>Date: Thu, 31 May 2018 10:55:11 +0800
>Subject: [PATCH 1/2] fix the system hang issue caused by a forced GPU reset.
>
>this GPU reset request occur when ELPS hasn't any active request,
>so it needs to add the conditional statement.
>
>[  625.719613] BUG: unable to handle kernel NULL pointer dereference at 0000000000000070
>[  625.727402] IP: reset_common_ring+0xa7/0x2e0 [i915]
>[  625.732246] PGD 0 P4D 0
>[  625.734762] Oops: 0000 [#1] SMP PTI
>[  625.738226] Modules linked in: fuse xt_CHECKSUM ipt_MASQUERADE nf_nat_masquerade_ipv4 tun ip6t_rpfilter ipt_REJECT nf_reject_ipv4 ip6t_REJECT nf_reject_ipv6 xt_conntrack ip_set nfnetlink ebtable_nat ebtable_broute bridge stp llc ip6table_nat nf_conntrack_ipv6 nf_defrag_ipv6 nf_nat_ipv6 ip6table_mangle ip6table_security ip6table_raw iptable_nat nf_conntrack_ipv4 nf_defrag_ipv4 nf_nat_ipv4 nf_nat nf_conntrack iptable_mangle iptable_security ip table_raw ebtable_filter ebtables ip6table_filter ip6_tables iptable_filter snd_hda_codec_hdmi rfkill snd_hda_co dec_realtek snd_hda_codec_generic snd_hda_intel intel_rapl x86_pkg_temp_thermal intel_powerclamp snd_hda_codec coretemp kvm_intel kvm snd_hda_core snd_hwdep snd_seq snd_seq_device snd_pcm snd_timer snd irqbypass crct10dif_pc lmul crc32_pclmul dell_wmi
>[  625.808345]  ghash_clmulni_intel pcbc dell_smbios iTCO_wdt sparse_keymap aesni_intel iTCO_vendor_support cryp to_simd glue_helper cryptd dcdbas wmi_bmof soundcore mei_me shpchp sg pcspkr i2c_i801 mei acpi_pad nfsd wmi auth_rpcgss nfs_acl lockd grace sunrpc ip_tables xfs libcrc32c sd_mod i915 i2c_algo_bit drm_kms_helper syscopyarea sysfillrect sysimgblt fb_sys_fops drm e1000e ahci libahci ptp libata crc32c_intel i2c_core pps_core serio_raw video dm_mirror dm_region_hash dm_log dm_mod
>[  625.850771] CPU: 5 PID: 71 Comm: kworker/5:1 Tainted: G     U          4.14.20-mss-pv5+ #2
>[  625.858980] Hardware name: Dell Inc. OptiPlex 5040/0R790T, BIOS 1.1.1 10/07/2015
>[  625.866335] Workqueue: events_long i915_hangcheck_elapsed [i915]
>[  625.872300] task: ffff9a45466c8000 task.stack: ffffb44780f14000
>[  625.878189] RIP: 0010:reset_common_ring+0xa7/0x2e0 [i915]
>[  625.883549] RSP: 0018:ffffb44780f17c50 EFLAGS: 00010246
>[  625.888739] RAX: 0000000000000000 RBX: ffff9a45ddd8c6c0 RCX: 0000000000000000
>[  625.895827] RDX: 0000000000000000 RSI: ffff9a4631d56978 RDI: ffff9a4631d56978
>[  625.902915] RBP: ffff9a454656e388 R08: 0000000000000000 R09: 0000000000000a93
>[  625.910002] R10: 0000000000000000 R11: ffffb44780f179c0 R12: ffff9a454656e000
>[  625.917088] R13: 00000000ffffffff R14: ffff9a4619834dc8 R15: ffff9a454656e000
>[  625.924175] FS:  0000000000000000(0000) GS:ffff9a4631d40000(0000) knlGS:0000000000000000
>[  625.932211] CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
>[  625.937918] CR2: 0000000000000070 CR3: 000000015400a004 CR4: 00000000003606e0
>[  625.945007] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
>[  625.952094] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
>
>Change-Id: Icc08d0df56fb0278c8c98d22ff11e56cba362625
>Signed-off-by: Owen Zhang <owen.zhang@intel.com>
>---
> drivers/gpu/drm/i915/i915_gem.c  |  6 ++++--
> drivers/gpu/drm/i915/intel_lrc.c | 17 +++++++++++------
> 2 files changed, 15 insertions(+), 8 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
>index 877e3b6..45f8130 100644
>--- a/drivers/gpu/drm/i915/i915_gem.c
>+++ b/drivers/gpu/drm/i915/i915_gem.c
>@@ -3058,8 +3058,10 @@ static void engine_set_wedged(struct intel_engine_cs *engine)
> 		for (n = 0; n < ARRAY_SIZE(engine->execlist_port); n++) {
> 			struct drm_i915_gem_request *rq = port_request(&port[n]);
> 
>-			intel_engine_context_out(rq->engine);
>-			i915_gem_request_put(rq);
>+			if(rq) {
>+				intel_engine_context_out(rq->engine);
>+				i915_gem_request_put(rq);
>+			}
> 		}
> 		memset(engine->execlist_port, 0, sizeof(engine->execlist_port));
> 		engine->execlist_queue = RB_ROOT;
>diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c
>index 50e9641..e620b4d 100644
>--- a/drivers/gpu/drm/i915/intel_lrc.c
>+++ b/drivers/gpu/drm/i915/intel_lrc.c
>@@ -1411,13 +1411,18 @@ static void reset_common_ring(struct intel_engine_cs *engine,
> 		return;
> 	}
> 
>-	if (request->ctx != port_request(port)->ctx) {
>-		i915_gem_request_put(port_request(port));
>-		port[0] = port[1];
>-		memset(&port[1], 0, sizeof(port[1]));
>-	}
>+	/* if the request in ELSP had been processed after GPU finished
>+	 * HW reset, this GPU reset occur when a forced request.
>+	 * */
>+	if (port_request(port)) {
>+		if (request->ctx != port_request(port)->ctx) {
>+			i915_gem_request_put(port_request(port));
>+			port[0] = port[1];
>+			memset(&port[1], 0, sizeof(port[1]));
>+		}
> 
>-	GEM_BUG_ON(request->ctx != port_request(port)->ctx);
>+		GEM_BUG_ON(request->ctx != port_request(port)->ctx);
>+	}
> 
> 	/* If the request was innocent, we leave the request in the ELSP
> 	 * and will try to replay it on restarting. The context image may
>-- 
>1.8.3.1
>

Actions: View | Splinter Review

Attachments on bug 106832: 140042 | 140043 | 140044 | 140045 | 140479

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.