From nobody Fri Jul 24 05:21:24 2026 Received: from out-184.mta0.migadu.com (out-184.mta0.migadu.com [91.218.175.184]) (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 D674B3C73EA for ; Thu, 23 Jul 2026 06:47:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.184 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784789228; cv=none; b=Inqnkvvmq/+trzU7VdeTyFxPhchSF6NcmDC4eyxipnUntdX9/ZRRksAaaDrAYqqyyahNElDs13n8c18lSnKp8V0vCOZxcUYsoK+CNxL7PNqgwxoGQYWNJrsgbK3UZ/XNZt1d8kWALeCZMRB9og6gIXv7KRCeXT5CdaoKdITGVus= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784789228; c=relaxed/simple; bh=s1HwgLjisx4lo+RIBg9GbyHZsmUMHAUesLc/Ts5rp04=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=shCqfs2w0qwBCznx4cKKF1FBPkNgsStm9fd5AsiaYUpLoBvghS+RjH/SO2A/F8ev9W9rKZGL1iyo4Iy7XlTLOiczDC0h3rwlhn+laxGUyPVOdpMvQXeiufUQWAuF7K+IgcD83eQ6SWopbW7CYjjtW8JRfFocZ1iyZkyKPzbNCRA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=nGFeH2q9; arc=none smtp.client-ip=91.218.175.184 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="nGFeH2q9" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1784789224; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=Ei6WH7j/Rd5ujPseL0Qyo0hJQuI83ztbNpCUwfAke+o=; b=nGFeH2q9NPC13eOROsQ1BqaRcc8yOYnyYPtZGPbx3QSrUdn0S+Ve3dEUwN2bTELDHvj95Q 9NCjK46zDekQSKKhAOIIPC/Q4UBFYj57hUM7BO8QH1XZoq8p06xLynZXmdRdk4shFJdJoC RXmHGAUuk1yLIEjsXnQ9Ofbq9VsWwQs= From: Hongfu Li To: jani.nikula@linux.intel.com, joonas.lahtinen@linux.intel.com, rodrigo.vivi@intel.com, tursulin@ursulin.net, airlied@gmail.com, simona@ffwll.ch, kees@kernel.org, tzimmermann@suse.de Cc: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, hongfu.li@linux.dev, Hongfu Li Subject: [PATCH] drm/i915/userptr: Convert page APIs to folio equivalents in put_pages Date: Thu, 23 Jul 2026 14:46:51 +0800 Message-ID: <20260723064651.4100-1-hongfu.li@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Migadu-Flow: FLOW_OUT Content-Type: text/plain; charset="utf-8" From: Hongfu Li Cache the folio with page_folio() at the start of the sg_table loop, then use folio helpers directly to eliminate repeated compound_head() lookups inside page API wrappers. Signed-off-by: Hongfu Li --- drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/i915/gem/i915_gem_userptr.c b/drivers/gpu/drm/= i915/gem/i915_gem_userptr.c index 043095f93ac6..0ae68c52cc12 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_userptr.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_userptr.c @@ -160,6 +160,7 @@ i915_gem_userptr_put_pages(struct drm_i915_gem_object *= obj, struct sg_table *pages) { struct sgt_iter sgt_iter; struct page *page; + struct folio *folio; =20 if (!pages) @@ -177,7 +178,9 @@ i915_gem_userptr_put_pages(struct drm_i915_gem_object *= obj, obj->mm.dirty =3D false; =20 for_each_sgt_page(page, sgt_iter, pages) { - if (obj->mm.dirty && trylock_page(page)) { + folio =3D page_folio(page); + + if (obj->mm.dirty && folio_trylock(folio)) { /* * As this may not be anonymous memory (e.g. shmem) * but exist on a real mapping, we have to lock @@ -193,14 +196,14 @@ i915_gem_userptr_put_pages(struct drm_i915_gem_object= *obj, * on the folio. Such a try_to_unmap() will result * in us calling put_pages() and so recursively try * to lock the page. We avoid that deadlock with - * a trylock_page() and in exchange we risk missing + * a folio_trylock() and in exchange we risk missing * some page dirtying. */ - set_page_dirty(page); - unlock_page(page); + folio_mark_dirty(folio); + folio_unlock(folio); } =20 - mark_page_accessed(page); + folio_mark_accessed(folio); } obj->mm.dirty =3D false; =20 --=20 2.54.0