From patchwork Tue Jan 14 05:15:53 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Skeggs X-Patchwork-Id: 3484021 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id DB52D9F382 for ; Tue, 14 Jan 2014 05:16:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BFFAC20179 for ; Tue, 14 Jan 2014 05:16:31 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id A3DBB2016C for ; Tue, 14 Jan 2014 05:16:30 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6B3BC87945; Mon, 13 Jan 2014 21:16:19 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qe0-f53.google.com (mail-qe0-f53.google.com [209.85.128.53]) by gabe.freedesktop.org (Postfix) with ESMTP id AD0E510818A; Mon, 13 Jan 2014 21:15:53 -0800 (PST) Received: by mail-qe0-f53.google.com with SMTP id t7so8221190qeb.12 for ; Mon, 13 Jan 2014 21:15:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=PVwyFCTDRIiD3haZasxD1NBaVspRnyToifBPXOcfypA=; b=BEAvNfoH0W05c6d1xFdHcvO8BXRYOFBEPFAeNQ4ZqSw8jvSWAa2b+FjAAbfYRf2KD6 l6iL80+YLphc7prFPtX/Zj4bL7UgxNGaHTEIQ0dWi3yLYgWzhNWmNe389c8CUQdv6IS2 fpTLVrDCw53rpimfWpZ1lUkYyCoOp3AxU7MPEZkhREBejeFx5eC/VdeNQnBZswf7Nx8g oGRjW3WvWz/gTYeWTFvOhBY+qC4dVLRfYHWHtL6m7OAaEFIH2tAIexzrqnKiL5jO6Iok hXLnrO0wPXhaXjt2lqXvlH7gUjXAU0YAA1FRZga1XCN0aFbx6681IbKgFZ5Vn1gSpxq2 kNcg== MIME-Version: 1.0 X-Received: by 10.229.126.9 with SMTP id a9mr46365432qcs.0.1389676553116; Mon, 13 Jan 2014 21:15:53 -0800 (PST) Received: by 10.229.117.4 with HTTP; Mon, 13 Jan 2014 21:15:53 -0800 (PST) In-Reply-To: References: <1389669776.1320.5.camel@s2895bg> Date: Tue, 14 Jan 2014 15:15:53 +1000 Message-ID: Subject: Re: [Nouveau] [Fwd: [PATCH] Fix null dereference oopses for nv40 cards] kernel 3.13.0-rc8 From: Ben Skeggs To: Bob Gleitsmann Cc: "nouveau@lists.freedesktop.org" , Ben Skeggs , "dri-devel@lists.freedesktop.org" X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Tue, Jan 14, 2014 at 3:07 PM, Ben Skeggs wrote: > On Tue, Jan 14, 2014 at 1:22 PM, Bob Gleitsmann wrote: >> I should have mentioned that this applies to Linus' 3.13.0-rc7 and rc8 >> git. Maybe it's obvious. > Hey Bob, > > Thanks for reporting this. Can you try the attached patch instead and > report if it helps you? Thinko in first attempt, new one attached. > > Ben. > >> >> Sorry about that. >> >> Bob >> -------- Forwarded Message -------- >> From: Bob Gleitsmann >> To: bskeggs@redhat.com >> Cc: nouveau@lists.freedesktop.org, dri-devel@lists.freedesktop.org >> Subject: [PATCH] Fix null dereference oopses for nv40 cards >> Date: Mon, 13 Jan 2014 01:45:36 -0500 >> >> The problem affects nv40 cards during booting. It comes from there being >> two places where subdev arrays are maintained. A commit was recently >> added to make the two equal. However, the struct nouveau_device version >> ends up being referenced before it is initialized. The problem arises >> during the creation of the INSTMEM and THERM subdevs. ' >> >> Signed off by: Bob Gleitsmann rjgleits@bellsouth.net >> >> diff --git a/drivers/gpu/drm/nouveau/core/subdev/instmem/nv40.c b/drivers/gpu/drm/nouveau/core/subdev/instmem/nv40.c >> index b10a143..0f494ca 100644 >> --- a/drivers/gpu/drm/nouveau/core/subdev/instmem/nv40.c >> +++ b/drivers/gpu/drm/nouveau/core/subdev/instmem/nv40.c >> @@ -23,6 +23,7 @@ >> */ >> >> #include >> +#include >> >> #include "nv04.h" >> >> @@ -38,6 +39,7 @@ nv40_instmem_ctor(struct nouveau_object *parent, struct nouveau_object *engine, >> >> ret = nouveau_instmem_create(parent, engine, oclass, &priv); >> *pobject = nv_object(priv); >> + device->subdev[NVDEV_SUBDEV_INSTMEM] = *pobject; >> if (ret) >> return ret; >> >> diff --git a/drivers/gpu/drm/nouveau/core/subdev/therm/nv40.c b/drivers/gpu/drm/nouveau/core/subdev/therm/nv40.c >> index 002e51b..59b25be 100644 >> --- a/drivers/gpu/drm/nouveau/core/subdev/therm/nv40.c >> +++ b/drivers/gpu/drm/nouveau/core/subdev/therm/nv40.c >> @@ -187,9 +187,11 @@ nv40_therm_ctor(struct nouveau_object *parent, >> { >> struct nv40_therm_priv *priv; >> int ret; >> + struct nouveau_device *device = nv_device(parent); >> >> ret = nouveau_therm_create(parent, engine, oclass, &priv); >> *pobject = nv_object(priv); >> + device->subdev[NVDEV_SUBDEV_THERM] = *pobject; >> if (ret) >> return ret; >> >> >> >> >> _______________________________________________ >> Nouveau mailing list >> Nouveau@lists.freedesktop.org >> http://lists.freedesktop.org/mailman/listinfo/nouveau From 2f40bcd890aa9d861c7e26b4867580f58836d8ec Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Tue, 14 Jan 2014 14:56:22 +1000 Subject: [PATCH] fix null ptr dereferences on some boards Regression from "device: populate master subdev pointer only when fully constructed" Reported-by: Bob Gleitsmann Signed-off-by: Ben Skeggs --- drm/dispnv04/dfp.c | 2 +- drm/dispnv04/tvnv04.c | 2 +- nvkm/include/subdev/i2c.h | 2 +- nvkm/include/subdev/instmem.h | 7 +++++++ nvkm/subdev/i2c/base.c | 4 ++-- nvkm/subdev/therm/ic.c | 10 +++++----- 6 files changed, 17 insertions(+), 10 deletions(-) diff --git a/drm/dispnv04/dfp.c b/drm/dispnv04/dfp.c index 936a71c..7fdc51e 100644 --- a/drm/dispnv04/dfp.c +++ b/drm/dispnv04/dfp.c @@ -643,7 +643,7 @@ static void nv04_tmds_slave_init(struct drm_encoder *encoder) get_tmds_slave(encoder)) return; - type = i2c->identify(i2c, 2, "TMDS transmitter", info, NULL); + type = i2c->identify(i2c, 2, "TMDS transmitter", info, NULL, NULL); if (type < 0) return; diff --git a/drm/dispnv04/tvnv04.c b/drm/dispnv04/tvnv04.c index cc4b208..244822d 100644 --- a/drm/dispnv04/tvnv04.c +++ b/drm/dispnv04/tvnv04.c @@ -59,7 +59,7 @@ int nv04_tv_identify(struct drm_device *dev, int i2c_index) struct nouveau_i2c *i2c = nouveau_i2c(drm->device); return i2c->identify(i2c, i2c_index, "TV encoder", - nv04_tv_encoder_info, NULL); + nv04_tv_encoder_info, NULL, NULL); } diff --git a/nvkm/include/subdev/i2c.h b/nvkm/include/subdev/i2c.h index 9fa5da7..7f50a85 100644 --- a/nvkm/include/subdev/i2c.h +++ b/nvkm/include/subdev/i2c.h @@ -73,7 +73,7 @@ struct nouveau_i2c { int (*identify)(struct nouveau_i2c *, int index, const char *what, struct nouveau_i2c_board_info *, bool (*match)(struct nouveau_i2c_port *, - struct i2c_board_info *)); + struct i2c_board_info *, void *), void *); struct list_head ports; }; diff --git a/nvkm/include/subdev/instmem.h b/nvkm/include/subdev/instmem.h index e40b26c..c1df26f 100644 --- a/nvkm/include/subdev/instmem.h +++ b/nvkm/include/subdev/instmem.h @@ -35,6 +35,13 @@ struct nouveau_instmem { static inline struct nouveau_instmem * nouveau_instmem(void *obj) { + /* nv04/nv40 impls need to create objects in their constructor, + * which is before the subdev pointer is valid + */ + if (nv_iclass(obj, NV_SUBDEV_CLASS) && + nv_subidx(obj) == NVDEV_SUBDEV_INSTMEM) + return obj; + return (void *)nv_device(obj)->subdev[NVDEV_SUBDEV_INSTMEM]; } diff --git a/nvkm/subdev/i2c/base.c b/nvkm/subdev/i2c/base.c index 041fd5e..c33c03d 100644 --- a/nvkm/subdev/i2c/base.c +++ b/nvkm/subdev/i2c/base.c @@ -197,7 +197,7 @@ static int nouveau_i2c_identify(struct nouveau_i2c *i2c, int index, const char *what, struct nouveau_i2c_board_info *info, bool (*match)(struct nouveau_i2c_port *, - struct i2c_board_info *)) + struct i2c_board_info *, void *), void *data) { struct nouveau_i2c_port *port = nouveau_i2c_find(i2c, index); int i; @@ -221,7 +221,7 @@ nouveau_i2c_identify(struct nouveau_i2c *i2c, int index, const char *what, } if (nv_probe_i2c(port, info[i].dev.addr) && - (!match || match(port, &info[i].dev))) { + (!match || match(port, &info[i].dev, data))) { nv_info(i2c, "detected %s: %s\n", what, info[i].dev.type); return i; diff --git a/nvkm/subdev/therm/ic.c b/nvkm/subdev/therm/ic.c index e44ed7b..7610fc5 100644 --- a/nvkm/subdev/therm/ic.c +++ b/nvkm/subdev/therm/ic.c @@ -29,9 +29,9 @@ static bool probe_monitoring_device(struct nouveau_i2c_port *i2c, - struct i2c_board_info *info) + struct i2c_board_info *info, void *data) { - struct nouveau_therm_priv *priv = (void *)nouveau_therm(i2c); + struct nouveau_therm_priv *priv = data; struct nvbios_therm_sensor *sensor = &priv->bios_sensor; struct i2c_client *client; @@ -96,7 +96,7 @@ nouveau_therm_ic_ctor(struct nouveau_therm *therm) }; i2c->identify(i2c, NV_I2C_DEFAULT(0), "monitoring device", - board, probe_monitoring_device); + board, probe_monitoring_device, therm); if (priv->ic) return; } @@ -108,7 +108,7 @@ nouveau_therm_ic_ctor(struct nouveau_therm *therm) }; i2c->identify(i2c, NV_I2C_DEFAULT(0), "monitoring device", - board, probe_monitoring_device); + board, probe_monitoring_device, therm); if (priv->ic) return; } @@ -117,5 +117,5 @@ nouveau_therm_ic_ctor(struct nouveau_therm *therm) device. Let's try our static list. */ i2c->identify(i2c, NV_I2C_DEFAULT(0), "monitoring device", - nv_board_infos, probe_monitoring_device); + nv_board_infos, probe_monitoring_device, therm); } -- 1.8.5.2