From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from sender5-op-o11.zoho.com (sender5-op-o11.zoho.com [165.173.182.11]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 979D5443AA5; Thu, 15 Oct 2026 18:35:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=165.173.182.11 ARC-Seal:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1792089365; cv=pass; b=tXhc02CyqpJ57PMysUooqX4L1S3qKAytml9iM8+wRxWXGdYk+cnrye6TrgJKzfCrKG3ycXzQEZoVm5CuR5wwouGinun13bqfWzzzWZN7+x3ZBKEm/dUhxHqZuyLjI7ZiEnc0QVRERn3cdcUJCrpxmm4pIBMb8EKdBPYOWbPsWbE= ARC-Message-Signature:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1792089365; c=relaxed/simple; bh=DZJfnAvV8EkhjjnaSIlrPYjTDs0ij0UF+Ko5HqgCFVw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=LqcL2g4PiJdyjrjJR1yG+dGxP660OQlakeEukAcnDHaDIKw8XTUmmxuAqnpVePb6L2lizdzWwECYgILvvWwA5D9PjraWdIV8p/BoM/71xOmMvnQUBoHNPOS65vwuLexE2upBIG2MNkTISMERMy3POQuZGMgcTHlSJS7nyooya8Q= ARC-Authentication-Results:i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (1024-bit key) header.d=collabora.com header.i=deborah.brouwer@collabora.com header.b=CZUQW+wb; arc=pass smtp.client-ip=165.173.182.11 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=collabora.com header.i=deborah.brouwer@collabora.com header.b="CZUQW+wb" ARC-Seal: i=1; a=rsa-sha256; t=1792089333; cv=none; d=zohomail.com; s=zohoarc; b=CPlROCTIUJRthURgm7f4Pa87E7sjyFI8gvVYWg1hLKuckN2vHNU1mHV5riCp1WrUfOGjAzmogWnDBIWNvLEgf40Xoiz59pds1lfeLkST7yKKd9oLJX2Ak5ov75neIaR6DJQaed9b7CgmYDaYdXS2xMHcBeXFoJZbdx9w/G7K218= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1792089333; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:Subject:Subject:To:To:Message-Id:Reply-To; bh=aOl9HYAMP+xIUtEbrHhZ5BIVz5fa8NNn1UoE6CftTww=; b=gZtWM5zmvRsAHtNgIfAkxq5+rtCrWAxIhtqvonUOR4cft/Xr6MViR7E/9ENuTYwrXJcpUPnf6hoeXNiKTAiTYOtMr/ZwmvU5u9GKdU5TYiK9YznqRiHtfCytZfkQyLKnq7GN9kqY7LlhTx1Qd+UXshLEwBSwXCfyRgeicIf9s3k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=collabora.com; spf=pass smtp.mailfrom=deborah.brouwer@collabora.com; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1792089333; s=zohomail; d=collabora.com; i=deborah.brouwer@collabora.com; h=From:From:Date:Date:Subject:Subject:MIME-Version:Content-Type:Content-Transfer-Encoding:Message-Id:Message-Id:In-Reply-To:To:To:Cc:Cc:Reply-To; bh=aOl9HYAMP+xIUtEbrHhZ5BIVz5fa8NNn1UoE6CftTww=; b=CZUQW+wbqKTI5a5VLEL/36RTtAzUbjZTHv9b6g4Ka3NiLxZcd/8ThJnY1l8Uqk+1 iuWmyyOwZ4B617dUWYopdDnSQZxBfQd9C1mLvgvWC1ujY3VkGjz/Ch6xiEkMM48okMi lhGFFt7K4em12XNSTWfDF87dU+UUIjS9XA8v3hMk= Received: by smtp.zohomail.com with SMTPS id 1792089332341214.90589565102164; Thu, 15 Oct 2026 11:35:32 -0700 (PDT) From: Deborah Brouwer Date: Thu, 15 Oct 2026 11:35:21 -0700 Subject: [PATCH v2 2/2] drm/tyr: allow userspace buffers to be mismatched Precedence: bulk X-Mailing-List: rust-for-linux@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20261015-b4-dev_query_fixes-v2-2-e3e6d25050cb@collabora.com> References: <20261015-b4-dev_query_fixes-v2-0-e3e6d25050cb@collabora.com> In-Reply-To: <20261015-b4-dev_query_fixes-v2-0-e3e6d25050cb@collabora.com> To: Miguel Ojeda , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , Daniel Almeida , Tamir Duberstein , Alexandre Courbot , =?utf-8?q?Onur_=C3=96zkan?= , David Airlie , Simona Vetter Cc: rust-for-linux@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Deborah Brouwer X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=2956; i=deborah.brouwer@collabora.com; h=from:subject:message-id; bh=DZJfnAvV8EkhjjnaSIlrPYjTDs0ij0UF+Ko5HqgCFVw=; b=owGbwMvMwCVWuULzOU9c7WvG02pJDFkXZd7Nv7TkdpySZmTiz7hH//ef2/dxVqjozZcvu3eEz Z1VOXvXoo5SFgYxLgZZMUWWs/ZGPeJV74105/9vhpnDygQyhIGLUwAmcvUXI8PFoBl+EbvUWhnE +efvrmNTv8wl6hsTIlvcJha2O+PnhZkM/32jD1hde9c4+VZeftf2hLpFHwLWTlh1KSxG8v9B6fN STvwA X-Developer-Key: i=deborah.brouwer@collabora.com; a=openpgp; fpr=CD3F328C177AEF322D9FFF8379A829E70C5E7DEB Allow userspace to provide a buffer that is smaller or larger than the object that the kernel expects to write into it. Set a minimum buffer size to match those in PANTHOR_UOBJ_MIN_SIZE. If userspace provides at least the minimum buffer size, then simply write until the buffer is full. If userspace provides a larger buffer than necessary, then zero out the remaining buffer. This ensures UAPI compatibility with Panthor. Signed-off-by: Deborah Brouwer --- drivers/gpu/drm/tyr/file.rs | 45 +++++++++++++++++++++++++++++++++++++-------- 1 file changed, 37 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/tyr/file.rs b/drivers/gpu/drm/tyr/file.rs index 9f60a90d4948..a5f96abe4d2e 100644 --- a/drivers/gpu/drm/tyr/file.rs +++ b/drivers/gpu/drm/tyr/file.rs @@ -1,11 +1,17 @@ // SPDX-License-Identifier: GPL-2.0 or MIT +use core::mem::{ + offset_of, + size_of_val, // +}; + use kernel::{ drm::{ self, Registered, // }, prelude::*, + transmute::AsBytes, uaccess::UserSlice, uapi, // }; @@ -16,6 +22,31 @@ TyrDrmRegistrationData, // }; +trait UobjMinSize { + fn min_size(&self) -> usize; +} + +impl UobjMinSize for uapi::drm_panthor_gpu_info { + fn min_size(&self) -> usize { + offset_of!(Self, tiler_present) + size_of_val(&self.tiler_present) + } +} + +// If the user buffer is at least the minimum required size, then +// copy as much of the kernel object as will fit into the user buffer. +// Don't fail if the user buffer is smaller than the kernel object. +// If the user buffer is bigger than needed, zero out the remainder. +fn set_uobj(usr_dst: u64, size: u32, min_size: usize, src_obj: &T) -> Result { + if (size as usize) < min_size { + return Err(EINVAL); + } + + let mut writer = UserSlice::new(UserPtr::from_addr(usr_dst as usize), size as usize).writer(); + writer.write_truncated(src_obj)?; + writer.clear()?; + Ok(()) +} + #[pin_data] pub(crate) struct TyrDrmFileData {} @@ -48,14 +79,12 @@ pub(crate) fn dev_query( } else { match devquery.type_ { uapi::drm_panthor_dev_query_type_DRM_PANTHOR_DEV_QUERY_GPU_INFO => { - let mut writer = UserSlice::new( - UserPtr::from_addr(devquery.pointer as usize), - devquery.size as usize, - ) - .writer(); - - writer.write(®_data.gpu_info)?; - + set_uobj( + devquery.pointer, + devquery.size, + reg_data.gpu_info.min_size(), + ®_data.gpu_info, + )?; Ok(0) } _ => Err(EINVAL), -- 2.56.0