rust: add helper for mutex_trylock

Maxim Levitsky · Maxim Levitsky · commit 84c5935da5cd · 2025-06-25T15:57:33.000-04:00
JIRA: https://issues.redhat.com/browse/RHEL-74410 commit 4dbe28c Author: Paolo Bonzini <pbonzini@redhat.com> Date: Wed May 28 10:34:30 2025 +0200 rust: add helper for mutex_trylock After commit c5b6aba ("locking/mutex: implement mutex_trylock_nested", currently in the KVM tree) mutex_trylock() will be a macro when lockdep is enabled. Rust therefore needs the corresponding helper. Just add it and the rust/bindings/bindings_helpers_generated.rs Makefile rules will do their thing. Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Message-ID: <20250528083431.1875345-1-pbonzini@redhat.com> Acked-by: Miguel Ojeda <ojeda@kernel.org> Reviewed-by: Alice Ryhl <aliceryhl@google.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Maxim Levitsky <mlevitsk@redhat.com>
diff --git a/rust/helpers/mutex.c b/rust/helpers/mutex.c
@@ -8,6 +8,11 @@ void rust_helper_mutex_lock(struct mutex *lock)
 	mutex_lock(lock);
 }
 
+int rust_helper_mutex_trylock(struct mutex *lock)
+{
+	return mutex_trylock(lock);
+}
+
 void rust_helper___mutex_init(struct mutex *mutex, const char *name,
 			      struct lock_class_key *key)
 {

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,11 @@ void rust_helper_mutex_lock(struct mutex *lock)`
`8`	`8`	`mutex_lock(lock);`
`9`	`9`	`}`
`10`	`10`
	`11`	`+int rust_helper_mutex_trylock(struct mutex *lock)`
	`12`	`+{`
	`13`	`+ return mutex_trylock(lock);`
	`14`	`+}`
	`15`	`+`
`11`	`16`	`void rust_helper___mutex_init(struct mutex mutex, const char name,`
`12`	`17`	`struct lock_class_key *key)`
`13`	`18`	`{`