From patchwork Wed Nov 8 14:59:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Christian_K=C3=B6nig?= X-Patchwork-Id: 10048633 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 9C48260381 for ; Wed, 8 Nov 2017 14:59:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 913F729384 for ; Wed, 8 Nov 2017 14:59:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 83577293C5; Wed, 8 Nov 2017 14:59:53 +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_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, 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 3FA8F29384 for ; Wed, 8 Nov 2017 14:59:53 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D43CB6E6F8; Wed, 8 Nov 2017 14:59:45 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-x243.google.com (mail-wm0-x243.google.com [IPv6:2a00:1450:400c:c09::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2EFB76E6EE; Wed, 8 Nov 2017 14:59:44 +0000 (UTC) Received: by mail-wm0-x243.google.com with SMTP id r68so11069661wmr.1; Wed, 08 Nov 2017 06:59:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=37Vs85xMRq6d23rZPIooarw9FWnXmFZACady4GcBieQ=; b=SbyvprFn7rFXhE1ElMH5g5PgE3yyWJLJY3eZGbBxYNVYcYdodRwnFB4DxZ6R2uPB8E YJgx7B0XCXHbvg+gQ5rNEadcJ8qp6u3h8Bk8zD39V5K98mr2/XfD+PExHDGEl8Nrkpzi pf/jiR3F5W+ZlhnMIcHEj8aLSX0yNqPxhtJlJuhAi3BPSyGIb34jaP63OjXUW6i8tnFo qGqnJ450SLMncvsv+MmvdVC0+LaRaYM/sf4+2VfakuieTuVGfARCS4c7aVVHTUDDe2af F/hbv9kU8zsBxbQiMt1SauwGjIsH1oiPVIhTE29bxAdvpDr+tzsMGSam8wvBxxiehRGL Devw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=37Vs85xMRq6d23rZPIooarw9FWnXmFZACady4GcBieQ=; b=kP1Yp1HrCWEdomdrPjuBZG2hpVEn/pB5mR5kmy5kbb8CIB8XIcC9OX++IWdSALp918 PspD3QUWrgNAgNf/VzAOr0NSuDtlkTQ2IMzVdk/opq6eHH3zJtYM2UEolwBoMaSDoaiD mmGbKYN21lG98sKJIvnylbdmAipSyFwOoRu34OZTk3rzXJd+yI+r6et9SADzjjiMxKEl wxmgAZBO/NHktuDD2d32NCHFhIXN2KKDARhv+NpxmcxQWzmHEHA4otTVlK5j5tCUgHPK wmJ0MjGnAsUCPS4pWycQldt/wQeALpLY0cIlPWX9jtrWwNkgy9FdC7A8Zsfrd5Ak9DeT SG9A== X-Gm-Message-State: AJaThX6ZD3r41K2kuwBjNmZyy4Fkt53mishp0HggmLeeJJOvV+iH/lbP iMw5Nq2mUyOkSX005WcbeRhueg== X-Google-Smtp-Source: ABhQp+QooRW1Bd+/cn9Dbj8ZbWGZQ3Sv+2OKGf4XNJdS/OwE7nXqYcaHHcPAgOGj0firQ0MaXquc0w== X-Received: by 10.28.154.137 with SMTP id c131mr721590wme.142.1510153182869; Wed, 08 Nov 2017 06:59:42 -0800 (PST) Received: from localhost.localdomain ([2a02:908:1251:7981:c04d:fe7d:a3de:74ad]) by smtp.gmail.com with ESMTPSA id 61sm801346wrl.0.2017.11.08.06.59.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Nov 2017 06:59:42 -0800 (PST) From: "=?UTF-8?q?Christian=20K=C3=B6nig?=" X-Google-Original-From: =?UTF-8?q?Christian=20K=C3=B6nig?= To: Hongbo.He@amd.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH 4/4] drm/ttm: optimize ttm_mem_evict_first Date: Wed, 8 Nov 2017 15:59:36 +0100 Message-Id: <20171108145936.27071-4-christian.koenig@amd.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171108145936.27071-1-christian.koenig@amd.com> References: <20171108145936.27071-1-christian.koenig@amd.com> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Deleted BOs with the same reservation object can be reaped even if they can't be reserved. Signed-off-by: Christian König --- drivers/gpu/drm/ttm/ttm_bo.c | 35 +++++++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c index d23592cfe42e..f486a484c70f 100644 --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c @@ -735,20 +735,35 @@ bool ttm_bo_eviction_valuable(struct ttm_buffer_object *bo, EXPORT_SYMBOL(ttm_bo_eviction_valuable); static int ttm_mem_evict_first(struct ttm_bo_device *bdev, - uint32_t mem_type, - const struct ttm_place *place, - bool interruptible, - bool no_wait_gpu) + struct reservation_object *resv, + uint32_t mem_type, + const struct ttm_place *place, + bool interruptible, + bool no_wait_gpu) { struct ttm_bo_global *glob = bdev->glob; struct ttm_mem_type_manager *man = &bdev->man[mem_type]; struct ttm_buffer_object *bo; int ret = -EBUSY; + bool locked; unsigned i; spin_lock(&glob->lru_lock); for (i = 0; i < TTM_MAX_BO_PRIORITY; ++i) { list_for_each_entry(bo, &man->lru[i], lru) { + if (bo->resv == resv) { + if (list_empty(&bo->ddestroy)) + continue; + + if (place && + !bdev->driver->eviction_valuable(bo, place)) + continue; + + ret = 0; + locked = false; + break; + } + ret = __ttm_bo_reserve(bo, false, true, NULL); if (ret) continue; @@ -760,6 +775,7 @@ static int ttm_mem_evict_first(struct ttm_bo_device *bdev, continue; } + locked = true; break; } @@ -775,7 +791,8 @@ static int ttm_mem_evict_first(struct ttm_bo_device *bdev, kref_get(&bo->list_kref); if (!list_empty(&bo->ddestroy)) { - ret = ttm_bo_cleanup_refs(bo, interruptible, no_wait_gpu, true); + ret = ttm_bo_cleanup_refs(bo, interruptible, no_wait_gpu, + locked); kref_put(&bo->list_kref, ttm_bo_release_list); return ret; } @@ -786,7 +803,8 @@ static int ttm_mem_evict_first(struct ttm_bo_device *bdev, BUG_ON(ret != 0); ret = ttm_bo_evict(bo, interruptible, no_wait_gpu); - ttm_bo_unreserve(bo); + if (locked) + ttm_bo_unreserve(bo); kref_put(&bo->list_kref, ttm_bo_release_list); return ret; @@ -850,7 +868,7 @@ static int ttm_bo_mem_force_space(struct ttm_buffer_object *bo, return ret; if (mem->mm_node) break; - ret = ttm_mem_evict_first(bdev, mem_type, place, + ret = ttm_mem_evict_first(bdev, bo->resv, mem_type, place, interruptible, no_wait_gpu); if (unlikely(ret != 0)) return ret; @@ -1353,7 +1371,8 @@ static int ttm_bo_force_list_clean(struct ttm_bo_device *bdev, for (i = 0; i < TTM_MAX_BO_PRIORITY; ++i) { while (!list_empty(&man->lru[i])) { spin_unlock(&glob->lru_lock); - ret = ttm_mem_evict_first(bdev, mem_type, NULL, false, false); + ret = ttm_mem_evict_first(bdev, NULL, mem_type, NULL, + false, false); if (ret) return ret; spin_lock(&glob->lru_lock);