From patchwork Sat Nov 25 12:51:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benno Lossin X-Patchwork-Id: 169722 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp1911680vqx; Sat, 25 Nov 2023 04:52:44 -0800 (PST) X-Google-Smtp-Source: AGHT+IHEsumyrVMqvD5YKp7x6VFqGKbRsgjKttKHCCJr+yZaqlUViZWqMS4bXbkHSO0Pz0kcqE1U X-Received: by 2002:a05:6602:36cf:b0:783:62d0:88c with SMTP id bg15-20020a05660236cf00b0078362d0088cmr1626471iob.19.1700916764072; Sat, 25 Nov 2023 04:52:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700916764; cv=none; d=google.com; s=arc-20160816; b=euCEx9RCBViKDV+Fi0/mspHE+OTA3umkeDDz7EvbcxciTpTVUDI/rvTAwIooKpl+Ke iqjNRFAj6FqiDMqWDWTvQWOyhhMIIV8m/TJ+yuApHDRjEVOY8LjOwu9MKD4hXgy7xHOU hu+1e6ueDrZnlrX56Gb1g8F8yEp/kP0FxdeWI6fA1x8bicGyBpvrkJnEJCIl8M1AAonS 49/KsslPM+d/z8Tgnldhz0p5o2qTlAA+CHBrRyqZhL02g7vGNlO57TyZ/JhWGCp8VMuF jO3zBE1AFkDBtZUjV9e6XkP6DlnKOew3qWN5d+zgcdisMnUticc58zBEjjBW9Oh5A4Kd iUAA== 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:date:dkim-signature; bh=5cwlw0HuMDDbZgo/K1At3+rO2e/15vaUqRXcq/BERzM=; fh=MKp4uwIS2qcobQvLDCgvPbRKPggooUfCgyYyA4DDQfU=; b=RtmqNOf9jAYW+dXnRq3TpFj3RnKOrgjC5peLLtFoj/kgiXE+a8DBUKUZIjmZvvVtit uDF1M3dyrEesL9bX+XfLP9JuBZAl8AaV1HEfSSH2WoMQgOVo5Kdr8ON5Ii9VPE6w0m3j DdlaF0gdc58CxztZ7x/hjFE90cHuTRi3BkqB7okJVOOQL87miV477uiaFQlgLO4tb8I5 yUIIF6VeKYv7gvL8qDRixneGpP5jt6Rsq05Y9cfnNUnAW1QTDdMeIkGxzCZxeKpjIVN1 0xQOlobdMYCX1nniC2Ab0Di/1XsDbqSyd+pA/6KWYhx+1slmmq63DzTRTHBK2g4ku68L kfuw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@proton.me header.s=protonmail header.b=FS3ez3D8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=proton.me Received: from fry.vger.email (fry.vger.email. [2620:137:e000::3:8]) by mx.google.com with ESMTPS id 23-20020a630c57000000b005ab7b51ab6csi5729086pgm.515.2023.11.25.04.52.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Nov 2023 04:52:44 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8; Authentication-Results: mx.google.com; dkim=pass header.i=@proton.me header.s=protonmail header.b=FS3ez3D8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=proton.me Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id 36A6C8063D45; Sat, 25 Nov 2023 04:51:48 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232088AbjKYMvb (ORCPT + 99 others); Sat, 25 Nov 2023 07:51:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41506 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231808AbjKYMv3 (ORCPT ); Sat, 25 Nov 2023 07:51:29 -0500 Received: from mail-4316.protonmail.ch (mail-4316.protonmail.ch [185.70.43.16]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BB9D618C for ; Sat, 25 Nov 2023 04:51:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me; s=protonmail; t=1700916693; x=1701175893; bh=5cwlw0HuMDDbZgo/K1At3+rO2e/15vaUqRXcq/BERzM=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=FS3ez3D8nDEmE+MRVnSjRM9nxTRr8v9kzeCCfjs7zZYj3YGzeyW4G2sPVZfmcU2hW CDdNb/nAxVfWR0uZ5lu30LwUdKIGM1ZzwAkldj471VMulFRmoTbdgN6qS2QSrYELEU QSfRsiwmR0lL4KrlQTAsZA0hZ5BXW4cWJFaRDPkD0E22LxezynuZqdKe2JJiD2huVr HOfNXZciWch/10Vm/Bu2ZLszU5hX6vGLGtAu8nBEomhkCbmT/PkPOVNrssLXl8I30g ++D2QaElRThHrNYAUL9TUrIYwdqTGST66IGS560BcK817bPYxTnr7Jw0KOdZO2/mYq 2hX2k5YW7GDhw== Date: Sat, 25 Nov 2023 12:51:23 +0000 To: Miguel Ojeda , Alex Gaynor , Wedson Almeida Filho , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Martin Rodriguez Reboredo , Tejun Heo From: Benno Lossin Cc: Wedson Almeida Filho , rust-for-linux@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/3] rust: workqueue: add `#[pin_data]` to `Work` Message-ID: <20231125125024.1235933-3-benno.lossin@proton.me> Feedback-ID: 71780778:user:proton MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Sat, 25 Nov 2023 04:51:48 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783540496737301370 X-GMAIL-MSGID: 1783540496737301370 The previous two patches made it possible to add `#[pin_data]` to structs with default values to const generic paramters. This patch makes `Work` use `#[pin_data]` and removes an invocation of `pin_init_from_closure`. This function is intended as a low level manual escape hatch, so it is better to rely on the `pin_init!` macro. Signed-off-by: Benno Lossin --- @Miguel: This patch is based on v6.7-rc2, because `workqueue.rs` has yet to land in rust-next. The first two patches also apply to rust-next. rust/kernel/workqueue.rs | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/rust/kernel/workqueue.rs b/rust/kernel/workqueue.rs index b67fb1ba168e..15bcfdb1ed33 100644 --- a/rust/kernel/workqueue.rs +++ b/rust/kernel/workqueue.rs @@ -334,8 +334,10 @@ pub trait WorkItem { /// Wraps the kernel's C `struct work_struct`. /// /// This is a helper type used to associate a `work_struct` with the [`WorkItem`] that uses it. +#[pin_data] #[repr(transparent)] pub struct Work { + #[pin] work: Opaque, _inner: PhantomData, } @@ -357,21 +359,22 @@ pub fn new(name: &'static CStr, key: &'static LockClassKey) -> impl PinInit, { - // SAFETY: The `WorkItemPointer` implementation promises that `run` can be used as the work - // item function. - unsafe { - kernel::init::pin_init_from_closure(move |slot| { - let slot = Self::raw_get(slot); - bindings::init_work_with_key( - slot, - Some(T::Pointer::run), - false, - name.as_char_ptr(), - key.as_ptr(), - ); - Ok(()) - }) - } + pin_init!(Self { + work: Opaque::ffi_init(|slot| { + // SAFETY: The `WorkItemPointer` implementation promises that `run` can be used as + // the work item function. + unsafe { + bindings::init_work_with_key( + slot, + Some(T::Pointer::run), + false, + name.as_char_ptr(), + key.as_ptr(), + ) + } + }), + _inner: PhantomData, + }) } /// Get a pointer to the inner `work_struct`.