From nobody Sun Nov 24 16:56:37 2024 Received: from mail-lj1-f180.google.com (mail-lj1-f180.google.com [209.85.208.180]) (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 83EBD18B483; Mon, 4 Nov 2024 09:07:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730711250; cv=none; b=TJE32g9qJXeZ09IRJvFtLT0AW9jyclZ5EEF8VE213vnQmoWJGcjBTaIolpgNGpvd0uYqW8wer3+43kwERuGn+2D3xKRygKzmXu+Pcyf3OFM4flWyTvF7LEYOBL2pIlUyEAwV5fzwmASp1l7UFsJiYdmp4rvrDUT/8s/6IWFTOk0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730711250; c=relaxed/simple; bh=giPXNvWrJ1zsJQZkQd2B2RCDaNpLkxleapOqDDfQfhc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mmPAmPPTOAE3q/bip7oc3XtXmxKAangp95zxvl1BZOAhU2pAdSU8MEdswxJroKUkHa3BJo91G41OnB29UAvZMz6u2Ye16MEVm1dTrgPolyOknPscdulpJbjy1fZsesagZ+O/gRMeMyYxIxmbWXwmE4grFATpVyg2QTN4SslK9EA= 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=iETcMSyI; arc=none smtp.client-ip=209.85.208.180 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="iETcMSyI" Received: by mail-lj1-f180.google.com with SMTP id 38308e7fff4ca-2fb470a8b27so45620051fa.1; Mon, 04 Nov 2024 01:07:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1730711247; x=1731316047; 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; bh=JLgsd+vXvTVhRmFeWAr5s+0uMHQtIheW0N8cf6W+eAo=; b=iETcMSyIXa21l7qbgNji1JoIuvh1G/g5XHpFY84a2OF1Ivrd3HcwY0r/COvP8jhC07 IIChIRIloITKdqrs0vWnkxyNmgJPOt4T8dWFjH+MdwxDwTziajjdIIj+eFzReujKxHZu WoNQXEMP7w7CNT4mYeOR5XP3ZRx5jsjs2On6pChw5bQRn6x8Zt5W1o5a54pTchE+Krmv cUdQs8uMKAjwWgPrU9bg0Yh/4yb0YR0PTyX1riuuooECjTeXIoJ+r6l0JaYX4Mi+v86P PdLb7F7ZdEbIVh3qgxeMhCB8SkrTYCZpKQpmjnHF4sHy+YcKw4pyOzUHmIIKUkHeFFyO FVMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730711247; x=1731316047; 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=JLgsd+vXvTVhRmFeWAr5s+0uMHQtIheW0N8cf6W+eAo=; b=aJr0Ew/5gZpIR5V/mqHc0S32uRA8DsLk+xxgn+/rt8BrhWZZ7W9/h1jmh48ucRSN7a xPPgfR4ZFrgu4naNkOI/BabMb3UrUhH43vBJ3WoWJDbR30vnrNtmIQU4MOebclDejDqK lwHCH8nkry5g/0LaOZqoyC/G9pcwAgDx55kcwl0lM3zKTMhfVxV3wQ0tXnsjqVlO5Hfq uqasqUlgsE4YFyYM3vY3kVMmq0K6armhX0aMNj4KwVg0jf2dm8GSgY1nlo2r+yX2vsPC j0HIrwHo0c8k/xbYoIyy6Nc36eHtDcdAO0Fny7JqnxT2c6aAce9M/vzmOAQj39H+jfIB IPWg== X-Forwarded-Encrypted: i=1; AJvYcCUp18BimRRWN8DaDO1io4F0ix+EMJaWKxE80TCyFvkcxhZd6ET9Vag31reEtlHPmOJUSzxri+U0nst/ELs=@vger.kernel.org X-Gm-Message-State: AOJu0Ywibh+PVvB0nQBDspihZfkdjDSJZf2EDvZLBy7VjzOMfb6CRrJn UGnXtLqfg3EaSNdyeOQhkMURiNzVJhKS2npH9FWXagbDnW3rbKik9faZtg== X-Google-Smtp-Source: AGHT+IGucAB/Ohqh9d0qNbYVZEz5HnatSkqMiJwf/69rUT2e2x9kydyAXGpeCtd+pCGjanSi2jjouQ== X-Received: by 2002:a05:651c:90a:b0:2f7:6062:a0a9 with SMTP id 38308e7fff4ca-2fdef252a0emr48199631fa.7.1730711246471; Mon, 04 Nov 2024 01:07:26 -0800 (PST) Received: from abj-NUC9VXQNX.. (87-94-132-183.rev.dnainternet.fi. [87.94.132.183]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-2fdef8a6070sm15829991fa.89.2024.11.04.01.07.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Nov 2024 01:07:25 -0800 (PST) From: Abdiel Janulgue To: rust-for-linux@vger.kernel.org Cc: daniel.almeida@collabora.com, a.hindborg@kernel.org, linux-kernel@vger.kernel.org, dakr@redhat.com, airlied@redhat.com, miguel.ojeda.sandonis@gmail.com, wedsonaf@gmail.com, Abdiel Janulgue Subject: [PATCH v3 1/2] rust: error: Add EOVERFLOW Date: Mon, 4 Nov 2024 11:06:33 +0200 Message-ID: <20241104090711.3000818-2-abdiel.janulgue@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241104090711.3000818-1-abdiel.janulgue@gmail.com> References: <20241104090711.3000818-1-abdiel.janulgue@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Trivial addition for missing EOVERFLOW error. This is used by a subsequent patch that might require returning EOVERFLOW as a result of `checked_mul`. Signed-off-by: Abdiel Janulgue --- rust/kernel/error.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/rust/kernel/error.rs b/rust/kernel/error.rs index 7cd3bbab52f2..92bfdaaedb02 100644 --- a/rust/kernel/error.rs +++ b/rust/kernel/error.rs @@ -63,6 +63,7 @@ macro_rules! declare_err { declare_err!(EPIPE, "Broken pipe."); declare_err!(EDOM, "Math argument out of domain of func."); declare_err!(ERANGE, "Math result not representable."); + declare_err!(EOVERFLOW, "Value too large for defined data type."); declare_err!(ERESTARTSYS, "Restart the system call."); declare_err!(ERESTARTNOINTR, "System call was interrupted by a signal = and will be restarted."); declare_err!(ERESTARTNOHAND, "Restart if no handler."); --=20 2.43.0 From nobody Sun Nov 24 16:56:37 2024 Received: from mail-lj1-f170.google.com (mail-lj1-f170.google.com [209.85.208.170]) (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 693F91ACDF0; Mon, 4 Nov 2024 09:07:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730711253; cv=none; b=Y2MLLWgXhAIh1Fj5Lt8iSF5DJVA651hYga0lYGGjCo7FG+k26c8oGqAkAg3+W4bDq4Ewm8L5ExkAjmsq4vNJSWUIzoxkKZop+sOyyJRuicPgkbllCP+fYfXB9arPugZptv2kq4cC/DraaDa3xt/FNT7myVm34/JEerIwSRqX+Fs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730711253; c=relaxed/simple; bh=b4HpGAD8/H+EFsnaQ23A1FKmj3D4cx0gWZbjsIi06kI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fxeeTPEtfxhZQcb3O9WJHuNCeb6iLZe5eHWjFTFbyCh2UtaixKdNUp4QT2NJzQV6JC+qrzho/lDTQfVlf3qkqRzKt+4hbqvHQz9wCMIbGFb7peUctUUI7KVWeDx57AroqbEvNZ+UooPrtbnePbuYWsPBiMl7PqT3TKNpzCIO4+c= 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=fEg0s3d7; arc=none smtp.client-ip=209.85.208.170 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="fEg0s3d7" Received: by mail-lj1-f170.google.com with SMTP id 38308e7fff4ca-2fb3c3d5513so32147731fa.1; Mon, 04 Nov 2024 01:07:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1730711249; x=1731316049; 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; bh=ZyVy7gdr0CZOajhFw0hRqDhU/vkb7fugb2BQinDJKQ0=; b=fEg0s3d7l/2mDTA/c3P86k26S9x2b11f8/AzV27EA9jPklt0uUtxDFCM+AChV0dGD/ sh4/R3TStVgv6W/0OUvOnLBZAdSTHgdSyGe+Eq4LAQQhuHrQxK/0PuG3y6OYCSfKbRy7 Ymwf5i+Wk1u+Bz1uEkDwja8P9DpqIFempBHEIK7QoQOcEMpGzdB6H7k3EBZ8w6Uxg5OP Kde3zdmACYhkwsqqystdCZMYyKhcJCc//85gznzYUF9RCXCFTsLtCt/PR+vz+wRsfI0G xx2d9RALEjggXQNruxbeLg+oFU69TysAHXHAdq+fNSChtFMXa2Y25BMjSCGafOc5NVdi v4BQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730711249; x=1731316049; 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=ZyVy7gdr0CZOajhFw0hRqDhU/vkb7fugb2BQinDJKQ0=; b=CB+LoA7Wh6zFwAt08wIzxhVjk7dl4sBBm+ofKeDN+0draaXWwhIz8M8lRo4lycoYi/ g+md40IqRK2n1GEx15CUTLTc7tF63Sy+/QlcHwIMk3SakQF2MQScT2QFmVi9/TD7uEyt SsXTx6YGngdrsGHcRnf67+xI0wYGJvDgqxUr9UwY9gX0HSH0/5Z3Ru/Px8p7HRN/lG0D u/q4CNiqq9xiiV1e8AmcBwa0EGJXVbkqZbtksmgFy4PgaOOwHk+XmIY8hnGlE11Fxt7+ vZG1rYBHXGT93u2rZ5vd6O9NpI/ojNwCqLOE/xobnda9z2tpuLCMzYzVcqo2SxS2x/u3 vnmg== X-Forwarded-Encrypted: i=1; AJvYcCUyZkK6xkdf/jDLObxNlMgJTirUmwopk4Y3osW/73tlaRZ7KNEs5XdbiLfDdLFhWpU+dqxfb9PL5u9THEE=@vger.kernel.org X-Gm-Message-State: AOJu0Yy5cAu1oCjFI5rYfeTaDjOZklJyzdTSSSIOHPnIXlTHo946Q5ck MUBwe95jZxZUDibNc1fKpN8qKs5V7OSPbzOFcYvnBDzQWtALTcajNQj7Cg== X-Google-Smtp-Source: AGHT+IH/3d4VHUKEdA3D23Z/rS1PfIASMm1BkVuuCsSeHaTvMGlya7IrOnJtKqCwswyZtiDB7W7hNQ== X-Received: by 2002:a05:651c:2204:b0:2fb:50e9:34b4 with SMTP id 38308e7fff4ca-2fdec47a3f4mr71696251fa.8.1730711249306; Mon, 04 Nov 2024 01:07:29 -0800 (PST) Received: from abj-NUC9VXQNX.. (87-94-132-183.rev.dnainternet.fi. [87.94.132.183]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-2fdef8a6070sm15829991fa.89.2024.11.04.01.07.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Nov 2024 01:07:27 -0800 (PST) From: Abdiel Janulgue To: rust-for-linux@vger.kernel.org Cc: daniel.almeida@collabora.com, a.hindborg@kernel.org, linux-kernel@vger.kernel.org, dakr@redhat.com, airlied@redhat.com, miguel.ojeda.sandonis@gmail.com, wedsonaf@gmail.com, Abdiel Janulgue , Andreas Hindborg Subject: [PATCH v3 2/2] rust: add dma coherent allocator abstraction. Date: Mon, 4 Nov 2024 11:06:34 +0200 Message-ID: <20241104090711.3000818-3-abdiel.janulgue@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241104090711.3000818-1-abdiel.janulgue@gmail.com> References: <20241104090711.3000818-1-abdiel.janulgue@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add a simple dma coherent allocator rust abstraction. Based on Andreas Hindborg's dma abstractions from the rnvme driver. Co-developed-by: Wedson Almeida Filho Signed-off-by: Wedson Almeida Filho Co-developed-by: Andreas Hindborg Signed-off-by: Andreas Hindborg Signed-off-by: Abdiel Janulgue --- rust/bindings/bindings_helper.h | 1 + rust/kernel/dma.rs | 165 ++++++++++++++++++++++++++++++++ rust/kernel/lib.rs | 1 + 3 files changed, 167 insertions(+) create mode 100644 rust/kernel/dma.rs diff --git a/rust/bindings/bindings_helper.h b/rust/bindings/bindings_helpe= r.h index a80783fcbe04..3ff2abbfaef6 100644 --- a/rust/bindings/bindings_helper.h +++ b/rust/bindings/bindings_helper.h @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include diff --git a/rust/kernel/dma.rs b/rust/kernel/dma.rs new file mode 100644 index 000000000000..75a304d612f0 --- /dev/null +++ b/rust/kernel/dma.rs @@ -0,0 +1,165 @@ +// SPDX-License-Identifier: GPL-2.0 + +//! Direct memory access (DMA). +//! +//! C header: [`include/linux/dma-mapping.h`](srctree/include/linux/dma-ma= pping.h) + +use crate::{ + bindings, + device::Device, + error::code::*, + error::Result, + types::ARef, +}; +use core::ops::Add; + +/// Abstraction of dma_alloc_coherent +/// +/// # Invariants +/// +/// For the lifetime of an instance of CoherentAllocation, the cpu address= is a valid pointer +/// to an allocated region of consistent memory and we hold a reference to= the device. +pub struct CoherentAllocation { + dev: ARef, + dma_handle: bindings::dma_addr_t, + count: usize, + cpu_addr: *mut T, +} + +impl CoherentAllocation { + /// Allocates a region of `size_of:: * count` of consistent memory. + /// + /// Returns a CoherentAllocation object which contains a pointer to th= e allocated region + /// (in the processor's virtual address space) and the device address = which can be + /// given to the device as the DMA address base of the region. The reg= ion is released once + /// [`CoherentAllocation`] is dropped. + /// + /// # Examples + /// + /// ``` + /// use kernel::device::Device; + /// use kernel::dma::CoherentAllocation; + /// + /// # fn dox(dev: &Device) -> Result<()> { + /// let c: CoherentAllocation =3D CoherentAllocation::alloc_coher= ent(dev, 4, GFP_KERNEL)?; + /// # Ok(()) } + /// ``` + pub fn alloc_coherent( + dev: &Device, + count: usize, + flags: kernel::alloc::Flags, + ) -> Result> { + let t_size =3D core::mem::size_of::(); + let size =3D count.checked_mul(t_size).ok_or(EOVERFLOW)?; + let mut dma_handle =3D 0; + // SAFETY: device pointer is guaranteed as valid by invariant on `= Device`. + // We ensure that we catch the failure on this function and throw = an ENOMEM + let ret =3D unsafe { + bindings::dma_alloc_attrs( + dev.as_raw(), + size, + &mut dma_handle, flags.as_raw(), + 0, + ) + }; + if ret.is_null() { + return Err(ENOMEM) + } + + Ok(Self { + dev: dev.into(), + dma_handle, + count, + cpu_addr: ret as _, + }) + } + + /// Reads a value on a location specified by index. + pub fn read(&self, index: usize) -> Result + where + T: Copy + { + if let Some(val) =3D self.cpu_buf().get(index) { + Ok(*val) + } else { + Err(EINVAL) + } + } + + /// Write a value on the memory location specified by index. + pub fn write(&mut self, index: usize, value: &T) -> Result + where + T: Copy, + { + if let Some(elem) =3D self.cpu_buf_mut().get_mut(index) { + *elem =3D *value; + Ok(()) + } else { + Err(EINVAL) + } + } + + /// Performs a read and then a write of a value on a location specifie= d by index. + pub fn read_write(&mut self, index: usize, value: &T) -> Result + where + T: Copy, + { + if let Some(elem) =3D self.cpu_buf_mut().get_mut(index) { + let val =3D *elem; + *elem =3D *value; + Ok(val) + } else { + Err(EINVAL) + } + } + + /// Returns the base address to the allocated region and the dma handl= e. + /// Caller takes ownership of returned resources. + pub fn into_parts(self) -> (usize, bindings::dma_addr_t) { + let ret =3D (self.cpu_addr as _, self.dma_handle); + core::mem::forget(self); + ret + } + + /// Returns the base address to the allocated region in the CPU's virt= ual address space. + pub fn start_ptr(&self) -> *const T { + self.cpu_addr as _ + } + + /// Returns the base address to the allocated region in the CPU's virt= ual address space as + /// a mutable pointer. + pub fn start_ptr_mut(&mut self) -> *mut T { + self.cpu_addr + } + + /// Returns a DMA handle which may given to the device as the DMA addr= ess base of + /// the region. + pub fn dma_handle(&self) -> bindings::dma_addr_t { + self.dma_handle + } + + fn cpu_buf(&self) -> &[T] + { + // SAFETY: The pointer is valid due to type invariant on `Coherent= Allocation` and + // is valid for reads for `self.count * size_of::` bytes. + unsafe { core::slice::from_raw_parts(self.cpu_addr, self.count) } + } + + fn cpu_buf_mut(&mut self) -> &mut [T] + { + // SAFETY: The pointer is valid due to type invariant on `Coherent= Allocation` and + // is valid for reads for `self.count * size_of::` bytes. + unsafe { core::slice::from_raw_parts_mut(self.cpu_addr, self.count= ) } + } +} + +impl Drop for CoherentAllocation { + fn drop(&mut self) { + let size =3D self.count * core::mem::size_of::(); + // SAFETY: the device, cpu address, and the dma handle is valid du= e to the + // type invariants on `CoherentAllocation`. + unsafe { bindings::dma_free_attrs(self.dev.as_raw(), size, + self.cpu_addr as _, + self.dma_handle, 0) } + } +} diff --git a/rust/kernel/lib.rs b/rust/kernel/lib.rs index b62451f64f6e..b713c92eb1ef 100644 --- a/rust/kernel/lib.rs +++ b/rust/kernel/lib.rs @@ -32,6 +32,7 @@ pub mod block; mod build_assert; pub mod device; +pub mod dma; pub mod error; #[cfg(CONFIG_RUST_FW_LOADER_ABSTRACTIONS)] pub mod firmware; --=20 2.43.0