<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<style type="text/css" style="display:none;"><!-- P {margin-top:0;margin-bottom:0;} --></style>
</head>
<body dir="ltr">
<div id="divtagdefaultwrapper" style="font-size: 12pt; color: rgb(0, 0, 0); font-family: Calibri, Helvetica, sans-serif, "EmojiFont", "Apple Color Emoji", "Segoe UI Emoji", NotoColorEmoji, "Segoe UI Symbol", "Android Emoji", EmojiSymbols;" dir="ltr">
<p style="margin-top:0;margin-bottom:0"><br>
</p>
<div style="color: rgb(0, 0, 0);">
<hr style="display:inline-block;width:98%" tabindex="-1">
<div id="divRplyFwdMsg" dir="ltr"><font style="font-size:11pt" face="Calibri, sans-serif" color="#000000"><b>From:</b> Kuehling, Felix<br>
<b>Sent:</b> Thursday, January 18, 2018 4:12 PM<br>
<b>To:</b> Koenig, Christian; amd-gfx@lists.freedesktop.org; dri-devel@lists.freedesktop.org; He, Roger; Deucher, Alexander<br>
<b>Subject:</b> Re: [PATCH 1/2] drm/ttm: Don't add swapped BOs to swap-LRU list</font>
<div> </div>
</div>
<div class="BodyFragment"><font size="2"><span style="font-size:11pt;">
<div class="PlainText">On 2018-01-18 01:09 PM, Christian König wrote:<br>
> Am 18.01.2018 um 17:56 schrieb Felix Kuehling:<br>
>> A BO that's already swapped would be added back to the swap-LRU list<br>
>> for example if its validation failed under high memory pressure. This<br>
>> could later lead to swapping it out again and leaking previous swap<br>
>> storage.<br>
>><br>
>> This commit adds a condition to prevent that from happening.<br>
>><br>
>> v2: Check page_flags instead of swap_storage<br>
>><br>
>> Signed-off-by: Felix Kuehling <Felix.Kuehling@amd.com><br>
><br>
> Reviewed-by: Christian König <christian.koenig@amd.com> for both.<br>
<br>
Thanks. I pushed them to amd-staging-drm-next. I think patch 1 should<br>
also go to -fixes. Alex?<br>
</div>
<div class="PlainText"><br>
</div>
<div class="PlainText">Yup, already planning on it.</div>
<div class="PlainText"><br>
</div>
<div class="PlainText">Alex<br>
</div>
<div class="PlainText"><br>
Regards,<br>
Felix<br>
<br>
><br>
>> ---<br>
>> drivers/gpu/drm/ttm/ttm_bo.c | 3 ++-<br>
>> 1 file changed, 2 insertions(+), 1 deletion(-)<br>
>><br>
>> diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c<br>
>> index 2eb71ff..62518b6 100644<br>
>> --- a/drivers/gpu/drm/ttm/ttm_bo.c<br>
>> +++ b/drivers/gpu/drm/ttm/ttm_bo.c<br>
>> @@ -170,7 +170,8 @@ void ttm_bo_add_to_lru(struct ttm_buffer_object *bo)<br>
>> list_add_tail(&bo->lru, &man->lru[bo->priority]);<br>
>> kref_get(&bo->list_kref);<br>
>> - if (bo->ttm && !(bo->ttm->page_flags & TTM_PAGE_FLAG_SG)) {<br>
>> + if (bo->ttm && !(bo->ttm->page_flags &<br>
>> + (TTM_PAGE_FLAG_SG | TTM_PAGE_FLAG_SWAPPED))) {<br>
>> list_add_tail(&bo->swap,<br>
>> &bo->glob->swap_lru[bo->priority]);<br>
>> kref_get(&bo->list_kref);<br>
><br>
<br>
</div>
</span></font></div>
</div>
</div>
</body>
</html>