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=-13.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham 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 44A3BC433DB for ; Wed, 30 Dec 2020 13:27:58 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DF4C12074A for ; Wed, 30 Dec 2020 13:27:57 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DF4C12074A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 43D1A892E0; Wed, 30 Dec 2020 13:27:57 +0000 (UTC) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id AD3BF892E0 for ; Wed, 30 Dec 2020 13:27:55 +0000 (UTC) IronPort-SDR: KtIlXZZB72LfvlbE4RzHt1B9jrkOIc3yA/LrPnTBPkGQmLjjiCtA0cgXQuUFp+DOm4vjTFQoJ/ B3Y0rJmb50gg== X-IronPort-AV: E=McAfee;i="6000,8403,9849"; a="261355705" X-IronPort-AV: E=Sophos;i="5.78,461,1599548400"; d="scan'208";a="261355705" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Dec 2020 05:27:55 -0800 IronPort-SDR: tEorE5sTdm4uJT4wqnfOYZj37qCN88yNBJUkHLiAP7koXwWajM7glmIjr8qwRVQQgSbeQzzqTd RUhmSdHt3erw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.78,461,1599548400"; d="scan'208";a="393460465" Received: from gaia.fi.intel.com ([10.237.72.192]) by fmsmga004.fm.intel.com with ESMTP; 30 Dec 2020 05:27:54 -0800 Received: by gaia.fi.intel.com (Postfix, from userid 1000) id AA6DF5C20E0; Wed, 30 Dec 2020 15:25:23 +0200 (EET) From: Mika Kuoppala To: Chris Wilson , intel-gfx@lists.freedesktop.org In-Reply-To: <20201229141626.4773-1-chris@chris-wilson.co.uk> References: <20201229141626.4773-1-chris@chris-wilson.co.uk> Date: Wed, 30 Dec 2020 15:25:23 +0200 Message-ID: <87y2hfl930.fsf@gaia.fi.intel.com> MIME-Version: 1.0 Subject: Re: [Intel-gfx] [PATCH] drm/i915/gt: Taint the reset mutex with the shrinker X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Chris Wilson Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Chris Wilson writes: > Declare that, under extreme circumstances, the shrinker may need to wait > upon a request, in which case reset must not itself deadlock in order to > ensure forward progress of the driver. That is since the shrinker may > depend upon a reset, any reset cannot touch the shrinker. > > Signed-off-by: Chris Wilson > Cc: Mika Kuoppala Reviewed-by: Mika Kuoppala > --- > drivers/gpu/drm/i915/gt/intel_reset.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/drivers/gpu/drm/i915/gt/intel_reset.c b/drivers/gpu/drm/i915/gt/intel_reset.c > index b85b6f3dcd60..e14b23c3b1cb 100644 > --- a/drivers/gpu/drm/i915/gt/intel_reset.c > +++ b/drivers/gpu/drm/i915/gt/intel_reset.c > @@ -1394,6 +1394,9 @@ void intel_gt_init_reset(struct intel_gt *gt) > mutex_init(>->reset.mutex); > init_srcu_struct(>->reset.backoff_srcu); > > + /* While undesirable to wait inside the shrinker, complain anyway */ > + i915_gem_shrinker_taints_mutex(gt->i915, >->reset.mutex); > + > /* no GPU until we are ready! */ > __set_bit(I915_WEDGED, >->reset.flags); > } > -- > 2.20.1 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx