From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr2-f12.google.com (mail-wr2-f12.google.com [74.125.225.76]) (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 E0D6A3806C4 for ; Sat, 26 Sep 2026 16:36:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.225.76 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790440563; cv=none; b=DtNT7mP48Xnsuby21+6RrIcBKzvgooHS61rxr7dC2PGpBVMMoZsC86r86Rrah7JUHmo3DmF4HyeWAjeTRs9cmZ6f3gtyVxZNey8WvJLZartTHMVtW4RDlA0162KzLOUg9BNxyvb3YQoltwQVAYGG7w8i8b4tRRY52bY9p4gOJHI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790440563; c=relaxed/simple; bh=kF13SbON5k5Arvp0ikMg5xGDnjZmmTCAm+geeOVzYi4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ahSqOKaWe4+Z337n6MYZS/HfRNsQ79s55wa+SxMpz5Er+Biis+lj3hEfUN2iLB+WKO89QcO+29XFlugC7Pd5OEET6h1d2WroWyn77HbyP0+Skw39UdTB8Ob9zHM1OxrXMYLszBwTMUX6504+i4OK/TLVYmI2zL54LUbbfFApqHk= 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=sxKLAyYx; arc=none smtp.client-ip=74.125.225.76 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 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="sxKLAyYx" Received: by mail-wr2-f12.google.com with SMTP id ffacd0b85a97d-485984ebf5cso1382105f8f.0 for ; Sat, 26 Sep 2026 09:36:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1790440560; x=1791045360; 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:content-type; bh=7JwW6U3iTEHgPApFOC8Hbz3JJt/r5iD7r/z62SOkAVw=; b=sxKLAyYxgqLF4SScP7aPvwZpR17nsPHFBYwqcyxJ6OsKV/6XxSkoW6GAD43S4j9pxT +BK7Ja+ChIfRiAKKxMpM6u6yiAb+YUwTPlvM9I2LTl/lXZGnlVhTx775WlWBTc5aZ6Ck HOO19A6Zrz9BpGWgYCq85qFuZNgYbtnVGvH6TYC4WMQGmSyyUwXVyVlCuHr5NATwrSfC WXUlhivM3ocZPNiVbAvsTYPntSB6xiQuaeQ35W9d1e4yEdJuBewiub75vfMp1RVd78+u FfKYp7uZfUR8fWA7uYJwYFfpAkvCkDG/o5daZX0QNlz2ewU5qE1tGPUF1+KULOoWt1cL QvGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790440560; x=1791045360; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=7JwW6U3iTEHgPApFOC8Hbz3JJt/r5iD7r/z62SOkAVw=; b=qBNjuWP4LUFtAj0o18XYT/JI2J1eo2B81VGBVUjyr/h78UQnn9sHj3M4UpOQGksZ33 6CDCU3DSpaRcTbJee/+iY7rOgXHeTu2ePEQBv1c7hK1W0aEdAZTQrOwNS6AjHDlArGar 5+PeMojPSrc/4KHi5cTDIdSI+FS1oBUKLcHseMnIR9QvPNeFJBZbZPsBdQ9NstRBn6Kj fGZp7A+HtTSwAGb6OX/JAEkzrHet84RdNsNBxDrWI4WRt7LwiAYd9kYbl9S8u9AAdBRI MfCiFy0UIoqSRZWAWNffsPL0MHpRCiZV9RyiRjwCz/0zBvKoYbcpkxWU5+SHsXnYxyFt yzlw== X-Forwarded-Encrypted: i=1; AKwUvBz2dlfNUmlkNW/+Kp+B/TdZCx8hZh7ZVShtoeK+7y19seB7uGKRR+gx/mTpBfNJEvYq5XryKEaYQHlDIQ==@vger.kernel.org X-Gm-Message-State: AFq9FYJZlenXfN4a0oO0FM8cpWi/CDgAdMKG2mpjaaODxQojGWC5hxxw sTQpe0Y3bpQwQ6wzYEwX8zLI7Rv/1EMZu5Pq4CmGbX22rfrl72vaJaE5 X-Gm-Gg: AYBFou3sytDnYDEgpSJQ70RoGnIvkIh/bs6yXEUvOJsUGf3CSR0QoUTWZQZuY5ve3EL 6hQnz4eFN/MwBz3/HSTS2S6s7zxLno0dVJUsdtHYMf9ceqfBjs7PgsZw19Ze97dWas29vVUDj2d RFgpGkH9EeeuvTacGS9y2UoMr83/XZeGTLvXocX1jPQAtV60BxQcs2tXyY8J8+E7u8/cqKvV056 0PNuIt7CvZH9YUTUv6FUcnyHnCg34wnROuzWN2SnJkwbSckiAKfF9EO1ocMtcjbQH24C+1U9gb0 BDRM1Hvhc9/VDGNACE8R3z0/4h8AUsoIB7d6I4LwRBsnWhM5kuZQVwPtKsk/X8lAuh5uWOC2prz jKVj7AL1ZHzJaYdJo6GrNCnzh/TqaTgKMm2Rdke7L++rqsSTejDBodMYltSHOljFH99sh5H45WK pu0L4PRP/19cOShBYf+wuklS3693H2Snf2UAUmNZEi4s0t8pLTl5FaWjEJlJjwf62nBFtbb+IK2 /Laaiu19NnUI98JIoMImTq5vQZHUrzBn4AqAwhj2qBfLvNOEhULMyTxLD2EATHiBWg= X-Received: by 2002:a05:6000:386:b0:488:8c99:fbc8 with SMTP id ffacd0b85a97d-4888c99fcccmr179322f8f.50.1790440559714; Sat, 26 Sep 2026 09:35:59 -0700 (PDT) Received: from moosama76.. ([102.44.245.127]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4887a355d96sm16176146f8f.17.2026.09.26.09.35.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Sep 2026 09:35:59 -0700 (PDT) From: Mohamed Osama To: ojeda@kernel.org Cc: boqun@kernel.org, gary@garyguo.net, bjorn3_gh@protonmail.com, lossin@kernel.org, a.hindborg@kernel.org, aliceryhl@google.com, tmgross@umich.edu, dakr@kernel.org, daniel.almeida@collabora.com, tamird@kernel.org, acourbot@nvidia.com, work@onurozkan.dev, longman@redhat.com, lyude@redhat.com, linux-block@vger.kernel.org, linux-serial@vger.kernel.org, rust-for-linux@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 3/5] rust: block: gen_disk: use DropGuard Date: Sat, 26 Sep 2026 19:35:49 +0300 Message-ID: <20260926163551.52371-4-mohamed.osama189110@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260926163551.52371-1-mohamed.osama189110@gmail.com> References: <20260926163551.52371-1-mohamed.osama189110@gmail.com> Precedence: bulk X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Replace the ScopeGuard instances in the Rust block layer generic disk implementation with DropGuard. DropGuard provides the same scope-exit cleanup behavior while using the new Rust kernel memory API. Signed-off-by: Mohamed Osama --- rust/kernel/block/mq/gen_disk.rs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/rust/kernel/block/mq/gen_disk.rs b/rust/kernel/block/mq/gen_disk.rs index fc97dd873974..d9019fbbb361 100644 --- a/rust/kernel/block/mq/gen_disk.rs +++ b/rust/kernel/block/mq/gen_disk.rs @@ -10,11 +10,12 @@ block::mq::{Operations, TagSet}, error::{self, from_err_ptr, Result}, fmt::{self, Write}, + mem::DropGuard, prelude::*, static_lock_class, str::NullTerminatedFormatter, sync::Arc, - types::{ForeignOwnable, ScopeGuard}, + types::ForeignOwnable, }; /// A builder for [`GenDisk`]. @@ -102,7 +103,7 @@ pub fn build( queue_data: T::QueueData, ) -> Result> { let data = queue_data.into_foreign(); - let recover_data = ScopeGuard::new(|| { + let recover_data = DropGuard::new((), |_| { // SAFETY: T::QueueData was created by the call to `into_foreign()` above drop(unsafe { T::QueueData::from_foreign(data) }); }); @@ -150,7 +151,7 @@ pub fn build( // SAFETY: `gendisk` is a valid pointer as we initialized it above unsafe { (*gendisk).fops = &TABLE }; - let cleanup_failure = ScopeGuard::new_with_data((gendisk, data), |(gendisk, data)| { + let cleanup_failure = DropGuard::new((gendisk, data), |(gendisk, data)| { // SAFETY: `gendisk` came from `__blk_mq_alloc_disk()` above and // has not been added to the VFS on this cleanup path. unsafe { bindings::put_disk(gendisk) }; @@ -161,7 +162,7 @@ pub fn build( // The failure guard now owns both pieces of cleanup; the early guard // must not run on this path anymore. - recover_data.dismiss(); + DropGuard::dismiss(recover_data); let mut writer = NullTerminatedFormatter::new( // SAFETY: `gendisk` points to a valid and initialized instance. We @@ -185,7 +186,7 @@ pub fn build( }, )?; - cleanup_failure.dismiss(); + DropGuard::dismiss(cleanup_failure); // INVARIANT: `gendisk` was initialized above. // INVARIANT: `gendisk` was added to the VFS via `device_add_disk` above. -- 2.43.0