From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EEBA838A723; Mon, 2 Mar 2026 14:19:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.137.202.133 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772461168; cv=none; b=JGlYSdPPXpPY5GPlDQdJatKmpR3+sFMTZ3aRJON5kg88sjGc+9Dku3I3sN74rsWaStcIP4ZJES/znHU1nXQfEJL22gimqNDvvRMQReyGinUgFiGabsPN6Cvz5+pd88Mc4LsrofMl5uW28ff9JVfeTHPl3b2UcaHmSEgyModu5Q4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772461168; c=relaxed/simple; bh=W9GZqW6NjL6/MQYVnfHt4zTImrZXqXJ9Ntus8qEAlks=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=P1KcC7mxf9KBwo5l3USIBRe6RUdyMvS9Y6BDf6cqk6lDhBWoOZZvYuDuVXm+sYuIPpf0adfYhB3m4V5zR2qds6DaP/Wlg1+L5p0hEcb8jflSCYArS/biNm+dNKvP85E9jarZGbpkaHvhc63luKjzXWbL3ctPeOhB6AX2/vkELtg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=lst.de; spf=none smtp.mailfrom=bombadil.srs.infradead.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b=KQQaQj/I; arc=none smtp.client-ip=198.137.202.133 Authentication-Results: smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=lst.de Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=bombadil.srs.infradead.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="KQQaQj/I" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=vRH0VYuDnXIQ/WJ+FaJNrLKhHHLaKL0S+YY2G+IdqU8=; b=KQQaQj/IT3chTySiJCVuiK1W5/ zI2yTx6tE92rx/uX9K/RuqfLRnZdOCaD8kTnQ5T71+A/VMlLqslcVRh5roKOC38nVydVHrpaVD2Y4 kpNgVlTC643UVxsfWuCpFgJDiY7JICZJgctDFOb6R59BNjkIDABBsKKIN6Wc9H8VlseHgxfHDZfjR vF/wMmMbXXNElMfp04EwieRgIr3VFJ1YMRcxCjCw/EmbdfxivAJLOZkraAC5vsMaMZhNXp6EFavpN pUI/D67nPtQZFo8vn0ZvjTvnQ9NmKFHqtbRbafy1iqpqNF+O8B7qIR8qKUMfxhZ38We3Qwd4dubuC U6Xicxvw==; Received: from [2604:3d08:797f:2840::9d5f] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.98.2 #2 (Red Hat Linux)) id 1vx47K-0000000DDRk-2YZr; Mon, 02 Mar 2026 14:19:26 +0000 From: Christoph Hellwig To: Eric Biggers Cc: "Theodore Y. Ts'o" , Jaegeuk Kim , Andreas Dilger , Chao Yu , Christian Brauner , "Darrick J. Wong" , linux-fscrypt@vger.kernel.org, linux-ext4@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, linux-fsdevel@vger.kernel.org Subject: [PATCH 02/14] ext4: open code fscrypt_set_bio_crypt_ctx_bh Date: Mon, 2 Mar 2026 06:18:07 -0800 Message-ID: <20260302141922.370070-3-hch@lst.de> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260302141922.370070-1-hch@lst.de> References: <20260302141922.370070-1-hch@lst.de> Precedence: bulk X-Mailing-List: linux-ext4@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html io_submit_init_bio already has or can easily get at most information needed to set the crypto context. Open code fscrypt_set_bio_crypt_ctx_bh based on that. Signed-off-by: Christoph Hellwig --- fs/ext4/page-io.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/fs/ext4/page-io.c b/fs/ext4/page-io.c index b8cf9f6f9e0b..c5ca99b33c26 100644 --- a/fs/ext4/page-io.c +++ b/fs/ext4/page-io.c @@ -417,6 +417,7 @@ void ext4_io_submit_init(struct ext4_io_submit *io, static void io_submit_init_bio(struct ext4_io_submit *io, struct inode *inode, + struct folio *folio, struct buffer_head *bh) { struct bio *bio; @@ -426,7 +427,9 @@ static void io_submit_init_bio(struct ext4_io_submit *io, * __GFP_DIRECT_RECLAIM is set, see comments for bio_alloc_bioset(). */ bio = bio_alloc(bh->b_bdev, BIO_MAX_VECS, REQ_OP_WRITE, GFP_NOIO); - fscrypt_set_bio_crypt_ctx_bh(bio, bh, GFP_NOIO); + fscrypt_set_bio_crypt_ctx(bio, inode, + (folio_pos(folio) + bh_offset(bh)) >> inode->i_blkbits, + GFP_NOIO); bio->bi_iter.bi_sector = bh->b_blocknr * (bh->b_size >> 9); bio->bi_end_io = ext4_end_bio; bio->bi_private = ext4_get_io_end(io->io_end); @@ -448,7 +451,7 @@ static void io_submit_add_bh(struct ext4_io_submit *io, ext4_io_submit(io); } if (io->io_bio == NULL) - io_submit_init_bio(io, inode, bh); + io_submit_init_bio(io, inode, folio, bh); if (!bio_add_folio(io->io_bio, io_folio, bh->b_size, bh_offset(bh))) goto submit_and_retry; wbc_account_cgroup_owner(io->io_wbc, folio, bh->b_size); -- 2.47.3 From mboxrd@z Thu Jan 1 00:00:00 1970 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 lists.sourceforge.net (lists.sourceforge.net [216.105.38.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D9A3FEA4E04 for ; Mon, 2 Mar 2026 14:19:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.sourceforge.net; s=beta; h=Content-Transfer-Encoding:Content-Type:Cc: List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: Subject:MIME-Version:References:In-Reply-To:Message-ID:Date:To:From:Sender: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=o4p/AXAmPUiCGRudJT8rXbBJxaAqgZH7DQA2rZK6/9g=; b=F4vwAGxkuf790fbkfIgK+a4xBX g04C8gcmtUqm21VNzn0vvRnMlajRQ6DNoIgvGxKYRmhHeYlcierJHcJsBmk3zlovE9UxBVqxnUNih xaL3PZfxnjpeDlBurm3xDe0jPP8T5gVt0E4kocl5hiSw51Hp3Mza1MnaNLtL0P6BeNv8=; Received: from [127.0.0.1] (helo=sfs-ml-4.v29.lw.sourceforge.com) by sfs-ml-4.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1vx47T-0002FG-9e; Mon, 02 Mar 2026 14:19:35 +0000 Received: from [172.30.29.66] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1vx47R-0002F8-1p for linux-f2fs-devel@lists.sourceforge.net; Mon, 02 Mar 2026 14:19:33 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=vRH0VYuDnXIQ/WJ+FaJNrLKhHHLaKL0S+YY2G+IdqU8=; b=T41hLCVtwRRo905KdSLWDWzrLZ cbsQMTS1yUbU3x3TQPkuKHHkQJ3tzD7Ncv7Brd7BTRSp8jWn5WsUG88t0DYJKVUHNcjenjvlllfzN LhLYP9KxHfzoylsP4wAJ+oEYkYd9JPTIT2rtxEgbQALDd09Z/Lhs62pyZITHW/zuPSUA=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID: Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=vRH0VYuDnXIQ/WJ+FaJNrLKhHHLaKL0S+YY2G+IdqU8=; b=YZLeW/BviNX4E42UABYCvzGUGr J53tpc0yJ6TfZ5Bvg8ozqNYM8Rs1BHcTk4IYTppuudUTijQlfMOU6QKfo4DJ8x+NYV8bN6lAxhorb 6j6fI9defwSgJA8ghXvZJb7sunj1tlQlpB3UJaFYgIBDRo5WJRVGTgw2WK0RrrJwtVas=; Received: from bombadil.infradead.org ([198.137.202.133]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1vx47Q-0001TK-MW for linux-f2fs-devel@lists.sourceforge.net; Mon, 02 Mar 2026 14:19:32 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=vRH0VYuDnXIQ/WJ+FaJNrLKhHHLaKL0S+YY2G+IdqU8=; b=KQQaQj/IT3chTySiJCVuiK1W5/ zI2yTx6tE92rx/uX9K/RuqfLRnZdOCaD8kTnQ5T71+A/VMlLqslcVRh5roKOC38nVydVHrpaVD2Y4 kpNgVlTC643UVxsfWuCpFgJDiY7JICZJgctDFOb6R59BNjkIDABBsKKIN6Wc9H8VlseHgxfHDZfjR vF/wMmMbXXNElMfp04EwieRgIr3VFJ1YMRcxCjCw/EmbdfxivAJLOZkraAC5vsMaMZhNXp6EFavpN pUI/D67nPtQZFo8vn0ZvjTvnQ9NmKFHqtbRbafy1iqpqNF+O8B7qIR8qKUMfxhZ38We3Qwd4dubuC U6Xicxvw==; Received: from [2604:3d08:797f:2840::9d5f] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.98.2 #2 (Red Hat Linux)) id 1vx47K-0000000DDRk-2YZr; Mon, 02 Mar 2026 14:19:26 +0000 From: Christoph Hellwig To: Eric Biggers Date: Mon, 2 Mar 2026 06:18:07 -0800 Message-ID: <20260302141922.370070-3-hch@lst.de> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260302141922.370070-1-hch@lst.de> References: <20260302141922.370070-1-hch@lst.de> MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html X-Headers-End: 1vx47Q-0001TK-MW Subject: [f2fs-dev] [PATCH 02/14] ext4: open code fscrypt_set_bio_crypt_ctx_bh X-BeenThere: linux-f2fs-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Christian Brauner , "Theodore Y. Ts'o" , "Darrick J. Wong" , linux-f2fs-devel@lists.sourceforge.net, linux-fscrypt@vger.kernel.org, Andreas Dilger , linux-fsdevel@vger.kernel.org, Jaegeuk Kim , linux-ext4@vger.kernel.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: linux-f2fs-devel-bounces@lists.sourceforge.net io_submit_init_bio already has or can easily get at most information needed to set the crypto context. Open code fscrypt_set_bio_crypt_ctx_bh based on that. Signed-off-by: Christoph Hellwig --- fs/ext4/page-io.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/fs/ext4/page-io.c b/fs/ext4/page-io.c index b8cf9f6f9e0b..c5ca99b33c26 100644 --- a/fs/ext4/page-io.c +++ b/fs/ext4/page-io.c @@ -417,6 +417,7 @@ void ext4_io_submit_init(struct ext4_io_submit *io, static void io_submit_init_bio(struct ext4_io_submit *io, struct inode *inode, + struct folio *folio, struct buffer_head *bh) { struct bio *bio; @@ -426,7 +427,9 @@ static void io_submit_init_bio(struct ext4_io_submit *io, * __GFP_DIRECT_RECLAIM is set, see comments for bio_alloc_bioset(). */ bio = bio_alloc(bh->b_bdev, BIO_MAX_VECS, REQ_OP_WRITE, GFP_NOIO); - fscrypt_set_bio_crypt_ctx_bh(bio, bh, GFP_NOIO); + fscrypt_set_bio_crypt_ctx(bio, inode, + (folio_pos(folio) + bh_offset(bh)) >> inode->i_blkbits, + GFP_NOIO); bio->bi_iter.bi_sector = bh->b_blocknr * (bh->b_size >> 9); bio->bi_end_io = ext4_end_bio; bio->bi_private = ext4_get_io_end(io->io_end); @@ -448,7 +451,7 @@ static void io_submit_add_bh(struct ext4_io_submit *io, ext4_io_submit(io); } if (io->io_bio == NULL) - io_submit_init_bio(io, inode, bh); + io_submit_init_bio(io, inode, folio, bh); if (!bio_add_folio(io->io_bio, io_folio, bh->b_size, bh_offset(bh))) goto submit_and_retry; wbc_account_cgroup_owner(io->io_wbc, folio, bh->b_size); -- 2.47.3 _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel