Message ID | 20230622101412.78426-5-thomas.hellstrom@linux.intel.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp4963459vqr; Thu, 22 Jun 2023 03:30:40 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5zeI2RqCJddERRsAsu7+SmgwqZF5iTlYnuv5EiyZTRXrT+kvqlLuQSWJ9AjvAsHN6VDLWk X-Received: by 2002:a17:90a:b89:b0:260:ba1e:9590 with SMTP id 9-20020a17090a0b8900b00260ba1e9590mr11910432pjr.3.1687429840515; Thu, 22 Jun 2023 03:30:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687429840; cv=none; d=google.com; s=arc-20160816; b=vD/vWX1npztAlnk2iSUmODsoCrRV94NrtOiydoHhnRkYIt/xad5d9skKBeejyEBH5K rrcA7nwoA1IV01P4piQTf07lQz2q7fu2qcVtjO01TyDdK+Jy6c3tkXfGT9n/5Atx360x dDz+GibK3pazjcZxtqTQNjh8b5+1PwCMJtMiA4GNLzccUBfZTE4hK2NzuyGT3AN+LjEJ OK1pH5hEjmJnrribDmOy0HCKE+JBstEYo/eenNtlfvbE5bYcjyyMOxgKk7AnEvZkm87P uikCotfl7HWLriEaLIWgt3M4m0uLg0p5ISez21Mg9wdljsqo80x8ZIg+GpBtuTq/2lnZ +3Iw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=stnnhuRiGIkf1IdHs3mKNn5iztktXq7SwWqq6PQXHgo=; b=gHJ0Icws1lenM4SGNsEm86VMrarz4WO0eaCBaqnkRZ5MxubUxtgrCNd6bkUx65yduC 1p/VNXGOwEBF21BkGG0bqTy8IgWAHvwTRpxT2wDMtOPQn9r2lh6O2l6tb+gw+NHtiXPd hI1JWZQSUqoOW/nDv6+bqNG1tUdF5iFWP8XC+ttSOq5tyTdbAAc/pd+AC66GyOvo5lzq 9PCnr04sTFdLdD7M0p8ASlmz/kFx5dUMMaMBu/eXeAcoI5j0o1S5G+Vo2lWzFKyIi9t9 HQFfuSs8MEsPVorMtdmrYefvYuox3aKU4ugK5Y5ooNcHrw2H7F90MqC2fNxu0+hsz1u+ Ps9w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=RuQakajh; 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: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id na15-20020a17090b4c0f00b0025bf2858c1dsi6975235pjb.106.2023.06.22.03.30.26; Thu, 22 Jun 2023 03:30:40 -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=RuQakajh; 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 S231502AbjFVKVr (ORCPT <rfc822;maxin.john@gmail.com> + 99 others); Thu, 22 Jun 2023 06:21:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41472 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231492AbjFVKVO (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Thu, 22 Jun 2023 06:21:14 -0400 Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CD5291FDC; Thu, 22 Jun 2023 03:21:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1687429262; x=1718965262; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=nsBrKyprDyQqXkX1mcuTIRsLusoyhrCBKqlpyi/2hsM=; b=RuQakajhlC/z47dEopc3dERRKZqhayFPutDZOmVx0idhQQPCkAhu3Qs1 3LCjsgR0QokJ//T4U519g12VXVK+B3dkEulJ//boUvxEDZAKwDmad/MNY rR1d4Glt5W8Mwu+nuJM37uZ3WMj4nqssphgHcCIGnAAwDEPahBHIuw97q A9Cl+lhOEibBIN6CQmCF0J06Ra+f1eprH4Sm51y1kD8tCx4mc8ODos1+S yiC1ZjNxwob4aZyMREao9xiZByV6QEnj0qxkR8WXkoG4u+mnghzSst8/D SuQyig1+/R81hwtpiqeUz4ZpBfB1JiBRlog00FzSzZtvi6QJYY+KgsRCn g==; X-IronPort-AV: E=McAfee;i="6600,9927,10748"; a="345182396" X-IronPort-AV: E=Sophos;i="6.00,263,1681196400"; d="scan'208";a="345182396" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Jun 2023 03:15:10 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10748"; a="692194650" X-IronPort-AV: E=Sophos;i="6.00,263,1681196400"; d="scan'208";a="692194650" Received: from shari19x-mobl1.gar.corp.intel.com (HELO thellstr-mobl1.intel.com) ([10.249.254.173]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Jun 2023 03:15:07 -0700 From: =?utf-8?q?Thomas_Hellstr=C3=B6m?= <thomas.hellstrom@linux.intel.com> To: intel-xe@lists.freedesktop.org Cc: =?utf-8?q?Thomas_Hellstr=C3=B6m?= <thomas.hellstrom@linux.intel.com>, =?utf-8?q?Christian_K=C3=B6nig?= <christian.koenig@amd.com>, =?utf-8?q?Chri?= =?utf-8?q?stian_K=C3=B6nig?= <ckoenig.leichtzumerken@gmail.com>, dri-devel@lists.freedesktop.org, stable@vger.kernel.org, intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH 4/4] drm/ttm: Don't leak a resource on swapout move error Date: Thu, 22 Jun 2023 12:14:12 +0200 Message-Id: <20230622101412.78426-5-thomas.hellstrom@linux.intel.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230622101412.78426-1-thomas.hellstrom@linux.intel.com> References: <20230622101412.78426-1-thomas.hellstrom@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,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: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1769398432329870865?= X-GMAIL-MSGID: =?utf-8?q?1769398432329870865?= |
Series |
drm/ttm: Fixes around resources and bulk moves
|
|
Commit Message
Thomas Hellström
June 22, 2023, 10:14 a.m. UTC
If moving the bo to system for swapout failed, we were leaking
a resource. Fix.
Fixes: bfa3357ef9ab ("drm/ttm: allocate resource object instead of embedding it v2")
Cc: Christian König <christian.koenig@amd.com>
Cc: "Christian König" <ckoenig.leichtzumerken@gmail.com>
Cc: dri-devel@lists.freedesktop.org
Cc: <stable@vger.kernel.org> # v5.14+
Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
---
drivers/gpu/drm/ttm/ttm_bo.c | 1 +
1 file changed, 1 insertion(+)
Comments
On 6/22/2023 12:14 PM, Thomas Hellström wrote: > If moving the bo to system for swapout failed, we were leaking > a resource. Fix. > > Fixes: bfa3357ef9ab ("drm/ttm: allocate resource object instead of embedding it v2") > Cc: Christian König <christian.koenig@amd.com> > Cc: "Christian König" <ckoenig.leichtzumerken@gmail.com> > Cc: dri-devel@lists.freedesktop.org > Cc: <stable@vger.kernel.org> # v5.14+ > Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com> Reviewed-by: Nirmoy Das <nirmoy.das@intel.com> > --- > drivers/gpu/drm/ttm/ttm_bo.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c > index 89530f2a027f..d737ddd7f4c0 100644 > --- a/drivers/gpu/drm/ttm/ttm_bo.c > +++ b/drivers/gpu/drm/ttm/ttm_bo.c > @@ -1166,6 +1166,7 @@ int ttm_bo_swapout(struct ttm_buffer_object *bo, struct ttm_operation_ctx *ctx, > ret = ttm_bo_handle_move_mem(bo, evict_mem, true, ctx, &hop); > if (unlikely(ret != 0)) { > WARN(ret == -EMULTIHOP, "Unexpected multihop in swaput - likely driver bug.\n"); > + ttm_resource_free(bo, &evict_mem); > goto out; > } > }
Hi Thomas, On Thu, Jun 22, 2023 at 12:14:12PM +0200, Thomas Hellström wrote: > If moving the bo to system for swapout failed, we were leaking > a resource. Fix. > > Fixes: bfa3357ef9ab ("drm/ttm: allocate resource object instead of embedding it v2") > Cc: Christian König <christian.koenig@amd.com> > Cc: "Christian König" <ckoenig.leichtzumerken@gmail.com> > Cc: dri-devel@lists.freedesktop.org > Cc: <stable@vger.kernel.org> # v5.14+ > Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com> Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com> Andi
diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c index 89530f2a027f..d737ddd7f4c0 100644 --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c @@ -1166,6 +1166,7 @@ int ttm_bo_swapout(struct ttm_buffer_object *bo, struct ttm_operation_ctx *ctx, ret = ttm_bo_handle_move_mem(bo, evict_mem, true, ctx, &hop); if (unlikely(ret != 0)) { WARN(ret == -EMULTIHOP, "Unexpected multihop in swaput - likely driver bug.\n"); + ttm_resource_free(bo, &evict_mem); goto out; } }