From patchwork Mon Oct 24 17:21:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Auld X-Patchwork-Id: 13017885 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A724AECAAA1 for ; Mon, 24 Oct 2022 17:22:19 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B71C010E571; Mon, 24 Oct 2022 17:22:18 +0000 (UTC) Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) by gabe.freedesktop.org (Postfix) with ESMTPS id 514DE10E571 for ; Mon, 24 Oct 2022 17:22:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1666632133; x=1698168133; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=a6vMOmubp3apFrSN+1upSxl7BYnUAf4rp7uNKM9SRoE=; b=HZdI3HHs/75T5bP8AsFC4zZo9rBLLxeO4aMdS34IpJM2Xk+lbdw4Kl7R 4G6MpAGTRGfKQIX2npkI58VvO9AUZFZeTDw4Ui+laDHhvQ/j8XJi0f1ax V7xCECDcEnR+vlOODWhc/YbwlZIlZWZOH6PYZgO22vAKJp4yC5nODawpU 3Hq6Tcf1LpQASgrwPonk2DPQMa65a1hV2Am2/Cc9dPhghNLh/bZGfT0vf 7l9R1Dg6LUEOqh0KtfjjsyIx/pJr1kRMq3DURxk9omrIilSn4q0IW2N4x gA4+a7pCoRF3wEkEiHPUQ/GIIw5tvAJkpLwoOxH+PCYtmvpbCW4PXhTvh g==; X-IronPort-AV: E=McAfee;i="6500,9779,10510"; a="369547668" X-IronPort-AV: E=Sophos;i="5.95,209,1661842800"; d="scan'208";a="369547668" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Oct 2022 10:22:12 -0700 X-IronPort-AV: E=McAfee;i="6500,9779,10510"; a="631337279" X-IronPort-AV: E=Sophos;i="5.95,209,1661842800"; d="scan'208";a="631337279" Received: from cwilso3-mobl.fi.intel.com (HELO mwauld-desk1.intel.com) ([10.252.13.22]) by orsmga002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Oct 2022 10:22:10 -0700 From: Matthew Auld To: intel-gfx@lists.freedesktop.org Date: Mon, 24 Oct 2022 18:21:39 +0100 Message-Id: <20221024172139.80435-1-matthew.auld@intel.com> X-Mailer: git-send-email 2.37.3 MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH] drm/i915/userptr: restore probe_range behaviour X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kernel test robot , Vlastimil Babka , Matthew Wilcox , Yu Zhao Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" The conversion looks harmless, however the addr value is updated inside the loop with the previous vm_end, which then incorrectly leads to for_each_vma_range() iterating over stuff outside the range we care about. Fix this by storing the end value separately. Testcase: igt@gem_userptr_blits@probe Fixes: f683b9d61319 ("i915: use the VMA iterator") Reported-by: kernel test robot Signed-off-by: Matthew Auld Cc: Tvrtko Ursulin Cc: Matthew Wilcox (Oracle) Cc: Vlastimil Babka Cc: Yu Zhao Reviewed-by: Tvrtko Ursulin --- drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/gem/i915_gem_userptr.c b/drivers/gpu/drm/i915/gem/i915_gem_userptr.c index b7e24476a0fd..dadb3e3fa9c8 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_userptr.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_userptr.c @@ -427,9 +427,10 @@ probe_range(struct mm_struct *mm, unsigned long addr, unsigned long len) { VMA_ITERATOR(vmi, mm, addr); struct vm_area_struct *vma; + unsigned long end = addr + len; mmap_read_lock(mm); - for_each_vma_range(vmi, vma, addr + len) { + for_each_vma_range(vmi, vma, end) { /* Check for holes, note that we also update the addr below */ if (vma->vm_start > addr) break;