From patchwork Wed Apr 5 19:36:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: y86-dev X-Patchwork-Id: 79882 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp547124vqo; Wed, 5 Apr 2023 12:40:02 -0700 (PDT) X-Google-Smtp-Source: AKy350bJROLhQ6scz6w2EmGfRNSeYGYGKc+3r0topyQP7xdHlHhRmav500Ia4RXqaPnZoVywyJtR X-Received: by 2002:a17:903:234c:b0:1a1:b9e6:28a8 with SMTP id c12-20020a170903234c00b001a1b9e628a8mr9047691plh.45.1680723602475; Wed, 05 Apr 2023 12:40:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680723602; cv=none; d=google.com; s=arc-20160816; b=SIVAxTy0DJl8AVgqiIDDJGwgwY4caAqav9Brt5fT5cF90UDS5hjDcS5OC+Rc7iKYDQ Luo1ZjN+Yimzd8kxfYL9vmgt1WdYdkz2nYBJPd3qq79GXPetMXP0DC7UA+zLZf/7xp5k DQYHfcx+gssUCEU58MjPkIWMYTMhajCYdCHUlilszXIsP/yDOpq+U2MTtl0hT30S93WV DbwH3KCxJ8hu9qE6gzKlekVgqTdQvAOllqqojDvs0dszOseLtfZiL3FZiM23cMvtKts5 t2zz+3m06OYw2h9Mo08WZH0RhFYTb8AKhZf2ANNpfQerzVD+Pb6X1l6MPPEqLYkNJMki l5lg== 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:references:in-reply-to:message-id:subject:cc:from:to :dkim-signature:date; bh=ZCKyMh4Cy/a8XCkX5YtgorxlPc4QWU1n5QVDMdo6GOo=; b=zB/GGm6o3hYUq02dJG6irikXs0ib2IGOMMRSoPFmZV0rqNQb8vkb9roVYKJGAprsBJ CRfiMKlkGjE0oCmSXCzb9wCBRdzU4bIB/GgfYCNDJziftdYuH+Gcz9GXLC4+CU3OEe/u +3REV3qyVSBtrZY4F7JiaDQXAlOmnnW+fuOkdh8XCxkN5gqUD54B8HN+HZMVVCVFc/Sp GWIDl2gRqqMRr21ee485JBYPCTQF6MYQ+FJ+hmLpS/sm+WuxPFu1yAZLTqM42WezLvJn 7x9lkYTqmTuDG9U7CTO4xRRvPuCYF/md/3JaNTMiq/gW9d7zJJ1Gc9RmGEBXNa32AvNB xeRQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@protonmail.com header.s=protonmail3 header.b=B9v+mNYE; 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 j3-20020a170902758300b001a25fe2f0e1si12593184pll.95.2023.04.05.12.39.49; Wed, 05 Apr 2023 12:40:02 -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=B9v+mNYE; 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 S233973AbjDETid (ORCPT + 99 others); Wed, 5 Apr 2023 15:38:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56648 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233659AbjDETiV (ORCPT ); Wed, 5 Apr 2023 15:38:21 -0400 Received: from mail-40133.protonmail.ch (mail-40133.protonmail.ch [185.70.40.133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 99F0B7ABF; Wed, 5 Apr 2023 12:37:48 -0700 (PDT) Date: Wed, 05 Apr 2023 19:36:51 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1680723430; x=1680982630; bh=ZCKyMh4Cy/a8XCkX5YtgorxlPc4QWU1n5QVDMdo6GOo=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=B9v+mNYE+wICOGnB1gx9G8hQz5juL8uXYdjvo0bSEZLdFjfADz11wIE2VhQDM7QNi x1p2Jd8LtPSnnXCxKBvT/BQMcSSVQakOn5Tu9zNq4BgJrjV36JBs1HKgQUcWdUwvcH CCH2wMxnRm/0j3WFa+m5L/OGsfJrk3XBKSapXCxB+bxmo6phWLX6xaeJL1oHmt/G98 n6A7XITPBOxvkXVDKSjY9/n/d7XCpba+Ub3bBocwqugIouncNDDnV3WaPQC10uSlGe iUZsj3YHeyud28v8VWNcoZSfsJSJDflsjvDQ6ZrdOOqlngzdBufDuYWy3zvySFVp+H qvHizrikBFTig== To: Miguel Ojeda , Alex Gaynor , Wedson Almeida Filho , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Alice Ryhl , Andreas Hindborg From: Benno Lossin Cc: rust-for-linux@vger.kernel.org, linux-kernel@vger.kernel.org, patches@lists.linux.dev, Benno Lossin , Alice Ryhl , Andreas Hindborg Subject: [PATCH v6 14/15] rust: sync: reduce stack usage of `UniqueArc::try_new_uninit` Message-ID: <20230405193445.745024-15-y86-dev@protonmail.com> In-Reply-To: <20230405193445.745024-1-y86-dev@protonmail.com> References: <20230405193445.745024-1-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?1762366432146686849?= X-GMAIL-MSGID: =?utf-8?q?1762366432146686849?= `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 Reviewed-by: Alice Ryhl Reviewed-by: Gary Guo Cc: Andreas Hindborg Reviewed-by: 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 43a53fbe175d..d05caa723718 100644 --- a/rust/kernel/sync/arc.rs +++ b/rust/kernel/sync/arc.rs @@ -18,7 +18,8 @@ use crate::{ bindings, error::{self, Error}, - init::{InPlaceInit, Init, PinInit}, + init::{self, InPlaceInit, Init, PinInit}, + try_init, types::{ForeignOwnable, Opaque}, }; use alloc::boxed::Box; @@ -30,6 +31,7 @@ use core::{ pin::Pin, ptr::NonNull, }; +use macros::pin_data; /// A reference-counted pointer to an instance of `T`. /// @@ -122,6 +124,7 @@ pub struct Arc { _p: PhantomData>, } +#[pin_data] #[repr(C)] struct ArcInner { refcount: Opaque, @@ -502,9 +505,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()) }, }) } }