mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2024-12-27 19:39:35 +03:00
e0cd6c28a3
In `config/kernel-timer.m4` refactor slightly to check more generally
for the new `timer_setup()` APIs, but also check the callback signature
because some kernels (notably 4.14) have the new `timer_setup()` API but
use the old callback signature. Also add a check for a `flags` member in
`struct timer_list`, which was added in 4.1-rc8.
Add compatibility shims to `include/spl/sys/timer.h` to allow using the
new timer APIs with the only two caveats being that the callback
argument type must be declared as `spl_timer_list_t` and an explicit
assignment is required to get the timer variable for the `timer_of()`
macro. So the callback would look like this:
```c
__cv_wakeup(spl_timer_list_t t)
{
struct timer_list *tmr = (struct timer_list *)t;
struct thing *parent = from_timer(parent, tmr,
parent_timer_field);
... /* do stuff with parent */
```
Make some minor changes to `spl-condvar.c` and `spl-taskq.c` to use the
new timer APIs instead of conditional code.
Reviewed-by: Tomohiro Kusumi <kusumi.tomohiro@gmail.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Rafael Kitover <rkitover@gmail.com>
Closes #8647
101 lines
3.1 KiB
C
101 lines
3.1 KiB
C
/*
|
|
* Copyright (C) 2007-2010 Lawrence Livermore National Security, LLC.
|
|
* Copyright (C) 2007 The Regents of the University of California.
|
|
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
|
|
* Written by Brian Behlendorf <behlendorf1@llnl.gov>.
|
|
* UCRL-CODE-235197
|
|
*
|
|
* This file is part of the SPL, Solaris Porting Layer.
|
|
* For details, see <http://zfsonlinux.org/>.
|
|
*
|
|
* The SPL is free software; you can redistribute it and/or modify it
|
|
* under the terms of the GNU General Public License as published by the
|
|
* Free Software Foundation; either version 2 of the License, or (at your
|
|
* option) any later version.
|
|
*
|
|
* The SPL is distributed in the hope that it will be useful, but WITHOUT
|
|
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
|
* for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along
|
|
* with the SPL. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#ifndef _SPL_TIMER_H
|
|
#define _SPL_TIMER_H
|
|
|
|
#include <linux/module.h>
|
|
#include <linux/delay.h>
|
|
#include <linux/sched.h>
|
|
#include <linux/time.h>
|
|
#include <linux/timer.h>
|
|
|
|
#define lbolt ((clock_t)jiffies)
|
|
#define lbolt64 ((int64_t)get_jiffies_64())
|
|
|
|
#define ddi_get_lbolt() ((clock_t)jiffies)
|
|
#define ddi_get_lbolt64() ((int64_t)get_jiffies_64())
|
|
|
|
#define ddi_time_before(a, b) (typecheck(clock_t, a) && \
|
|
typecheck(clock_t, b) && \
|
|
((a) - (b) < 0))
|
|
#define ddi_time_after(a, b) ddi_time_before(b, a)
|
|
#define ddi_time_before_eq(a, b) (!ddi_time_after(a, b))
|
|
#define ddi_time_after_eq(a, b) ddi_time_before_eq(b, a)
|
|
|
|
#define ddi_time_before64(a, b) (typecheck(int64_t, a) && \
|
|
typecheck(int64_t, b) && \
|
|
((a) - (b) < 0))
|
|
#define ddi_time_after64(a, b) ddi_time_before64(b, a)
|
|
#define ddi_time_before_eq64(a, b) (!ddi_time_after64(a, b))
|
|
#define ddi_time_after_eq64(a, b) ddi_time_before_eq64(b, a)
|
|
|
|
#define delay(ticks) schedule_timeout_uninterruptible(ticks)
|
|
|
|
/* usleep_range() introduced in 2.6.36 */
|
|
#ifndef HAVE_USLEEP_RANGE
|
|
static inline void
|
|
usleep_range(unsigned long min, unsigned long max)
|
|
{
|
|
unsigned int min_ms = min / USEC_PER_MSEC;
|
|
|
|
if (min >= MAX_UDELAY_MS)
|
|
msleep(min_ms);
|
|
else
|
|
udelay(min);
|
|
}
|
|
#endif /* HAVE_USLEEP_RANGE */
|
|
|
|
#define SEC_TO_TICK(sec) ((sec) * HZ)
|
|
#define MSEC_TO_TICK(ms) msecs_to_jiffies(ms)
|
|
#define USEC_TO_TICK(us) usecs_to_jiffies(us)
|
|
#define NSEC_TO_TICK(ns) usecs_to_jiffies(ns / NSEC_PER_USEC)
|
|
|
|
#ifndef from_timer
|
|
#define from_timer(var, timer, timer_field) \
|
|
container_of(timer, typeof(*var), timer_field)
|
|
#endif
|
|
|
|
#ifdef HAVE_KERNEL_TIMER_FUNCTION_TIMER_LIST
|
|
typedef struct timer_list *spl_timer_list_t;
|
|
#else
|
|
typedef unsigned long spl_timer_list_t;
|
|
#endif
|
|
|
|
#ifndef HAVE_KERNEL_TIMER_SETUP
|
|
|
|
static inline void
|
|
timer_setup(struct timer_list *timer, void (*func)(spl_timer_list_t), u32 fl)
|
|
{
|
|
#ifdef HAVE_KERNEL_TIMER_LIST_FLAGS
|
|
(timer)->flags = fl;
|
|
#endif
|
|
init_timer(timer);
|
|
setup_timer(timer, func, (spl_timer_list_t)(timer));
|
|
}
|
|
|
|
#endif /* HAVE_KERNEL_TIMER_SETUP */
|
|
|
|
#endif /* _SPL_TIMER_H */
|