From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 76FA1C433EF for ; Mon, 27 Sep 2021 15:17:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 548F461058 for ; Mon, 27 Sep 2021 15:17:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235002AbhI0PTR (ORCPT ); Mon, 27 Sep 2021 11:19:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40560 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234972AbhI0PTQ (ORCPT ); Mon, 27 Sep 2021 11:19:16 -0400 Received: from mail-wr1-x42b.google.com (mail-wr1-x42b.google.com [IPv6:2a00:1450:4864:20::42b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9201FC061575; Mon, 27 Sep 2021 08:17:38 -0700 (PDT) Received: by mail-wr1-x42b.google.com with SMTP id x20so7925373wrg.10; Mon, 27 Sep 2021 08:17:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=tetxFL9+5GmfRcJZUQF3Nho9xO1Jgkf6i2MZ8kBXK5Y=; b=f1E1cYAW/S9T++gJfdfEOEFSrF80YvO0xsjuPylXQ6axVTPupw1Q/O3SXOB8WisaeS VjgByosbcj36sq3m5wcz267wJT/80ig2yp7HNitCAZbGLxaeeHNn0j8zJ6yxeQl9jGB1 cbJpyy9Oh/xGHt7j8dz2yIJ9/bB0suHH2shVEvNl1h9r1ERIrz9ziQHM+D2Oim3LG8LB ZFfVg6/dLmrf8cFt4SlTR/mPDyuOGLVpufZFcu7bU8y8FRyOehjIXBQncqsvf3bd1J7x f48XLHbjoch3dCteMViY7Dht01O+mgADvmmf02DquoqwcUq8+LL7ap43YUmHOK7GfHsJ V0Dg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=tetxFL9+5GmfRcJZUQF3Nho9xO1Jgkf6i2MZ8kBXK5Y=; b=ugcQ3jt8mGWikNDfT3WPZ40iunMKkZE4pEiYmsN4UK+MZVQxZPSpp7nqJmtVPJ6OQ6 FdCF+6ITKUdwNKJTz+cQ4igTYnUXprt+MaY0lrmret4kU6LXC2WhVfm+nlHWLv7F00gd O0CFoXwNtoWYwj1562fcMlCN0SawhCfBqbVyeCZS4Wv94yM/eHXRERkL7moUuI0RJJCm yWoX5XUI4279gmRpPpsz0HhOVTvZ0ocbnnVkoVHVTTSJCGsKiAr6bwCld9CU1dUfcYpU eKlgB35jV84IyGyaW6d5ZxIg5My+N16tykXLPw92/1gvlpOIAxDH/HxOkGC0335V4Bkf 4NIw== X-Gm-Message-State: AOAM532OX8lFdZaFKVAcsh25V70nJedJVHIN2n+PMOXhgkR7wJzLJv0N dc9k8cu1JkNcsWBRi3m9MeuBXOmtItKYZ/1Odg4= X-Google-Smtp-Source: ABdhPJy4Z6K+A31iTGXB/OiQhqwB1ORVFMl6q4JShHt0KMHu9lZw8pI8JsGnP6jluVs2MNamyaMr2p8qBRRgjMLOPb4= X-Received: by 2002:adf:dd8e:: with SMTP id x14mr485784wrl.260.1632755857102; Mon, 27 Sep 2021 08:17:37 -0700 (PDT) MIME-Version: 1.0 References: <20210926190554.761482-1-robdclark@gmail.com> In-Reply-To: From: Rob Clark Date: Mon, 27 Sep 2021 08:22:09 -0700 Message-ID: Subject: Re: [PATCH] drm/msm: Fix crash on dev file close To: Dmitry Baryshkov Cc: "open list:DRM DRIVER FOR MSM ADRENO GPU" , "open list:DRM DRIVER FOR MSM ADRENO GPU" , freedreno , Rob Clark , Steev Klimaszewski , Sean Paul , David Airlie , Daniel Vetter , =?UTF-8?Q?Christian_K=C3=B6nig?= , open list Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org On Sun, Sep 26, 2021 at 12:36 PM Dmitry Baryshkov wrote: > > On Sun, 26 Sept 2021 at 22:01, Rob Clark wrote: > > > > From: Rob Clark > > > > If the device file was opened prior to fw being available (such as from > > initrd before rootfs is mounted, when the initrd does not contain GPU > > fw), that would cause a later crash when the dev file is closed due to > > unitialized submitqueues list: > > Reviewed-by: Dmitry Baryshkov > > I've sent a close version of this patch a day or so ago, but yours is > better, as I did not touch rwlock init. Thanks, sorry I did not see your patch earlier BR, -R > > > > CPU: 4 PID: 263 Comm: plymouthd Tainted: G W 5.15.0-rc2-next-20210924 #2 > > Hardware name: LENOVO 81JL/LNVNB161216, BIOS 9UCN33WW(V2.06) 06/ 4/2019 > > pstate: 60400005 (nZCv daif +PAN -UAO -TCO -DIT -SSBS BTYPE=--) > > pc : msm_submitqueue_close+0x30/0x190 [msm] > > lr : msm_postclose+0x54/0xf0 [msm] > > sp : ffff80001074bb80 > > x29: ffff80001074bb80 x28: ffff03ad80c4db80 x27: ffff03ad80dc5ab0 > > x26: 0000000000000000 x25: ffff03ad80dc5af8 x24: ffff03ad81e90800 > > x23: 0000000000000000 x22: ffff03ad81e90800 x21: ffff03ad8b35e788 > > x20: ffff03ad81e90878 x19: 0000000000000000 x18: 0000000000000000 > > x17: 0000000000000000 x16: ffffda15f14f7940 x15: 0000000000000000 > > x14: 0000000000000000 x13: 0000000000000001 x12: 0000000000000040 > > x11: 0000000000000000 x10: 0000000000000000 x9 : ffffda15cd18ff88 > > x8 : ffff03ad80c4db80 x7 : 0000000000000228 x6 : 0000000000000000 > > x5 : 1793a4e807e636bd x4 : ffff03ad80c4db80 x3 : ffff03ad81e90878 > > x2 : 0000000000000000 x1 : ffff03ad80c4db80 x0 : 0000000000000000 > > Call trace: > > msm_submitqueue_close+0x30/0x190 [msm] > > msm_postclose+0x54/0xf0 [msm] > > drm_file_free.part.0+0x1cc/0x2e0 [drm] > > drm_close_helper.isra.0+0x74/0x84 [drm] > > drm_release+0x78/0x120 [drm] > > __fput+0x78/0x23c > > ____fput+0x1c/0x30 > > task_work_run+0xcc/0x22c > > do_exit+0x304/0x9f4 > > do_group_exit+0x44/0xb0 > > __wake_up_parent+0x0/0x3c > > invoke_syscall+0x50/0x120 > > el0_svc_common.constprop.0+0x4c/0xf4 > > do_el0_svc+0x30/0x9c > > el0_svc+0x20/0x60 > > el0t_64_sync_handler+0xe8/0xf0 > > el0t_64_sync+0x1a0/0x1a4 > > Code: aa0003f5 a90153f3 f8408eb3 aa1303e0 (f85e8674) > > ---[ end trace 39b2fa37509a2be2 ]--- > > Fixing recursive fault but reboot is needed! > > > > Fixes: 86c2a0f000c1 drm/msm: ("Small submitqueue creation cleanup") > > Reported-by: Steev Klimaszewski > > Signed-off-by: Rob Clark > > --- > > drivers/gpu/drm/msm/msm_drv.c | 3 +++ > > drivers/gpu/drm/msm/msm_submitqueue.c | 4 ---- > > 2 files changed, 3 insertions(+), 4 deletions(-) > > > > diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c > > index f350de754f84..938765ad7109 100644 > > --- a/drivers/gpu/drm/msm/msm_drv.c > > +++ b/drivers/gpu/drm/msm/msm_drv.c > > @@ -689,6 +689,9 @@ static int context_init(struct drm_device *dev, struct drm_file *file) > > if (!ctx) > > return -ENOMEM; > > > > + INIT_LIST_HEAD(&ctx->submitqueues); > > + rwlock_init(&ctx->queuelock); > > + > > kref_init(&ctx->ref); > > msm_submitqueue_init(dev, ctx); > > > > diff --git a/drivers/gpu/drm/msm/msm_submitqueue.c b/drivers/gpu/drm/msm/msm_submitqueue.c > > index 32a55d81b58b..7ce0771b5582 100644 > > --- a/drivers/gpu/drm/msm/msm_submitqueue.c > > +++ b/drivers/gpu/drm/msm/msm_submitqueue.c > > @@ -140,10 +140,6 @@ int msm_submitqueue_init(struct drm_device *drm, struct msm_file_private *ctx) > > */ > > default_prio = DIV_ROUND_UP(max_priority, 2); > > > > - INIT_LIST_HEAD(&ctx->submitqueues); > > - > > - rwlock_init(&ctx->queuelock); > > - > > return msm_submitqueue_create(drm, ctx, default_prio, 0, NULL); > > } > > > > -- > > 2.31.1 > > > > > -- > With best wishes > Dmitry