From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: Re: [PATCH RESEND] drm/dp/mst: fix kernel oops when turning off secondary monitor Date: Wed, 15 Feb 2017 10:07:35 +0200 Message-ID: <87r32zri60.fsf@intel.com> References: <1487076561-2169-1-git-send-email-jani.nikula@intel.com> <20170214213843.GD11138@dvetter-linux.ger.corp.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170214213843.GD11138@dvetter-linux.ger.corp.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Daniel Vetter Cc: Dave Airlie , intel-gfx@lists.freedesktop.org, stable@vger.kernel.org, dri-devel@lists.freedesktop.org, Dhinakaran Pandiyan List-Id: dri-devel@lists.freedesktop.org T24gVHVlLCAxNCBGZWIgMjAxNywgRGFuaWVsIFZldHRlciA8ZGFuaWVsQGZmd2xsLmNoPiB3cm90 ZToKPiBPbiBUdWUsIEZlYiAxNCwgMjAxNyBhdCAwMjo0OToyMVBNICswMjAwLCBKYW5pIE5pa3Vs YSB3cm90ZToKPj4gRnJvbTogUGllcnJlLUxvdWlzIEJvc3NhcnQgPHBpZXJyZS1sb3Vpcy5ib3Nz YXJ0QGxpbnV4LmludGVsLmNvbT4KPj4gCj4+IDEwMCUgcmVwcm9kdWNpYmxlIGlzc3VlIGZvdW5k IG9uIFNLTCBTa3VsbENhbnlvbiBOVUMgd2l0aCB0d28gZXh0ZXJuYWwKPj4gRFAgZGFpc3ktY2hh aW5lZCBtb25pdG9ycyBpbiBEUC9NU1QgbW9kZS4gV2hlbiB0dXJuaW5nIG9mZiBvciBjaGFuZ2lu Zwo+PiB0aGUgaW5wdXQgb2YgdGhlIHNlY29uZCBtb25pdG9yIHRoZSBtYWNoaW5lIHN0b3BzIHdp dGggYSBrZXJuZWwKPj4gb29wcy4gVGhpcyBpc3N1ZSBoYXBwZW5lZCB3aXRoIDQuOC44IGFzIHdl bGwgYXMgZHJtL2RybS1pbnRlbC1uaWdodGx5Lgo+PiAKPj4gVGhpcyBpc3N1ZSBpcyB0cmFjZWQg dG8gYW4gaW5jb25zaXN0ZW50IGNvbnRyb2wgZmxvdyBpbgo+PiBkcm1fZHBfdXBkYXRlX3BheWxv YWRfcGFydDEoKTogdGhlICdwb3J0JyBwb2ludGVyIGlzIHNldCB0byBOVUxMIGF0IHRoZQo+PiBz YW1lIHRpbWUgYXMgJ3JlcV9wYXlsb2FkLm51bV9zbG90cycgaXMgc2V0IHRvIHplcm8sIGJ1dCB0 aGUgcG9pbnRlciBpcwo+PiBkZXJlZmVyZW5jZWQgZXZlbiB3aGVuIHJlcV9wYXlsb2FkLm51bV9z bG90IGlzIHplcm8uCj4+IAo+PiBUaGUgcHJvYmxlbWF0aWMgZGVyZWZlcmVuY2Ugd2FzIGludHJv ZHVjZWQgaW4gY29tbWl0IGRmZGEwZGYzNAo+PiAoImRybS9tc3Q6IHJld29yayBwYXlsb2FkIHRh YmxlIGFsbG9jYXRpb24gdG8gY29uZm9ybSBiZXR0ZXIiKSBhbmQgbWF5Cj4+IGltcGFjdCBhbGwg dmVyc2lvbnMgc2luY2UgdjMuMTgKPj4gCj4+IFRoZSBmaXggc3VnZ2VzdGVkIGJ5IENocmlzIFdp bHNvbiByZW1vdmVzIHRoZSBrZXJuZWwgb29wcyBhbmQgd2FzIGZvdW5kIHRvCj4+IHdvcmsgd2Vs bCBhZnRlciAxMG1uIG9mIG1vbmtleS10ZXN0aW5nIHdpdGggdGhlIHNlY29uZCBtb25pdG9yIHBv d2VyIGFuZAo+PiBpbnB1dCBidXR0b25zCj4+IAo+PiBCdWd6aWxsYTogaHR0cHM6Ly9idWdzLmZy ZWVkZXNrdG9wLm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTg5OTAKPj4gRml4ZXM6IGRmZGEwZGYzNDI2 NCAoImRybS9tc3Q6IHJld29yayBwYXlsb2FkIHRhYmxlIGFsbG9jYXRpb24gdG8gY29uZm9ybSBi ZXR0ZXIuIikKPj4gQ2M6IERhdmUgQWlybGllIDxhaXJsaWVkQHJlZGhhdC5jb20+Cj4+IENjOiBD aHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KPj4gQ2M6IE5hdGhhbiBEIENp b2JhbnUgPG5hdGhhbi5kLmNpb2JhbnVAbGludXguaW50ZWwuY29tPgo+PiBDYzogRGhpbmFrYXJh biBQYW5kaXlhbiA8ZGhpbmFrYXJhbi5wYW5kaXlhbkBpbnRlbC5jb20+Cj4+IENjOiBTZWFuIFBh dWwgPHNlYW5wYXVsQGNocm9taXVtLm9yZz4KPj4gQ2M6IDxzdGFibGVAdmdlci5rZXJuZWwub3Jn PiAjIHYzLjE4Kwo+PiBUZXN0ZWQtYnk6IE5hdGhhbiBEIENpb2JhbnUgPG5hdGhhbi5kLmNpb2Jh bnVAbGludXguaW50ZWwuY29tPgo+PiBSZXZpZXdlZC1ieTogRGhpbmFrYXJhbiBQYW5kaXlhbiA8 ZGhpbmFrYXJhbi5wYW5kaXlhbkBpbnRlbC5jb20+Cj4+IFNpZ25lZC1vZmYtYnk6IFBpZXJyZS1M b3VpcyBCb3NzYXJ0IDxwaWVycmUtbG91aXMuYm9zc2FydEBsaW51eC5pbnRlbC5jb20+Cj4+IFNp Z25lZC1vZmYtYnk6IEphbmkgTmlrdWxhIDxqYW5pLm5pa3VsYUBpbnRlbC5jb20+Cj4KPiBZb3Ug aGF6IGRybS1taXNjIGNvbW1pdCByaWdodHMsIHBscyB1c2UgdGhlbSA6LSkKClN1cmUsIEkganVz dCB3YW50ZWQgdG8gaGF2ZSBhIGZyZXNoIENJIHJ1biBvbiB0aGlzLgoKPiBTaW5jZSBpdCBkb2Vz bid0IGhhdmUgZGVwcywgcHJvYmFibHkgc2ltcGxlc3QgdG8gc21hc2ggaW50byBkcm0tbWlzYy1m aXhlcwo+IGFuZCB0aGVuIHNlbmQgYSBwdWxsIHJlcSB0byBEYXZlIHJpZ2h0IGF3YXkuIElmIHlv dSB3YW50LCB5b3UgY2FuIHJvbGwKPiAtZml4ZXMgZm9yd2FyZCB0byAtcmM4IHdoaWxlIGF0IGl0 LgoKV2lsbCBkby4KCkJSLApKYW5pLgoKPiAtRGFuaWVsCj4KPj4gLS0tCj4+ICBkcml2ZXJzL2dw dS9kcm0vZHJtX2RwX21zdF90b3BvbG9neS5jIHwgMiArLQo+PiAgMSBmaWxlIGNoYW5nZWQsIDEg aW5zZXJ0aW9uKCspLCAxIGRlbGV0aW9uKC0pCj4+IAo+PiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2RybV9kcF9tc3RfdG9wb2xvZ3kuYyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fZHBfbXN0 X3RvcG9sb2d5LmMKPj4gaW5kZXggMTIyYTFiMDRiZWJjLi5mMmNjMzc1OTA3ZDAgMTAwNjQ0Cj4+ IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fZHBfbXN0X3RvcG9sb2d5LmMKPj4gKysrIGIvZHJp dmVycy9ncHUvZHJtL2RybV9kcF9tc3RfdG9wb2xvZ3kuYwo+PiBAQCAtMTgxNyw3ICsxODE3LDcg QEAgaW50IGRybV9kcF91cGRhdGVfcGF5bG9hZF9wYXJ0MShzdHJ1Y3QgZHJtX2RwX21zdF90b3Bv bG9neV9tZ3IgKm1ncikKPj4gIAkJCQltZ3ItPnBheWxvYWRzW2ldLnZjcGkgPSByZXFfcGF5bG9h ZC52Y3BpOwo+PiAgCQkJfSBlbHNlIGlmIChtZ3ItPnBheWxvYWRzW2ldLm51bV9zbG90cykgewo+ PiAgCQkJCW1nci0+cGF5bG9hZHNbaV0ubnVtX3Nsb3RzID0gMDsKPj4gLQkJCQlkcm1fZHBfZGVz dHJveV9wYXlsb2FkX3N0ZXAxKG1nciwgcG9ydCwgcG9ydC0+dmNwaS52Y3BpLCAmbWdyLT5wYXls b2Fkc1tpXSk7Cj4+ICsJCQkJZHJtX2RwX2Rlc3Ryb3lfcGF5bG9hZF9zdGVwMShtZ3IsIHBvcnQs IG1nci0+cGF5bG9hZHNbaV0udmNwaSwgJm1nci0+cGF5bG9hZHNbaV0pOwo+PiAgCQkJCXJlcV9w YXlsb2FkLnBheWxvYWRfc3RhdGUgPSBtZ3ItPnBheWxvYWRzW2ldLnBheWxvYWRfc3RhdGU7Cj4+ ICAJCQkJbWdyLT5wYXlsb2Fkc1tpXS5zdGFydF9zbG90ID0gMDsKPj4gIAkJCX0KPj4gLS0gCj4+ IDIuMS40Cj4+IAo+PiBfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fXwo+PiBJbnRlbC1nZnggbWFpbGluZyBsaXN0Cj4+IEludGVsLWdmeEBsaXN0cy5mcmVlZGVz a3RvcC5vcmcKPj4gaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5m by9pbnRlbC1nZngKCi0tIApKYW5pIE5pa3VsYSwgSW50ZWwgT3BlbiBTb3VyY2UgVGVjaG5vbG9n eSBDZW50ZXIKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K SW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0 dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga14.intel.com ([192.55.52.115]:11191 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750716AbdBOIHk (ORCPT ); Wed, 15 Feb 2017 03:07:40 -0500 From: Jani Nikula To: Daniel Vetter Cc: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, stable@vger.kernel.org, Dhinakaran Pandiyan , Dave Airlie Subject: Re: [Intel-gfx] [PATCH RESEND] drm/dp/mst: fix kernel oops when turning off secondary monitor In-Reply-To: <20170214213843.GD11138@dvetter-linux.ger.corp.intel.com> References: <1487076561-2169-1-git-send-email-jani.nikula@intel.com> <20170214213843.GD11138@dvetter-linux.ger.corp.intel.com> Date: Wed, 15 Feb 2017 10:07:35 +0200 Message-ID: <87r32zri60.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain Sender: stable-owner@vger.kernel.org List-ID: On Tue, 14 Feb 2017, Daniel Vetter wrote: > On Tue, Feb 14, 2017 at 02:49:21PM +0200, Jani Nikula wrote: >> From: Pierre-Louis Bossart >> >> 100% reproducible issue found on SKL SkullCanyon NUC with two external >> DP daisy-chained monitors in DP/MST mode. When turning off or changing >> the input of the second monitor the machine stops with a kernel >> oops. This issue happened with 4.8.8 as well as drm/drm-intel-nightly. >> >> This issue is traced to an inconsistent control flow in >> drm_dp_update_payload_part1(): the 'port' pointer is set to NULL at the >> same time as 'req_payload.num_slots' is set to zero, but the pointer is >> dereferenced even when req_payload.num_slot is zero. >> >> The problematic dereference was introduced in commit dfda0df34 >> ("drm/mst: rework payload table allocation to conform better") and may >> impact all versions since v3.18 >> >> The fix suggested by Chris Wilson removes the kernel oops and was found to >> work well after 10mn of monkey-testing with the second monitor power and >> input buttons >> >> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=98990 >> Fixes: dfda0df34264 ("drm/mst: rework payload table allocation to conform better.") >> Cc: Dave Airlie >> Cc: Chris Wilson >> Cc: Nathan D Ciobanu >> Cc: Dhinakaran Pandiyan >> Cc: Sean Paul >> Cc: # v3.18+ >> Tested-by: Nathan D Ciobanu >> Reviewed-by: Dhinakaran Pandiyan >> Signed-off-by: Pierre-Louis Bossart >> Signed-off-by: Jani Nikula > > You haz drm-misc commit rights, pls use them :-) Sure, I just wanted to have a fresh CI run on this. > Since it doesn't have deps, probably simplest to smash into drm-misc-fixes > and then send a pull req to Dave right away. If you want, you can roll > -fixes forward to -rc8 while at it. Will do. BR, Jani. > -Daniel > >> --- >> drivers/gpu/drm/drm_dp_mst_topology.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c >> index 122a1b04bebc..f2cc375907d0 100644 >> --- a/drivers/gpu/drm/drm_dp_mst_topology.c >> +++ b/drivers/gpu/drm/drm_dp_mst_topology.c >> @@ -1817,7 +1817,7 @@ int drm_dp_update_payload_part1(struct drm_dp_mst_topology_mgr *mgr) >> mgr->payloads[i].vcpi = req_payload.vcpi; >> } else if (mgr->payloads[i].num_slots) { >> mgr->payloads[i].num_slots = 0; >> - drm_dp_destroy_payload_step1(mgr, port, port->vcpi.vcpi, &mgr->payloads[i]); >> + drm_dp_destroy_payload_step1(mgr, port, mgr->payloads[i].vcpi, &mgr->payloads[i]); >> req_payload.payload_state = mgr->payloads[i].payload_state; >> mgr->payloads[i].start_slot = 0; >> } >> -- >> 2.1.4 >> >> _______________________________________________ >> Intel-gfx mailing list >> Intel-gfx@lists.freedesktop.org >> https://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Jani Nikula, Intel Open Source Technology Center