CCF_100/linux-tkg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

linux510-tkg: Update Project C patchset to v5.10-r1 - http://cchalpha.blogspot.com/2020/12/project-c-v510-r1-release.html

Browse Source
This commit is contained in:
Tk-Glitch 2020-12-26 11:11:28 +01:00
parent ec51b940f4
commit 4cae9d92d3
3 changed files with 84 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
PKGBUILD
View File

@ -48,7 +48,7 @@ else
fi fi
pkgname=("${pkgbase}" "${pkgbase}-headers") pkgname=("${pkgbase}" "${pkgbase}-headers")
pkgver="${_basekernel}"."${_sub}" pkgver="${_basekernel}"."${_sub}"
pkgrel=104 pkgrel=105
pkgdesc='Linux-tkg' pkgdesc='Linux-tkg'
arch=('x86_64') # no i686 in here arch=('x86_64') # no i686 in here
url="http://www.kernel.org/" url="http://www.kernel.org/"
@ -312,7 +312,7 @@ case $_basever in
#0008-5.10-bcachefs.patch #0008-5.10-bcachefs.patch
0009-glitched-ondemand-bmq.patch 0009-glitched-ondemand-bmq.patch
0009-glitched-bmq.patch 0009-glitched-bmq.patch
0009-prjc_v5.10-r0.patch 0009-prjc_v5.10-r1.patch
0011-ZFS-fix.patch 0011-ZFS-fix.patch
#0012-linux-hardened.patch #0012-linux-hardened.patch
0012-misc-additions.patch 0012-misc-additions.patch
@ -338,7 +338,7 @@ case $_basever in
'b302ba6c5bbe8ed19b20207505d513208fae1e678cf4d8e7ac0b154e5fe3f456' 'b302ba6c5bbe8ed19b20207505d513208fae1e678cf4d8e7ac0b154e5fe3f456'
'9fad4a40449e09522899955762c8928ae17f4cdaa16e01239fd12592e9d58177' '9fad4a40449e09522899955762c8928ae17f4cdaa16e01239fd12592e9d58177'
'a557b342111849a5f920bbe1c129f3ff1fc1eff62c6bd6685e0972fc88e39911' 'a557b342111849a5f920bbe1c129f3ff1fc1eff62c6bd6685e0972fc88e39911'
'3586c46f240e5bedcf32543085c2593c64a449d264506ed31260073b55a000f8' '3db1c9aaae36336fdca8fe80fe87ed95732e63f1f445735f1f7f1c0d77240476'
'49262ce4a8089fa70275aad742fc914baa28d9c384f710c9a62f64796d13e104' '49262ce4a8089fa70275aad742fc914baa28d9c384f710c9a62f64796d13e104'
'433b919e6a0be26784fb4304c43b1811a28f12ad3de9e26c0af827f64c0c316e') '433b919e6a0be26784fb4304c43b1811a28f12ad3de9e26c0af827f64c0c316e')
;; ;;

2
linux-tkg-config/prepare
View File

@ -368,6 +368,8 @@ _tkg_srcprep() {
rev=3 rev=3
elif [ "$_basever" = "59" ]; then elif [ "$_basever" = "59" ]; then
rev=3 rev=3
elif [ "$_basever" = "510" ]; then
rev=1
else else
rev=0 rev=0
fi fi

105
linux-tkg-patches/5.10/0009-prjc_v5.10-r0.patch → linux-tkg-patches/5.10/0009-prjc_v5.10-r1.patch
View File

@ -830,10 +830,10 @@ index 5fc9c9b70862..eb6d7d87779f 100644
obj-$(CONFIG_CPU_FREQ_GOV_SCHEDUTIL) += cpufreq_schedutil.o obj-$(CONFIG_CPU_FREQ_GOV_SCHEDUTIL) += cpufreq_schedutil.o
diff --git a/kernel/sched/alt_core.c b/kernel/sched/alt_core.c diff --git a/kernel/sched/alt_core.c b/kernel/sched/alt_core.c
new file mode 100644 new file mode 100644
index 000000000000..1a857d7e230b index 000000000000..9880d9b50f7e
--- /dev/null --- /dev/null
+++ b/kernel/sched/alt_core.c +++ b/kernel/sched/alt_core.c
@@ -0,0 +1,6370 @@ @@ -0,0 +1,6385 @@
+/* +/*
+ * kernel/sched/alt_core.c + * kernel/sched/alt_core.c
+ * + *
@ -888,7 +888,7 @@ index 000000000000..1a857d7e230b
+ */ + */
+EXPORT_TRACEPOINT_SYMBOL_GPL(pelt_irq_tp); +EXPORT_TRACEPOINT_SYMBOL_GPL(pelt_irq_tp);
+ +
+#define ALT_SCHED_VERSION "v5.10-r0" +#define ALT_SCHED_VERSION "v5.10-r1"
+ +
+/* rt_prio(prio) defined in include/linux/sched/rt.h */ +/* rt_prio(prio) defined in include/linux/sched/rt.h */
+#define rt_task(p) rt_prio((p)->prio) +#define rt_task(p) rt_prio((p)->prio)
@ -928,6 +928,8 @@ index 000000000000..1a857d7e230b
+ +
+DEFINE_PER_CPU(cpumask_t [NR_CPU_AFFINITY_LEVELS], sched_cpu_affinity_masks); +DEFINE_PER_CPU(cpumask_t [NR_CPU_AFFINITY_LEVELS], sched_cpu_affinity_masks);
+DEFINE_PER_CPU(cpumask_t *, sched_cpu_affinity_end_mask); +DEFINE_PER_CPU(cpumask_t *, sched_cpu_affinity_end_mask);
+
+DEFINE_PER_CPU(cpumask_t [NR_CPU_AFFINITY_LEVELS], sched_cpu_topo_masks);
+DEFINE_PER_CPU(cpumask_t *, sched_cpu_llc_mask); +DEFINE_PER_CPU(cpumask_t *, sched_cpu_llc_mask);
+ +
+#ifdef CONFIG_SCHED_SMT +#ifdef CONFIG_SCHED_SMT
@ -5622,10 +5624,15 @@ index 000000000000..1a857d7e230b
+ rcu_read_lock(); + rcu_read_lock();
+ retval = -ESRCH; + retval = -ESRCH;
+ p = find_process_by_pid(pid); + p = find_process_by_pid(pid);
+ if (p != NULL) + if (likely(p))
+ retval = sched_setattr(p, &attr); + get_task_struct(p);
+ rcu_read_unlock(); + rcu_read_unlock();
+ +
+ if (likely(p)) {
+ retval = sched_setattr(p, &attr);
+ put_task_struct(p);
+ }
+
+ return retval; + return retval;
+} +}
+ +
@ -5797,13 +5804,11 @@ index 000000000000..1a857d7e230b
+ struct task_struct *p; + struct task_struct *p;
+ int retval; + int retval;
+ +
+ get_online_cpus();
+ rcu_read_lock(); + rcu_read_lock();
+ +
+ p = find_process_by_pid(pid); + p = find_process_by_pid(pid);
+ if (!p) { + if (!p) {
+ rcu_read_unlock(); + rcu_read_unlock();
+ put_online_cpus();
+ return -ESRCH; + return -ESRCH;
+ } + }
+ +
@ -5828,17 +5833,18 @@ index 000000000000..1a857d7e230b
+ rcu_read_lock(); + rcu_read_lock();
+ if (!ns_capable(__task_cred(p)->user_ns, CAP_SYS_NICE)) { + if (!ns_capable(__task_cred(p)->user_ns, CAP_SYS_NICE)) {
+ rcu_read_unlock(); + rcu_read_unlock();
+ goto out_unlock; + goto out_free_new_mask;
+ } + }
+ rcu_read_unlock(); + rcu_read_unlock();
+ } + }
+ +
+ retval = security_task_setscheduler(p); + retval = security_task_setscheduler(p);
+ if (retval) + if (retval)
+ goto out_unlock; + goto out_free_new_mask;
+ +
+ cpuset_cpus_allowed(p, cpus_allowed); + cpuset_cpus_allowed(p, cpus_allowed);
+ cpumask_and(new_mask, in_mask, cpus_allowed); + cpumask_and(new_mask, in_mask, cpus_allowed);
+
+again: +again:
+ retval = __set_cpus_allowed_ptr(p, new_mask, true); + retval = __set_cpus_allowed_ptr(p, new_mask, true);
+ +
@ -5854,13 +5860,12 @@ index 000000000000..1a857d7e230b
+ goto again; + goto again;
+ } + }
+ } + }
+out_unlock: +out_free_new_mask:
+ free_cpumask_var(new_mask); + free_cpumask_var(new_mask);
+out_free_cpus_allowed: +out_free_cpus_allowed:
+ free_cpumask_var(cpus_allowed); + free_cpumask_var(cpus_allowed);
+out_put_task: +out_put_task:
+ put_task_struct(p); + put_task_struct(p);
+ put_online_cpus();
+ return retval; + return retval;
+} +}
+ +
@ -6707,42 +6712,52 @@ index 000000000000..1a857d7e230b
+ cpumask_t *tmp; + cpumask_t *tmp;
+ +
+ for_each_possible_cpu(cpu) { + for_each_possible_cpu(cpu) {
+ /* init affinity masks */
+ tmp = per_cpu(sched_cpu_affinity_masks, cpu); + tmp = per_cpu(sched_cpu_affinity_masks, cpu);
+ +
+ cpumask_copy(tmp, cpumask_of(cpu)); + cpumask_copy(tmp, cpumask_of(cpu));
+ tmp++; + tmp++;
+ cpumask_copy(tmp, cpu_possible_mask); + cpumask_copy(tmp, cpu_possible_mask);
+ cpumask_clear_cpu(cpu, tmp); + cpumask_clear_cpu(cpu, tmp);
+ per_cpu(sched_cpu_llc_mask, cpu) = tmp;
+ per_cpu(sched_cpu_affinity_end_mask, cpu) = ++tmp; + per_cpu(sched_cpu_affinity_end_mask, cpu) = ++tmp;
+ /* init topo masks */
+ tmp = per_cpu(sched_cpu_topo_masks, cpu);
+
+ cpumask_copy(tmp, cpumask_of(cpu));
+ tmp++;
+ cpumask_copy(tmp, cpu_possible_mask);
+ per_cpu(sched_cpu_llc_mask, cpu) = tmp;
+ /*per_cpu(sd_llc_id, cpu) = cpu;*/ + /*per_cpu(sd_llc_id, cpu) = cpu;*/
+ } + }
+} +}
+ +
+#define TOPOLOGY_CPUMASK(name, mask, last) \ +#define TOPOLOGY_CPUMASK(name, mask, last) \
+ if (cpumask_and(chk, chk, mask)) \ + if (cpumask_and(chk, chk, mask)) { \
+ printk(KERN_INFO "sched: cpu#%02d affinity mask: 0x%08lx - "#name,\ + cpumask_copy(topo, mask); \
+ cpu, (chk++)->bits[0]); \ + printk(KERN_INFO "sched: cpu#%02d affinity: 0x%08lx topo: 0x%08lx - "#name,\
+ cpu, (chk++)->bits[0], (topo++)->bits[0]); \
+ } \
+ if (!last) \ + if (!last) \
+ cpumask_complement(chk, mask) + cpumask_complement(chk, mask)
+ +
+static void sched_init_topology_cpumask(void) +static void sched_init_topology_cpumask(void)
+{ +{
+ int cpu; + int cpu;
+ cpumask_t *chk; + cpumask_t *chk, *topo;
+ +
+ for_each_online_cpu(cpu) { + for_each_online_cpu(cpu) {
+ /* take chance to reset time slice for idle tasks */ + /* take chance to reset time slice for idle tasks */
+ cpu_rq(cpu)->idle->time_slice = sched_timeslice_ns; + cpu_rq(cpu)->idle->time_slice = sched_timeslice_ns;
+ +
+ chk = per_cpu(sched_cpu_affinity_masks, cpu) + 1; + chk = per_cpu(sched_cpu_affinity_masks, cpu) + 1;
+ topo = per_cpu(sched_cpu_topo_masks, cpu) + 1;
+ +
+ cpumask_complement(chk, cpumask_of(cpu)); + cpumask_complement(chk, cpumask_of(cpu));
+#ifdef CONFIG_SCHED_SMT +#ifdef CONFIG_SCHED_SMT
+ TOPOLOGY_CPUMASK(smt, topology_sibling_cpumask(cpu), false); + TOPOLOGY_CPUMASK(smt, topology_sibling_cpumask(cpu), false);
+#endif +#endif
+ per_cpu(sd_llc_id, cpu) = cpumask_first(cpu_coregroup_mask(cpu)); + per_cpu(sd_llc_id, cpu) = cpumask_first(cpu_coregroup_mask(cpu));
+ per_cpu(sched_cpu_llc_mask, cpu) = chk; + per_cpu(sched_cpu_llc_mask, cpu) = topo;
+ TOPOLOGY_CPUMASK(coregroup, cpu_coregroup_mask(cpu), false); + TOPOLOGY_CPUMASK(coregroup, cpu_coregroup_mask(cpu), false);
+ +
+ TOPOLOGY_CPUMASK(core, topology_core_cpumask(cpu), false); + TOPOLOGY_CPUMASK(core, topology_core_cpumask(cpu), false);
@ -6753,7 +6768,7 @@ index 000000000000..1a857d7e230b
+ printk(KERN_INFO "sched: cpu#%02d llc_id = %d, llc_mask idx = %d\n", + printk(KERN_INFO "sched: cpu#%02d llc_id = %d, llc_mask idx = %d\n",
+ cpu, per_cpu(sd_llc_id, cpu), + cpu, per_cpu(sd_llc_id, cpu),
+ (int) (per_cpu(sched_cpu_llc_mask, cpu) - + (int) (per_cpu(sched_cpu_llc_mask, cpu) -
+ per_cpu(sched_cpu_affinity_masks, cpu))); + per_cpu(sched_cpu_topo_masks, cpu)));
+ } + }
+} +}
+#endif +#endif
@ -7243,10 +7258,10 @@ index 000000000000..1212a031700e
+{} +{}
diff --git a/kernel/sched/alt_sched.h b/kernel/sched/alt_sched.h diff --git a/kernel/sched/alt_sched.h b/kernel/sched/alt_sched.h
new file mode 100644 new file mode 100644
index 000000000000..fd75b7895469 index 000000000000..5d6ee22875b9
--- /dev/null --- /dev/null
+++ b/kernel/sched/alt_sched.h +++ b/kernel/sched/alt_sched.h
@@ -0,0 +1,574 @@ @@ -0,0 +1,612 @@
+#ifndef ALT_SCHED_H +#ifndef ALT_SCHED_H
+#define ALT_SCHED_H +#define ALT_SCHED_H
+ +
@ -7472,7 +7487,8 @@ index 000000000000..fd75b7895469
+ NR_CPU_AFFINITY_LEVELS + NR_CPU_AFFINITY_LEVELS
+}; +};
+ +
+DECLARE_PER_CPU(cpumask_t [NR_CPU_AFFINITY_LEVELS], sched_cpu_affinity_masks); +DECLARE_PER_CPU(cpumask_t [NR_CPU_AFFINITY_LEVELS], sched_cpu_topo_masks);
+DECLARE_PER_CPU(cpumask_t *, sched_cpu_llc_mask);
+ +
+static inline int __best_mask_cpu(int cpu, const cpumask_t *cpumask, +static inline int __best_mask_cpu(int cpu, const cpumask_t *cpumask,
+ const cpumask_t *mask) + const cpumask_t *mask)
@ -7491,13 +7507,50 @@ index 000000000000..fd75b7895469
+#endif +#endif
+} +}
+ +
+static inline int best_mask_cpu(int cpu, const cpumask_t *cpumask) +static inline int best_mask_cpu(int cpu, cpumask_t *mask)
+{ +{
+#if NR_CPUS <= 64 +#if NR_CPUS <= 64
+ return __best_mask_cpu(cpu, cpumask, per_cpu(sched_cpu_affinity_masks, cpu)); + unsigned long llc_match;
+ cpumask_t *chk = per_cpu(sched_cpu_llc_mask, cpu);
+
+ if ((llc_match = mask->bits[0] & chk->bits[0])) {
+ unsigned long match;
+
+ chk = per_cpu(sched_cpu_topo_masks, cpu);
+ if (mask->bits[0] & chk->bits[0])
+ return cpu;
+
+#ifdef CONFIG_SCHED_SMT
+ chk++;
+ if ((match = mask->bits[0] & chk->bits[0]))
+ return __ffs(match);
+#endif
+
+ return __ffs(llc_match);
+ }
+
+ return __best_mask_cpu(cpu, mask, chk + 1);
+#else +#else
+ return cpumask_test_cpu(cpu, cpumask) ? cpu: + cpumask_t llc_match;
+ __best_mask_cpu(cpu, cpumask, per_cpu(sched_cpu_affinity_masks, cpu) + 1); + cpumask_t *chk = per_cpu(sched_cpu_llc_mask, cpu);
+
+ if (cpumask_and(&llc_match, mask, chk)) {
+ cpumask_t tmp;
+
+ chk = per_cpu(sched_cpu_topo_masks, cpu);
+ if (cpumask_test_cpu(cpu, mask))
+ return cpu;
+
+#ifdef CONFIG_SCHED_SMT
+ chk++;
+ if (cpumask_and(&tmp, mask, chk))
+ return cpumask_any(&tmp);
+#endif
+
+ return cpumask_any(&llc_match);
+ }
+
+ return __best_mask_cpu(cpu, mask, chk + 1);
+#endif +#endif
+} +}
+ +
@ -7843,7 +7896,7 @@ index 000000000000..aba3c98759f8
+#endif +#endif
diff --git a/kernel/sched/bmq_imp.h b/kernel/sched/bmq_imp.h diff --git a/kernel/sched/bmq_imp.h b/kernel/sched/bmq_imp.h
new file mode 100644 new file mode 100644
index 000000000000..83c2d019c446 index 000000000000..3faba5f9bb69
--- /dev/null --- /dev/null
+++ b/kernel/sched/bmq_imp.h +++ b/kernel/sched/bmq_imp.h
@@ -0,0 +1,198 @@ @@ -0,0 +1,198 @@