From 42672d73de4fab730a2d6e91c92d19afebeb40bb Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 9 Feb 2019 20:03:56 +0000
Subject: sys-kernel/linux-{image,sources}-redcore-lts : version bump to
 v4.14.95 && v4.19.20

---
 ...r-granularity-and-minimum-hrtimeout-confi.patch | 136 +++++++++++++++++++++
 1 file changed, 136 insertions(+)
 create mode 100644 sys-kernel/linux-sources-redcore-lts/files/4.14-0011-Make-hrtimer-granularity-and-minimum-hrtimeout-confi.patch

(limited to 'sys-kernel/linux-sources-redcore-lts/files/4.14-0011-Make-hrtimer-granularity-and-minimum-hrtimeout-confi.patch')

diff --git a/sys-kernel/linux-sources-redcore-lts/files/4.14-0011-Make-hrtimer-granularity-and-minimum-hrtimeout-confi.patch b/sys-kernel/linux-sources-redcore-lts/files/4.14-0011-Make-hrtimer-granularity-and-minimum-hrtimeout-confi.patch
new file mode 100644
index 00000000..5ac20300
--- /dev/null
+++ b/sys-kernel/linux-sources-redcore-lts/files/4.14-0011-Make-hrtimer-granularity-and-minimum-hrtimeout-confi.patch
@@ -0,0 +1,136 @@
+diff -Nur a/kernel/sysctl.c b/kernel/sysctl.c
+--- a/kernel/sysctl.c	2018-11-03 17:03:07.433069521 +0000
++++ b/kernel/sysctl.c	2018-11-03 17:02:11.020267246 +0000
+@@ -141,7 +141,9 @@
+ extern int sched_iso_cpu;
+ extern int sched_yield_type;
+ #endif
+-#ifdef CONFIG_PRINTK
++extern int hrtimer_granularity_us;
++extern int hrtimeout_min_us;
++#if defined(CONFIG_PRINTK) || defined(CONFIG_SCHED_MUQSS)
+ static int ten_thousand __read_only = 10000;
+ #endif
+ #ifdef CONFIG_PERF_EVENTS
+@@ -1119,6 +1121,24 @@
+ 		.extra2		= &two,
+ 	},
+ #endif
++	{
++		.procname	= "hrtimer_granularity_us",
++		.data		= &hrtimer_granularity_us,
++		.maxlen		= sizeof(int),
++		.mode		= 0644,
++		.proc_handler	= &proc_dointvec_minmax,
++		.extra1		= &one,
++		.extra2		= &ten_thousand,
++	},
++	{
++		.procname	= "hrtimeout_min_us",
++		.data		= &hrtimeout_min_us,
++		.maxlen		= sizeof(int),
++		.mode		= 0644,
++		.proc_handler	= &proc_dointvec_minmax,
++		.extra1		= &one,
++		.extra2		= &ten_thousand,
++	},
+ #if defined(CONFIG_S390) && defined(CONFIG_SMP)
+ 	{
+ 		.procname	= "spin_retry",
+diff -Nur a/kernel/time/clockevents.c b/kernel/time/clockevents.c
+--- a/kernel/time/clockevents.c	2018-11-03 17:03:07.433069521 +0000
++++ b/kernel/time/clockevents.c	2018-11-03 16:58:17.283800909 +0000
+@@ -198,13 +198,9 @@
+ 
+ #ifdef CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST
+ 
+-#ifdef CONFIG_SCHED_MUQSS
++int __read_mostly hrtimer_granularity_us = 100;
+ /* Limit min_delta to 100us */
+-#define MIN_DELTA_LIMIT		(NSEC_PER_SEC / 10000)
+-#else
+-/* Limit min_delta to a jiffie */
+-#define MIN_DELTA_LIMIT		(NSEC_PER_SEC / HZ)
+-#endif
++#define MIN_DELTA_LIMIT		(hrtimer_granularity_us * NSEC_PER_USEC)
+ 
+ /**
+  * clockevents_increase_min_delta - raise minimum delta of a clock event device
+diff -Nur a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c
+--- a/kernel/time/hrtimer.c	2018-11-03 17:04:16.448274547 +0000
++++ b/kernel/time/hrtimer.c	2018-11-03 16:58:17.283800909 +0000
+@@ -1803,7 +1803,7 @@
+ long __sched schedule_msec_hrtimeout(long timeout)
+ {
+ 	struct hrtimer_sleeper t;
+-	int delta, secs, jiffs;
++	int delta, jiffs;
+ 	ktime_t expires;
+ 
+ 	if (!timeout) {
+@@ -1820,9 +1820,8 @@
+ 	if (jiffs > 4 || hrtimer_resolution >= NSEC_PER_SEC / HZ || pm_freezing)
+ 		return schedule_timeout(jiffs);
+ 
+-	secs = timeout / 1000;
+ 	delta = (timeout % 1000) * NSEC_PER_MSEC;
+-	expires = ktime_set(secs, delta);
++	expires = ktime_set(0, delta);
+ 
+ 	hrtimer_init_on_stack(&t.timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
+ 	hrtimer_set_expires_range_ns(&t.timer, expires, delta);
+@@ -1846,9 +1845,53 @@
+ 
+ EXPORT_SYMBOL(schedule_msec_hrtimeout);
+ 
++#define USECS_PER_SEC 1000000
++extern int hrtimer_granularity_us;
++
++static inline long schedule_usec_hrtimeout(long timeout)
++{
++	struct hrtimer_sleeper t;
++	ktime_t expires;
++	int delta;
++
++	if (!timeout) {
++		__set_current_state(TASK_RUNNING);
++		return 0;
++	}
++
++	if (hrtimer_resolution >= NSEC_PER_SEC / HZ)
++		return schedule_timeout(usecs_to_jiffies(timeout));
++
++	if (timeout < hrtimer_granularity_us)
++		timeout = hrtimer_granularity_us;
++	delta = (timeout % USECS_PER_SEC) * NSEC_PER_USEC;
++	expires = ktime_set(0, delta);
++
++	hrtimer_init_on_stack(&t.timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
++	hrtimer_set_expires_range_ns(&t.timer, expires, delta);
++
++	hrtimer_init_sleeper(&t, current);
++
++	hrtimer_start_expires(&t.timer, HRTIMER_MODE_REL);
++
++	if (likely(t.task))
++		schedule();
++
++	hrtimer_cancel(&t.timer);
++	destroy_hrtimer_on_stack(&t.timer);
++
++	__set_current_state(TASK_RUNNING);
++
++	expires = hrtimer_expires_remaining(&t.timer);
++	timeout = ktime_to_us(expires);
++	return timeout < 0 ? 0 : timeout;
++}
++
++int __read_mostly hrtimeout_min_us = 1000;
++
+ long __sched schedule_min_hrtimeout(void)
+ {
+-	return schedule_msec_hrtimeout(1);
++	return usecs_to_jiffies(schedule_usec_hrtimeout(hrtimeout_min_us));
+ }
+ 
+ EXPORT_SYMBOL(schedule_min_hrtimeout);
-- 
cgit v1.2.3