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 X-Spam-Level: X-Spam-Status: No, score=-5.3 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A96F3C433FF for ; Wed, 31 Jul 2019 16:48:36 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 60D6E208E4 for ; Wed, 31 Jul 2019 16:48:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="TEShoLf6" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 60D6E208E4 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id E98108E0003; Wed, 31 Jul 2019 12:48:35 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E49968E0001; Wed, 31 Jul 2019 12:48:35 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D38138E0003; Wed, 31 Jul 2019 12:48:35 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from mail-pf1-f197.google.com (mail-pf1-f197.google.com [209.85.210.197]) by kanga.kvack.org (Postfix) with ESMTP id 9E86E8E0001 for ; Wed, 31 Jul 2019 12:48:35 -0400 (EDT) Received: by mail-pf1-f197.google.com with SMTP id d190so43562810pfa.0 for ; Wed, 31 Jul 2019 09:48:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:date:to:cc:subject :message-id:references:mime-version:content-disposition:in-reply-to :user-agent; bh=0yU6+7Jqba/P/dYVUesQKoUXFUkl65XIpqFII+Vl9uI=; b=EQpTccEnKNjCAI+jKbhcysAbdZ8Y41z7qfYdNJ5tPuhuZ4kP8ls3rq8WnVQIesRZ8t SoZZVVTF+sh35tg4qaYh7amgO14V+CHrW7At/kXRmBAU6c2yd4mH1GdJ7fjQRjAiS3aa HcP58QVaQgEmIcOxPTYzsnGpcq9IcHEBfOlJyt6MddPsL439QaUozixJmhiHjnN3J1io EN1ikhEMfYSgzqrwQ0wpWNjRR5CnA5shT/udcTLC6nkz62d1rtwVRjeKwj1ICJRAwR7s xw6NgjtJyXh0UlMKw4Q81TAJMs9+5JVjzxMrU2/kXRUdEUlNc0t2KilY8ynwKsQBCeGz l1VQ== X-Gm-Message-State: APjAAAWrtU+YM5c+mZD7GhmCdCsC1IyOQUNAHImhLeTsPnOBfAAjHsEz akmcwkHm3iwA5gjwfnmmgQY3bWLzozHkV7qk+boRlhaLaSqgSenVnNii+Ey5wjt9K1R/KjWkNOz e4nt0ox5ANF8+I6U1b52hR99phvhORGBehKlQZLWvJjf+UW7eBQs+gAa6elnWttZXkA== X-Received: by 2002:a63:ff66:: with SMTP id s38mr116313306pgk.363.1564591715183; Wed, 31 Jul 2019 09:48:35 -0700 (PDT) X-Received: by 2002:a63:ff66:: with SMTP id s38mr116313248pgk.363.1564591714243; Wed, 31 Jul 2019 09:48:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564591714; cv=none; d=google.com; s=arc-20160816; b=CNPKhS+jTaOWUXEUW6+ZRoeU44uS3wa2FGEuF8/TCSIvyueFgTIrEOEi4iGIIjyR9s z9NU5Utav/KbIcxwGJbyKr5fBBva3rvOGOBK25HuQDSrkreGq2KWHOyP3Zxnw92+u3QI 2UD8PomgyekbDdBFkgASAmIsFOskG4A/LflDYLKS+rYb4ZkXqvRtv/UOF8IZXTaoWUid spLmH1OClUIpRb32/TlngtrSxuzzvoJmsZDFPZTT2TxOG2wA4f2cGOV/+VAXLO4PxpxN QVMrOu3N83eLv9ZadGt81GYP007wdRbIb/hK2X1vyLXYxlS9h80Oene0juyGyHn8mSH1 +A/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=user-agent:in-reply-to:content-disposition:mime-version:references :message-id:subject:cc:to:date:from:dkim-signature; bh=0yU6+7Jqba/P/dYVUesQKoUXFUkl65XIpqFII+Vl9uI=; b=JzL6RH5AxU8vH/Mex40y/laOE0pwM8XJsswYy45F+9I+nGnKGXNPdcaM+QFSa09xgn hXvSG9f9aBDXOXDbzUKPBNaSad/g6GRQKTm83Jlq0J5TmIecRosIHgSFj/z2tQa6FHv+ 46JDTM4vEE8rsPP1zgQi0suAQv7aI8MKqVYkA5R04PJXaYoJ0kHT2OWZe93ORE6gRQ0R e51gIxi77WtMSW4XQE7RrG/vTyyvlxxsjr2T1hqGdIobR6G65NAq1jsxbYiRjK6ijnFv iYVqPVhK2Kp9QHz46u+a7/dhxFgcF0UkKIW60tdLcYz6qbdaMl7Pb6gsr0ziiWLDznMn jiLA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=TEShoLf6; spf=pass (google.com: domain of sergey.senozhatsky@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=sergey.senozhatsky@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id f9sor82434448plr.31.2019.07.31.09.48.34 for (Google Transport Security); Wed, 31 Jul 2019 09:48:34 -0700 (PDT) Received-SPF: pass (google.com: domain of sergey.senozhatsky@gmail.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=TEShoLf6; spf=pass (google.com: domain of sergey.senozhatsky@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=sergey.senozhatsky@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:date:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=0yU6+7Jqba/P/dYVUesQKoUXFUkl65XIpqFII+Vl9uI=; b=TEShoLf6suD1oowWqmx+9hD1Z9ME22dg6oXWv+TZC0a59DtmlQsXGcIFRaKjW67vdc xJuBNUNjTffMUMovFe3HEn12UKyKzcwMLSkUBMlxgvtMebyzn/R7rPDCUr1I5Humd5+0 ZUnKpZrKA1v1nxnaoUKzg3Hr5b0cYcTNuqqc4b0ExTtOj6SLqQqk3qUZHWxihx0AoILp gUfNyHNB3ZWYYEgqiktawoBoqtMdZGnEp0p6A0BBZDVFA33JHeXqbE1n1ExBaJVPvRj7 nf220LhYoSaWsrlEKCnOevK8tDqEOu5Y1VGm9PD0fpTLKJL5CWc030WyaecUdDqbhAQo QWlg== X-Google-Smtp-Source: APXvYqxFFgDlNniDL8CJHmZ07neF4gFczeMrZumpY8D33YQTsuHwvnRMvRsPvkoX1WVdvj5G5Yqdsg== X-Received: by 2002:a17:902:934a:: with SMTP id g10mr123637304plp.18.1564591713720; Wed, 31 Jul 2019 09:48:33 -0700 (PDT) Received: from localhost ([121.137.63.184]) by smtp.gmail.com with ESMTPSA id d18sm24192770pgi.40.2019.07.31.09.48.32 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 31 Jul 2019 09:48:32 -0700 (PDT) From: Sergey Senozhatsky X-Google-Original-From: Sergey Senozhatsky Date: Thu, 1 Aug 2019 01:48:29 +0900 To: Sergey Senozhatsky Cc: Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , David Airlie , Daniel Vetter , Hugh Dickins , David Howells , Andrew Morton , linux-mm@kvack.org, linux-kernel@vger.kernel.org, intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: Re: [linux-next] mm/i915: i915_gemfs_init() NULL dereference Message-ID: <20190731164829.GA399@tigerII.localdomain> References: <20190721142930.GA480@tigerII.localdomain> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190721142930.GA480@tigerII.localdomain> User-Agent: Mutt/1.12.1 (2019-06-15) X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On (07/21/19 23:29), Sergey Senozhatsky wrote: > > BUG: kernel NULL pointer dereference, address: 0000000000000000 > #PF: supervisor instruction fetch in kernel mode > #PF: error_code(0x0010) - not-present page > PGD 0 P4D 0 > Oops: 0010 [#1] PREEMPT SMP PTI > RIP: 0010:0x0 > Code: Bad RIP value. > [..] > Call Trace: > i915_gemfs_init+0x6e/0xa0 [i915] > i915_gem_init_early+0x76/0x90 [i915] > i915_driver_probe+0x30a/0x1640 [i915] > ? kernfs_activate+0x5a/0x80 > ? kernfs_add_one+0xdd/0x130 > pci_device_probe+0x9e/0x110 > really_probe+0xce/0x230 > driver_probe_device+0x4b/0xc0 > device_driver_attach+0x4e/0x60 > __driver_attach+0x47/0xb0 > ? device_driver_attach+0x60/0x60 > bus_for_each_dev+0x61/0x90 > bus_add_driver+0x167/0x1b0 > driver_register+0x67/0xaa > ? 0xffffffffc0522000 > do_one_initcall+0x37/0x13f > ? kmem_cache_alloc+0x11a/0x150 > do_init_module+0x51/0x200 > __se_sys_init_module+0xef/0x100 > do_syscall_64+0x49/0x250 > entry_SYSCALL_64_after_hwframe+0x44/0xa9 So "the new mount API" conversion probably looks like something below. But I'm not 100% sure. --- drivers/gpu/drm/i915/gem/i915_gemfs.c | 32 +++++++++++++++++++++------ 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/i915/gem/i915_gemfs.c b/drivers/gpu/drm/i915/gem/i915_gemfs.c index 099f3397aada..2e365b26f8ee 100644 --- a/drivers/gpu/drm/i915/gem/i915_gemfs.c +++ b/drivers/gpu/drm/i915/gem/i915_gemfs.c @@ -7,12 +7,14 @@ #include #include #include +#include #include "i915_drv.h" #include "i915_gemfs.h" int i915_gemfs_init(struct drm_i915_private *i915) { + struct fs_context *fc; struct file_system_type *type; struct vfsmount *gemfs; @@ -36,19 +38,35 @@ int i915_gemfs_init(struct drm_i915_private *i915) struct super_block *sb = gemfs->mnt_sb; /* FIXME: Disabled until we get W/A for read BW issue. */ char options[] = "huge=never"; - int flags = 0; int err; - err = sb->s_op->remount_fs(sb, &flags, options); - if (err) { - kern_unmount(gemfs); - return err; - } + fc = fs_context_for_reconfigure(sb->s_root, 0, 0); + if (IS_ERR(fc)) + goto err; + + if (!fc->ops->parse_monolithic) + goto err; + + err = fc->ops->parse_monolithic(fc, options); + if (err) + goto err; + + if (!fc->ops->reconfigure) + goto err; + + err = fc->ops->reconfigure(fc); + if (err) + goto err; } i915->mm.gemfs = gemfs; - return 0; + +err: + pr_err("i915 gemfs init() failed\n"); + put_fs_context(fc); + kern_unmount(gemfs); + return -EINVAL; } void i915_gemfs_fini(struct drm_i915_private *i915) -- 2.22.0