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=-11.3 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,HTML_MESSAGE,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,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 4BDFEC47094 for ; Mon, 7 Jun 2021 14:15:39 +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 E47D861029 for ; Mon, 7 Jun 2021 14:15:38 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E47D861029 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 620AE6E8DE; Mon, 7 Jun 2021 14:15:38 +0000 (UTC) Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [IPv6:2a00:1450:4864:20::32f]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9E8CB6E8DC for ; Mon, 7 Jun 2021 14:15:36 +0000 (UTC) Received: by mail-wm1-x32f.google.com with SMTP id h3so10165044wmq.3 for ; Mon, 07 Jun 2021 07:15:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language; bh=IW8ZoegfOZWEQlU2rNIVkkosxMjtt1cTaff6c7yLfxg=; b=UJuzqgoQe7hbA/+UnbLPhQlr9lVzAVSIdBSGxALR/PA22iKhYpx9p6RpmpJUfs3dMj 9uwITNzG91YjMyN82nYJ6abJA/vbeRxEzrS+WQtHU+fXPXhLbm4zvYcUYUbEm6601nfc G43E2dcNibsG+ZOChCDQ4/jN50mnJvWoAGzSxoLvITjkKO/FjfCTaFvh6HRrF/VY0frw AqFl62rUnh4ANZZp3ockQ3IRa4uK807R2IxIV5PdpS35PNxrxClSFACSgYMN3QZXudDA sZsiYacC8XPC3+FWFDCW/yQETqr8vlkeyYE5m0ZKWzGuX3wAjxShiz8D7FoHDqNSvILt WhHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language; bh=IW8ZoegfOZWEQlU2rNIVkkosxMjtt1cTaff6c7yLfxg=; b=cjxGsgLcfgdtzvHzDk3ucAwHY8CasSok6VP6AoYXdcXfl/bAeEpdb5gouFb7tlvQFr D4K8LQaB95MMf5n8c5XxCCuCBnQDHdxq+6gW6RPWRuRqgFc0ZxokMGMubL30WtmD2r9V yjGoGdzZTDueI/1u1BcC4eiEyBD63uPM0Btvz2XhZXNjHXai2lWhA8bLtwApMwfQgRrl 8uHi6YZ+91lVpyU9WpBN8kmbpcd7p3JYqNGHcGov3/Qu2KGWwMQs2VUol8oChn8ZmpS+ Aok26HYI3e0xqhRcbUmUC/SU02wfPod1gwH9adxZC4knqkNB85MZveAMnqBVyCT+0cz8 Rj8g== X-Gm-Message-State: AOAM530roMYUhPGuwp2vUz133N1tPsXfwzXrMmAOnysuwI4/rVjiqIsl 1qGKIZYcoGJvmlzhBpZACGI= X-Google-Smtp-Source: ABdhPJz+GIpltMWT3dNjpCgkWAmnKGhVOvgCTIFVBXXHeMifDBm+Caa86clJiNYjeJEH27TnaGsYYA== X-Received: by 2002:a05:600c:3586:: with SMTP id p6mr8534568wmq.28.1623075335266; Mon, 07 Jun 2021 07:15:35 -0700 (PDT) Received: from ?IPv6:2a02:908:1252:fb60:ce67:4e4d:875d:ffeb? ([2a02:908:1252:fb60:ce67:4e4d:875d:ffeb]) by smtp.gmail.com with ESMTPSA id p12sm16421128wme.43.2021.06.07.07.15.34 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 07 Jun 2021 07:15:34 -0700 (PDT) Subject: Re: [PATCH] drm/ttm: fix deref of bo->ttm without holding the lock v2 To: "Pan, Xinhui" , "dri-devel@lists.freedesktop.org" , "Das, Nirmoy" , "Huang, Ray" References: <20210528130041.1683-1-christian.koenig@amd.com> <279b72f6-cf27-c1bb-370e-a04348387105@gmail.com> From: =?UTF-8?Q?Christian_K=c3=b6nig?= Message-ID: Date: Mon, 7 Jun 2021 16:15:33 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.8.1 MIME-Version: 1.0 In-Reply-To: Content-Type: multipart/alternative; boundary="------------7BE0B58E488B6F4ACD2D5AB0" Content-Language: en-US X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?Q?Thomas_Hellstr=c3=b6m?= Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" This is a multi-part message in MIME format. --------------7BE0B58E488B6F4ACD2D5AB0 Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 8bit I take that as an reviewed-by :) Thanks, Christian. Am 07.06.21 um 16:14 schrieb Pan, Xinhui: > > [AMD Official Use Only] > > > Looks good to me. > ------------------------------------------------------------------------ > *From:* Christian König > *Sent:* Monday, June 7, 2021 8:52:21 PM > *To:* dri-devel@lists.freedesktop.org > ; Pan, Xinhui ; > Das, Nirmoy ; Huang, Ray > *Cc:* Thomas Hellström > *Subject:* Re: [PATCH] drm/ttm: fix deref of bo->ttm without holding > the lock v2 > > > Am 28.05.21 um 15:06 schrieb Thomas Hellström: > > > > On 5/28/21 3:00 PM, Christian König wrote: > >> We need to grab the resv lock first before doing that check. > >> > >> v2 (chk): simplify the change for -fixes > >> > >> Signed-off-by: Christian König > >> Signed-off-by: Thomas Hellström > > > > Hmm, OK, but this doesn't fix the swapped-bo-not-on-lru and > > unpopulating from swap_notify issues. Are you planning a follow up > > patch for those? > > As discussed in a separate thread this needs to be applied as needed > when the DG1 branch is merged. > > Xinhui, Nirmoy, Rui can anybody give be an rb/ab so that I can push this? > > Thanks, > Christian. > > > > > Thanks, > > > > Thomas > > > >> --- > >>   drivers/gpu/drm/ttm/ttm_bo.c     | 5 ++++- > >>   drivers/gpu/drm/ttm/ttm_device.c | 8 +------- > >>   2 files changed, 5 insertions(+), 8 deletions(-) > >> > >> diff --git a/drivers/gpu/drm/ttm/ttm_bo.c > b/drivers/gpu/drm/ttm/ttm_bo.c > >> index cfd0b9292397..ebcffe794adb 100644 > >> --- a/drivers/gpu/drm/ttm/ttm_bo.c > >> +++ b/drivers/gpu/drm/ttm/ttm_bo.c > >> @@ -1172,7 +1172,10 @@ int ttm_bo_swapout(struct ttm_buffer_object > >> *bo, struct ttm_operation_ctx *ctx, > >>       if (!ttm_bo_evict_swapout_allowable(bo, ctx, &locked, NULL)) > >>           return -EBUSY; > >>   -    if (!ttm_bo_get_unless_zero(bo)) { > >> +    if (!bo->ttm || !ttm_tt_is_populated(bo->ttm) || > >> +        bo->ttm->page_flags & TTM_PAGE_FLAG_SG || > >> +        bo->ttm->page_flags & TTM_PAGE_FLAG_SWAPPED || > >> +        !ttm_bo_get_unless_zero(bo)) { > >>           if (locked) > >> dma_resv_unlock(bo->base.resv); > >>           return -EBUSY; > >> diff --git a/drivers/gpu/drm/ttm/ttm_device.c > >> b/drivers/gpu/drm/ttm/ttm_device.c > >> index a1dcf7d55c90..3d9c62b93e29 100644 > >> --- a/drivers/gpu/drm/ttm/ttm_device.c > >> +++ b/drivers/gpu/drm/ttm/ttm_device.c > >> @@ -143,14 +143,8 @@ int ttm_device_swapout(struct ttm_device *bdev, > >> struct ttm_operation_ctx *ctx, > >>             for (j = 0; j < TTM_MAX_BO_PRIORITY; ++j) { > >>               list_for_each_entry(bo, &man->lru[j], lru) { > >> -                uint32_t num_pages; > >> +                uint32_t num_pages = PFN_UP(bo->base.size); > >>   -                if (!bo->ttm || !ttm_tt_is_populated(bo->ttm) || > >> -                    bo->ttm->page_flags & TTM_PAGE_FLAG_SG || > >> -                    bo->ttm->page_flags & TTM_PAGE_FLAG_SWAPPED) > >> -                    continue; > >> - > >> -                num_pages = bo->ttm->num_pages; > >>                   ret = ttm_bo_swapout(bo, ctx, gfp_flags); > >>                   /* ttm_bo_swapout has dropped the lru_lock */ > >>                   if (!ret) > --------------7BE0B58E488B6F4ACD2D5AB0 Content-Type: text/html; charset=windows-1252 Content-Transfer-Encoding: 8bit I take that as an reviewed-by :)

Thanks,
Christian.

Am 07.06.21 um 16:14 schrieb Pan, Xinhui:

[AMD Official Use Only]


Looks good to me.
From: Christian König <ckoenig.leichtzumerken@gmail.com>
Sent: Monday, June 7, 2021 8:52:21 PM
To: dri-devel@lists.freedesktop.org <dri-devel@lists.freedesktop.org>; Pan, Xinhui <Xinhui.Pan@amd.com>; Das, Nirmoy <Nirmoy.Das@amd.com>; Huang, Ray <Ray.Huang@amd.com>
Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Subject: Re: [PATCH] drm/ttm: fix deref of bo->ttm without holding the lock v2
 


Am 28.05.21 um 15:06 schrieb Thomas Hellström:
>
> On 5/28/21 3:00 PM, Christian König wrote:
>> We need to grab the resv lock first before doing that check.
>>
>> v2 (chk): simplify the change for -fixes
>>
>> Signed-off-by: Christian König <christian.koenig@amd.com>
>> Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
>
> Hmm, OK, but this doesn't fix the swapped-bo-not-on-lru and
> unpopulating from swap_notify issues. Are you planning a follow up
> patch for those?

As discussed in a separate thread this needs to be applied as needed
when the DG1 branch is merged.

Xinhui, Nirmoy, Rui can anybody give be an rb/ab so that I can push this?

Thanks,
Christian.

>
> Thanks,
>
> Thomas
>
>> ---
>>   drivers/gpu/drm/ttm/ttm_bo.c     | 5 ++++-
>>   drivers/gpu/drm/ttm/ttm_device.c | 8 +-------
>>   2 files changed, 5 insertions(+), 8 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
>> index cfd0b9292397..ebcffe794adb 100644
>> --- a/drivers/gpu/drm/ttm/ttm_bo.c
>> +++ b/drivers/gpu/drm/ttm/ttm_bo.c
>> @@ -1172,7 +1172,10 @@ int ttm_bo_swapout(struct ttm_buffer_object
>> *bo, struct ttm_operation_ctx *ctx,
>>       if (!ttm_bo_evict_swapout_allowable(bo, ctx, &locked, NULL))
>>           return -EBUSY;
>>   -    if (!ttm_bo_get_unless_zero(bo)) {
>> +    if (!bo->ttm || !ttm_tt_is_populated(bo->ttm) ||
>> +        bo->ttm->page_flags & TTM_PAGE_FLAG_SG ||
>> +        bo->ttm->page_flags & TTM_PAGE_FLAG_SWAPPED ||
>> +        !ttm_bo_get_unless_zero(bo)) {
>>           if (locked)
>>               dma_resv_unlock(bo->base.resv);
>>           return -EBUSY;
>> diff --git a/drivers/gpu/drm/ttm/ttm_device.c
>> b/drivers/gpu/drm/ttm/ttm_device.c
>> index a1dcf7d55c90..3d9c62b93e29 100644
>> --- a/drivers/gpu/drm/ttm/ttm_device.c
>> +++ b/drivers/gpu/drm/ttm/ttm_device.c
>> @@ -143,14 +143,8 @@ int ttm_device_swapout(struct ttm_device *bdev,
>> struct ttm_operation_ctx *ctx,
>>             for (j = 0; j < TTM_MAX_BO_PRIORITY; ++j) {
>>               list_for_each_entry(bo, &man->lru[j], lru) {
>> -                uint32_t num_pages;
>> +                uint32_t num_pages = PFN_UP(bo->base.size);
>>   -                if (!bo->ttm || !ttm_tt_is_populated(bo->ttm) ||
>> -                    bo->ttm->page_flags & TTM_PAGE_FLAG_SG ||
>> -                    bo->ttm->page_flags & TTM_PAGE_FLAG_SWAPPED)
>> -                    continue;
>> -
>> -                num_pages = bo->ttm->num_pages;
>>                   ret = ttm_bo_swapout(bo, ctx, gfp_flags);
>>                   /* ttm_bo_swapout has dropped the lru_lock */
>>                   if (!ret)


--------------7BE0B58E488B6F4ACD2D5AB0--