Received: by 2002:ab2:6a05:0:b0:1f8:1780:a4ed with SMTP id w5csp2677919lqo; Tue, 14 May 2024 06:18:41 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCX8iK9nsfo3oCEzANDKNvYF0UFxzZBf5MLPmXR0aCyGZ7gmNoNzKaUntvjcxjHua2Y9pvpA3QiuKetetjOWf4GHx2q9AghH8KClj2fjxA== X-Google-Smtp-Source: AGHT+IHeTGpQ04Xx5i3etlqgtYIIAigAagPtuAYNoYWBohBv2XF3UD+Bj9jfxIaxeubteCziRZXG X-Received: by 2002:a05:6102:6cd:b0:47c:2b2f:8f13 with SMTP id ada2fe7eead31-48077dcd430mr11653104137.6.1715692721684; Tue, 14 May 2024 06:18:41 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1715692721; cv=pass; d=google.com; s=arc-20160816; b=SsLNHcngagkA2ttmtwKFq7zY9K6a0ojgdEeMKCw2JeSNfoj/nfajcWLXoy7Q4bHpMa N8ae9rZ0OAxFb3LPtQGBiWxLfyaC1sX5WydBUJb6lPnffiramuGMJ7kTiekkUNlQvvCT E6YsLVOMBT53xwLm/QcbqFwgull9nO3/ezrUTISR4UYMTS7VoTY6PLG1NlvnVtuid/eE HrAU47ykYaWUSZ7NXDOlvr2y/lqUBtBHwerizA9hpvfSlj0GHy4KLvS5vJwEwQEkm+/i QqHViIjDoBFxDTnIVKQvJVLNN1S2/LHZDnkobMSLAPOyC8IYmRrHuJuS5SeVinXi9OEv CfAg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=rGJsPpk+V4pg7g+WZPwCWfXSyJlMwREYYXFaZU3M6G8=; fh=8F2bjnxf7BA/5hmtnVUxfb2a9BqfPztoIKoFbC+ZSss=; b=chfhVLqfsUiiUaFsYDGOoKz91tqTUHob0nRnMErn1p0r2pSMaKBGXe7MRp9aUxyS5W MfYHmw9XdG0pEzQKHBW1EdBRVY6VIDLyRAcB4vipiiK4bDawjkSnLOwkTTC0HXx1SZxq MKbDpu9Py8R3Q4mrM8MuWN2NdoUj9NjctKHvemNC4+p0het7BnEhf556poLuEpgk5VYH FZtHcXXsHC/B7ZOizdv+iEonTJpzngMU6mlnpmoQ+DgsZ9s8KLLfsJt+LaUCFLxqEAdp n1SuJXbiWq2Z/QEGCbPSZRLp4p57dF8PYhT5fzMfGHv+iqebPmlg+Hf+ezxIgLdlwkoA 2I+Q==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=RYOSYhLo; arc=pass (i=1 spf=pass spfdomain=gmail.com dkim=pass dkdomain=gmail.com dmarc=pass fromdomain=gmail.com); spf=pass (google.com: domain of linux-kernel+bounces-178714-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-178714-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id ada2fe7eead31-4806cc90d00si2180132137.592.2024.05.14.06.18.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 May 2024 06:18:41 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-178714-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=RYOSYhLo; arc=pass (i=1 spf=pass spfdomain=gmail.com dkim=pass dkdomain=gmail.com dmarc=pass fromdomain=gmail.com); spf=pass (google.com: domain of linux-kernel+bounces-178714-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-178714-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 654591C22143 for ; Tue, 14 May 2024 13:18:41 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 7E5061459E0; Tue, 14 May 2024 13:17:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="RYOSYhLo" Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) (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 397C9144D3A; Tue, 14 May 2024 13:17:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.175 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715692658; cv=none; b=jIK8Dei5oeY9B/p4bRHnkWhr0nt7lcMoP0XeSwVXx5w7IaJGxaadB4C37/0qh7oFrGkmRzNVXrVJlxfLvRkfpSEOzw7raZAWzaqYUehYgReaLKqrWm7XyTETX24kA/VLUjg0tDuN9WwiPm8vjzfQYTY7zCh/KQUcSWqZwjdBmBU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715692658; c=relaxed/simple; bh=FnRY1u4YwwnOW6PD08/fpU/dFshvY9j1Vl1jbm0E9ig=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=uaGT7y8obV6ThHrJ6I6Nj1GrREuS5S52F5IfOCUn5cutpO0BW/LRFhtSKBIPfWcEJ0BWA0pCcEye7BY53ocNEN9FYLjqNIPeMGBx+3ukyzZ4zslKCdCcEnx9R0MElgaO89tUU7Z6BnCHau52+RS7/UOHRqDPJSd2CwcOnQqdavs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=RYOSYhLo; arc=none smtp.client-ip=209.85.214.175 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-1ec92e355bfso52579165ad.3; Tue, 14 May 2024 06:17:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715692656; x=1716297456; 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=rGJsPpk+V4pg7g+WZPwCWfXSyJlMwREYYXFaZU3M6G8=; b=RYOSYhLoKJEpE4Df0CLYiu02f0X6POzYBIGjHnzBqaiuoVT5tCMOzRUqfuHd+j9DqH ykoT2WNJ8f9CXr21VKrCENsf8XYDntp0Y/piWSCEcizpza2o8El2i8WAuDTMq2YhPoDE 0xkDZjq+W3FmQrzH55R2N5JQ+MQD16PFSS3sCwyf1rzNhNF05BG1zN36eS/4HbGR5BW5 IuEcMBMJ7QQgsE4vT5q3wEUjze3lCSp+N7IcSsVD/18FULZAE/Si8HRy1oAhlk2Opqof MYqTsoFeNPCE8hJX4oo6LXAVLZYOxCEuApxInqCgOAQgNbGZqmaF+FvhICha6sDuCgG8 GDOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715692656; x=1716297456; 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=rGJsPpk+V4pg7g+WZPwCWfXSyJlMwREYYXFaZU3M6G8=; b=bjfG4ODxqBZtKjRnz5DbdNiv42UAqutgIXqrWsa+HPuI7CX1DRkyDkn5OBCxBendVX vX4Lu4vTWyoUGqr77z52Gy/5iZFJ23EyvVeOdeAzZtxjiDrYfu/ODnPQjy+Pprhj2CK0 TFSebRrHMBBm4y+XU6vSGSX6kU7Ku/JdTGmxhNjVLmQrVjM2m4JVjHQ/53AYJDbZNYKl Rn5M/WUxHlo0cUo7a7SGoMLYZIaGpweKlLUNLRH0veJY3xwgEqTXtIBvuDrJ8Jhzm7zD /vJTIr7E9M1Q4g1M3YZRbtE5KD0hg+sDRb2TRDPLrbSV6WYpfGLOkpZWNhc1DKbr+8P9 z0bw== X-Forwarded-Encrypted: i=1; AJvYcCUnybLwGZtMlOD25okeK8eH0TdH5cUxsExv1t/LcPjMzcFGN1ls9VHZi0EZG0OQOwUBUqIq+AOywIvn1FmbOjezAZaRW3zMeuEZ5THyRAf0ypzfdNnuwsiV66PHY/Dib0uGb9CEECVO49G6FP9njcYEg7fjeMpJuABZ1ZO4pg42tAOmrvQMp17QWyMm X-Gm-Message-State: AOJu0YycHY3W9kqiUavZPC7FfiOSQJJ091BVtXcp+jprVJoEFD8uZPSz o71r2bt8Zp2MMVA3Ku9mKIJ1WVnZ1Li/tyIKcepYwHYRmianCmFu X-Received: by 2002:a17:902:aa03:b0:1ec:5f64:6e74 with SMTP id d9443c01a7336-1ef43d29b65mr141454895ad.23.1715692656519; Tue, 14 May 2024 06:17:36 -0700 (PDT) Received: from wedsonaf-dev.. ([50.204.89.32]) by smtp.googlemail.com with ESMTPSA id d9443c01a7336-1ef0b9d18a4sm97277335ad.56.2024.05.14.06.17.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 May 2024 06:17:36 -0700 (PDT) From: Wedson Almeida Filho To: Alexander Viro , Christian Brauner , Matthew Wilcox , Dave Chinner Cc: Kent Overstreet , Greg Kroah-Hartman , linux-fsdevel@vger.kernel.org, rust-for-linux@vger.kernel.org, linux-kernel@vger.kernel.org, Wedson Almeida Filho Subject: [RFC PATCH v2 02/30] rust: fs: introduce the `module_fs` macro Date: Tue, 14 May 2024 10:16:43 -0300 Message-Id: <20240514131711.379322-3-wedsonaf@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240514131711.379322-1-wedsonaf@gmail.com> References: <20240514131711.379322-1-wedsonaf@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Wedson Almeida Filho Simplify the declaration of modules that only expose a file system type. They can now do it using the `module_fs` macro. Signed-off-by: Wedson Almeida Filho --- rust/kernel/fs.rs | 56 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 55 insertions(+), 1 deletion(-) diff --git a/rust/kernel/fs.rs b/rust/kernel/fs.rs index cc1ed7ed2f54..fb7a9b200b85 100644 --- a/rust/kernel/fs.rs +++ b/rust/kernel/fs.rs @@ -9,7 +9,7 @@ use crate::error::{code::*, from_result, to_result, Error}; use crate::types::Opaque; use crate::{bindings, init::PinInit, str::CStr, try_pin_init, ThisModule}; -use core::{ffi, pin::Pin}; +use core::{ffi, marker::PhantomData, pin::Pin}; use macros::{pin_data, pinned_drop}; /// A file system type. @@ -73,3 +73,57 @@ fn drop(self: Pin<&mut Self>) { unsafe { bindings::unregister_filesystem(self.fs.get()) }; } } + +/// Kernel module that exposes a single file system implemented by `T`. +#[pin_data] +pub struct Module { + #[pin] + fs_reg: Registration, + _p: PhantomData, +} + +impl crate::InPlaceModule for Module { + fn init(module: &'static ThisModule) -> impl PinInit { + try_pin_init!(Self { + fs_reg <- Registration::new::(module), + _p: PhantomData, + }) + } +} + +/// Declares a kernel module that exposes a single file system. +/// +/// The `type` argument must be a type which implements the [`FileSystem`] trait. Also accepts +/// various forms of kernel metadata. +/// +/// # Examples +/// +/// ``` +/// # mod module_fs_sample { +/// use kernel::fs; +/// use kernel::prelude::*; +/// +/// kernel::module_fs! { +/// type: MyFs, +/// name: "myfs", +/// author: "Rust for Linux Contributors", +/// description: "My Rust fs", +/// license: "GPL", +/// } +/// +/// struct MyFs; +/// impl fs::FileSystem for MyFs { +/// const NAME: &'static CStr = kernel::c_str!("myfs"); +/// } +/// # } +/// ``` +#[macro_export] +macro_rules! module_fs { + (type: $type:ty, $($f:tt)*) => { + type ModuleType = $crate::fs::Module<$type>; + $crate::macros::module! { + type: ModuleType, + $($f)* + } + } +} -- 2.34.1