From patchwork Sun Nov 10 15:28:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 13869956 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2BE2AD12D43 for ; Sun, 10 Nov 2024 15:29:47 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A88146B00BE; Sun, 10 Nov 2024 10:29:36 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 9EC0F6B00BF; Sun, 10 Nov 2024 10:29:36 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 83B286B00C0; Sun, 10 Nov 2024 10:29:36 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 609036B00BE for ; Sun, 10 Nov 2024 10:29:36 -0500 (EST) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 139DE413D7 for ; Sun, 10 Nov 2024 15:29:36 +0000 (UTC) X-FDA: 82770569112.18.BABC0E3 Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) by imf12.hostedemail.com (Postfix) with ESMTP id 6729840008 for ; Sun, 10 Nov 2024 15:29:16 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=kernel-dk.20230601.gappssmtp.com header.s=20230601 header.b=zy+fsDul; spf=pass (imf12.hostedemail.com: domain of axboe@kernel.dk designates 209.85.210.173 as permitted sender) smtp.mailfrom=axboe@kernel.dk; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1731252344; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=QHHnA1NsQjr1van9cnJ+PQRWRXhY+a6ETIPA3kXFfjk=; b=naCIA3pJVSTUZiTP3aV901E0vLAYBym6oHyoOAlFcR6+sSBJTJNWu6WcRsYUfJrRo1FY8b I7M+zJynQMgf9S8op2sMC4xQlBxNGHWTw0hZ5CsZoJIgRLizrbaa0VH8qN1pY4lmXnn68g 8dGtuLtyaBtoYqd6lhpE3Eie6iBVbQA= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=kernel-dk.20230601.gappssmtp.com header.s=20230601 header.b=zy+fsDul; spf=pass (imf12.hostedemail.com: domain of axboe@kernel.dk designates 209.85.210.173 as permitted sender) smtp.mailfrom=axboe@kernel.dk; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1731252344; a=rsa-sha256; cv=none; b=yOlrqvLaFsoefhBH8mJxFz0+ix9sCjVTL3W/TNlR0G+pBfv+s9ODsb0HKwjqmnhUgt6Mx3 CHKL/E4yBUdXEtNECLrrNKC3WSGNH2inlTpOomHw9w5qnYwIZnCSnSitv5iYlNCwJ/6Vx1 5imsGEUPBW7KH5OOXKhM4kuc9AXmtC4= Received: by mail-pf1-f173.google.com with SMTP id d2e1a72fcca58-720aa3dbda5so2658078b3a.1 for ; Sun, 10 Nov 2024 07:29:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20230601.gappssmtp.com; s=20230601; t=1731252572; x=1731857372; darn=kvack.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=QHHnA1NsQjr1van9cnJ+PQRWRXhY+a6ETIPA3kXFfjk=; b=zy+fsDulDDNNSuO0+XDG7cy99Bf3eUs3kBi/uab5+p4p+VI7lceYoVgFetfHQCvBuO gp+BOHH+UHEQ1eqjIZAJWH3RqvII94ss6hwqC5GorG7aREH6/aLsygrSF0wR4DPfoNpd tcP4kyG6i/YSM3qKWRowtW3XRb1Vg0b6i7kwAU+Phd1Ic2owOEB6l6XOzcb3C30N2TU3 HxaiIqlC/ZkwccaoXFZ06vaBJMR1bf4Q8qPh4Nl0pqIYBw1mt1MSZ1587lQ4mHW26uLt ADNwCfDcaO1myupT6egho/jLWoqJQ7Ukb6vxTq2hePauuZMx3eqHuL0zmW1SRhRC/PBB troQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731252572; x=1731857372; 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=QHHnA1NsQjr1van9cnJ+PQRWRXhY+a6ETIPA3kXFfjk=; b=vYNZzygM1239/jSSbYFB9GtqbnovO6rN0BmayPZjOrT4BinM0+7nbXJsJP/rvslstf zlRtWIkMTyYFzrIVsRr0zQqBBLPji2moO+rPb5/2zNTcLoArQvMIfHmMvY3PKrK50Jgn Xfxu6/Mhi3lvoSGL40r6kjRQA5bAQF8FYcRsR9C6wAAgx1mx+MMdgQQvp8oAN8JTadxP BIfZFe6imzexHYj+jCUb80Y50n4qGPuXRWJkm9IlYw8gadpABs9gPwOKzbkdv2VQbgyg cqX59HdOZYKyw+KFMHCeh7RbIVhvnSxJmFlaZAOLlLB0soU9wbEGnLgwvTWDQYDw2J3y /WXQ== X-Gm-Message-State: AOJu0Yz5e7YAkcdEF58lYPqK/9fHF9PYF9G4lmiDAeEiv/X6WtqNXlZa uo21uDnZ/HH6mYCxhaV5nPfP3LUwIe5kgRXkqdA5RXdL9uIl0z5GCUcScPBWVMKTuVGpYt15ds1 cklc= X-Google-Smtp-Source: AGHT+IHV0wAiD3bQchKcabbTvXh2pU9AbMQUOshna304t+XB0bKs6GgV7ufQgRJwzKJwVoPNWeBA0A== X-Received: by 2002:a17:90a:e7c1:b0:2da:9115:15ce with SMTP id 98e67ed59e1d1-2e9b1682714mr12810753a91.15.1731252572603; Sun, 10 Nov 2024 07:29:32 -0800 (PST) Received: from localhost.localdomain ([198.8.77.157]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2e99a5f935dsm9940973a91.35.2024.11.10.07.29.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 Nov 2024 07:29:31 -0800 (PST) From: Jens Axboe To: linux-mm@kvack.org, linux-fsdevel@vger.kernel.org Cc: hannes@cmpxchg.org, clm@meta.com, linux-kernel@vger.kernel.org, willy@infradead.org, Jens Axboe Subject: [PATCH 13/15] iomap: make buffered writes work with RWF_UNCACHED Date: Sun, 10 Nov 2024 08:28:05 -0700 Message-ID: <20241110152906.1747545-14-axboe@kernel.dk> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241110152906.1747545-1-axboe@kernel.dk> References: <20241110152906.1747545-1-axboe@kernel.dk> MIME-Version: 1.0 X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 6729840008 X-Stat-Signature: ngbf5wt7gjx7fcx9pwoo9ogm1bmenmkg X-Rspam-User: X-HE-Tag: 1731252556-19039 X-HE-Meta: U2FsdGVkX1/j2VoO6hltxc5XMWdHgE1f99qmqGQneXXPlOynkBpIXI2SszHTwZJU2RSjfq9k9CNvBjzTBky93M8Vf4CHbB70wD4FNey7AZfMURL95CQY7+YQ4cURSH9JU3eOtIAfxbCdfonLARcCeZ2b9ku2EnQ0hDfu8uLwOh64bQ46XbzzsetFX0ESYlb+cxkDehmKGCQqXlhBNJH1M2RgX7TLg9YRWqTW+cRlP2bRI3GHInXfJbFTX6ctUBz81QMW8hZhlzhEG5+NKjJkuRTPSIDWveY+eTfywJSLZe1NS4qXZzCFw1mgwidRSaHPfFSuMOZijqEVcC3GgyaO74CypdxBXfZyWXEIhbwYPsCKMgaeYG2wSpHs9pPU29WObJlVzLsWNm00xPsgyKC5qK9fd0muVh2Xwe/QtjrPFU4mZQixbW//IgBOYgszJzlLERM22c2UCp6VW1a0Bft6CEnz2ulYC5UNCj9SWlrHKG2qzuSkcG8xKUbZFYcOUt3grvIosFdvN1lh/ZavmcqQpa/G3j6fhPmDNtuVBM6L6AyWnr1SaU0M6AgqKdLRYtUlV3RXVM9ocFfKZ2JWhK48k3CAMiVqf9MYl5T+5D7Zr4xQRndCIozHO29WA8kiGEozulzd+OwPAxaLeBXLDO6bPcgzFivy6H6F3niPmFfxenu0PoTLF99h/wSPxAXhliP7Vm9HxD5ROQ5/RSc/H1A08oarR/c2JhBaNHCeWZ+B9HJy7+OtfpFqb+a9tZEelD9R08z1mciOUXwbmLjAIEFA/y4oiRpufifDRb23fpMu1yrN/3h2dA60wx33zaMd/ebkyFpLuvkjSTYn4c1bypojcQR9BdxPkZS7vjQA8tXHpXrCkpORl4Nq2YyKYsyB2Jxct6WXGjLbDt4wpSCnW5IAweItgtCQJOP6uCyL09Gz5lzai26aDc6hsVWWNOVqS0I5fT/qUCsBEnlBal17PND /J+2BUkR Xh6l6FQwTnj2ynfvy9I1NlIwNoj7d5P/x9Ow1sg00SYXUN9bQ8G5SL2oaOljSZWw1aWCwnEHSZmhcxdGTp1FWHCPqMIi69B/L/ZJABHErH2Yap9L3FUTjQjKagNaOaqP4HxjOPc7tOTi6LF6bK0FeVh9RLA79Keqh35XZ80gEAY2K/2EqN1F1w8BGQdfvlEZkIyoN/okkRpir+xHd4Q45bkMmuF975aKg8Ronsta2IADVowrCW/Haq5bbNqPmXmJJVjG91pv4/3JxDpndhNpvvCTkXFgFWifhYs/tnyjF57gCx7FuvskkT7Y3EyjOBTMf2DSZQg/G5B9Rk+DOkAqbi5JSEZCPRUdxzbYt X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Add iomap buffered write support for RWF_UNCACHED. If RWF_UNCACHED is set for a write, mark the folios being written with drop_writeback. Then writeback completion will drop the pages. The write_iter handler simply kicks off writeback for the pages, and writeback completion will take care of the rest. This still needs the user of the iomap buffered write helpers to call iocb_uncached_write() upon successful issue of the writes. Signed-off-by: Jens Axboe --- fs/iomap/buffered-io.c | 15 +++++++++++++-- include/linux/iomap.h | 4 +++- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c index ef0b68bccbb6..2f2a5db04a68 100644 --- a/fs/iomap/buffered-io.c +++ b/fs/iomap/buffered-io.c @@ -603,6 +603,8 @@ struct folio *iomap_get_folio(struct iomap_iter *iter, loff_t pos, size_t len) if (iter->flags & IOMAP_NOWAIT) fgp |= FGP_NOWAIT; + if (iter->flags & IOMAP_UNCACHED) + fgp |= FGP_UNCACHED; fgp |= fgf_set_order(len); return __filemap_get_folio(iter->inode->i_mapping, pos >> PAGE_SHIFT, @@ -1023,8 +1025,9 @@ ssize_t iomap_file_buffered_write(struct kiocb *iocb, struct iov_iter *i, const struct iomap_ops *ops, void *private) { + struct address_space *mapping = iocb->ki_filp->f_mapping; struct iomap_iter iter = { - .inode = iocb->ki_filp->f_mapping->host, + .inode = mapping->host, .pos = iocb->ki_pos, .len = iov_iter_count(i), .flags = IOMAP_WRITE, @@ -1034,9 +1037,14 @@ iomap_file_buffered_write(struct kiocb *iocb, struct iov_iter *i, if (iocb->ki_flags & IOCB_NOWAIT) iter.flags |= IOMAP_NOWAIT; + if (iocb->ki_flags & IOCB_UNCACHED) + iter.flags |= IOMAP_UNCACHED; - while ((ret = iomap_iter(&iter, ops)) > 0) + while ((ret = iomap_iter(&iter, ops)) > 0) { + if (iocb->ki_flags & IOCB_UNCACHED) + iter.iomap.flags |= IOMAP_F_UNCACHED; iter.processed = iomap_write_iter(&iter, i); + } if (unlikely(iter.pos == iocb->ki_pos)) return ret; @@ -1770,6 +1778,9 @@ static int iomap_add_to_ioend(struct iomap_writepage_ctx *wpc, size_t poff = offset_in_folio(folio, pos); int error; + if (folio_test_uncached(folio)) + wpc->iomap.flags |= IOMAP_F_UNCACHED; + if (!wpc->ioend || !iomap_can_add_to_ioend(wpc, pos)) { new_ioend: error = iomap_submit_ioend(wpc, 0); diff --git a/include/linux/iomap.h b/include/linux/iomap.h index f61407e3b121..2efc72df19a2 100644 --- a/include/linux/iomap.h +++ b/include/linux/iomap.h @@ -64,6 +64,7 @@ struct vm_fault; #define IOMAP_F_BUFFER_HEAD 0 #endif /* CONFIG_BUFFER_HEAD */ #define IOMAP_F_XATTR (1U << 5) +#define IOMAP_F_UNCACHED (1U << 6) /* * Flags set by the core iomap code during operations: @@ -173,8 +174,9 @@ struct iomap_folio_ops { #define IOMAP_NOWAIT (1 << 5) /* do not block */ #define IOMAP_OVERWRITE_ONLY (1 << 6) /* only pure overwrites allowed */ #define IOMAP_UNSHARE (1 << 7) /* unshare_file_range */ +#define IOMAP_UNCACHED (1 << 8) /* uncached IO */ #ifdef CONFIG_FS_DAX -#define IOMAP_DAX (1 << 8) /* DAX mapping */ +#define IOMAP_DAX (1 << 9) /* DAX mapping */ #else #define IOMAP_DAX 0 #endif /* CONFIG_FS_DAX */