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=-9.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 25BCBC4742C for ; Tue, 3 Nov 2020 20:52:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D5F11223BD for ; Tue, 3 Nov 2020 20:52:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604436757; bh=kbL2i6ClqnBNgUCZXfy2B8qSZM3vFB5Ne8HZ2QbPPNU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=FWxfkSjhsKW0PkLra53XxPHmQmtOiShYfMSytIDAiitqZ5TWNEXOtuWPko7MKbmdV FEoYOSiir/h4IuUOfexwnOuINJxwQawBAsOmgpiUKLzwGDlOkgSSxWDKeDdEFnlLmg TYn+K0GTky2bMfDtSPp+bQsqfINB0HUE4qbakO9I= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732117AbgKCUwg (ORCPT ); Tue, 3 Nov 2020 15:52:36 -0500 Received: from mail.kernel.org ([198.145.29.99]:49234 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732109AbgKCUwd (ORCPT ); Tue, 3 Nov 2020 15:52:33 -0500 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D3E7E2053B; Tue, 3 Nov 2020 20:52:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604436752; bh=kbL2i6ClqnBNgUCZXfy2B8qSZM3vFB5Ne8HZ2QbPPNU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=V4qx9uoQd+hMtdA6gm7FfBcLTTPwK8P3M7OEJCWMp/bQXfaapUol4R0CeUOFIPi9T TyO2QwRumYj4hPnEEBqTot0fvwmfiNiZ+NbCIA1hX3YLQCWENeyByKXbzExDK1Pe9a 2kNLaWfjRF7ggJkPQ1BRHSab4M0pQE378QP6/Qjs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dave Airlie , =?UTF-8?q?Christian=20K=C3=B6nig?= Subject: [PATCH 5.9 349/391] drm/ttm: fix eviction valuable range check. Date: Tue, 3 Nov 2020 21:36:40 +0100 Message-Id: <20201103203410.688165824@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201103203348.153465465@linuxfoundation.org> References: <20201103203348.153465465@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dave Airlie commit fea456d82c19d201c21313864105876deabe148b upstream. This was adding size to start, but pfn and start are in pages, so it should be using num_pages. Not sure this fixes anything in the real world, just noticed it during refactoring. Signed-off-by: Dave Airlie Reviewed-by: Christian König Cc: stable@vger.kernel.org Link: https://patchwork.freedesktop.org/patch/msgid/20201019222257.1684769-2-airlied@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/ttm/ttm_bo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c @@ -694,7 +694,7 @@ bool ttm_bo_eviction_valuable(struct ttm /* Don't evict this BO if it's outside of the * requested placement range */ - if (place->fpfn >= (bo->mem.start + bo->mem.size) || + if (place->fpfn >= (bo->mem.start + bo->mem.num_pages) || (place->lpfn && place->lpfn <= bo->mem.start)) return false;