Received: by 2002:a05:6358:3188:b0:123:57c1:9b43 with SMTP id q8csp11232128rwd; Thu, 22 Jun 2023 10:20:48 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ71fTnUzoOC2UGpYAZpnnJHngNeM1zNWsw/UH6KgFfb9K56gsSu7tscfJpU446vpxcyAgBi X-Received: by 2002:a05:6a20:7349:b0:11c:d2d0:6439 with SMTP id v9-20020a056a20734900b0011cd2d06439mr36099946pzc.25.1687454447959; Thu, 22 Jun 2023 10:20:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687454447; cv=none; d=google.com; s=arc-20160816; b=j+ETu5jlXaPC57G1210R4MC5bDBimO2fD/LFsDEeQSVZEeQIQiqa9/ZMXCv8LLRlui xgs63n7l9UpQXjF4a8VMcQgAd/HXEOylj5QlfATEgjg30d83ucATnqf0Cer14sEto0dz K6/SSI3drbuG8weAOhyPyeddLHxpAvWqw1A/ioVoBnJw3v6YTqNG8Hq7OpHjmzUWnBIL fA/KSD+eCzily8a8hCXVmHtNN713lzRWrqG7WGw3yV8jXfCYQRT+RJpR6fJHipeUKLlD E/dcLY7a8EZ/6PW/drR1BGGpdOHPKk5SQQdd8n4FCXmDc7QnlHeFT/q3ZAIibmuS/idA VZ+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:in-reply-to:from :references:cc:to:content-language:subject:user-agent:mime-version :date:message-id:dkim-signature; bh=6eW1yGB6R4l/hA8KebBHJaYOHhCmZssacIRoU/x9Xbw=; b=G10XHvsMzc7NiZAq69s/5GN7cyhtw2ESzRKALfEd3n8tYeJPQXzoPvc2L/szlv8jMF M87ZZiSY2DZGZsmDTm3ALbiB03LxG6Zad1LHq1oHDuIA6VMQyXqweLW1dGTi3gIR+G19 7+8KGkGv4p4Ap5l9Wj1O+AiiD4zTAZ9cwJVh8nOhvjHDh2COCxpzrZ2VrKk89r8MMxwr 2Q5h5n10GUHIL0YJ31ZG4ApqvgQeABFuompH90QaKRa/ijrAbfY23Ti/T5lT172CJaUk MFfbBMV337nPmb4kgm9No3wHRiIVcyS+i2GNSWOgqRL+6jMbnWxX5HJsG2MS8pjvxwB5 6R8g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=nicibwG0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id v70-20020a638949000000b005443c85156bsi886153pgd.222.2023.06.22.10.20.34; Thu, 22 Jun 2023 10:20:47 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=nicibwG0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230091AbjFVRIx (ORCPT + 99 others); Thu, 22 Jun 2023 13:08:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48884 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229802AbjFVRIw (ORCPT ); Thu, 22 Jun 2023 13:08:52 -0400 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 48499C3; Thu, 22 Jun 2023 10:08:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1687453731; x=1718989731; h=message-id:date:mime-version:subject:to:cc:references: from:in-reply-to:content-transfer-encoding; bh=Cf+dpIYfAbSBeiWlETELLtCHHrcSgMWgIRdJXuiqLaE=; b=nicibwG0x6SZ68yxH1a7avLcbIeR/E51LExxCtTg5xQdUlbc5sL4zESY HNUmxOhz0qgn6EIpkeo+VFpZr2LkNO80+6uyIE5pfvUhwY9nhT5UpeX4n HWGSCQBLhMX+CTDFeI1VGHQTpgnGoIZGlXUrOYHwUBlMFBDr8imb4PYnj h8g7cX3DIY0sP52xoIOTkupkaGbfG/HTFpIDXozhTRHHBeVMI5GDTtc/p implGM17DHq+FHz6v1kUnMYd+A08Mi5Mq5Q0Ph3iilKw2CE/o8lKapCrr WjDbxmoYih6lkVT/oqGpNTOUMHj5rQHF/K3phBOqg9TPyzT7wnUu7rwTe Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10749"; a="363104865" X-IronPort-AV: E=Sophos;i="6.01,149,1684825200"; d="scan'208";a="363104865" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Jun 2023 10:04:06 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10749"; a="1045277900" X-IronPort-AV: E=Sophos;i="6.01,149,1684825200"; d="scan'208";a="1045277900" Received: from shari19x-mobl1.gar.corp.intel.com (HELO [10.249.254.173]) ([10.249.254.173]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Jun 2023 10:03:59 -0700 Message-ID: Date: Thu, 22 Jun 2023 19:03:56 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.11.1 Subject: Re: [Intel-gfx] [PATCH 3/4] drm/ttm: Don't leak a resource on eviction error Content-Language: en-US To: =?UTF-8?Q?Christian_K=c3=b6nig?= , Andi Shyti Cc: intel-xe@lists.freedesktop.org, Andrey Grodzovsky , =?UTF-8?Q?Christian_K=c3=b6nig?= , intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org, Huang Rui , dri-devel@lists.freedesktop.org References: <20230622101412.78426-1-thomas.hellstrom@linux.intel.com> <20230622101412.78426-4-thomas.hellstrom@linux.intel.com> <3a089ebb-7389-3d3e-beb0-13a8d64eb04d@linux.intel.com> <196a7f74-66ac-1eae-4795-a42691f4793e@amd.com> From: =?UTF-8?Q?Thomas_Hellstr=c3=b6m?= In-Reply-To: <196a7f74-66ac-1eae-4795-a42691f4793e@amd.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,NICE_REPLY_A,RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 6/22/23 16:48, Christian König wrote: > > > Am 22.06.23 um 16:08 schrieb Thomas Hellström: >> >> On 6/22/23 15:55, Andi Shyti wrote: >>> Hi Thomas, >>> >>> On Thu, Jun 22, 2023 at 12:14:11PM +0200, Thomas Hellström wrote: >>>> On eviction errors other than -EMULTIHOP we were leaking a resource. >>>> Fix. >>>> >>>> Fixes: 403797925768 ("drm/ttm: Fix multihop assert on eviction.") >>>> Cc: Andrey Grodzovsky >>>> Cc: Christian König >>>> Cc: Christian Koenig >>>> Cc: Huang Rui >>>> Cc: dri-devel@lists.freedesktop.org >>>> Cc: # v5.15+ >>>> Signed-off-by: Thomas Hellström >>>> --- >>>>   drivers/gpu/drm/ttm/ttm_bo.c | 16 ++++++++-------- >>>>   1 file changed, 8 insertions(+), 8 deletions(-) >>>> >>>> diff --git a/drivers/gpu/drm/ttm/ttm_bo.c >>>> b/drivers/gpu/drm/ttm/ttm_bo.c >>>> index 615d30c4262d..89530f2a027f 100644 >>>> --- a/drivers/gpu/drm/ttm/ttm_bo.c >>>> +++ b/drivers/gpu/drm/ttm/ttm_bo.c >>>> @@ -462,14 +462,14 @@ static int ttm_bo_evict(struct >>>> ttm_buffer_object *bo, >>>>       ret = ttm_bo_handle_move_mem(bo, evict_mem, true, ctx, &hop); >>>>       if (ret == -EMULTIHOP) { >>>>           ret = ttm_bo_bounce_temp_buffer(bo, &evict_mem, ctx, &hop); >>>> -        if (ret) { >>>> -            if (ret != -ERESTARTSYS && ret != -EINTR) >>>> -                pr_err("Buffer eviction failed\n"); >>>> -            ttm_resource_free(bo, &evict_mem); >>>> -            goto out; >>>> -        } >>>> -        /* try and move to final place now. */ >>>> -        goto bounce; >>>> +        if (!ret) >>>> +            /* try and move to final place now. */ >>>> +            goto bounce; >>> As we are at this, can't we replace this with a while()? Goto's >>> used instead of a while loop are a fist in the eye... >> >> I'm completely OK with that. this patch already did away with one of >> them. Let's hear Christian's opinion first, though. > > I'm not a fan of that goto either, but could we somehow avoid the > while(1) ? E.g. something like do { } while (!ret) after handling the > multihop? I think the construct that makes it most obvious what's happening, although it needs two tests for -EMULTIHOP is something like do { ....    if (ret != -EMULTIHOP)       break;    .... } while (ret ==-EMULTIHOP); Will be out tomorrow, though, so I don't have time to respin before Monday. /Thomas > > Christian. > >> >> Thanks, >> >> Thomas >> >> >> >> >> >>> >>> It looks even better: >>> >>>     while (1) { >>>         ret = ttm_bo_handle_move_mem(bo, evict_mem, true, ctx, &hop); >>>         if (!ret) >>>             break; >>> >>>         if (ret == -EMULTIHOP) >>>             ret = ttm_bo_bounce_temp_buffer(bo, &evict_mem, >>>                             ctx, &hop); >>> >>>         /* try again */ >>>         if (!ret) >>>             continue; >>> >>>         ttm_resource_free(bo, &evict_mem); >>>         if (ret != -ERESTARTSYS && ret != -EINTR) >>>             pr_err("Buffer eviction failed\n"); >>> >>>         break; >>>     } >>> >>> Andi >>> >>>> +    } >>>> +    if (ret) { >>>> +        ttm_resource_free(bo, &evict_mem); >>>> +        if (ret != -ERESTARTSYS && ret != -EINTR) >>>> +            pr_err("Buffer eviction failed\n"); >>>>       } >>>>   out: >>>>       return ret; >>>> -- >>>> 2.40.1 >