rust: add helper for mutex_trylock

bonzini · bonzini · commit 4dbe28c0fabd · 2025-05-28T06:28:30.000-04:00
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>
diff --git a/rust/helpers/mutex.c b/rust/helpers/mutex.c
@@ -7,6 +7,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
`@@ -7,6 +7,11 @@ void rust_helper_mutex_lock(struct mutex *lock)`
`7`	`7`	`mutex_lock(lock);`
`8`	`8`	`}`
`9`	`9`
	`10`	`+int rust_helper_mutex_trylock(struct mutex *lock)`
	`11`	`+{`
	`12`	`+ return mutex_trylock(lock);`
	`13`	`+}`
	`14`	`+`
`10`	`15`	`void rust_helper___mutex_init(struct mutex mutex, const char name,`
`11`	`16`	`struct lock_class_key *key)`
`12`	`17`	`{`