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=-15.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 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 8B908C4338F for ; Tue, 17 Aug 2021 16:17:18 +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 440FE60FD7 for ; Tue, 17 Aug 2021 16:17:18 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 440FE60FD7 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A54096E1EC; Tue, 17 Aug 2021 16:17:17 +0000 (UTC) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7A6BC6E1EC; Tue, 17 Aug 2021 16:17:16 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10079"; a="214287888" X-IronPort-AV: E=Sophos;i="5.84,329,1620716400"; d="scan'208";a="214287888" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Aug 2021 09:17:15 -0700 X-IronPort-AV: E=Sophos;i="5.84,329,1620716400"; d="scan'208";a="531132950" Received: from jons-linux-dev-box.fm.intel.com (HELO jons-linux-dev-box) ([10.1.27.20]) by fmsmga002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Aug 2021 09:17:15 -0700 Date: Tue, 17 Aug 2021 09:12:02 -0700 From: Matthew Brost To: Daniel Vetter Cc: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, daniel.vetter@ffwll.ch Message-ID: <20210817161201.GA30699@jons-linux-dev-box> References: <20210816135139.10060-1-matthew.brost@intel.com> <20210816135139.10060-15-matthew.brost@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.9.4 (2018-02-28) Subject: Re: [Intel-gfx] [PATCH 14/22] drm/i915: Allocate error capture in atomic context 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: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Tue, Aug 17, 2021 at 12:06:16PM +0200, Daniel Vetter wrote: > On Mon, Aug 16, 2021 at 06:51:31AM -0700, Matthew Brost wrote: > > Error captures can now be done in a work queue processing G2H messages. > > These messages need to be completely done being processed in the reset > > path, to avoid races in the missing G2H cleanup, which create a > > dependency on memory allocations and dma fences (i915_requests). > > Requests depend on resets, thus now we have a circular dependency. To > > work around this, allocate the error capture in an atomic context. > > > > Fixes: dc0dad365c5e ("Fix for error capture after full GPU reset with GuC") > > Fixes: 573ba126aef3 ("Capture error state on context reset") > > Signed-off-by: Matthew Brost > > --- > > drivers/gpu/drm/i915/i915_gpu_error.c | 37 +++++++++++++-------------- > > 1 file changed, 18 insertions(+), 19 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c > > index 0f08bcfbe964..453376aa6d9f 100644 > > --- a/drivers/gpu/drm/i915/i915_gpu_error.c > > +++ b/drivers/gpu/drm/i915/i915_gpu_error.c > > @@ -49,7 +49,6 @@ > > #include "i915_memcpy.h" > > #include "i915_scatterlist.h" > > > > -#define ALLOW_FAIL (GFP_KERNEL | __GFP_RETRY_MAYFAIL | __GFP_NOWARN) > > #define ATOMIC_MAYFAIL (GFP_ATOMIC | __GFP_NOWARN) > > This one doesn't make much sense. GFP_ATOMIC essentially means we're > high-priority and failure would be a pretty bad day. Meanwhile > __GFP_NOWARN means we can totally cope with failure, pls don't holler. > > GFP_NOWAIT | __GFP_NOWARN would the more consistent one here I think. > > gfp.h for all the docs for this. > > Separate patch ofc. This one is definitely the right direction, since > GFP_KERNEL from the reset worker is not a good idea. Lockdep is happy with GFP_NOWAIT so this works for me. Matt > -Daniel > > > > > static void __sg_set_buf(struct scatterlist *sg, > > @@ -79,7 +78,7 @@ static bool __i915_error_grow(struct drm_i915_error_state_buf *e, size_t len) > > if (e->cur == e->end) { > > struct scatterlist *sgl; > > > > - sgl = (typeof(sgl))__get_free_page(ALLOW_FAIL); > > + sgl = (typeof(sgl))__get_free_page(ATOMIC_MAYFAIL); > > if (!sgl) { > > e->err = -ENOMEM; > > return false; > > @@ -99,10 +98,10 @@ static bool __i915_error_grow(struct drm_i915_error_state_buf *e, size_t len) > > } > > > > e->size = ALIGN(len + 1, SZ_64K); > > - e->buf = kmalloc(e->size, ALLOW_FAIL); > > + e->buf = kmalloc(e->size, ATOMIC_MAYFAIL); > > if (!e->buf) { > > e->size = PAGE_ALIGN(len + 1); > > - e->buf = kmalloc(e->size, GFP_KERNEL); > > + e->buf = kmalloc(e->size, ATOMIC_MAYFAIL); > > } > > if (!e->buf) { > > e->err = -ENOMEM; > > @@ -243,12 +242,12 @@ static bool compress_init(struct i915_vma_compress *c) > > { > > struct z_stream_s *zstream = &c->zstream; > > > > - if (pool_init(&c->pool, ALLOW_FAIL)) > > + if (pool_init(&c->pool, ATOMIC_MAYFAIL)) > > return false; > > > > zstream->workspace = > > kmalloc(zlib_deflate_workspacesize(MAX_WBITS, MAX_MEM_LEVEL), > > - ALLOW_FAIL); > > + ATOMIC_MAYFAIL); > > if (!zstream->workspace) { > > pool_fini(&c->pool); > > return false; > > @@ -256,7 +255,7 @@ static bool compress_init(struct i915_vma_compress *c) > > > > c->tmp = NULL; > > if (i915_has_memcpy_from_wc()) > > - c->tmp = pool_alloc(&c->pool, ALLOW_FAIL); > > + c->tmp = pool_alloc(&c->pool, ATOMIC_MAYFAIL); > > > > return true; > > } > > @@ -280,7 +279,7 @@ static void *compress_next_page(struct i915_vma_compress *c, > > if (dst->page_count >= dst->num_pages) > > return ERR_PTR(-ENOSPC); > > > > - page = pool_alloc(&c->pool, ALLOW_FAIL); > > + page = pool_alloc(&c->pool, ATOMIC_MAYFAIL); > > if (!page) > > return ERR_PTR(-ENOMEM); > > > > @@ -376,7 +375,7 @@ struct i915_vma_compress { > > > > static bool compress_init(struct i915_vma_compress *c) > > { > > - return pool_init(&c->pool, ALLOW_FAIL) == 0; > > + return pool_init(&c->pool, ATOMIC_MAYFAIL) == 0; > > } > > > > static bool compress_start(struct i915_vma_compress *c) > > @@ -391,7 +390,7 @@ static int compress_page(struct i915_vma_compress *c, > > { > > void *ptr; > > > > - ptr = pool_alloc(&c->pool, ALLOW_FAIL); > > + ptr = pool_alloc(&c->pool, ATOMIC_MAYFAIL); > > if (!ptr) > > return -ENOMEM; > > > > @@ -997,7 +996,7 @@ i915_vma_coredump_create(const struct intel_gt *gt, > > > > num_pages = min_t(u64, vma->size, vma->obj->base.size) >> PAGE_SHIFT; > > num_pages = DIV_ROUND_UP(10 * num_pages, 8); /* worstcase zlib growth */ > > - dst = kmalloc(sizeof(*dst) + num_pages * sizeof(u32 *), ALLOW_FAIL); > > + dst = kmalloc(sizeof(*dst) + num_pages * sizeof(u32 *), ATOMIC_MAYFAIL); > > if (!dst) > > return NULL; > > > > @@ -1433,7 +1432,7 @@ capture_engine(struct intel_engine_cs *engine, > > struct i915_request *rq = NULL; > > unsigned long flags; > > > > - ee = intel_engine_coredump_alloc(engine, GFP_KERNEL); > > + ee = intel_engine_coredump_alloc(engine, ATOMIC_MAYFAIL); > > if (!ee) > > return NULL; > > > > @@ -1481,7 +1480,7 @@ gt_record_engines(struct intel_gt_coredump *gt, > > struct intel_engine_coredump *ee; > > > > /* Refill our page pool before entering atomic section */ > > - pool_refill(&compress->pool, ALLOW_FAIL); > > + pool_refill(&compress->pool, ATOMIC_MAYFAIL); > > > > ee = capture_engine(engine, compress); > > if (!ee) > > @@ -1507,7 +1506,7 @@ gt_record_uc(struct intel_gt_coredump *gt, > > const struct intel_uc *uc = >->_gt->uc; > > struct intel_uc_coredump *error_uc; > > > > - error_uc = kzalloc(sizeof(*error_uc), ALLOW_FAIL); > > + error_uc = kzalloc(sizeof(*error_uc), ATOMIC_MAYFAIL); > > if (!error_uc) > > return NULL; > > > > @@ -1518,8 +1517,8 @@ gt_record_uc(struct intel_gt_coredump *gt, > > * As modparams are generally accesible from the userspace make > > * explicit copies of the firmware paths. > > */ > > - error_uc->guc_fw.path = kstrdup(uc->guc.fw.path, ALLOW_FAIL); > > - error_uc->huc_fw.path = kstrdup(uc->huc.fw.path, ALLOW_FAIL); > > + error_uc->guc_fw.path = kstrdup(uc->guc.fw.path, ATOMIC_MAYFAIL); > > + error_uc->huc_fw.path = kstrdup(uc->huc.fw.path, ATOMIC_MAYFAIL); > > error_uc->guc_log = > > i915_vma_coredump_create(gt->_gt, > > uc->guc.log.vma, "GuC log buffer", > > @@ -1778,7 +1777,7 @@ i915_vma_capture_prepare(struct intel_gt_coredump *gt) > > { > > struct i915_vma_compress *compress; > > > > - compress = kmalloc(sizeof(*compress), ALLOW_FAIL); > > + compress = kmalloc(sizeof(*compress), ATOMIC_MAYFAIL); > > if (!compress) > > return NULL; > > > > @@ -1811,11 +1810,11 @@ i915_gpu_coredump(struct intel_gt *gt, intel_engine_mask_t engine_mask) > > if (IS_ERR(error)) > > return error; > > > > - error = i915_gpu_coredump_alloc(i915, ALLOW_FAIL); > > + error = i915_gpu_coredump_alloc(i915, ATOMIC_MAYFAIL); > > if (!error) > > return ERR_PTR(-ENOMEM); > > > > - error->gt = intel_gt_coredump_alloc(gt, ALLOW_FAIL); > > + error->gt = intel_gt_coredump_alloc(gt, ATOMIC_MAYFAIL); > > if (error->gt) { > > struct i915_vma_compress *compress; > > > > -- > > 2.32.0 > > > > -- > Daniel Vetter > Software Engineer, Intel Corporation > http://blog.ffwll.ch