From: Greg Kroah-Hartman Date: Thu, 16 Sep 2021 08:54:16 +0000 (+0200) Subject: drop osix-cpu-timers-force-next-expiration-recalc-after-.patch from 4.14 4.19 and 4.9 X-Git-Tag: v5.14.5~12 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=149979908aab1e582f87e82a3667f9c07b795bd3;p=thirdparty%2Fkernel%2Fstable-queue.git drop osix-cpu-timers-force-next-expiration-recalc-after-.patch from 4.14 4.19 and 4.9 --- diff --git a/queue-4.14/posix-cpu-timers-force-next-expiration-recalc-after-.patch b/queue-4.14/posix-cpu-timers-force-next-expiration-recalc-after-.patch deleted file mode 100644 index 31eb88f703a..00000000000 --- a/queue-4.14/posix-cpu-timers-force-next-expiration-recalc-after-.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 9419160e66d8f2158a05f08d147eaecd9bf7968c Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 26 Jul 2021 14:55:10 +0200 -Subject: posix-cpu-timers: Force next expiration recalc after itimer reset - -From: Frederic Weisbecker - -[ Upstream commit 406dd42bd1ba0c01babf9cde169bb319e52f6147 ] - -When an itimer deactivates a previously armed expiration, it simply doesn't -do anything. As a result the process wide cputime counter keeps running and -the tick dependency stays set until it reaches the old ghost expiration -value. - -This can be reproduced with the following snippet: - - void trigger_process_counter(void) - { - struct itimerval n = {}; - - n.it_value.tv_sec = 100; - setitimer(ITIMER_VIRTUAL, &n, NULL); - n.it_value.tv_sec = 0; - setitimer(ITIMER_VIRTUAL, &n, NULL); - } - -Fix this with resetting the relevant base expiration. This is similar to -disarming a timer. - -Signed-off-by: Frederic Weisbecker -Signed-off-by: Thomas Gleixner -Acked-by: Peter Zijlstra (Intel) -Link: https://lore.kernel.org/r/20210726125513.271824-4-frederic@kernel.org -Signed-off-by: Sasha Levin ---- - kernel/time/posix-cpu-timers.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c -index fb5a57ffb98c..495d690cc92b 100644 ---- a/kernel/time/posix-cpu-timers.c -+++ b/kernel/time/posix-cpu-timers.c -@@ -1207,8 +1207,6 @@ void set_process_cpu_timer(struct task_struct *tsk, unsigned int clock_idx, - } - } - -- if (!*newval) -- return; - *newval += now; - } - --- -2.30.2 - diff --git a/queue-4.14/series b/queue-4.14/series index ec24d329be6..c690941a93b 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -30,7 +30,6 @@ regmap-fix-the-offset-of-register-error-log.patch crypto-mxs-dcp-check-for-dma-mapping-errors.patch power-supply-axp288_fuel_gauge-report-register-addre.patch crypto-omap-sham-clear-dma-flags-only-after-omap_sha.patch -posix-cpu-timers-force-next-expiration-recalc-after-.patch udf-check-lvid-earlier.patch isofs-joliet-fix-iocharset-utf8-mount-option.patch nvme-rdma-don-t-update-queue-count-when-failing-to-s.patch diff --git a/queue-4.19/posix-cpu-timers-force-next-expiration-recalc-after-.patch b/queue-4.19/posix-cpu-timers-force-next-expiration-recalc-after-.patch deleted file mode 100644 index 588a813c04d..00000000000 --- a/queue-4.19/posix-cpu-timers-force-next-expiration-recalc-after-.patch +++ /dev/null @@ -1,54 +0,0 @@ -From c505dc5f056d0fc763109b52c41cb96ef52b089b Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 26 Jul 2021 14:55:10 +0200 -Subject: posix-cpu-timers: Force next expiration recalc after itimer reset - -From: Frederic Weisbecker - -[ Upstream commit 406dd42bd1ba0c01babf9cde169bb319e52f6147 ] - -When an itimer deactivates a previously armed expiration, it simply doesn't -do anything. As a result the process wide cputime counter keeps running and -the tick dependency stays set until it reaches the old ghost expiration -value. - -This can be reproduced with the following snippet: - - void trigger_process_counter(void) - { - struct itimerval n = {}; - - n.it_value.tv_sec = 100; - setitimer(ITIMER_VIRTUAL, &n, NULL); - n.it_value.tv_sec = 0; - setitimer(ITIMER_VIRTUAL, &n, NULL); - } - -Fix this with resetting the relevant base expiration. This is similar to -disarming a timer. - -Signed-off-by: Frederic Weisbecker -Signed-off-by: Thomas Gleixner -Acked-by: Peter Zijlstra (Intel) -Link: https://lore.kernel.org/r/20210726125513.271824-4-frederic@kernel.org -Signed-off-by: Sasha Levin ---- - kernel/time/posix-cpu-timers.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c -index bfaa44a80c03..d9feac7aad52 100644 ---- a/kernel/time/posix-cpu-timers.c -+++ b/kernel/time/posix-cpu-timers.c -@@ -1230,8 +1230,6 @@ void set_process_cpu_timer(struct task_struct *tsk, unsigned int clock_idx, - } - } - -- if (!*newval) -- return; - *newval += now; - } - --- -2.30.2 - diff --git a/queue-4.19/series b/queue-4.19/series index 540bfcafaf6..7ca2186886f 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -36,7 +36,6 @@ sched-deadline-fix-reset_on_fork-reporting-of-dl-tas.patch power-supply-axp288_fuel_gauge-report-register-addre.patch crypto-omap-sham-clear-dma-flags-only-after-omap_sha.patch sched-deadline-fix-missing-clock-update-in-migrate_t.patch -posix-cpu-timers-force-next-expiration-recalc-after-.patch hrtimer-avoid-double-reprogramming-in-__hrtimer_star.patch udf-check-lvid-earlier.patch isofs-joliet-fix-iocharset-utf8-mount-option.patch diff --git a/queue-4.9/posix-cpu-timers-force-next-expiration-recalc-after-.patch b/queue-4.9/posix-cpu-timers-force-next-expiration-recalc-after-.patch deleted file mode 100644 index acbd0d286dc..00000000000 --- a/queue-4.9/posix-cpu-timers-force-next-expiration-recalc-after-.patch +++ /dev/null @@ -1,54 +0,0 @@ -From c82bea8d8911f60c096f664134a7b1a53282f0ae Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 26 Jul 2021 14:55:10 +0200 -Subject: posix-cpu-timers: Force next expiration recalc after itimer reset - -From: Frederic Weisbecker - -[ Upstream commit 406dd42bd1ba0c01babf9cde169bb319e52f6147 ] - -When an itimer deactivates a previously armed expiration, it simply doesn't -do anything. As a result the process wide cputime counter keeps running and -the tick dependency stays set until it reaches the old ghost expiration -value. - -This can be reproduced with the following snippet: - - void trigger_process_counter(void) - { - struct itimerval n = {}; - - n.it_value.tv_sec = 100; - setitimer(ITIMER_VIRTUAL, &n, NULL); - n.it_value.tv_sec = 0; - setitimer(ITIMER_VIRTUAL, &n, NULL); - } - -Fix this with resetting the relevant base expiration. This is similar to -disarming a timer. - -Signed-off-by: Frederic Weisbecker -Signed-off-by: Thomas Gleixner -Acked-by: Peter Zijlstra (Intel) -Link: https://lore.kernel.org/r/20210726125513.271824-4-frederic@kernel.org -Signed-off-by: Sasha Levin ---- - kernel/time/posix-cpu-timers.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c -index 9fff077d0ffc..458ffe4ac6fb 100644 ---- a/kernel/time/posix-cpu-timers.c -+++ b/kernel/time/posix-cpu-timers.c -@@ -1240,8 +1240,6 @@ void set_process_cpu_timer(struct task_struct *tsk, unsigned int clock_idx, - } - } - -- if (!*newval) -- return; - *newval += now; - } - --- -2.30.2 - diff --git a/queue-4.9/series b/queue-4.9/series index 3a91a0519ee..73808039068 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -36,7 +36,6 @@ regmap-fix-the-offset-of-register-error-log.patch crypto-mxs-dcp-check-for-dma-mapping-errors.patch power-supply-axp288_fuel_gauge-report-register-addre.patch crypto-omap-sham-clear-dma-flags-only-after-omap_sha.patch -posix-cpu-timers-force-next-expiration-recalc-after-.patch udf-check-lvid-earlier.patch power-supply-max17042_battery-fix-typo-in-max17042_t.patch libata-fix-ata_host_start.patch