From patchwork Fri Mar 31 21:54:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: y86-dev X-Patchwork-Id: 78019 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp876995vqo; Fri, 31 Mar 2023 15:25:39 -0700 (PDT) X-Google-Smtp-Source: AKy350ZGMp/ROuetqXcKpXu5SOvbTQOaD3UG8y6NdX90vlG4aLoVjqj0hywN8PcPCZFvNouJgbAz X-Received: by 2002:a17:90a:1997:b0:234:b964:5708 with SMTP id 23-20020a17090a199700b00234b9645708mr31823339pji.5.1680301539504; Fri, 31 Mar 2023 15:25:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680301539; cv=none; d=google.com; s=arc-20160816; b=xIjLRfn6uoPrrjwgN7Eyx7sbrIC9Ppojj11FMaO+98PkEKBbrPNR17kiv7leAswspw 9QLQg/KI6oDy9ywJ6fJvyXQ+7PjBdxLG0Vhg5yyul2B710Cv0RseAIhJlKEveq7MSYO5 JiBdPA42aLVUOSHug2YsEyOTQAhwKzkjEMeUYsxbEJ8gdZX9MfcMSZZ4sXphQtOy88Q0 gZsBxqxswHrGAptZu5mDM22LmgXKsHnN49NLeEPLYPSWQQmeYj0dSQo9rDeg1GMheVg2 ZetNLGT9o5qHCzRJNLVrUiOEDcL0MkzedVFpkU5GeiVq3K3PrU6WckGDfQLJXod3UtWr qCPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :feedback-id:message-id:subject:cc:from:to:dkim-signature:date; bh=1GecTG6cMNHUnl55zwpVGr5SWiWDxMMvxrRphdMkDzM=; b=YEbeQ5EvwU7vPGmVonKeZFXnmm7A1jy5vRO1wSuaSsCfl3dpHKqbISmT6zW6FoMsS2 o0G+q2X3vbvCgJYwqlsiEXtTIKQbXRib5/n7MDraGnZ+Dgcdd/ezbdqdpam0pJ6EJd9I q1092wxaQYzd9lmhcKib5TmpnlU2l5IQEjEv+KQPUADUyJmFjd/H0ixvqPGiv6I8+XrK fVTu5mGssavkq4J6UfRxMJ+YdCfocTVVws36yba1qZOja3nZQuFYYMzXb/hDm4ll9A74 35MeOwf6kyj985yHbexblEqPVFuOSi7PB9M8otIeVisET/dI27Z1/CsxDcnFLVNWEAgA m/pw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@protonmail.com header.s=protonmail3 header.b="H/mNqIvO"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=protonmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id a11-20020a17090a854b00b0023f86fda6b0si3167009pjw.51.2023.03.31.15.25.27; Fri, 31 Mar 2023 15:25:39 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@protonmail.com header.s=protonmail3 header.b="H/mNqIvO"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=protonmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233380AbjCaV4X (ORCPT + 99 others); Fri, 31 Mar 2023 17:56:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47716 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233384AbjCaV4I (ORCPT ); Fri, 31 Mar 2023 17:56:08 -0400 Received: from mail-4322.protonmail.ch (mail-4322.protonmail.ch [185.70.43.22]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 11C1B24AF4; Fri, 31 Mar 2023 14:55:35 -0700 (PDT) Date: Fri, 31 Mar 2023 21:54:41 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1680299693; x=1680558893; bh=1GecTG6cMNHUnl55zwpVGr5SWiWDxMMvxrRphdMkDzM=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=H/mNqIvOr45ghmNt8qtgctkPuixhU+PCgVBeee893sIWCHl6p2qEZN27wioRs4E+n FqFbvKSBhEF3K3trcy9aH8/qQU9J8cROLpYIYkNal6jzEdiPV5Gpdd0FVFb+adqRfF zdhQnkhGl9QDb54OEJFhVIFwMG6Jkj8KVwKiw/OdzQWQg8QR1JRtKUdVljeQvf8oX4 +Qg0Eg2lNwkaU8E0Cu8qyhJvJrm6buuSXuvwgm2AVA82sfgYtHFQC2ofC/TZhPsfNP F/ICkJlIgQlSDtKX9mngxonjkcjfGPRs4crPUMcRz29WuC6hoxnBzw4FIE+m9IDCgS Qpro+dh3HIZXg== To: Miguel Ojeda , Alex Gaynor , Wedson Almeida Filho , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Alice Ryhl From: y86-dev@protonmail.com Cc: rust-for-linux@vger.kernel.org, linux-kernel@vger.kernel.org, patches@lists.linux.dev, Benno Lossin , Alice Ryhl , Andreas Hindborg Subject: [PATCH v4 14/15] rust: sync: reduce stack usage of `UniqueArc::try_new_uninit` Message-ID: <20230331215053.585759-15-y86-dev@protonmail.com> Feedback-ID: 40624463:user:proton MIME-Version: 1.0 X-Spam-Status: No, score=-0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1761923867051572011?= X-GMAIL-MSGID: =?utf-8?q?1761923867051572011?= From: Benno Lossin `UniqueArc::try_new_uninit` calls `Arc::try_new(MaybeUninit::uninit())`. This results in the uninitialized memory being placed on the stack, which may be arbitrarily large due to the generic `T` and thus could cause a stack overflow for large types. Change the implementation to use the pin-init API which enables in-place initialization. In particular it avoids having to first construct and then move the uninitialized memory from the stack into the final location. Signed-off-by: Benno Lossin Cc: Gary Guo Cc: Alice Ryhl Cc: Andreas Hindborg --- rust/kernel/lib.rs | 1 - rust/kernel/sync/arc.rs | 16 +++++++++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) -- 2.39.2 diff --git a/rust/kernel/lib.rs b/rust/kernel/lib.rs index 821bd067151c..2d7606135ef6 100644 --- a/rust/kernel/lib.rs +++ b/rust/kernel/lib.rs @@ -28,7 +28,6 @@ #[cfg(not(CONFIG_RUST))] compile_error!("Missing kernel configuration for conditional compilation"); -#[allow(unused_extern_crates)] // Allow proc-macros to refer to `::kernel` inside the `kernel` crate (this crate). extern crate self as kernel; diff --git a/rust/kernel/sync/arc.rs b/rust/kernel/sync/arc.rs index 24dc96603090..5f64affd8f33 100644 --- a/rust/kernel/sync/arc.rs +++ b/rust/kernel/sync/arc.rs @@ -17,7 +17,8 @@ use crate::{ bindings, - init::{InPlaceInit, Init, PinInit}, + init::{self, InPlaceInit, Init, PinInit}, + try_init, types::{ForeignOwnable, Opaque}, }; use alloc::boxed::Box; @@ -29,6 +30,7 @@ use core::{ pin::Pin, ptr::NonNull, }; +use macros::pin_data; /// A reference-counted pointer to an instance of `T`. /// @@ -121,6 +123,7 @@ pub struct Arc { _p: PhantomData>, } +#[pin_data] #[repr(C)] struct ArcInner { refcount: Opaque, @@ -501,9 +504,16 @@ impl UniqueArc { /// Tries to allocate a new [`UniqueArc`] instance whose contents are not initialised yet. pub fn try_new_uninit() -> Result>, AllocError> { - Ok(UniqueArc::> { + // INVARIANT: The refcount is initialised to a non-zero value. + let inner = Box::try_init::(try_init!(ArcInner { + // SAFETY: There are no safety requirements for this FFI call. + refcount: Opaque::new(unsafe { bindings::REFCOUNT_INIT(1) }), + data <- init::uninit::(), + }? AllocError))?; + Ok(UniqueArc { // INVARIANT: The newly-created object has a ref-count of 1. - inner: Arc::try_new(MaybeUninit::uninit())?, + // SAFETY: The pointer from the `Box` is valid. + inner: unsafe { Arc::from_inner(Box::leak(inner).into()) }, }) } }