From nobody Wed Feb 5 19:03:59 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 70EBE22ACD4 for ; Thu, 16 Jan 2025 13:56:48 +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=1737035810; cv=none; b=a0QM2ueqSoNCe5pMzRRatpY2OMnx7r0Lt7pv46UeIlE4GS0taG4/I7WnXF55AKiRP8AbrV+n8VuVrR41kSEtWK0r29ZE7I+SqcD2nGg5XCc/DTokvGy7xJ/QQPUOCjpiSxVLsLWHnx2o+kThwgdF5KTxi/zNgghxqqxOy1dl2MQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737035810; c=relaxed/simple; bh=cLbUMu8Y2k29sTI3vapBPiR8yzp1E/NlJZT6Gk3inIA=; h=Date:Mime-Version:Message-ID:Subject:From:To:Cc:Content-Type; b=b/9J4WR54I5SAZ2iTyHIPwnCG8vcoVrs18Z3DI+0vfepsWw9gy0KSrgg+c5AUEc8o+/CEFjHLblGIhSUzXnku9h+jmE5XRuxHjYXP9xdJEF7mAyUqLHqseH4CTqOt3yFw8Qrs7LIwnpAhlMplc9x0Lkb2AG7AuB6N7qL22Q2l2k= 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=xB09kjnV; 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="xB09kjnV" Received: by mail-qk1-f201.google.com with SMTP id af79cd13be357-7bb849aa5fbso191150485a.0 for ; Thu, 16 Jan 2025 05:56:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1737035807; x=1737640607; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=Afmzcj7YvLn6GXyrbKyUaoeIfkKGSsahsDNZPlhAdRk=; b=xB09kjnV0Y42mkiCkkMkt+CF/5Ye7rGsTRd71OrurszPH05WcpsDnuP711RwtquJVf NSWj45Xp70sOpwDZv1Hih4jNcCQdTEtpnF8IzVTLYAjOdnFNJOYShEd+IBk3tl/G2ePZ KN4yc0gsMmJCLJKpGaqE3+gGANBrOSK3vV1gJ2I4W8BAXEV7c7ZQI2rVZmTpPNGttZyq EBx6G8VCKBegLpSDxNTQzPMiTleKxmGHKwChNHgaenq2YCF7B/P0YY0HjSiTO0ZbAbS1 xXDcJARS0HWX9ebl2H3IFAbIlMPP13tQ3XnYM0/0n27ncWdcNWsX9lyE7KcQ76MZ6umy ztxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737035807; x=1737640607; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=Afmzcj7YvLn6GXyrbKyUaoeIfkKGSsahsDNZPlhAdRk=; b=USTkWn8HW0zsxcXRMZHafWO1WolANUa7GRLpVuJPMir+6Z4bn6jjeTD313OXQyWDGz nOhm2yLe1mFdfCC0iAkt7J4lhkHKbtO6QHFUq140y+ZjsyVQxuir71B1bprt4b9Gtn8h LqwGLKADaEKEpOpGJKcLS+9KqO6AmNWMtiuM+e4aIjf5fWw/V+rbat0UZG/qHPglTCxJ X4WHtzOLx/9Z2SXPQNyTV+naGbLZ2+TrXzl41rYfnUWk+dZr35HVNCjiN6v5d1n2I87y niulwUfl+au8AfyjTEona7dzSoC4nbm+FFRc69z5gOJ5wxLSmAL/kU5Cdz0yo7/R8ZrY dkUg== X-Forwarded-Encrypted: i=1; AJvYcCXxA/MlmXdB8cv2diJO/9IO2sLzRuZcMPNYgjMQDf15UoKGY94OIfQmE7tPqNcrxYDOMgUuwN9UIy4Z7ZQ=@vger.kernel.org X-Gm-Message-State: AOJu0Yy7wkkqngcD4BtL8KIwLOe+T4Btl3Syc6MqNV0tvlE2HT5+tLiL 2D8FRiyfufezmXZQHSOWDmy1klNZO6/zUfs+uBfTf7HJNldnqG8KU4Vnkcbx5CiAhCoYUYr2y/j pEnbGGw== X-Google-Smtp-Source: AGHT+IF3gKnK89tbVwHbUDUwD1lEN0/kaHGYmsaSOGreDcBut40sY3iWcjgUhYRrT2wdvYDMwQDTtKijor7j X-Received: from qkbbn9.prod.google.com ([2002:a05:620a:2ac9:b0:7b6:e6cf:180e]) (user=bgeffon job=prod-delivery.src-stubby-dispatcher) by 2002:a05:620a:40c1:b0:7b6:db05:143c with SMTP id af79cd13be357-7bcd9759e7fmr5322280485a.45.1737035807417; Thu, 16 Jan 2025 05:56:47 -0800 (PST) Date: Thu, 16 Jan 2025 08:56:36 -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: <20250116135636.410164-1-bgeffon@google.com> Subject: [PATCH] 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 , 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. Link: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/13487 Fixes: 0b62af28f249 ("i915: convert shmem_sg_free_table() to use a folio_ba= tch") Signed-off-by: Brian Geffon Suggested-by: Tomasz Figa --- drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) 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..02ddab5bf5c0 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_shmem.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_shmem.c @@ -37,8 +37,6 @@ void shmem_sg_free_table(struct sg_table *st, struct addr= ess_space *mapping, 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 +178,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); } else { - mapping_clear_unevictable(mapping); sg_free_table(st); } =20 @@ -209,8 +207,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 +235,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, mapping, false, false); kfree(st); =20 max_segment =3D PAGE_SIZE; @@ -265,6 +260,7 @@ static int shmem_get_pages(struct drm_i915_gem_object *= obj) return 0; =20 err_pages: + mapping_clear_unevictable(mapping); shmem_sg_free_table(st, mapping, false, false); /* * shmemfs first checks if there is enough memory to allocate the page @@ -402,6 +398,7 @@ 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 + mapping_clear_unevictable(file_inode(obj->base.filp)->i_mapping); shmem_sg_free_table(pages, file_inode(obj->base.filp)->i_mapping, obj->mm.dirty, obj->mm.madv =3D=3D I915_MADV_WILLNEED); kfree(pages); --=20 2.48.0.rc2.279.g1de40edade-goog