From patchwork Fri Jun 7 14:58:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Pankaj Raghav (Samsung)" X-Patchwork-Id: 13690333 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 AAE2EC27C5F for ; Fri, 7 Jun 2024 14:59:47 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4F4096B00AB; Fri, 7 Jun 2024 10:59:46 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4547C6B00AC; Fri, 7 Jun 2024 10:59:46 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 232D16B00AD; Fri, 7 Jun 2024 10:59:46 -0400 (EDT) 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 F13766B00AB for ; Fri, 7 Jun 2024 10:59:45 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id E72AEA18DA for ; Fri, 7 Jun 2024 14:59:42 +0000 (UTC) X-FDA: 82204401804.20.8038DD3 Received: from mout-p-202.mailbox.org (mout-p-202.mailbox.org [80.241.56.172]) by imf22.hostedemail.com (Postfix) with ESMTP id 2EA3FC001A for ; Fri, 7 Jun 2024 14:59:40 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=pankajraghav.com header.s=MBO0001 header.b=G8rJmHPP; spf=pass (imf22.hostedemail.com: domain of kernel@pankajraghav.com designates 80.241.56.172 as permitted sender) smtp.mailfrom=kernel@pankajraghav.com; dmarc=pass (policy=quarantine) header.from=pankajraghav.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1717772381; a=rsa-sha256; cv=none; b=RM0x3RxWNZcw6nvhxEAWPPLIPPnjW2oGy4umwNAz3mE9pisuljjYSM1fPF4DDCDxlaJzQP vSnGhMBmzy/bnHUXImpYpvjvhjUQk8b5kgzJ5zUgyJ/tsX09f1glbbQp7YmHyJcMGMtNHX aXZmfuYRj0sr4V4Qknn2foeDnR7Rovg= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=pankajraghav.com header.s=MBO0001 header.b=G8rJmHPP; spf=pass (imf22.hostedemail.com: domain of kernel@pankajraghav.com designates 80.241.56.172 as permitted sender) smtp.mailfrom=kernel@pankajraghav.com; dmarc=pass (policy=quarantine) header.from=pankajraghav.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1717772381; 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=8sLXh3ItwEq5TYZ7rJHrfyrYcE/YpAXA+GtXY9esiOQ=; b=26db4X2GqbpvEY6KhPymTYbe2aH1pzM2KefxBdMZZvN/ptkBD/cQVRIolQuoFstZOqVPWb 9hJxl8XYJBs0Rt8J9Hsy1ZDj4W8fvM/ETYYp7EByxZQwQlc3MMpPINeqqrrWDgfsrIq1rD N88nghVij6IrgFxnEUYXGhPsq0fQOVE= Received: from smtp102.mailbox.org (smtp102.mailbox.org [IPv6:2001:67c:2050:b231:465::102]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-202.mailbox.org (Postfix) with ESMTPS id 4Vwkr96mtFz9sQg; Fri, 7 Jun 2024 16:59:37 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pankajraghav.com; s=MBO0001; t=1717772377; 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: in-reply-to:in-reply-to:references:references; bh=8sLXh3ItwEq5TYZ7rJHrfyrYcE/YpAXA+GtXY9esiOQ=; b=G8rJmHPPcxHDWg9xX/dktQ9HwiydrWEABafRT0DQVy8yun8SAsiK2HjYovvsfD5tVewnLU e7vCv0u+F3IDEkMs18wVCelFF2ytkEpFlyJ2UHfSCGpjQgl9Zm3XPmXkOE5Stwz+ivsiu5 s+6IBi9WHp6kYkf1WfMmcP0yU+306PvjCpL45362UtPH2MixOdqebdY0grac6KOrRpEREn sDu5S4JegDjd8Q8z7xfpbF4Xr8wwvQb7z40XHmLfgquiHYp3yZLjhvhi6mEZEtWImeg/ph Do6WmwQ31Zv2BMk8zutT+kBCCfXWK0y9kDt1dRtkeBNviEt4xKtPZ6E304xGqQ== From: "Pankaj Raghav (Samsung)" To: david@fromorbit.com, djwong@kernel.org, chandan.babu@oracle.com, brauner@kernel.org, akpm@linux-foundation.org, willy@infradead.org Cc: mcgrof@kernel.org, linux-mm@kvack.org, hare@suse.de, linux-kernel@vger.kernel.org, yang@os.amperecomputing.com, Zi Yan , linux-xfs@vger.kernel.org, p.raghav@samsung.com, linux-fsdevel@vger.kernel.org, kernel@pankajraghav.com, hch@lst.de, gost.dev@samsung.com, cl@os.amperecomputing.com, john.g.garry@oracle.com Subject: [PATCH v7 07/11] iomap: fix iomap_dio_zero() for fs bs > system page size Date: Fri, 7 Jun 2024 14:58:58 +0000 Message-ID: <20240607145902.1137853-8-kernel@pankajraghav.com> In-Reply-To: <20240607145902.1137853-1-kernel@pankajraghav.com> References: <20240607145902.1137853-1-kernel@pankajraghav.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 2EA3FC001A X-Stat-Signature: f1n6c8gmztry61hx6m9ss36fkdfnw1qf X-HE-Tag: 1717772380-602803 X-HE-Meta: U2FsdGVkX19rvEsklD1uy3glorJlay2gwU1IXYVrbZsgcSVX6U88EUYgkBgKJpCLsdgSNzzhT+tOQzrygKMfosvJ9Cz6mDR0ZsG1/xs8le6r+jkkK7+uNeLQmSO4o877zRk6Edb1FWt2778QgNQ74tiUFWrZtdQYzOcaFjaa55DInk0S+NXVs6oLWb9QSRfWi7qNR7z6uJD9j4ptTzXwpQo9Rrs1IzW1iHv2mft082ov/sSSMy0PoVz8M3WT57y7nnq+vT1w9ORMmpOIhGstAbibBOnBe4SxBkSCAtWQpqAr1kFOScJG6bOXr+jEXxft/aFdSMiduZDQBjGuqC32ZZdLwX30D4A+2n+aJuHnatk3Xkguy3TOqxN7JSjR0PtbdqjFOIqO1vLOPP2fZ7nyDvoqzf1Tq3pCIRywBkqesm1fW0aEeLSfOdYs1KF6RlzA69IjcrEtXpARLI1FP3jWkeJn09z+Lv7gUXY9+FjlpvPkB9FZYMYaKL2fIxokzk/g4GzvP5J6hIHlJ0fVg/mO8bWzxbwM3r75wQu7tCn8RyQ2jwUGc0RNajQV8/jEefl33UMy29V7PCR7GsqOHhppcM7OTk3PdQWgKbmDaa8shCmMt4hc/pWgC7Ho6RxmZcxDIGdnS6Skawj39UKJlS+B/OFLOo4pWYp3A1nsa/ymLydQooO0rS+ts0dZWBYaUMGLRxSi85Si0kkjjsEByycswfs6TkOVOEdbsCQuVeHIIpj6VEjjL59udJETva/jql9bL3hpBgxUZlFXK2V9ep7daIE6zxl+PJisrQsv9U1IiMseAkY9O8l5k72amUqQxB6CkzvwjV1UomxNOHXIzwYJDlIAm6t+Sa5Y1RnhVOdVqq0b6+KJCaM4tSoR+PPu7Igr6ZDgXRK/mWsOHlt4MyOd2iMM+x1Fa1TptHeryz1VJNmbbRrX9Kkf9v3NW+ZHclfMpsYNhPeqw83QU+Bo1Uv +OMZFJrd PyzpBVOxhH/L+cXNIxxV7R0haTGkZuKCZyztFdR8zDY47U+jQC9N6hy2zERAL3/DtmIgkDEXYPhsObL0EL6XB2wf9wT5k6LHZqi/nzbMJhYGX5RvbzcvAg1HGROiMP1GFoXmsJvAkuWSMng3rgiAOUjlj+92cdjQ1ujSERcVBwMagiQzNTQCNzBLxBo5KFv8V9WsnEQXbs3UmJ8DXia00o5PEsqUesNaJi/vxFVIUEvQCWw0liwuYhFtXy3dSW5mpQp6VJd15O+1CdoCFUmm6HrxR7Q== 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: From: Pankaj Raghav iomap_dio_zero() will pad a fs block with zeroes if the direct IO size < fs block size. iomap_dio_zero() has an implicit assumption that fs block size < page_size. This is true for most filesystems at the moment. If the block size > page size, this will send the contents of the page next to zero page(as len > PAGE_SIZE) to the underlying block device, causing FS corruption. iomap is a generic infrastructure and it should not make any assumptions about the fs block size and the page size of the system. Signed-off-by: Pankaj Raghav Reviewed-by: Hannes Reinecke --- fs/internal.h | 5 +++++ fs/iomap/buffered-io.c | 6 ++++++ fs/iomap/direct-io.c | 26 ++++++++++++++++++++++++-- 3 files changed, 35 insertions(+), 2 deletions(-) diff --git a/fs/internal.h b/fs/internal.h index 84f371193f74..30217f0ff4c6 100644 --- a/fs/internal.h +++ b/fs/internal.h @@ -35,6 +35,11 @@ static inline void bdev_cache_init(void) int __block_write_begin_int(struct folio *folio, loff_t pos, unsigned len, get_block_t *get_block, const struct iomap *iomap); +/* + * iomap/direct-io.c + */ +int iomap_dio_init(void); + /* * char_dev.c */ diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c index 49938419fcc7..9f791db473e4 100644 --- a/fs/iomap/buffered-io.c +++ b/fs/iomap/buffered-io.c @@ -1990,6 +1990,12 @@ EXPORT_SYMBOL_GPL(iomap_writepages); static int __init iomap_init(void) { + int ret; + + ret = iomap_dio_init(); + if (ret) + return ret; + return bioset_init(&iomap_ioend_bioset, 4 * (PAGE_SIZE / SECTOR_SIZE), offsetof(struct iomap_ioend, io_bio), BIOSET_NEED_BVECS); diff --git a/fs/iomap/direct-io.c b/fs/iomap/direct-io.c index f3b43d223a46..b95600b254a3 100644 --- a/fs/iomap/direct-io.c +++ b/fs/iomap/direct-io.c @@ -27,6 +27,13 @@ #define IOMAP_DIO_WRITE (1U << 30) #define IOMAP_DIO_DIRTY (1U << 31) +/* + * Used for sub block zeroing in iomap_dio_zero() + */ +#define ZERO_FSB_SIZE (65536) +#define ZERO_FSB_ORDER (get_order(ZERO_FSB_SIZE)) +static struct page *zero_fs_block; + struct iomap_dio { struct kiocb *iocb; const struct iomap_dio_ops *dops; @@ -52,6 +59,16 @@ struct iomap_dio { }; }; +int iomap_dio_init(void) +{ + zero_fs_block = alloc_pages(GFP_KERNEL | __GFP_ZERO, ZERO_FSB_ORDER); + + if (!zero_fs_block) + return -ENOMEM; + + return 0; +} + static struct bio *iomap_dio_alloc_bio(const struct iomap_iter *iter, struct iomap_dio *dio, unsigned short nr_vecs, blk_opf_t opf) { @@ -236,17 +253,22 @@ static void iomap_dio_zero(const struct iomap_iter *iter, struct iomap_dio *dio, loff_t pos, unsigned len) { struct inode *inode = file_inode(dio->iocb->ki_filp); - struct page *page = ZERO_PAGE(0); struct bio *bio; + /* + * Max block size supported is 64k + */ + WARN_ON_ONCE(len > ZERO_FSB_SIZE); + bio = iomap_dio_alloc_bio(iter, dio, 1, REQ_OP_WRITE | REQ_SYNC | REQ_IDLE); fscrypt_set_bio_crypt_ctx(bio, inode, pos >> inode->i_blkbits, GFP_KERNEL); + bio->bi_iter.bi_sector = iomap_sector(&iter->iomap, pos); bio->bi_private = dio; bio->bi_end_io = iomap_dio_bio_end_io; - __bio_add_page(bio, page, len, 0); + __bio_add_page(bio, zero_fs_block, len, 0); iomap_dio_submit_bio(iter, dio, bio, pos); }