From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ed1-f73.google.com (mail-ed1-f73.google.com [209.85.208.73]) (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 159D233F372 for ; Thu, 30 Oct 2025 10:41:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.73 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761820873; cv=none; b=YNx35sANXdyjUinoa4nOelU+f4am4g/gNFFOsaHOMuaY8UOBpYYfz7eJQVj1E8mjObDUNHSjYYCUZ2VoYrTuW8naUsKzDbj8OUm6ipBhp2XdTYaEAc/aibikfYcZ7pJotoKBihSz02jXL5/mwoV3OABrBstFx+krepG8xpcebjo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761820873; c=relaxed/simple; bh=qB4+AN+XtWF1ZQlX4n330LR8dLEGK6tp50f5P7FmmOo=; h=Date:Mime-Version:Message-ID:Subject:From:To:Cc:Content-Type; b=ZDY2tea6sIEq6Jp88EUVzVPKhTlPFMDHmvys7v8YhmvhbOVB1IYUgWElNOlWnNJV3v3ITTHjqBoOZLDEY3HEeuRRDtrcNwkpQ4pnegcqPQEwNSZhZVDn7e7MdQMD2pZM9rllOVtkXLjhBmkOpcXFf1O9QPZY8rvNICowHgR4cRU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--aliceryhl.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=lkG0Vr74; arc=none smtp.client-ip=209.85.208.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--aliceryhl.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="lkG0Vr74" Received: by mail-ed1-f73.google.com with SMTP id 4fb4d7f45d1cf-63c10d86ef2so830393a12.3 for ; Thu, 30 Oct 2025 03:41:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1761820870; x=1762425670; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=moMZ7EUS7x50M5ZOXZBq3dx7C8epDy4gJjTPsdjnRvw=; b=lkG0Vr74LbPKJs67TCTXffqPScDlBa8pNOkiTgY54F2I9BVYoFGtFKWXGsVYs+IkBv B3anykp4MLXL0aBHQBjq37ObZQcFftMbebTP+cF8VscvOBzBn+eGaI3BDa5Yg9FHt2f0 aEFnDor8Vc92RBveJlEf6DatdiEFhhMIrfHMIuJTXhBxCR5jp4V58vffYOU1PUDmkTUE DLe9SvADW8AX/ahIsa7Aqad/PeHxGxQkok+crgVouvwmQbfDVpb4/lej8rny/7qDqDtt 4m/JK7fj5QH2DGE4ruARzooruFLwuF15XJ1nSq0HLzXWWwAk7bBB1Xf89kLk/M54XHBv G5kw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761820870; x=1762425670; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=moMZ7EUS7x50M5ZOXZBq3dx7C8epDy4gJjTPsdjnRvw=; b=SzJU8y/Q+3PmAmxw5TMFnBZBNote6okUmf8dXJ5MzIzZF0/v8JqGbm6E2tskd1bHde I1BQej76kx4zYVjDK/3bA/0RUYHK9zdLCl8hu7u1Oy6iAzOk6ZJDbDqfUVYQmO52Dtwr kQhXYxu3dVTEyOS5JrT3CFOXXIzHi6/s/2N65YImqI201TleLpUUe/ZBNQ5vCYzFrgB5 mduQ2bJsdsq1NfF/Tzw/hNlKcrL/7JOTUVNWgAPtoWFca8KRIEqHTLZsWsksBgg/oJGJ CfAqKkgTR8TbcVLltVM/+Apv5qtlqIVG/1GgIrESyoIolnVDQz/YbAaZLkCIGNYzV9gb DOQA== X-Forwarded-Encrypted: i=1; AJvYcCWE++1jAfhe2QApUrelv9fpL7AEMabQJr9gYX7ugGzvwa1ALIqjI1Dmv/MnHxUMF4/hSxKdv1W9iwCVXqucjQ==@vger.kernel.org X-Gm-Message-State: AOJu0YyxqB5G0fljtuiJC0xTwp4FCIRyOmkAb6qNcbcWU/kx78c1MrDf jQJTsdQrh4Y6CodtuAG6vVYESnwfBwy5P020Vn82oDA+BAcYdGKfdjNIQ9r1+QHsMWcMk2j10Ml tbCkYXufuAsSuftxsig== X-Google-Smtp-Source: AGHT+IEWoYbwyLCri6MdfQcuPF9lnLunNX959SrwJVa92mvpCBGO5XoUBG1tP6cOYcaj85SnHI3H+MiMQpTdE7A= X-Received: from edz6.prod.google.com ([2002:a05:6402:1f46:b0:634:c016:745a]) (user=aliceryhl job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6402:3045:10b0:633:7017:fcc1 with SMTP id 4fb4d7f45d1cf-640619fce8cmr1783593a12.14.1761820870615; Thu, 30 Oct 2025 03:41:10 -0700 (PDT) Date: Thu, 30 Oct 2025 10:41:04 +0000 Precedence: bulk X-Mailing-List: rust-for-linux@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 X-B4-Tracking: v=1; b=H4sIAL9AA2kC/x3MywqDMBBG4VeRWTeQCy7aVxEXOvnVgTYJk1AE8 d0buvwW51xUoYJKr+EixVeq5NThHgPxsaQdRmI3eetHZ4M1q6QINZw/ZWmlqWRubwPmJ7wLDnG l3hbFJuf/O833/QMLUvFvZwAAAA== X-Change-Id: 20251030-binder-compatptrioctl-ecc9e2131edb X-Developer-Key: i=aliceryhl@google.com; a=openpgp; fpr=49F6C1FAA74960F43A5B86A1EE7A392FDE96209F X-Developer-Signature: v=1; a=openpgp-sha256; l=2975; i=aliceryhl@google.com; h=from:subject:message-id; bh=qB4+AN+XtWF1ZQlX4n330LR8dLEGK6tp50f5P7FmmOo=; b=owEBbQKS/ZANAwAKAQRYvu5YxjlGAcsmYgBpA0DAGdHfRYFrmlKBFauUCROo0RBKEkS0KgrZk Ba+slMpMPeJAjMEAAEKAB0WIQSDkqKUTWQHCvFIvbIEWL7uWMY5RgUCaQNAwAAKCRAEWL7uWMY5 Rh/tD/9kFcN9q5MWaJ8m+z/nA3Ho33n2cvKVN60F0+yqCMOomjfh4pMMam4+kPz28dU1oqM2e7r /Wel7E+EOjGdKUlFfhRu0VuWhyInE70nQdJ9NVNbUhJfImaBFnZQ6BbIXKwTj71VI0p50jIuEUI 0YLGStCSUmnCpEK9RpxA79GDpkdIBWW5afWkHcLuqDF0vf10W6+5stqc52fjz9GbZhTakGSUgol OyFTpd6zTs1xmZYdxSruWacd9p4GFEhMzqOfSrQiFR4YsV12GT1mmAyQ0D+Qalz0zMtm4sv+QAO Z+kkywu5WNOzDWRNpwB1BMXuV7VUA/63/FyMPZbpMXETlEpbj9TM+CT2iSaE9H6AKXPFugp6J4t 6IJHnkI1/rm37n5pdhQnwbwNvP+peLTbqTuAnz2YXsWtXWkbhfNJgLaR2H54cekgMyQEo5vfm3F STbDRpTCeGyEJ5xDXm44sPyDsddwDJ1ywjJixTY2EIY+4zFHrc/C+a33Db07PUAu4pTAf5JJbiy Kp3d7Og24M3OBjm2yCpxEEqi8g5y+pk3hdeq5Y+vMk2vZA0HOJBrDf9pazME30tf9r8HhqtBPMl aA3x4USgoQiOOHYsALnN/svqjMh1FP8EBsIZs4WMGXzJ5Nfun47ABYjjmjBWhRvl/LZMZyqcI1o MkgD+SmIM/dTMyA== X-Mailer: b4 0.14.2 Message-ID: <20251030-binder-compatptrioctl-v1-1-64875010279e@google.com> Subject: [PATCH] rust_binder: use compat_ptr_ioctl From: Alice Ryhl To: Greg Kroah-Hartman , Carlos Llamas Cc: "=?utf-8?q?Arve_Hj=C3=B8nnev=C3=A5g?=" , Todd Kjos , Martijn Coenen , Joel Fernandes , Christian Brauner , Suren Baghdasaryan , linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, Alice Ryhl Content-Type: text/plain; charset="utf-8" This is commit 1832f2d8ff69 ("compat_ioctl: move more drivers to compat_ptr_ioctl") but for Rust Binder. Signed-off-by: Alice Ryhl --- drivers/android/binder/process.rs | 9 --------- drivers/android/binder/rust_binder_main.rs | 22 +++------------------- 2 files changed, 3 insertions(+), 28 deletions(-) diff --git a/drivers/android/binder/process.rs b/drivers/android/binder/process.rs index f13a747e784c84a0fb09cbf47442712106eba07c..7df144d07b20d238a127299cd208f6280ba1bb7a 100644 --- a/drivers/android/binder/process.rs +++ b/drivers/android/binder/process.rs @@ -1599,15 +1599,6 @@ pub(crate) fn ioctl(this: ArcBorrow<'_, Process>, file: &File, cmd: u32, arg: us } } - pub(crate) fn compat_ioctl( - this: ArcBorrow<'_, Process>, - file: &File, - cmd: u32, - arg: usize, - ) -> Result { - Self::ioctl(this, file, cmd, arg) - } - pub(crate) fn mmap( this: ArcBorrow<'_, Process>, _file: &File, diff --git a/drivers/android/binder/rust_binder_main.rs b/drivers/android/binder/rust_binder_main.rs index 6773b7c273ec9634057300954d67b51ca9b54f6f..c79a9e7422401fd50078c1902774573b8ba0076c 100644 --- a/drivers/android/binder/rust_binder_main.rs +++ b/drivers/android/binder/rust_binder_main.rs @@ -313,8 +313,8 @@ unsafe impl Sync for AssertSync {} let ops = kernel::bindings::file_operations { owner: THIS_MODULE.as_ptr(), poll: Some(rust_binder_poll), - unlocked_ioctl: Some(rust_binder_unlocked_ioctl), - compat_ioctl: Some(rust_binder_compat_ioctl), + unlocked_ioctl: Some(rust_binder_ioctl), + compat_ioctl: Some(bindings::compat_ptr_ioctl), mmap: Some(rust_binder_mmap), open: Some(rust_binder_open), release: Some(rust_binder_release), @@ -402,23 +402,7 @@ unsafe impl Sync for AssertSync {} /// # Safety /// Only called by binderfs. -unsafe extern "C" fn rust_binder_compat_ioctl( - file: *mut bindings::file, - cmd: kernel::ffi::c_uint, - arg: kernel::ffi::c_ulong, -) -> kernel::ffi::c_long { - // SAFETY: We previously set `private_data` in `rust_binder_open`. - let f = unsafe { Arc::::borrow((*file).private_data) }; - // SAFETY: The caller ensures that the file is valid. - match Process::compat_ioctl(f, unsafe { File::from_raw_file(file) }, cmd as _, arg as _) { - Ok(()) => 0, - Err(err) => err.to_errno() as isize, - } -} - -/// # Safety -/// Only called by binderfs. -unsafe extern "C" fn rust_binder_unlocked_ioctl( +unsafe extern "C" fn rust_binder_ioctl( file: *mut bindings::file, cmd: kernel::ffi::c_uint, arg: kernel::ffi::c_ulong, --- base-commit: 211ddde0823f1442e4ad052a2f30f050145ccada change-id: 20251030-binder-compatptrioctl-ecc9e2131edb Best regards, -- Alice Ryhl