From nobody Fri Nov 29 21:36:17 2024 Received: from mail.tlmp.cc (unknown [148.135.17.20]) (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 36EBB18CC0A; Mon, 16 Sep 2024 13:57:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.135.17.20 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1726495041; cv=none; b=NT+PD00yQwByg46apn6N03hSLm3yAqO62GhYe4ju1xjy9+FZM/s2xljgwRU6M+l0KfMsUve+9SxiEt5hfg+m1jPEKrOeukxZ4lglw64QulmRPpQWJm57HTLPWer2s7nFFcVZjsmWf9I0H3BmHjMBP+nkAkk4eae5uP+QTUQlsSE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1726495041; c=relaxed/simple; bh=P8reVC9LHn9Ss/NzZdNp07rUoCvE/rgeeNwx4HOeqnw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IjtF8aVBVfWzgYna1maCIRmk4VLogWMnrAb4G2EVePOxKfODM69jBiSodk4/hChV8a9mZyJ48U9WGbDB8AP/h3k9ERnMqZAq6SvL91TzX/Hp/vKDEMxNgjQ6z/ktrTyS0qOek8DW9ApTW5Z/cB1Wz9wYMgc2IAmaJehZ5+BISDw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=tlmp.cc; spf=pass smtp.mailfrom=tlmp.cc; dkim=pass (2048-bit key) header.d=tlmp.cc header.i=@tlmp.cc header.b=X5cUuPKc; arc=none smtp.client-ip=148.135.17.20 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=tlmp.cc Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=tlmp.cc Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=tlmp.cc header.i=@tlmp.cc header.b="X5cUuPKc" Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 584C969839; Mon, 16 Sep 2024 09:57:18 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tlmp.cc; s=dkim; t=1726495039; h=from:subject:date:message-id:to:cc:mime-version: content-transfer-encoding:in-reply-to:references; bh=SF+isR41/QqrBfGfC6meT3Kg4eWEa6AIAKKhQ1hnyqE=; b=X5cUuPKcDAJD4qrkdbm0LQChHyRJrM+CjfZdi2pNiAo3Gu2Pbkbzoy2+ZgrhlD7ofI06mj blYOAEf2pYeemD0LXW0dKogk+HQaxnzrCt+pFL7ZMYsBWgy1bDVVrw+R4UTlgXG18IAIT0 QRbBTNXXdkHc5dTL2oVYI/1RgPEYRt4oAbzo9+DfSQ4aNMPccOlygyOnfQPM5e3QAaSs8L 5mrbOfVBY3lQiL15qkSsUCPmoNJ71ipLnZgDo/hFse/fb9t/BXtSixqvPCw+i0cMbk+pIg 4imgAQxaMDCa/6rHNCewn5Uw3UcvIAe9dEz0QgMAI/PFjHEDSZtT4GX+V+OWTw== From: Yiyang Wu To: linux-erofs@lists.ozlabs.org Cc: rust-for-linux@vger.kernel.org, linux-fsdevel@vger.kernel.org, LKML Subject: [RFC PATCH 21/24] erofs: introduce erofs_map_blocks alternative to C Date: Mon, 16 Sep 2024 21:56:31 +0800 Message-ID: <20240916135634.98554-22-toolmanp@tlmp.cc> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240916135634.98554-1-toolmanp@tlmp.cc> References: <20240916135634.98554-1-toolmanp@tlmp.cc> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Last-TLS-Session-Version: TLSv1.3 Content-Type: text/plain; charset="utf-8" This patch introduces erofs_map_blocks alternative written in Rust, which will be hooked inside the erofs_iomap_begin. Signed-off-by: Yiyang Wu --- fs/erofs/Makefile | 2 +- fs/erofs/data.c | 5 ++++ fs/erofs/data_rs.rs | 63 ++++++++++++++++++++++++++++++++++++++++ fs/erofs/rust_bindings.h | 4 +++ 4 files changed, 73 insertions(+), 1 deletion(-) create mode 100644 fs/erofs/data_rs.rs diff --git a/fs/erofs/Makefile b/fs/erofs/Makefile index e086487971b6..219ddca0642e 100644 --- a/fs/erofs/Makefile +++ b/fs/erofs/Makefile @@ -9,4 +9,4 @@ erofs-$(CONFIG_EROFS_FS_ZIP_DEFLATE) +=3D decompressor_defl= ate.o erofs-$(CONFIG_EROFS_FS_ZIP_ZSTD) +=3D decompressor_zstd.o erofs-$(CONFIG_EROFS_FS_BACKED_BY_FILE) +=3D fileio.o erofs-$(CONFIG_EROFS_FS_ONDEMAND) +=3D fscache.o -erofs-$(CONFIG_EROFS_FS_RUST) +=3D super_rs.o inode_rs.o namei_rs.o dir_rs= .o rust_helpers.o +erofs-$(CONFIG_EROFS_FS_RUST) +=3D super_rs.o inode_rs.o namei_rs.o dir_rs= .o data_rs.o rust_helpers.o diff --git a/fs/erofs/data.c b/fs/erofs/data.c index 61debd799cf9..c9694661136b 100644 --- a/fs/erofs/data.c +++ b/fs/erofs/data.c @@ -293,7 +293,12 @@ static int erofs_iomap_begin(struct inode *inode, loff= _t offset, loff_t length, map.m_la =3D offset; map.m_llen =3D length; =20 +#ifdef CONFIG_EROFS_FS_RUST + ret =3D erofs_map_blocks_rust(inode, &map); +#else =20 ret =3D erofs_map_blocks(inode, &map); +#endif + if (ret < 0) return ret; =20 diff --git a/fs/erofs/data_rs.rs b/fs/erofs/data_rs.rs new file mode 100644 index 000000000000..ac34a9dd2079 --- /dev/null +++ b/fs/erofs/data_rs.rs @@ -0,0 +1,63 @@ +// Copyright 2024 Yiyang Wu +// SPDX-License-Identifier: MIT or GPL-2.0-or-later + +//! EROFS Rust Kernel Module Helpers Implementation +//! This is only for experimental purpose. Feedback is always welcome. + +#[allow(dead_code)] +#[allow(missing_docs)] +pub(crate) mod rust; +use core::ffi::*; +use core::ptr::NonNull; + +use kernel::bindings::inode; +use kernel::container_of; + +use rust::{erofs_sys::*, kinode::*, ksuperblock::*}; + +#[repr(C)] +struct ErofsBuf { + mapping: NonNull, + page: NonNull, + base: NonNull, + kmap_type: c_int, +} + +/// A helper sturct to map blocks for iomap_begin because iomap is not gen= erated by bindgen +#[repr(C)] +pub struct ErofsMapBlocks { + buf: ErofsBuf, + pub(crate) m_pa: u64, + pub(crate) m_la: u64, + pub(crate) m_plen: u64, + pub(crate) m_llen: u64, + pub(crate) m_deviceid: u16, + pub(crate) m_flags: u32, +} +/// Exported as a replacement for erofs_map_blocks. +#[no_mangle] +pub unsafe extern "C" fn erofs_map_blocks_rust( + k_inode: NonNull, + mut map: NonNull, +) -> c_int { + // SAFETY: super_block and superblockinfo is always initialized in k_i= node. + let sbi =3D erofs_sbi(unsafe { NonNull::new(k_inode.as_ref().i_sb).unw= rap() }); + // SAFETY: We are sure that the inode is a Kernel Inode since alloc_in= ode is called + let erofs_inode =3D unsafe { &*container_of!(k_inode.as_ptr(), KernelI= node, k_inode) }; + // SAFETY: The map is always initialized in the caller. + match sbi + .filesystem + .map(erofs_inode, unsafe { map.as_ref().m_la } as Off) + { + Ok(m) =3D> unsafe { + map.as_mut().m_pa =3D m.physical.start; + map.as_mut().m_la =3D map.as_ref().m_la; + map.as_mut().m_plen =3D m.physical.len; + map.as_mut().m_llen =3D m.physical.len; + map.as_mut().m_deviceid =3D m.device_id; + map.as_mut().m_flags =3D m.map_type.into(); + 0 + }, + Err(e) =3D> i32::from(e) as c_int, + } +} diff --git a/fs/erofs/rust_bindings.h b/fs/erofs/rust_bindings.h index 8b71d65e2c0b..ad9aa75a7a2c 100644 --- a/fs/erofs/rust_bindings.h +++ b/fs/erofs/rust_bindings.h @@ -24,4 +24,8 @@ extern struct dentry *erofs_lookup_rust(struct inode *ino= de, struct dentry *dent unsigned int flags); extern struct dentry *erofs_get_parent_rust(struct dentry *dentry); extern int erofs_readdir_rust(struct file *file, struct dir_context *ctx); + +struct erofs_map_blocks; +extern int erofs_map_blocks_rust(struct inode *inode, + struct erofs_map_blocks *map); #endif --=20 2.46.0