| Message ID | 20241220061853.2782878-7-fujita.tomonori@gmail.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | rust: Add IO polling | expand |
Hi FUJITA, kernel test robot noticed the following build warnings: [auto build test WARNING on 0c5928deada15a8d075516e6e0d9ee19011bb000] url: https://github.com/intel-lab-lkp/linux/commits/FUJITA-Tomonori/rust-time-Add-PartialEq-Eq-PartialOrd-Ord-trait-to-Ktime/20241220-142722 base: 0c5928deada15a8d075516e6e0d9ee19011bb000 patch link: https://lore.kernel.org/r/20241220061853.2782878-7-fujita.tomonori%40gmail.com patch subject: [PATCH v7 6/7] rust: Add read_poll_timeout functions config: microblaze-randconfig-r131-20241221 (https://download.01.org/0day-ci/archive/20241221/202412211700.9lWP3KmT-lkp@intel.com/config) compiler: microblaze-linux-gcc (GCC) 14.2.0 reproduce: (https://download.01.org/0day-ci/archive/20241221/202412211700.9lWP3KmT-lkp@intel.com/reproduce) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp@intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202412211700.9lWP3KmT-lkp@intel.com/ sparse warnings: (new ones prefixed by >>) kernel/sched/core.c:1080:38: sparse: sparse: incorrect type in initializer (different address spaces) @@ expected struct task_struct *curr @@ got struct task_struct [noderef] __rcu *curr @@ kernel/sched/core.c:1080:38: sparse: expected struct task_struct *curr kernel/sched/core.c:1080:38: sparse: got struct task_struct [noderef] __rcu *curr kernel/sched/core.c:2179:39: sparse: sparse: incorrect type in initializer (different address spaces) @@ expected struct task_struct *donor @@ got struct task_struct [noderef] __rcu *donor @@ kernel/sched/core.c:2179:39: sparse: expected struct task_struct *donor kernel/sched/core.c:2179:39: sparse: got struct task_struct [noderef] __rcu *donor kernel/sched/core.c:2190:65: sparse: sparse: incorrect type in argument 1 (different address spaces) @@ expected struct task_struct *tsk @@ got struct task_struct [noderef] __rcu *curr @@ kernel/sched/core.c:2190:65: sparse: expected struct task_struct *tsk kernel/sched/core.c:2190:65: sparse: got struct task_struct [noderef] __rcu *curr kernel/sched/core.c:5641:15: sparse: sparse: incorrect type in assignment (different address spaces) @@ expected struct task_struct *donor @@ got struct task_struct [noderef] __rcu *donor @@ kernel/sched/core.c:5641:15: sparse: expected struct task_struct *donor kernel/sched/core.c:5641:15: sparse: got struct task_struct [noderef] __rcu *donor kernel/sched/core.c:6653:14: sparse: sparse: incorrect type in assignment (different address spaces) @@ expected struct task_struct *prev @@ got struct task_struct [noderef] __rcu *curr @@ kernel/sched/core.c:6653:14: sparse: expected struct task_struct *prev kernel/sched/core.c:6653:14: sparse: got struct task_struct [noderef] __rcu *curr kernel/sched/core.c:7199:17: sparse: sparse: incompatible types in comparison expression (different address spaces): kernel/sched/core.c:7199:17: sparse: struct task_struct * kernel/sched/core.c:7199:17: sparse: struct task_struct [noderef] __rcu * kernel/sched/core.c:8901:16: sparse: sparse: incorrect type in return expression (different address spaces) @@ expected struct task_struct * @@ got struct task_struct [noderef] __rcu *curr @@ kernel/sched/core.c:8901:16: sparse: expected struct task_struct * kernel/sched/core.c:8901:16: sparse: got struct task_struct [noderef] __rcu *curr kernel/sched/core.c:10116:25: sparse: sparse: incorrect type in argument 1 (different address spaces) @@ expected struct task_struct *p @@ got struct task_struct [noderef] __rcu *curr @@ kernel/sched/core.c:10116:25: sparse: expected struct task_struct *p kernel/sched/core.c:10116:25: sparse: got struct task_struct [noderef] __rcu *curr kernel/sched/core.c: note: in included file: kernel/sched/sched.h:1490:17: sparse: sparse: self-comparison always evaluates to true kernel/sched/core.c:591:6: sparse: sparse: context imbalance in 'raw_spin_rq_lock_nested' - wrong count at exit kernel/sched/sched.h:1490:17: sparse: sparse: self-comparison always evaluates to true kernel/sched/core.c:624:23: sparse: sparse: context imbalance in 'raw_spin_rq_trylock' - wrong count at exit kernel/sched/core.c:640:6: sparse: sparse: context imbalance in 'raw_spin_rq_unlock' - unexpected unlock kernel/sched/core.c:677:21: sparse: sparse: self-comparison always evaluates to true kernel/sched/core.c:678:36: sparse: sparse: context imbalance in '__task_rq_lock' - wrong count at exit kernel/sched/core.c:718:21: sparse: sparse: self-comparison always evaluates to true kernel/sched/core.c:719:36: sparse: sparse: context imbalance in 'task_rq_lock' - wrong count at exit kernel/sched/sched.h:2258:25: sparse: sparse: incompatible types in comparison expression (different address spaces): kernel/sched/sched.h:2258:25: sparse: struct task_struct [noderef] __rcu * kernel/sched/sched.h:2258:25: sparse: struct task_struct * kernel/sched/sched.h:2258:25: sparse: sparse: incompatible types in comparison expression (different address spaces): kernel/sched/sched.h:2258:25: sparse: struct task_struct [noderef] __rcu * kernel/sched/sched.h:2258:25: sparse: struct task_struct * kernel/sched/sched.h:2258:25: sparse: sparse: incompatible types in comparison expression (different address spaces): kernel/sched/sched.h:2258:25: sparse: struct task_struct [noderef] __rcu * kernel/sched/sched.h:2258:25: sparse: struct task_struct * kernel/sched/sched.h:2269:26: sparse: sparse: incompatible types in comparison expression (different address spaces): kernel/sched/sched.h:2269:26: sparse: struct task_struct [noderef] __rcu * kernel/sched/sched.h:2269:26: sparse: struct task_struct * kernel/sched/sched.h:2481:9: sparse: sparse: incompatible types in comparison expression (different address spaces): kernel/sched/sched.h:2481:9: sparse: struct task_struct [noderef] __rcu * kernel/sched/sched.h:2481:9: sparse: struct task_struct * kernel/sched/sched.h:2481:9: sparse: sparse: incompatible types in comparison expression (different address spaces): kernel/sched/sched.h:2481:9: sparse: struct task_struct [noderef] __rcu * kernel/sched/sched.h:2481:9: sparse: struct task_struct * kernel/sched/sched.h:2269:26: sparse: sparse: incompatible types in comparison expression (different address spaces): kernel/sched/sched.h:2269:26: sparse: struct task_struct [noderef] __rcu * kernel/sched/sched.h:2269:26: sparse: struct task_struct * kernel/sched/sched.h:2458:9: sparse: sparse: incompatible types in comparison expression (different address spaces): kernel/sched/sched.h:2458:9: sparse: struct task_struct [noderef] __rcu * kernel/sched/sched.h:2458:9: sparse: struct task_struct * >> kernel/sched/core.c:8722:31: sparse: sparse: marked inline, but without a definition vim +8722 kernel/sched/core.c 8721 > 8722 void __might_resched_precision(const char *file, int len, int line, unsigned int offsets) 8723 { 8724 /* Ratelimiting timestamp: */ 8725 static unsigned long prev_jiffy; 8726 8727 unsigned long preempt_disable_ip; 8728 8729 /* WARN_ON_ONCE() by default, no rate limit required: */ 8730 rcu_sleep_check(); 8731 8732 if ((resched_offsets_ok(offsets) && !irqs_disabled() && 8733 !is_idle_task(current) && !current->non_block_count) || 8734 system_state == SYSTEM_BOOTING || system_state > SYSTEM_RUNNING || 8735 oops_in_progress) 8736 return; 8737 8738 if (time_before(jiffies, prev_jiffy + HZ) && prev_jiffy) 8739 return; 8740 prev_jiffy = jiffies; 8741 8742 /* Save this before calling printk(), since that will clobber it: */ 8743 preempt_disable_ip = get_preempt_disable_ip(current); 8744 8745 pr_err("BUG: sleeping function called from invalid context at %.*s:%d\n", 8746 len, file, line); 8747 pr_err("in_atomic(): %d, irqs_disabled(): %d, non_block: %d, pid: %d, name: %s\n", 8748 in_atomic(), irqs_disabled(), current->non_block_count, 8749 current->pid, current->comm); 8750 pr_err("preempt_count: %x, expected: %x\n", preempt_count(), 8751 offsets & MIGHT_RESCHED_PREEMPT_MASK); 8752 8753 if (IS_ENABLED(CONFIG_PREEMPT_RCU)) { 8754 pr_err("RCU nest depth: %d, expected: %u\n", 8755 rcu_preempt_depth(), offsets >> MIGHT_RESCHED_RCU_SHIFT); 8756 } 8757 8758 if (task_stack_end_corrupted(current)) 8759 pr_emerg("Thread overran stack, or stack corrupted\n"); 8760 8761 debug_show_held_locks(current); 8762 if (irqs_disabled()) 8763 print_irqtrace_events(current); 8764 8765 print_preempt_disable_ip(offsets & MIGHT_RESCHED_PREEMPT_MASK, 8766 preempt_disable_ip); 8767 8768 dump_stack(); 8769 add_taint(TAINT_WARN, LOCKDEP_STILL_OK); 8770 } 8771
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index be2e8c0a187e..086ee1dc447e 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -87,6 +87,7 @@ extern int dynamic_might_resched(void); #ifdef CONFIG_DEBUG_ATOMIC_SLEEP extern void __might_resched(const char *file, int line, unsigned int offsets); extern void __might_sleep(const char *file, int line); +extern void __might_sleep_precision(const char *file, int len, int line); extern void __cant_sleep(const char *file, int line, int preempt_offset); extern void __cant_migrate(const char *file, int line); @@ -145,6 +146,7 @@ extern void __cant_migrate(const char *file, int line); static inline void __might_resched(const char *file, int line, unsigned int offsets) { } static inline void __might_sleep(const char *file, int line) { } +static inline void __might_sleep_precision(const char *file, int len, int line) { } # define might_sleep() do { might_resched(); } while (0) # define cant_sleep() do { } while (0) # define cant_migrate() do { } while (0) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 3e5a6bf587f9..6ed70c801172 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -8670,7 +8670,10 @@ void __init sched_init(void) #ifdef CONFIG_DEBUG_ATOMIC_SLEEP -void __might_sleep(const char *file, int line) +extern inline void __might_resched_precision(const char *file, int len, + int line, unsigned int offsets); + +void __might_sleep_precision(const char *file, int len, int line) { unsigned int state = get_current_state(); /* @@ -8684,7 +8687,14 @@ void __might_sleep(const char *file, int line) (void *)current->task_state_change, (void *)current->task_state_change); - __might_resched(file, line, 0); + __might_resched_precision(file, len, line, 0); +} + +void __might_sleep(const char *file, int line) +{ + long len = strlen(file); + + __might_sleep_precision(file, len, line); } EXPORT_SYMBOL(__might_sleep); @@ -8709,7 +8719,7 @@ static inline bool resched_offsets_ok(unsigned int offsets) return nested == offsets; } -void __might_resched(const char *file, int line, unsigned int offsets) +void __might_resched_precision(const char *file, int len, int line, unsigned int offsets) { /* Ratelimiting timestamp: */ static unsigned long prev_jiffy; @@ -8732,8 +8742,8 @@ void __might_resched(const char *file, int line, unsigned int offsets) /* Save this before calling printk(), since that will clobber it: */ preempt_disable_ip = get_preempt_disable_ip(current); - pr_err("BUG: sleeping function called from invalid context at %s:%d\n", - file, line); + pr_err("BUG: sleeping function called from invalid context at %.*s:%d\n", + len, file, line); pr_err("in_atomic(): %d, irqs_disabled(): %d, non_block: %d, pid: %d, name: %s\n", in_atomic(), irqs_disabled(), current->non_block_count, current->pid, current->comm); @@ -8758,6 +8768,13 @@ void __might_resched(const char *file, int line, unsigned int offsets) dump_stack(); add_taint(TAINT_WARN, LOCKDEP_STILL_OK); } + +void __might_resched(const char *file, int line, unsigned int offsets) +{ + long len = strlen(file); + + __might_resched_precision(file, len, line, offsets); +} EXPORT_SYMBOL(__might_resched); void __cant_sleep(const char *file, int line, int preempt_offset) diff --git a/rust/helpers/helpers.c b/rust/helpers/helpers.c index d16aeda7a558..7ab71a6d4603 100644 --- a/rust/helpers/helpers.c +++ b/rust/helpers/helpers.c @@ -13,6 +13,7 @@ #include "build_bug.c" #include "cred.c" #include "err.c" +#include "kernel.c" #include "fs.c" #include "jump_label.c" #include "kunit.c" diff --git a/rust/helpers/kernel.c b/rust/helpers/kernel.c new file mode 100644 index 000000000000..9dff28f4618e --- /dev/null +++ b/rust/helpers/kernel.c @@ -0,0 +1,13 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include <linux/kernel.h> + +void rust_helper_cpu_relax(void) +{ + cpu_relax(); +} + +void rust_helper___might_sleep_precision(const char *file, int len, int line) +{ + __might_sleep_precision(file, len, line); +} diff --git a/rust/kernel/cpu.rs b/rust/kernel/cpu.rs new file mode 100644 index 000000000000..eeeff4be84fa --- /dev/null +++ b/rust/kernel/cpu.rs @@ -0,0 +1,13 @@ +// SPDX-License-Identifier: GPL-2.0 + +//! Processor related primitives. +//! +//! C header: [`include/linux/processor.h`](srctree/include/linux/processor.h). + +/// Lower CPU power consumption or yield to a hyperthreaded twin processor. +/// +/// It also happens to serve as a compiler barrier. +pub fn cpu_relax() { + // SAFETY: FFI call. + unsafe { bindings::cpu_relax() } +} diff --git a/rust/kernel/error.rs b/rust/kernel/error.rs index 914e8dec1abd..b5016083a115 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!(ETIMEDOUT, "Connection timed out."); 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."); diff --git a/rust/kernel/io.rs b/rust/kernel/io.rs new file mode 100644 index 000000000000..033f3c4e4adf --- /dev/null +++ b/rust/kernel/io.rs @@ -0,0 +1,5 @@ +// SPDX-License-Identifier: GPL-2.0 + +//! Input and Output. + +pub mod poll; diff --git a/rust/kernel/io/poll.rs b/rust/kernel/io/poll.rs new file mode 100644 index 000000000000..da8e975d8e50 --- /dev/null +++ b/rust/kernel/io/poll.rs @@ -0,0 +1,84 @@ +// SPDX-License-Identifier: GPL-2.0 + +//! IO polling. +//! +//! C header: [`include/linux/iopoll.h`](srctree/include/linux/iopoll.h). + +use crate::{ + cpu::cpu_relax, + error::{code::*, Result}, + time::{delay::fsleep, Delta, Instant}, +}; + +use core::panic::Location; + +/// Polls periodically until a condition is met or a timeout is reached. +/// +/// Public but hidden since it should only be used from public macros. +/// +/// ```rust +/// use kernel::io::poll::read_poll_timeout; +/// use kernel::time::Delta; +/// use kernel::sync::{SpinLock, new_spinlock}; +/// +/// let lock = KBox::pin_init(new_spinlock!(()), kernel::alloc::flags::GFP_KERNEL)?; +/// let g = lock.lock(); +/// read_poll_timeout(|| Ok(()), |()| true, Delta::from_micros(42), Delta::from_micros(42)); +/// drop(g); +/// +/// # Ok::<(), Error>(()) +/// ``` +#[track_caller] +pub fn read_poll_timeout<Op, Cond, T: Copy>( + mut op: Op, + cond: Cond, + sleep_delta: Delta, + timeout_delta: Delta, +) -> Result<T> +where + Op: FnMut() -> Result<T>, + Cond: Fn(T) -> bool, +{ + let start = Instant::now(); + let sleep = !sleep_delta.is_zero(); + let timeout = !timeout_delta.is_zero(); + + might_sleep(Location::caller()); + + let val = loop { + let val = op()?; + if cond(val) { + // Unlike the C version, we immediately return. + // We know a condition is met so we don't need to check again. + return Ok(val); + } + if timeout && start.elapsed() > timeout_delta { + // Should we return Err(ETIMEDOUT) here instead of call op() again + // without a sleep between? But we follow the C version. op() could + // take some time so might be worth checking again. + break op()?; + } + if sleep { + fsleep(sleep_delta); + } + // fsleep() could be busy-wait loop so we always call cpu_relax(). + cpu_relax(); + }; + + if cond(val) { + Ok(val) + } else { + Err(ETIMEDOUT) + } +} + +fn might_sleep(loc: &Location<'_>) { + // SAFETY: FFI call. + unsafe { + crate::bindings::__might_sleep_precision( + loc.file().as_ptr().cast(), + loc.file().len() as i32, + loc.line() as i32, + ) + } +} diff --git a/rust/kernel/lib.rs b/rust/kernel/lib.rs index e1065a7551a3..2e9722f980bd 100644 --- a/rust/kernel/lib.rs +++ b/rust/kernel/lib.rs @@ -33,6 +33,7 @@ #[cfg(CONFIG_BLOCK)] pub mod block; mod build_assert; +pub mod cpu; pub mod cred; pub mod device; pub mod error; @@ -40,6 +41,7 @@ pub mod firmware; pub mod fs; pub mod init; +pub mod io; pub mod ioctl; pub mod jump_label; #[cfg(CONFIG_KUNIT)]