From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.9]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 02AFB40F8D0 for ; Tue, 28 Jul 2026 09:03:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.9 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785229401; cv=none; b=BzRqQ5FdnMaDftBVlXuL9F5hDmwJ96D/xyKqIccpgHXu87buRhciBMRjHaMdqr8MsiGdq+eoivlHtKXLZlDJHNuNfObsyPO1xTdslwF6FJDYnKXO49Snt05ogf57wxvz45SOVw+vugpAdCeGXk+07rJjz83/+r5KyIs/6Nnu7+M= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785229401; c=relaxed/simple; bh=uYXE00ZDNZg6McXWLG6zrQgvAbtT0UyrMHagh+XWbjM=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type; b=LVU+1/axLRh8/BY4GrAnf233qjbrfpNq3ctDriDzsYO5raIK+9949ibA0MVB3n8VRyGMu587ETcOAJA4XnBaACEDgaB9r9hhfWvlKdHeW7BNYIt5MhMcWBVC0ziGhxwzkIpOsPN3Vcg7u5S2mM/GWSZUnExYowTZ+NGrVMCjaRw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=JjWy0zdt; arc=none smtp.client-ip=192.198.163.9 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="JjWy0zdt" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1785229400; x=1816765400; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=uYXE00ZDNZg6McXWLG6zrQgvAbtT0UyrMHagh+XWbjM=; b=JjWy0zdtxHQJMZIU7/RGPdgQ5oAZgS/IfbB1+LnC3jlzfUVjmZsqbzoP 1jwN9tEoeDKMSX7X5UJA6xSTDNX2rEYIYY1skmC76WNOYj3zFrf5lLt6J 8Jdu7fMmBjJkAjEUzHmtdEOf0JytuEJwb0qT8pEfn3jFN+P+tsvuiVa4X 4t3m7zXtXeyzsn9vByY49N5kDqNZso8EzpXPDzXmkrahSW23Ra18wvKU4 T2BvElumI/zrEWccGRbPHWly76XMtQfxzKXF2pgTJcxgSqDTwalGh413R rgdsBw5uvzfjfVvdKMrn51p+nFBT0FEpbSTSEANXSi2TslykRgZ+vbfCE Q==; X-CSE-ConnectionGUID: XR14sH4OT86lqTqn/CnBHQ== X-CSE-MsgGUID: XBz9kJnfQs+xNPxmcH7vYA== X-IronPort-AV: E=McAfee;i="6800,10657,11858"; a="96467712" X-IronPort-AV: E=Sophos;i="6.25,190,1779174000"; d="scan'208";a="96467712" Received: from fmviesa001.fm.intel.com ([10.60.135.141]) by fmvoesa103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Jul 2026 02:03:19 -0700 X-CSE-ConnectionGUID: Bi42+ACIRWSEixkxN1wDDg== X-CSE-MsgGUID: wAwgQ9n3QgWzF+/kKoD6EQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.25,190,1779174000"; d="scan'208";a="284196203" Received: from varungup-desk.iind.intel.com ([10.190.238.71]) by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Jul 2026 02:03:15 -0700 From: Arvind Yadav To: intel-xe@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Cc: simona@ffwll.ch, mripard@kernel.org, tzimmermann@suse.de, airlied@gmail.com, maarten.lankhorst@linux.intel.com, matthew.brost@intel.com, himal.prasad.ghimiray@intel.com, thomas.hellstrom@linux.intel.com Subject: [PATCH] drm/pagemap: Reset migration page count on eviction retry Date: Tue, 28 Jul 2026 14:33:04 +0530 Message-ID: <20260728090304.1264759-1-arvind.yadav@intel.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit drm_pagemap_evict_to_ram() may retry eviction, but mpages retains the count from the previous attempt. A retry can therefore continue to the copy path even when no RAM pages were populated. Reset mpages at the retry label so it reflects only the current attempt. Fixes: 99624bdff867 ("drm/gpusvm: Add support for GPU Shared Virtual Memory") Cc: Matthew Brost Cc: Thomas Hellström Cc: Himal Prasad Ghimiray Cc: Maarten Lankhorst Cc: Maxime Ripard Cc: Thomas Zimmermann Cc: David Airlie Cc: Simona Vetter Signed-off-by: Arvind Yadav --- drivers/gpu/drm/drm_pagemap.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_pagemap.c b/drivers/gpu/drm/drm_pagemap.c index 4a794544b7dc..7faba4acd59f 100644 --- a/drivers/gpu/drm/drm_pagemap.c +++ b/drivers/gpu/drm/drm_pagemap.c @@ -1122,7 +1122,7 @@ int drm_pagemap_evict_to_ram(struct drm_pagemap_devmem *devmem_allocation) { const struct drm_pagemap_devmem_ops *ops = devmem_allocation->ops; struct drm_pagemap_iova_state state = {}; - unsigned long npages, mpages = 0; + unsigned long npages, mpages; struct page **pages; unsigned long *src, *dst; struct drm_pagemap_addr *pagemap_addr; @@ -1133,6 +1133,7 @@ int drm_pagemap_evict_to_ram(struct drm_pagemap_devmem *devmem_allocation) npages = devmem_allocation->size >> PAGE_SHIFT; retry: + mpages = 0; if (!mmget_not_zero(devmem_allocation->mm)) return -EFAULT; -- 2.43.0