From patchwork Sun Nov 12 15:31:20 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: 10054821 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 1C3D36028A for ; Sun, 12 Nov 2017 15:31:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 12B462976C for ; Sun, 12 Nov 2017 15:31:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 079FF29798; Sun, 12 Nov 2017 15:31:31 +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 A03202976C for ; Sun, 12 Nov 2017 15:31:30 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6EEF86E397; Sun, 12 Nov 2017 15:31:28 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wr0-x243.google.com (mail-wr0-x243.google.com [IPv6:2a00:1450:400c:c0c::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6DBCD6E39B; Sun, 12 Nov 2017 15:31:26 +0000 (UTC) Received: by mail-wr0-x243.google.com with SMTP id l8so12319285wre.12; Sun, 12 Nov 2017 07:31:26 -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=8nbrOqFrhh9w3WkiJj5sNG9THcB+wEJchKM6cdStDf8=; b=blE9cVtXIpQAb09YeeigZ0pA1qRktYpaKWOiTRLxRB15JKJsimudN9axSVxP5Hw9m7 pnuMg9cTGdmXKnZe4v3l7dBBUHPAGdP7Pc5pgANuOcHB0GsN1XPVthO0gGMhpqTa73vH hHUpbMs1L3xkbxq+0eG/11YmFVPfltIXZW0to4WhiUXS9GCXM9+kBqO0cC42DsKFxZbQ cI9v87Jm8dU85pfCgHv+DMBPvGrFnok4HdfgOaoQlSMsHuX2yoR9lwQL7G5qyn1M1d7b q59BqFxJG897jfbv29uOKLdjExXFUt1bSbmIGNRGUTIC2Oy+x5lyWxc0nrqcKWElo1Fk CjLA== 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=8nbrOqFrhh9w3WkiJj5sNG9THcB+wEJchKM6cdStDf8=; b=q4EopjpKuhYIgX3l1l4IeUmpAXt3BcWM9jjoPpN9ojXunDLqjA3Ty/kASh5zABJYYX iw6fNHO/ogDNEMoAgpmUxhAwR5pfg0SUv4c9v8hcxReMWNqdRT66fAEgVLewyv5SKeII e3gcVTukKKFfH3jT3FY+AjcFbd+7tILyaSWV5gJLiyEVQiMGkW60oZKjv9PWK19yTgss xPQu78pEYJbcYLEtyXYHHtuh9D9a5kqzdRQCqPQUUzU2WXFSwsMXTWxlk/PqtOqlkKXN MxPf0Nh6A+cwH838CgVLWmdcEzRou7hfM54qjMknScjYzpY2grdUVShDmqSTfykdP1DC OFfg== X-Gm-Message-State: AJaThX7PyqhbBVE6uWqYWgCmxFg8dIafeAlS68NBxr+YnWJEje8EsIi2 slz+oP3oHqNhA+jlZmZsWGfsaw== X-Google-Smtp-Source: AGs4zMYo0iMXNsDH6cgHXbZ9Zgr53qgJcojzkKn6X67+2WQlhyfxWJW276+dgISFzNawL73/kOlAtg== X-Received: by 10.223.184.125 with SMTP id u58mr5167289wrf.33.1510500684881; Sun, 12 Nov 2017 07:31:24 -0800 (PST) Received: from localhost.localdomain ([2a02:908:1251:7981:9d6d:7508:2f91:be0c]) by smtp.gmail.com with ESMTPSA id 19sm7927465wmn.15.2017.11.12.07.31.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 12 Nov 2017 07:31:24 -0800 (PST) From: "=?UTF-8?q?Christian=20K=C3=B6nig?=" X-Google-Original-From: =?UTF-8?q?Christian=20K=C3=B6nig?= To: amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH 2/2] drm/ttm: optimize ttm_mem_evict_first v3 Date: Sun, 12 Nov 2017 16:31:20 +0100 Message-Id: <20171112153120.16028-2-christian.koenig@amd.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171112153120.16028-1-christian.koenig@amd.com> References: <20171112153120.16028-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. v2: rebase and we still need to remove/add the BO from/to the LRU. v3: fix remove/add one more time, cleanup the logic a bit Signed-off-by: Christian König --- drivers/gpu/drm/ttm/ttm_bo.c | 55 +++++++++++++++++++++++++++----------------- 1 file changed, 34 insertions(+), 21 deletions(-) diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c index 691646c0f8d3..31b0028704f5 100644 --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c @@ -738,47 +738,58 @@ 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; + struct ttm_buffer_object *bo = NULL; + bool locked = false; unsigned i; + int ret; spin_lock(&glob->lru_lock); for (i = 0; i < TTM_MAX_BO_PRIORITY; ++i) { list_for_each_entry(bo, &man->lru[i], lru) { - ret = reservation_object_trylock(bo->resv) ? 0 : -EBUSY; - if (ret) - continue; + if (bo->resv == resv) { + if (list_empty(&bo->ddestroy)) + continue; + + break; + } else { + locked = reservation_object_trylock(bo->resv); + if (!locked) + continue; + } if (place && !bdev->driver->eviction_valuable(bo, place)) { - reservation_object_unlock(bo->resv); - ret = -EBUSY; + if (locked) + reservation_object_unlock(bo->resv); continue; } - break; } - if (!ret) + if (&bo->lru != &man->lru[i]) break; + else + bo = NULL; } - if (ret) { + if (!bo) { spin_unlock(&glob->lru_lock); - return ret; + return -EBUSY; } 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,10 +797,11 @@ static int ttm_mem_evict_first(struct ttm_bo_device *bdev, ttm_bo_del_from_lru(bo); spin_unlock(&glob->lru_lock); - BUG_ON(ret != 0); - ret = ttm_bo_evict(bo, interruptible, no_wait_gpu); - ttm_bo_unreserve(bo); + if (locked) + ttm_bo_unreserve(bo); + else + ttm_bo_add_to_lru(bo); kref_put(&bo->list_kref, ttm_bo_release_list); return ret; @@ -853,7 +865,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; @@ -1356,7 +1368,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);