Author: hselasky
Date: Sat Mar 3 18:54:16 2018
New Revision: 330352
URL: https://svnweb.freebsd.org/changeset/base/330352
Log:
Implement msleep_interruptible() in the LinuxKPI. While at it use pause_sbt()
instead of pause() in the msleep() function to avoid rounding errors when
converting delay values forth and back. Add a guard for a delay value
of zero milliseconds which is undefined.
MFC after: 1 week
Requested by: Johannes Lundberg <johal...@gmail.com>
Sponsored by: Mellanox Technologies
Modified:
head/sys/compat/linuxkpi/common/include/linux/delay.h
head/sys/compat/linuxkpi/common/src/linux_schedule.c
Modified: head/sys/compat/linuxkpi/common/include/linux/delay.h
==============================================================================
--- head/sys/compat/linuxkpi/common/include/linux/delay.h Sat Mar 3
18:52:19 2018 (r330351)
+++ head/sys/compat/linuxkpi/common/include/linux/delay.h Sat Mar 3
18:54:16 2018 (r330352)
@@ -36,14 +36,20 @@
#include <sys/systm.h>
static inline void
-linux_msleep(int ms)
+linux_msleep(unsigned int ms)
{
- pause("lnxsleep", msecs_to_jiffies(ms));
+ /* guard against invalid values */
+ if (ms == 0)
+ ms = 1;
+ pause_sbt("lnxsleep", SBT_1MS * ms, 0, C_HARDCLOCK);
}
#undef msleep
-#define msleep linux_msleep
+#define msleep(ms) linux_msleep(ms)
+#undef msleep_interruptible
+#define msleep_interruptible(ms) linux_msleep_interruptible(ms)
+
#define udelay(t) DELAY(t)
static inline void
@@ -64,5 +70,7 @@ usleep_range(unsigned long min, unsigned long max)
{
DELAY(min);
}
+
+extern unsigned int linux_msleep_interruptible(unsigned int ms);
#endif /* _LINUX_DELAY_H_ */
Modified: head/sys/compat/linuxkpi/common/src/linux_schedule.c
==============================================================================
--- head/sys/compat/linuxkpi/common/src/linux_schedule.c Sat Mar 3
18:52:19 2018 (r330351)
+++ head/sys/compat/linuxkpi/common/src/linux_schedule.c Sat Mar 3
18:54:16 2018 (r330352)
@@ -33,6 +33,7 @@ __FBSDID("$FreeBSD$");
#include <sys/signalvar.h>
#include <sys/sleepqueue.h>
+#include <linux/delay.h>
#include <linux/errno.h>
#include <linux/kernel.h>
#include <linux/list.h>
@@ -72,6 +73,25 @@ linux_add_to_sleepqueue(void *wchan, struct task_struc
ret = -ERESTARTSYS;
}
return (ret);
+}
+
+unsigned int
+linux_msleep_interruptible(unsigned int ms)
+{
+ int ret;
+
+ /* guard against invalid values */
+ if (ms == 0)
+ ms = 1;
+ ret = -pause_sbt("lnxsleep", SBT_1MS * ms, 0, C_HARDCLOCK | C_CATCH);
+
+ switch (ret) {
+ case -EWOULDBLOCK:
+ return (0);
+ default:
+ linux_schedule_save_interrupt_value(current, ret);
+ return (ms);
+ }
}
static int
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
