From nobody Wed Feb 5 19:01:27 2025 Received: from mail-qk1-f201.google.com (mail-qk1-f201.google.com [209.85.222.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6AB0722ACDC for ; Thu, 16 Jan 2025 15:53:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737042825; cv=none; b=n8exy4aMq4zrA/DvDlcew5BpBA0Co7IoBU2qyH7oL4Dg4WHBQjDIVyQBfHY96roBRA4jTJbVHV8+zWbaY8keY8ef2diKfkHd2xEN9sCGKfxIq665rkZD4c8Vgz84Rroc3inJDVB/7BGhVFkb9LgYo4C4Rx84ZPx2/Hnsbb+VKyY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737042825; c=relaxed/simple; bh=Q7aXi4fcGo6T1SehVHNdY3YQJ59WO0VvIIZiNerAq64=; h=Date:Mime-Version:Message-ID:Subject:From:To:Cc:Content-Type; b=iAfOtb0P46tcUv00caOEvaCFyYJn9/c7gYg8eJmyIb9wCrWi8uqwTRIDPhN6Sc+ctzvqG7U88+DlGVugYWbClJSPQI3H69MMfUdOPxx4jP25zHvJ4Gzk7YwlmygJ+3NwrV9SsihEibJ5KNG6VZAse2I9Cudth3bGuTNzR+gw1xE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--bgeffon.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=r5hLHK5Z; arc=none smtp.client-ip=209.85.222.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--bgeffon.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="r5hLHK5Z" Received: by mail-qk1-f201.google.com with SMTP id af79cd13be357-7b6e9fb0436so296701385a.0 for ; Thu, 16 Jan 2025 07:53:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1737042822; x=1737647622; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=+NgxzohitdM1qWFyHYVoLcjjA8gFpN7ubVQANdColG0=; b=r5hLHK5ZCoUNXy5lcs2O53Bd7U9YQQLRg1VuD1mFi/jtMgfSJEBvfGehNM+5cLK//V IUU53SWd4FWlZ8QjGl8Es58lLZR6hJZYmZFHcQvwc465o8XctGfvChWwLMzCqUPSJ4U1 cx9E5ZlI7vrw5vUGH7vwciesaeXGCCZmGMS9LUpE5+V4fp7qNBYAqq3pg7M7O1JmVuWA ZZDaU2VJmwYJCCfAW5HCrbVqa4/adTWOImRpYWujRqEFslw0NgVHN+yVcazt0614AGkq lI/XZrkVgpnO7WCXEiFRYAdnPNKAqq6DrgbNA1mb8C5P1ZqXW8adm7+6pG+H2EvhlIwK 4IZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737042822; x=1737647622; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=+NgxzohitdM1qWFyHYVoLcjjA8gFpN7ubVQANdColG0=; b=J2Jk6dM1aCiOD+SG9P0bhSrmh0DvcZNV94jrM+MfdzY2Rl/oxl4BbUEdKYcbUriASb 0L4O/Gwj4NS0uuZrhdUCHFT8VtK2+G+VF3dU4j+dkJb2x1YRI4MKQd19fcFmqm6Gj40L 7SvfiYnCKt2EDmoA1tAZgk5nKBqGfyXcvQa/3sOxKK4qjypg0gPW0yL/8s+I6RLqVeMh 6MM1AV4aP+WbWSyXi807pTZvSOt3zsVWs7C2KVT/ekoonxpP/h/Y1xYdTYIOV/yH2/th spDxaro7poxaaxR1uRUzXAuaxEZyDgSVy3Lty+YBTnAGKoMEpYingYj8dTjUuS+erVZD ZDRw== X-Forwarded-Encrypted: i=1; AJvYcCWAA6kxy/Mpg21huwmjKSHCEgxaqzAhBVkh92PFcCc9GuWnhpnsgWRG5OviiL9TQFTDXqGF6Zpqj6/7188=@vger.kernel.org X-Gm-Message-State: AOJu0YzyQivs4CoupkZVpMe3qtdXUhrGIwLz428WmrBgd7PFPDKmeiwl 7yl+sL31BkGwBTLXYo44Rz0v8k+a+z6Fu4ZfwIF4cBeblpJHMdl8pwG9Td2Am0RMJmSzSrLpGm3 5oS0Zpg== X-Google-Smtp-Source: AGHT+IGJOnZhDdWOuqF4V2FKZrAxZRVdn4bKnAiEpdg+yjoPSSoWSLu+uDS4cdr2EjL67ZS7jo3Ffc+mWC1W X-Received: from qkhn21.prod.google.com ([2002:a05:620a:2235:b0:7b6:cc15:8bb0]) (user=bgeffon job=prod-delivery.src-stubby-dispatcher) by 2002:a05:620a:5e15:b0:7be:3cd7:dd95 with SMTP id af79cd13be357-7be3cd7de65mr1979422985a.12.1737042822520; Thu, 16 Jan 2025 07:53:42 -0800 (PST) Date: Thu, 16 Jan 2025 10:53:40 -0500 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 X-Mailer: git-send-email 2.48.0.rc2.279.g1de40edade-goog Message-ID: <20250116155340.533180-1-bgeffon@google.com> Subject: [PATCH v2] drm/i915: Fix page cleanup on DMA remap failure From: Brian Geffon To: intel-gfx@lists.freedesktop.org Cc: chris.p.wilson@intel.com, jani.saarinen@intel.com, tomasz.mistat@intel.com, vidya.srinivas@intel.com, ville.syrjala@linux.intel.com, jani.nikula@linux.intel.com, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Joonas Lahtinen , Brian Geffon , stable@vger.kernel.org, Tomasz Figa Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" When converting to folios the cleanup path of shmem_get_pages() was missed. When a DMA remap fails and the max segment size is greater than PAGE_SIZE it will attempt to retry the remap with a PAGE_SIZEd segment size. The cleanup code isn't properly using the folio apis and as a result isn't handling compound pages correctly. v1 -> v2: (Ville) Fixed locations where we were not clearing mapping unevictable. Cc: stable@vger.kernel.org Cc: Ville Syrjala Cc: Vidya Srinivas Link: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/13487 Link: https://lore.kernel.org/lkml/20250116135636.410164-1-bgeffon@google.c= om/ Fixes: 0b62af28f249 ("i915: convert shmem_sg_free_table() to use a folio_ba= tch") Signed-off-by: Brian Geffon Suggested-by: Tomasz Figa Tested-by: Vidya Srinivas --- drivers/gpu/drm/i915/gem/i915_gem_object.h | 3 +-- drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 23 +++++++++------------- drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 7 ++++--- 3 files changed, 14 insertions(+), 19 deletions(-) diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object.h b/drivers/gpu/drm/i= 915/gem/i915_gem_object.h index 3dc61cbd2e11..0f122a12d4a5 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_object.h +++ b/drivers/gpu/drm/i915/gem/i915_gem_object.h @@ -843,8 +843,7 @@ int shmem_sg_alloc_table(struct drm_i915_private *i915,= struct sg_table *st, size_t size, struct intel_memory_region *mr, struct address_space *mapping, unsigned int max_segment); -void shmem_sg_free_table(struct sg_table *st, struct address_space *mappin= g, - bool dirty, bool backup); +void shmem_sg_free_table(struct sg_table *st, bool dirty, bool backup); void __shmem_writeback(size_t size, struct address_space *mapping); =20 #ifdef CONFIG_MMU_NOTIFIER diff --git a/drivers/gpu/drm/i915/gem/i915_gem_shmem.c b/drivers/gpu/drm/i9= 15/gem/i915_gem_shmem.c index fe69f2c8527d..b320d9dfd6d3 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_shmem.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_shmem.c @@ -29,16 +29,13 @@ static void check_release_folio_batch(struct folio_batc= h *fbatch) cond_resched(); } =20 -void shmem_sg_free_table(struct sg_table *st, struct address_space *mappin= g, - bool dirty, bool backup) +void shmem_sg_free_table(struct sg_table *st, bool dirty, bool backup) { struct sgt_iter sgt_iter; struct folio_batch fbatch; struct folio *last =3D NULL; struct page *page; =20 - mapping_clear_unevictable(mapping); - folio_batch_init(&fbatch); for_each_sgt_page(page, sgt_iter, st) { struct folio *folio =3D page_folio(page); @@ -180,10 +177,10 @@ int shmem_sg_alloc_table(struct drm_i915_private *i91= 5, struct sg_table *st, return 0; err_sg: sg_mark_end(sg); + mapping_clear_unevictable(mapping); if (sg !=3D st->sgl) { - shmem_sg_free_table(st, mapping, false, false); + shmem_sg_free_table(st, false, false); } else { - mapping_clear_unevictable(mapping); sg_free_table(st); } =20 @@ -209,8 +206,6 @@ static int shmem_get_pages(struct drm_i915_gem_object *= obj) struct address_space *mapping =3D obj->base.filp->f_mapping; unsigned int max_segment =3D i915_sg_segment_size(i915->drm.dev); struct sg_table *st; - struct sgt_iter sgt_iter; - struct page *page; int ret; =20 /* @@ -239,9 +234,8 @@ static int shmem_get_pages(struct drm_i915_gem_object *= obj) * for PAGE_SIZE chunks instead may be helpful. */ if (max_segment > PAGE_SIZE) { - for_each_sgt_page(page, sgt_iter, st) - put_page(page); - sg_free_table(st); + /* Leave the mapping unevictable while we retry */ + shmem_sg_free_table(st, false, false); kfree(st); =20 max_segment =3D PAGE_SIZE; @@ -265,7 +259,8 @@ static int shmem_get_pages(struct drm_i915_gem_object *= obj) return 0; =20 err_pages: - shmem_sg_free_table(st, mapping, false, false); + mapping_clear_unevictable(mapping); + shmem_sg_free_table(st, false, false); /* * shmemfs first checks if there is enough memory to allocate the page * and reports ENOSPC should there be insufficient, along with the usual @@ -402,8 +397,8 @@ void i915_gem_object_put_pages_shmem(struct drm_i915_ge= m_object *obj, struct sg_ if (i915_gem_object_needs_bit17_swizzle(obj)) i915_gem_object_save_bit_17_swizzle(obj, pages); =20 - shmem_sg_free_table(pages, file_inode(obj->base.filp)->i_mapping, - obj->mm.dirty, obj->mm.madv =3D=3D I915_MADV_WILLNEED); + mapping_clear_unevictable(file_inode(obj->base.filp)->i_mapping); + shmem_sg_free_table(pages, obj->mm.dirty, obj->mm.madv =3D=3D I915_MADV_W= ILLNEED); kfree(pages); obj->mm.dirty =3D false; } diff --git a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c b/drivers/gpu/drm/i915= /gem/i915_gem_ttm.c index 10d8673641f7..37f51a04b838 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c @@ -232,7 +232,8 @@ static int i915_ttm_tt_shmem_populate(struct ttm_device= *bdev, return 0; =20 err_free_st: - shmem_sg_free_table(st, filp->f_mapping, false, false); + mapping_clear_unevictable(filp->f_mapping); + shmem_sg_free_table(st, false, false); =20 return err; } @@ -243,8 +244,8 @@ static void i915_ttm_tt_shmem_unpopulate(struct ttm_tt = *ttm) bool backup =3D ttm->page_flags & TTM_TT_FLAG_SWAPPED; struct sg_table *st =3D &i915_tt->cached_rsgt.table; =20 - shmem_sg_free_table(st, file_inode(i915_tt->filp)->i_mapping, - backup, backup); + mapping_clear_unevictable(file_inode(i915_tt->filp)->i_mapping); + shmem_sg_free_table(st, backup, backup); } =20 static void i915_ttm_tt_release(struct kref *ref) --=20 2.48.0.rc2.279.g1de40edade-goog