From patchwork Sat Dec 31 12:06:44 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 9492699 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7F0D162ABD for ; Sat, 31 Dec 2016 12:09:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4DABC223A6 for ; Sat, 31 Dec 2016 12:09:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3EA6B252D5; Sat, 31 Dec 2016 12:09:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 01959223A6 for ; Sat, 31 Dec 2016 12:09:35 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BA5226E2EF; Sat, 31 Dec 2016 12:09:33 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id BE2C36E2E8; Sat, 31 Dec 2016 12:07:13 +0000 (UTC) Received: by mail-wm0-x242.google.com with SMTP id m203so74926154wma.3; Sat, 31 Dec 2016 04:07:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=JMvpH5vUHELFqJDfwzeh7BCGWzVKCZ2X2sUTHEpZO7Y=; b=KqLWBd81GnooXxIbgZ5ZEzzwwhGjPBKNY3kPVcqoahRVTGWkgcH2AyqfCxoKSPJfrj 9apIN7g5C1Q4pJlT37EJn3lam7hQh9hPp0+kdzlJRpZthKTdiX9hhugXZN/2hrEnOM78 GTHA7ljjD8zgr3kIfMUNBsTIm8aPiKGirWa5SVh8gScCHJ4ltuIOw/I8rIp23OrzMVcf Rc7xuuUKn/WfJda4yFCK97vK5xrBMyvFu7meiCBe5aoaOE9ECbQ8oMeusJEtuqDco0eO cBrFWS8tXacFTSX4Wj+Im0QA6ViYjiOukhaH7rOgFaQJEc9RhJ0BUORC1OLez0jjyrHF a8MQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=JMvpH5vUHELFqJDfwzeh7BCGWzVKCZ2X2sUTHEpZO7Y=; b=GMqrkigNksD2IVvYD7C9jspibcFwBxyhKVdVB6VDfN+aVdPM0nLfDqr2/cH7szfkBM I8K9Zb2eFhKA1m1EzKZQFk/1IV9kKDygFESYL/ckDKXu9o5cAOf0cdvWwSmH8dhtvJhw B8OJFP7zrDS+gmwQJSN/diEu/u3ckSk4aC65m7jnnwJOpAjy4CSDwAyv6+hC6KpmdEzI DvinocIRPWIJPfkFa0EaSn18GYCrUfwzaeOjI476Bx1zt9A1xr+pMBW39ByzC1BrjAAV 5gmlMuDzel6rgFaTzSLyd9w3wHvq1xFAsleg6IlG1IUIkFjCO1T+SbDbh1JHVdPPGEfJ MR3Q== X-Gm-Message-State: AIkVDXLKW49tJ0vNTA4xK6v6IF+wb6PDm4bF/5HV9LS/9e2kWgDIxGGOttgDd8QZKh/kFg== X-Received: by 10.28.56.132 with SMTP id f126mr43136336wma.126.1483186031903; Sat, 31 Dec 2016 04:07:11 -0800 (PST) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id c81sm74411987wmf.22.2016.12.31.04.07.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 31 Dec 2016 04:07:11 -0800 (PST) From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Sat, 31 Dec 2016 12:06:44 +0000 Message-Id: <20161231120702.21204-9-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20161231120702.21204-1-chris@chris-wilson.co.uk> References: <20161231120702.21204-1-chris@chris-wilson.co.uk> Cc: drm-intel-fixes@lists.freedesktop.org Subject: [Intel-gfx] [PATCH 08/26] drm/i915: Drain freed objects for mmap space exhaustion X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP As we now use a deferred free queue for objects, simply retiring the active objects is not enough to immediately free them and recover their mmap space - we must now also drain the freed object list. Fixes: fbbd37b36fa5 ("drm/i915: Move object release to a freelist + worker" Signed-off-by: Chris Wilson Cc: Joonas Lahtinen Cc: --- drivers/gpu/drm/i915/i915_gem.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index e5b4a72645d4..fe7419cab716 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -2090,23 +2090,21 @@ static int i915_gem_object_create_mmap_offset(struct drm_i915_gem_object *obj) int err; err = drm_gem_create_mmap_offset(&obj->base); - if (!err) + if (likely(!err)) return 0; - /* We can idle the GPU locklessly to flush stale objects, but in order - * to claim that space for ourselves, we need to take the big - * struct_mutex to free the requests+objects and allocate our slot. - */ - err = i915_gem_wait_for_idle(dev_priv, I915_WAIT_INTERRUPTIBLE); - if (err) - return err; + /* Attempt to reap some mmap space from dead objects */ + do { + err = i915_gem_wait_for_idle(dev_priv, I915_WAIT_INTERRUPTIBLE); + if (err) + break; - err = i915_mutex_lock_interruptible(&dev_priv->drm); - if (!err) { - i915_gem_retire_requests(dev_priv); + i915_gem_drain_freed_objects(dev_priv); err = drm_gem_create_mmap_offset(&obj->base); - mutex_unlock(&dev_priv->drm.struct_mutex); - } + if (!err) + break; + + } while (flush_delayed_work(&dev_priv->gt.retire_work)); return err; }