d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve high resolution timer support in the LinuxKPI.

Browse Source 
Submitted by:	Johannes Lundberg <johalun0@gmail.com>
MFC after:	1 week
Sponsored by:	Mellanox Technologies
Sponsored by:	Limelight Networks
This commit is contained in:
Hans Petter Selasky 2018-06-01 11:33:14 +00:00
parent f03ae7e802
commit 0a85496223
2 changed files with 41 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/compat/linuxkpi/common/include/linux/hrtimer.h
View File

@ -36,6 +36,7 @@
enum hrtimer_mode {
HRTIMER_MODE_REL,
HRTIMER_MODE_REL_PINNED = HRTIMER_MODE_REL,
};
enum hrtimer_restart {
@ -47,31 +48,42 @@ struct hrtimer {
enum hrtimer_restart (*function)(struct hrtimer *);
struct mtx mtx;
struct callout callout;
s64 expires; /* relative time in nanoseconds */
s64 precision; /* in nanoseconds */
};
#define hrtimer_active(hrtimer) linux_hrtimer_active(hrtimer)
#define hrtimer_cancel(hrtimer) linux_hrtimer_cancel(hrtimer)
#define hrtimer_init(hrtimer, clock, mode) do { \
CTASSERT((clock) == CLOCK_MONOTONIC); \
CTASSERT((mode) == HRTIMER_MODE_REL); \
linux_hrtimer_init(hrtimer); \
} while (0)
#define hrtimer_set_expires(hrtimer, time) \
linux_hrtimer_set_expires(hrtimer, time)
#define hrtimer_start(hrtimer, time, mode) do { \
CTASSERT((mode) == HRTIMER_MODE_REL); \
linux_hrtimer_start(hrtimer, time); \
} while (0)
#define hrtimer_start_range_ns(hrtimer, time, prec, mode) do { \
CTASSERT((mode) == HRTIMER_MODE_REL); \
linux_hrtimer_start_range_ns(hrtimer, time, prec); \
} while (0)
#define hrtimer_forward_now(hrtimer, interval) do { \
linux_hrtimer_forward_now(hrtimer, interval); \
} while (0)
bool linux_hrtimer_active(struct hrtimer *);
int linux_hrtimer_cancel(struct hrtimer *);
void linux_hrtimer_init(struct hrtimer *);
void linux_hrtimer_set_expires(struct hrtimer *, ktime_t);
void linux_hrtimer_start(struct hrtimer *, ktime_t);
void linux_hrtimer_start_range_ns(struct hrtimer *, ktime_t, int64_t);
void linux_hrtimer_forward_now(struct hrtimer *, ktime_t);
#endif /* _LINUX_HRTIMER_H_ */

38
sys/compat/linuxkpi/common/src/linux_hrtimer.c
View File

@ -44,8 +44,13 @@ hrtimer_call_handler(void *arg)
hrtimer = arg;
ret = hrtimer->function(hrtimer);
MPASS(ret == HRTIMER_NORESTART);
callout_deactivate(&hrtimer->callout);
if (ret == HRTIMER_RESTART) {
callout_schedule_sbt(&hrtimer->callout,
nstosbt(hrtimer->expires), nstosbt(hrtimer->precision), 0);
} else {
callout_deactivate(&hrtimer->callout);
}
}
bool
@ -56,6 +61,7 @@ linux_hrtimer_active(struct hrtimer *hrtimer)
mtx_lock(&hrtimer->mtx);
ret = callout_active(&hrtimer->callout);
mtx_unlock(&hrtimer->mtx);
return (ret);
}
@ -74,15 +80,16 @@ void
linux_hrtimer_init(struct hrtimer *hrtimer)
{
hrtimer->function = NULL;
mtx_init(&hrtimer->mtx, "hrtimer", NULL, MTX_DEF | MTX_RECURSE);
memset(hrtimer, 0, sizeof(*hrtimer));
mtx_init(&hrtimer->mtx, "hrtimer", NULL,
MTX_DEF | MTX_RECURSE | MTX_NOWITNESS);
callout_init_mtx(&hrtimer->callout, &hrtimer->mtx, 0);
}
void
linux_hrtimer_set_expires(struct hrtimer *hrtimer __unused,
ktime_t time __unused)
linux_hrtimer_set_expires(struct hrtimer *hrtimer, ktime_t time)
{
hrtimer->expires = ktime_to_ns(time);
}
void
@ -93,11 +100,24 @@ linux_hrtimer_start(struct hrtimer *hrtimer, ktime_t time)
}
void
linux_hrtimer_start_range_ns(struct hrtimer *hrtimer, ktime_t time, int64_t nsec)
linux_hrtimer_start_range_ns(struct hrtimer *hrtimer, ktime_t time,
int64_t nsec)
{
mtx_lock(&hrtimer->mtx);
callout_reset_sbt(&hrtimer->callout, nstosbt(time), nstosbt(nsec),
hrtimer_call_handler, hrtimer, 0);
hrtimer->precision = nsec;
callout_reset_sbt(&hrtimer->callout, nstosbt(ktime_to_ns(time)),
nstosbt(nsec), hrtimer_call_handler, hrtimer, 0);
mtx_unlock(&hrtimer->mtx);
}
void
linux_hrtimer_forward_now(struct hrtimer *hrtimer, ktime_t interval)
{
mtx_lock(&hrtimer->mtx);
callout_reset_sbt(&hrtimer->callout, nstosbt(ktime_to_ns(interval)),
nstosbt(hrtimer->precision), hrtimer_call_handler, hrtimer, 0);
mtx_unlock(&hrtimer->mtx);
}