From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1tnenA-0005b4-Ft for mharc-qemu-rust@gnu.org; Thu, 27 Feb 2025 09:23:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tnemk-0003va-CD for qemu-rust@nongnu.org; Thu, 27 Feb 2025 09:22:47 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tnemi-00048X-9X for qemu-rust@nongnu.org; Thu, 27 Feb 2025 09:22:45 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1740666163; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Hp60NgzpFm3jMkNxot3ICZaotMUbZm/BSXyoCpaAV7I=; b=dN+7YS7MTxIM72bEqsbLsx27XHMQhr6Js5FC7WdeeGjZ39CL+Vc0TyCmWsi+vWlRgMfr7i M0hQaQMLAVXPZkD2NaSxqyrixEQYAVvt0/n2aFBhGZglrffK3MCGSsQcZM0Mt4D76ZhXDf vqh0RcUJ9XLuqm3eh16qttzVNXdWMjM= Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-298-U9SJHd-lMfCROKKzaI1gmw-1; Thu, 27 Feb 2025 09:22:42 -0500 X-MC-Unique: U9SJHd-lMfCROKKzaI1gmw-1 X-Mimecast-MFC-AGG-ID: U9SJHd-lMfCROKKzaI1gmw_1740666161 Received: by mail-ej1-f69.google.com with SMTP id a640c23a62f3a-abb9d1c8113so105695466b.0 for ; Thu, 27 Feb 2025 06:22:41 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740666161; x=1741270961; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Hp60NgzpFm3jMkNxot3ICZaotMUbZm/BSXyoCpaAV7I=; b=j33atAlx13iVkhvMp/I5KAxGSwpqyDqU7h1iq5Wh4xr/08US/OrJArK1ujPBY5JLPJ Tvl4X/U5Wfjrt+301c92fg1nqxPisYZenNwgEMqu15CHWsRL4LMmf7OxJ+PPfBRC9Ouk E4WQsWYDTUdHNR8HrcIidAvZlaCPD1AikNdgu1VlgtSNNod5dBRzQqZegQAZMrCYO4Zc cOgQoRcNYPoYH2cTZb4VcSiGQpkmsZaNdvRPUgdtoqK2+2BejfzApEr6IFlXwlUSRC1d ZAhU6gNCrSjbYG4lSYC/lL1LCY1meXmVEvmcwN573/p6jxim7RuwfgSQGq8nBrbH3GK4 kXzA== X-Gm-Message-State: AOJu0YwdckHDzpuXgSd50Ix7fWET9LlQ7Jf9S2x7KFNi7n/a36pTN4Kq rNfMQhsePoeQmhwxvAsRwoCP+zNUX0wi3KJLPG2FLNFPsDtHmUrKb5ehJe85U5iJPkGFJp3t9AN eu4pgoBYaKouOttXnOf5aYDYOcfo8K0/s2RylJrh8uP9ejr7hgtc= X-Gm-Gg: ASbGnctsrivX9uS4j0sIOYiDQi9I57iSCjr/XsDMgoDzqqlMorb3l91mshnpBUFvdCD DQq0lcLbG/nqKyHEVaDEUHL6p8bwhT0qT2V/lOaYndEZn894zXO39P7rqGYDW9SwY2EbFgjtRo9 J+bZaSzrbFMo+d9srPtDMwZWP+d4ruCDcmtnZL3QW4lHtERj2SEVeLY5XSK/6d1XziWj2FXu4gT 5P4PsUm3xiYgX4rKqlufK7I6+7g5co33us/Oaa+Eh1iqLumXU50NCeCgI+wepi68X5lNJpYSTMn 3CGYcDai2QIS7LnxdPIl X-Received: by 2002:a17:907:c407:b0:abc:4b7:e3d3 with SMTP id a640c23a62f3a-abeeedcfecbmr1035991266b.27.1740666160774; Thu, 27 Feb 2025 06:22:40 -0800 (PST) X-Google-Smtp-Source: AGHT+IGhkDzLZ7Rqvt7edxAJCDIQHcYGsOiEcgzSXzD9gNCicFHn6Ta7APVPqoxssTSBNlFJQ/LaWg== X-Received: by 2002:a17:907:c407:b0:abc:4b7:e3d3 with SMTP id a640c23a62f3a-abeeedcfecbmr1035988666b.27.1740666160328; Thu, 27 Feb 2025 06:22:40 -0800 (PST) Received: from [192.168.10.48] ([176.206.102.52]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-abf0c1165e7sm130130566b.82.2025.02.27.06.22.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Feb 2025 06:22:38 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: qemu-rust@nongnu.org, zhao1.liu@intel.com Subject: [PATCH 09/12] rust: sysbus: wrap SysBusDevice with Opaque<> Date: Thu, 27 Feb 2025 15:22:16 +0100 Message-ID: <20250227142219.812270-10-pbonzini@redhat.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250227142219.812270-1-pbonzini@redhat.com> References: <20250227142219.812270-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: CKNZq90micyZqJQAyYlYgEMMM0XXJhw_5S6KHcmtask_1740666161 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.438, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-rust@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: QEMU Rust-related patches and discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Feb 2025 14:22:48 -0000 Signed-off-by: Paolo Bonzini --- rust/qemu-api/src/bindings.rs | 3 --- rust/qemu-api/src/sysbus.rs | 29 +++++++++++++++++++++-------- 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/rust/qemu-api/src/bindings.rs b/rust/qemu-api/src/bindings.rs index 6e70a75a0e6..b791ca6d87f 100644 --- a/rust/qemu-api/src/bindings.rs +++ b/rust/qemu-api/src/bindings.rs @@ -40,9 +40,6 @@ unsafe impl Sync for MemoryRegion {} unsafe impl Send for ObjectClass {} unsafe impl Sync for ObjectClass {} -unsafe impl Send for SysBusDevice {} -unsafe impl Sync for SysBusDevice {} - // SAFETY: this is a pure data struct unsafe impl Send for CoalescedMemoryRange {} unsafe impl Sync for CoalescedMemoryRange {} diff --git a/rust/qemu-api/src/sysbus.rs b/rust/qemu-api/src/sysbus.rs index 0790576d446..e92502a8fe6 100644 --- a/rust/qemu-api/src/sysbus.rs +++ b/rust/qemu-api/src/sysbus.rs @@ -6,11 +6,11 @@ use std::{ffi::CStr, ptr::addr_of_mut}; -pub use bindings::{SysBusDevice, SysBusDeviceClass}; +pub use bindings::SysBusDeviceClass; use crate::{ bindings, - cell::bql_locked, + cell::{bql_locked, Opaque}, irq::{IRQState, InterruptSource}, memory::MemoryRegion, prelude::*, @@ -18,6 +18,14 @@ qom::Owned, }; +/// A safe wrapper around [`bindings::SysBusDevice`]. +#[repr(transparent)] +#[derive(Debug, qemu_api_macros::Wrapper)] +pub struct SysBusDevice(Opaque); + +unsafe impl Send for SysBusDevice {} +unsafe impl Sync for SysBusDevice {} + unsafe impl ObjectType for SysBusDevice { type Class = SysBusDeviceClass; const TYPE_NAME: &'static CStr = @@ -49,7 +57,7 @@ pub trait SysBusDeviceMethods: ObjectDeref fn init_mmio(&self, iomem: &MemoryRegion) { assert!(bql_locked()); unsafe { - bindings::sysbus_init_mmio(self.as_mut_ptr(), iomem.as_mut_ptr()); + bindings::sysbus_init_mmio(self.upcast().as_mut_ptr(), iomem.as_mut_ptr()); } } @@ -60,14 +68,16 @@ fn init_mmio(&self, iomem: &MemoryRegion) { fn init_irq(&self, irq: &InterruptSource) { assert!(bql_locked()); unsafe { - bindings::sysbus_init_irq(self.as_mut_ptr(), irq.as_ptr()); + bindings::sysbus_init_irq(self.upcast().as_mut_ptr(), irq.as_ptr()); } } // TODO: do we want a type like GuestAddress here? fn mmio_addr(&self, id: u32) -> Option { assert!(bql_locked()); - let sbd = self.upcast(); + // SAFETY: the BQL ensures that no one else writes to sbd.mmio[], and + // the SysBusDevice must be initialized to get an IsA. + let sbd = unsafe { *self.upcast().as_ptr() }; let id: usize = id.try_into().unwrap(); if sbd.mmio[id].memory.is_null() { None @@ -81,7 +91,7 @@ fn mmio_map(&self, id: u32, addr: u64) { assert!(bql_locked()); let id: i32 = id.try_into().unwrap(); unsafe { - bindings::sysbus_mmio_map(self.as_mut_ptr(), id, addr); + bindings::sysbus_mmio_map(self.upcast().as_mut_ptr(), id, addr); } } @@ -93,7 +103,7 @@ fn connect_irq(&self, id: u32, irq: &Owned) { let id: i32 = id.try_into().unwrap(); let irq: &IRQState = irq; unsafe { - bindings::sysbus_connect_irq(self.as_mut_ptr(), id, irq.as_mut_ptr()); + bindings::sysbus_connect_irq(self.upcast().as_mut_ptr(), id, irq.as_mut_ptr()); } } @@ -101,7 +111,10 @@ fn sysbus_realize(&self) { // TODO: return an Error assert!(bql_locked()); unsafe { - bindings::sysbus_realize(self.as_mut_ptr(), addr_of_mut!(bindings::error_fatal)); + bindings::sysbus_realize( + self.upcast().as_mut_ptr(), + addr_of_mut!(bindings::error_fatal), + ); } } } -- 2.48.1