From patchwork Thu Aug 1 00:02:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danilo Krummrich X-Patchwork-Id: 13749353 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 0CB86C3DA64 for ; Thu, 1 Aug 2024 00:08:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 948D96B00AC; Wed, 31 Jul 2024 20:08:15 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8F9A16B00AE; Wed, 31 Jul 2024 20:08:15 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 79A036B00AF; Wed, 31 Jul 2024 20:08:15 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 5708C6B00AC for ; Wed, 31 Jul 2024 20:08:15 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 189CFC079E for ; Thu, 1 Aug 2024 00:08:15 +0000 (UTC) X-FDA: 82401739350.23.4488671 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by imf11.hostedemail.com (Postfix) with ESMTP id C89014000E for ; Thu, 1 Aug 2024 00:08:12 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=cuq4GKG1; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf11.hostedemail.com: domain of dakr@kernel.org designates 145.40.73.55 as permitted sender) smtp.mailfrom=dakr@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1722470847; a=rsa-sha256; cv=none; b=1WmbVr2OpyqQcAXC/WfxUXlijjd+Ipa47Qdtbfdf2wHXuH4I2YMOPD9FDJUjj2/vzMPBPp T6OVgggdKM7p0zQMYlhY6SodjGI+tZabWj4b0jr0GKngUq15vsRbvOtLQHNt5IBoh0sdFP wbYpnHg/A8QUh5CX1CASVhrBWAZ7YK4= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=cuq4GKG1; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf11.hostedemail.com: domain of dakr@kernel.org designates 145.40.73.55 as permitted sender) smtp.mailfrom=dakr@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1722470847; 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=eXot3MZHYnZ3K6+E1NVzV0/frvElP3kiHuHsfR9IzbY=; b=bVFEFAb7LsmLUAVNrGPAjwj5muZ0qKn6CrGAIj8T9Rm9pN93MRdDkm5KwFqYDJdF35NwkR oSvX7sEGZlg4PBkRpWiVl+I5ERCMfboiMCa4dlnO7rye4vCTAXPCYIAZKFOqZh3Fl7Rovl jr8DfsvKH6MdCsxJDCM7sNM5OPgiRMg= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 12F1DCE1836; Thu, 1 Aug 2024 00:08:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5A302C116B1; Thu, 1 Aug 2024 00:08:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1722470889; bh=IVeFanrsSDZ5EV05jvxVmzxFrqOI4KjMh5AykPQhj/Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cuq4GKG1noPXG4VromqEQ5zTR/nbJlMJsyPeU7CAhTOpPfxxu0+6HNgp9Z4iJM2no TYLribq5kSOg7QueTYWZ/kivvl8DXQBnDqU1VCfad2nhN6gWLgrhyuIbFU8AkiW0gK UfscVewIgoA7NhLfnntiU21/c+3RrPIk0DTJUk5Q1qEXoOIKFixLbE8P3iCTXBjfOk ZJryrH8v/PpxMJE9BMgPUTA0O/0od0lVUDNowGA0euP+QWNS6fLMJkklMY1DfbUCvS odtDuWRg2OXRcMi+Ox1HrsiRYNn5jVhqQLjG7wpjhDw2oQxunrHiPUkQhZ4d6kTZCt hI8HmjqY65Svg== From: Danilo Krummrich To: ojeda@kernel.org, alex.gaynor@gmail.com, wedsonaf@gmail.com, boqun.feng@gmail.com, gary@garyguo.net, bjorn3_gh@protonmail.com, benno.lossin@proton.me, a.hindborg@samsung.com, aliceryhl@google.com, akpm@linux-foundation.org Cc: daniel.almeida@collabora.com, faith.ekstrand@collabora.com, boris.brezillon@collabora.com, lina@asahilina.net, mcanal@igalia.com, zhiw@nvidia.com, acurrid@nvidia.com, cjia@nvidia.com, jhubbard@nvidia.com, airlied@redhat.com, ajanulgu@redhat.com, lyude@redhat.com, linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, linux-mm@kvack.org, Danilo Krummrich Subject: [PATCH v3 14/25] rust: alloc: import kernel `Box` type in init.rs Date: Thu, 1 Aug 2024 02:02:13 +0200 Message-ID: <20240801000641.1882-15-dakr@kernel.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240801000641.1882-1-dakr@kernel.org> References: <20240801000641.1882-1-dakr@kernel.org> MIME-Version: 1.0 X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: C89014000E X-Stat-Signature: zy7mwdj7u59953jbhj7ecmed41ynrb3u X-Rspam-User: X-HE-Tag: 1722470892-569429 X-HE-Meta: U2FsdGVkX1+fFLT9/2EKwmuux8E8A0NEwvFt4hdJiTdkXUKnRy4Xc5XAWXVXMDGTNce8glnP0mPwkpJONFx4Y3BBgdr7Xc5Pkp04EKQsl9XxJ87j6nbejalKSwCOL8Dq9mN/h+xUjrUic8YaPIxBqLo5NQQ98wKc5HT20yOrMpES/RJdWb+AfKwfTcsUjgxCait9Y+njVPWfkyYKC8dOvW5dgaisPEXNDeLbAiWbrMU8fBlQKOyV5R0roIrcmitLOSwtMkVSbcWjukZHVfnsjC5QxqFt6FFe0VonujcowzL2ywYgtJtoWzxiwGFaAy/Ly1VmS4TT12jctHnMj2/AcEjq0spTyWjUCjZwUjxBluCLWI0vjDpjPJqAwRmpgNTobEqmdshnQzx+q7QwulkVLNjPWY0VD7B+pEcibeoNg7A5sQEBE9x4rECRzvUckP9/agsmiPxSf1580RQRJ50cy/KsUuCQZ1fnjqblMF/hTxbZLCgZKJtwLCHbx/gHLtq67rtGuMN0yTgGX6k/nUM5KWl8Uw2EAsmI7XxZ029Q3hZq1+EryWbAihI8YduF20k2aruXhjXXBs0dkc474bRVUy4iwoa/HewMXRg99ZP3gIdFo8tkKA3Bb2zllUe9mx38imNvEJPKE5hpOiIWYsbyg+42Y0pmc6bZONkW0q7ydMgoplcXZMac+5ocoyeVvdW8cBEQ8SH9Kz71xgjdLLqQRNKu2Xer3Jn51InaAFkK6svQq0OkpqyWgd29HaSKzNAy1327OfbD5zS/rhEjpKg0PWNAlZyNu0gR0QpnIIVquEZppuvllHIFxsVEZpt+QS2raA8zg2rnVPLkVdUXpdAYhDDyGgS7F/8ItvgVlCXbwuSSTIHXNXUUNHAsl9QZTadI1O27/A9dfboHXU2LRuJ49ziIbZdyzY7jGGyuY8fMZCNLcKAj/8dvbefkMxjSkQpFQuOez5DU6hRHHAYFpSK RWv/brdm Dn4u23Qbgr86CQi1YdH8EBmL4DQUrRpK4YrYSL+p9eCGd58sobs6Nya7tQNmRWPIT0tIy0CPE19JZu2MrIpp7MbKPlV1+b/EZEEGjw2+bVu16dnd+m4MvcCQhSFri/w1l2jXMNuaP0/8dju8vkrdsdW15RM4CyhypXJ58STr1jPSQEAIKCMnxtixrOdcDxeiwW4VLDtEzyMCcvjfHVIF3C7AFy9PMU2Hq9nG2wtLGrwqUjdhFQCX7W1xCNxNK/Xm8dp9UU9yWCYqSjPxME8tMvLMxGNphGwWz87K+AMvVjQxFZJXHs3DSJTewOQ== 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: Now that we removed `BoxExt` and the corresponding includes in init.rs, add the new kernel `Box` type instead. Signed-off-by: Danilo Krummrich Reviewed-by: Alice Ryhl --- rust/kernel/init.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/rust/kernel/init.rs b/rust/kernel/init.rs index ae533305d40e..350582662964 100644 --- a/rust/kernel/init.rs +++ b/rust/kernel/init.rs @@ -211,7 +211,7 @@ //! [`pin_init!`]: crate::pin_init! use crate::{ - alloc::{AllocError, Allocator, Flags, KBox}, + alloc::{AllocError, Allocator, Box, Flags, KBox}, error::{self, Error}, sync::UniqueArc, types::{Opaque, ScopeGuard}, @@ -1147,7 +1147,7 @@ fn init(init: impl Init, flags: Flags) -> error::Result } } -impl InPlaceInit for crate::alloc::Box +impl InPlaceInit for Box where A: Allocator + 'static, { @@ -1156,13 +1156,13 @@ fn try_pin_init(init: impl PinInit, flags: Flags) -> Result, where E: From, { - let mut this = crate::alloc::Box::<_, A>::new_uninit(flags)?; + let mut this = Box::<_, A>::new_uninit(flags)?; let slot = this.as_mut_ptr(); // SAFETY: When init errors/panics, slot will get deallocated but not dropped, // slot is valid and will not be moved, because we pin it later. unsafe { init.__pinned_init(slot)? }; // SAFETY: All fields have been initialized. - Ok(unsafe { crate::alloc::Box::assume_init(this) }.into()) + Ok(unsafe { Box::assume_init(this) }.into()) } #[inline] @@ -1170,13 +1170,13 @@ fn try_init(init: impl Init, flags: Flags) -> Result where E: From, { - let mut this = crate::alloc::Box::<_, A>::new_uninit(flags)?; + let mut this = Box::<_, A>::new_uninit(flags)?; let slot = this.as_mut_ptr(); // SAFETY: When init errors/panics, slot will get deallocated but not dropped, // slot is valid. unsafe { init.__init(slot)? }; // SAFETY: All fields have been initialized. - Ok(unsafe { crate::alloc::Box::assume_init(this) }) + Ok(unsafe { Box::assume_init(this) }) } }