From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-il1-f174.google.com (mail-il1-f174.google.com [209.85.166.174]) (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 3CCE0248F4E for ; Tue, 27 May 2025 13:33:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.174 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748352783; cv=none; b=Z4hNMeSdtuL4gCBToimIXDHa5BlgcJBu8SATNT6aZ2zSWPd2i1L8UxZtzLtURkRIH36CBYouDNeV+l0c0+JoULP1wbPdrLUo0magkUTndfAN+nBqmoo17/Jhb6g3yR5N+eFKgjrlya/JLvwWTflWhVEHwNKBIVGWI/h8v6wTfsI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748352783; c=relaxed/simple; bh=SnfCPd09KI83AwFhxqISP1WhHm2KbgZjrK8l6DCnIbU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BcfhJxVgLJuoT1Lm3wA00Bd2vZU3EGjfqh0IRy/6YMgI1sD5Ibcs4vvEeuGFSGzgVgJQWCWs5/ldIZ5Wu36/P2n8GLCliIRm32KlYiGjXekSiwYCvAQD6uk45RsZwDpGXic5bheFNA3n7jUrkvR5a8CYxV/Fg3OiIBdQ01JByTg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk; spf=pass smtp.mailfrom=kernel.dk; dkim=pass (2048-bit key) header.d=kernel-dk.20230601.gappssmtp.com header.i=@kernel-dk.20230601.gappssmtp.com header.b=M14tqoi3; arc=none smtp.client-ip=209.85.166.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=kernel.dk Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel-dk.20230601.gappssmtp.com header.i=@kernel-dk.20230601.gappssmtp.com header.b="M14tqoi3" Received: by mail-il1-f174.google.com with SMTP id e9e14a558f8ab-3d948ce7d9dso8906825ab.2 for ; Tue, 27 May 2025 06:33:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20230601.gappssmtp.com; s=20230601; t=1748352781; x=1748957581; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=AeTFSAEd3e9K4f20EuEzamS6jJURw+VLEXVfeVvYL4A=; b=M14tqoi3cEATmh2wq0jFZ6CW95GQDWFGv22lw8onrS5YknxeHpS5vooAYC8LKk67+8 Pz7MpRcrInVrdSxbHeMPvYdPtAH+SeRc3d1RJYhlUTi1/EkYx+7hNgZYJ740DVOUz98n IUi3T0q5eTVe236gb2Vg1fes9GpvV8EXTVeP333GuYxRd223Kb7Yc58Jl9FF38ElKiVz AvwEPKQmZ+tbFFiDNPDzApGXe/olt1VPLr4Omdo1rRHN9S2ckV9otWy9TuZWVp6uOENB ffr56nvQ83IEe17z9w4wydP1Xb4bJLrwJ020VlgfnkbAMgRKvw/btFUSrIZDqmzsCZe9 HaYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748352781; x=1748957581; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=AeTFSAEd3e9K4f20EuEzamS6jJURw+VLEXVfeVvYL4A=; b=frdqh5c2fiO9zliRiSSMXzhHaWKvyCfBWedP3gFWficqgK4sAqzPKPwVKumL7JpuGI C23hIJ7WlYUGZ2w3WRf6uErsrkWJkKQmg2HAk98Hea+z1lrZlq1pqfwvIByBt5H3chl7 nBWDcezObrjsGAHLohG3IN3lOvt9umsNGX7uLgbMH0JlOwJUXEVxh7Ks0pAAz8A8YRV5 Ubd7B4wd3DynPqgLurJAqUqexpMNYz5TfU1LVg/pqrJ0pjZT8po8rc6BwqKXl1uLCp2S Hn5swEkZVQ+Mu1U4D8iHzG7Eg4bBmfLSzdEOVEy7CQpGMn/zDmS+8+e5GDIChHh7Zqqq TUgw== X-Forwarded-Encrypted: i=1; AJvYcCW+qg9Lr1n6f6hhLgc5vV79BouqiObA8kTvSNfmKtFgomaFXMNG3d0HTYAUufRyG2CqV2mw1Vo=@vger.kernel.org X-Gm-Message-State: AOJu0YxlBD2oFuj3f80nxnCRJpWFRSmwNnvrjfe7XeTN3glggRfZbF/N Xwa8uSuIw6m3byKU+ua1JJWxX4p8m6arWJuXrTY2V9cPQhbDqzuTD0LuIJ1AQOg9vwg= X-Gm-Gg: ASbGncswDTHfEXJw+Ch1a0AIQSEwtjR3nJdJRQBENjmF2JotymmOAszIztF0jcdIi/d f7Oo0O1iBoXxVHZY2Ke/ioNe8ulozaK6r+4md2UDavqj4ZayMYE2PONWwvRoEpJOVls4KIFVqGD vW9m5AgsQ2vUu2eS5bwdgo9AbPZWcVPl+0am2YvyLlDaxdH2m3bMhiPL6QPFk/v26OMRj5bFJw4 WHHkGfANQdvOWKK5WJBjtTqWUZHmIqJLq+vNjx/ol1meSjxMDrn98rTaTgEhEJ4weWQlLF3015H 84+iE/DqWftebB+Vzvmk+l39WoqZOHPoyKzI1vxcXkZUS9vCLcSUIUw= X-Google-Smtp-Source: AGHT+IFoo0WB7XDJf8IvZpsdTMDJP9rvKyN8h+HUxU8YOvFNZSTtnUk3xT+2sGlz4u+aQ1U76FPACA== X-Received: by 2002:a92:cd88:0:b0:3d8:1ea5:26d1 with SMTP id e9e14a558f8ab-3dc9b7033d7mr137668275ab.18.1748352781236; Tue, 27 May 2025 06:33:01 -0700 (PDT) Received: from localhost.localdomain ([96.43.243.2]) by smtp.gmail.com with ESMTPSA id e9e14a558f8ab-3dc8298d8a2sm37404315ab.18.2025.05.27.06.33.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 May 2025 06:33:00 -0700 (PDT) From: Jens Axboe To: linux-fsdevel@vger.kernel.org Cc: viro@zeniv.linux.org.uk, djwong@kernel.org, brauner@kernel.org, torvalds@linux-foundation.org, trondmy@hammerspace.com, Jens Axboe , stable@vger.kernel.org Subject: [PATCH 2/5] mm/filemap: use filemap_end_dropbehind() for read invalidation Date: Tue, 27 May 2025 07:28:53 -0600 Message-ID: <20250527133255.452431-3-axboe@kernel.dk> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250527133255.452431-1-axboe@kernel.dk> References: <20250527133255.452431-1-axboe@kernel.dk> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Use the filemap_end_dropbehind() helper rather than calling folio_unmap_invalidate() directly, as we need to check if the folio has been redirtied or marked for writeback once the folio lock has been re-acquired. Cc: stable@vger.kernel.org Reported-by: Trond Myklebust Fixes: 8026e49bff9b ("mm/filemap: add read support for RWF_DONTCACHE") Link: https://lore.kernel.org/linux-fsdevel/ba8a9805331ce258a622feaca266b163db681a10.camel@hammerspace.com/ Signed-off-by: Jens Axboe --- mm/filemap.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/mm/filemap.c b/mm/filemap.c index 008a55290f34..6af6d8f2929c 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -2644,8 +2644,7 @@ static inline bool pos_same_folio(loff_t pos1, loff_t pos2, struct folio *folio) return (pos1 >> shift == pos2 >> shift); } -static void filemap_end_dropbehind_read(struct address_space *mapping, - struct folio *folio) +static void filemap_end_dropbehind_read(struct folio *folio) { if (!folio_test_dropbehind(folio)) return; @@ -2653,7 +2652,7 @@ static void filemap_end_dropbehind_read(struct address_space *mapping, return; if (folio_trylock(folio)) { if (folio_test_clear_dropbehind(folio)) - folio_unmap_invalidate(mapping, folio, 0); + filemap_end_dropbehind(folio); folio_unlock(folio); } } @@ -2774,7 +2773,7 @@ ssize_t filemap_read(struct kiocb *iocb, struct iov_iter *iter, for (i = 0; i < folio_batch_count(&fbatch); i++) { struct folio *folio = fbatch.folios[i]; - filemap_end_dropbehind_read(mapping, folio); + filemap_end_dropbehind_read(folio); folio_put(folio); } folio_batch_init(&fbatch); -- 2.49.0