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=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 37497C2D0A3 for ; Tue, 3 Nov 2020 21:13:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D5CD022226 for ; Tue, 3 Nov 2020 21:13:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604438028; bh=OX8b5EYQe+b95zAF2JHuthkCUFe9Iuso79cVvXTmIyI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ldivIrdTUSH5HgW0w2MpPs7KXR43M78FCOwPBHXL2xmM7H6kt3SVf+Bx0x86DJfKG LuU2HIGN2U/fN6Xw2yRhlgyqpcFH+zFi1QJ+Op9sAazHl8513XNNpoLWiS0JYltfmF nBEiyB9iRx6+FtIhqzsE1Nptowtm0rCxGIuFdq4c= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389352AbgKCVNr (ORCPT ); Tue, 3 Nov 2020 16:13:47 -0500 Received: from mail.kernel.org ([198.145.29.99]:57068 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389341AbgKCVNq (ORCPT ); Tue, 3 Nov 2020 16:13:46 -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 42AF620757; Tue, 3 Nov 2020 21:13:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604438025; bh=OX8b5EYQe+b95zAF2JHuthkCUFe9Iuso79cVvXTmIyI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uqCNtm+5WYvV6xvuwK8gVQDhUvyL3C5TZfKN3JwHn3JR2gorvDVEZSYMEmqmPE8OJ 59vxrlG+qJvPgcsq1sHpr6H99/e5gZL8ZEPNWQvZfP7MNiP9qfni0fBezVHRshKU4X 1G62lz7zFVr7fTgFAQbk2BaY4+iF06AZ1VnDMyPk= 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 4.14 111/125] drm/ttm: fix eviction valuable range check. Date: Tue, 3 Nov 2020 21:38:08 +0100 Message-Id: <20201103203213.604378448@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201103203156.372184213@linuxfoundation.org> References: <20201103203156.372184213@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: stable@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 @@ -721,7 +721,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;