diff options
| -rw-r--r-- | patches/0001-drm-i915-remember-to-call-i915_sw_fence_fini.patch | 35 | ||||
| -rw-r--r-- | patches/0001-mqprio-Correct-stats-in-mqprio_dump_class_stats.patch | 69 | ||||
| -rw-r--r-- | patches/Add_localversion_for_-RT_release.patch | 2 | ||||
| -rw-r--r-- | patches/series | 2 |
4 files changed, 1 insertions, 107 deletions
diff --git a/patches/0001-drm-i915-remember-to-call-i915_sw_fence_fini.patch b/patches/0001-drm-i915-remember-to-call-i915_sw_fence_fini.patch deleted file mode 100644 index 96a65d66e1b2..000000000000 --- a/patches/0001-drm-i915-remember-to-call-i915_sw_fence_fini.patch +++ /dev/null @@ -1,35 +0,0 @@ -From: Matthew Auld <matthew.auld@intel.com> -Date: Fri, 24 Sep 2021 15:46:46 +0100 -Subject: [PATCH 01/10] drm/i915: remember to call i915_sw_fence_fini -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Seems to fix some object-debug splat which appeared while debugging -something unrelated. - -v2: s/guc_blocked/guc_state.blocked/ - -[bigeasy: s/guc_state.blocked/guc_blocked ] - -Signed-off-by: Matthew Auld <matthew.auld@intel.com> -Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> -Cc: Matthew Brost <matthew.brost@intel.com> -Tested-by: Ville Syrjälä <ville.syrjala@linux.intel.com> -Reviewed-by: Matthew Brost <matthew.brost@intel.com> -Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> -Link: https://lore.kernel.org/r/20210924144646.4096402-1-matthew.auld@intel.com ---- - drivers/gpu/drm/i915/gt/intel_context.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/drivers/gpu/drm/i915/gt/intel_context.c -+++ b/drivers/gpu/drm/i915/gt/intel_context.c -@@ -421,6 +421,7 @@ void intel_context_fini(struct intel_con - - mutex_destroy(&ce->pin_mutex); - i915_active_fini(&ce->active); -+ i915_sw_fence_fini(&ce->guc_blocked); - } - - void i915_context_module_exit(void) diff --git a/patches/0001-mqprio-Correct-stats-in-mqprio_dump_class_stats.patch b/patches/0001-mqprio-Correct-stats-in-mqprio_dump_class_stats.patch deleted file mode 100644 index d16a5ade53b2..000000000000 --- a/patches/0001-mqprio-Correct-stats-in-mqprio_dump_class_stats.patch +++ /dev/null @@ -1,69 +0,0 @@ -From: Sebastian Andrzej Siewior <bigeasy@linutronix.de> -Date: Thu, 7 Oct 2021 18:06:03 +0200 -Subject: [PATCH 01/10] mqprio: Correct stats in mqprio_dump_class_stats(). - -It looks like with the introduction of subqueus the statics broke. -Before the change `bstats' and `qstats' on stack was fed and later this -was copied over to struct gnet_dump. - -After the change the `bstats' and `qstats' are only set to 0 and no -longer updated and that is then fed to gnet_dump. Additionally -qdisc->cpu_bstats and qdisc->cpu_qstats is destroeyd for global -stats. For per-CPU stats both __gnet_stats_copy_basic() and -__gnet_stats_copy_queue() add the values but for global stats the value -set and so the previous value is lost and only the last value from the -loop ends up in sch->[bq]stats. - -Use the on-stack [bq]stats variables again and add the stats manually in -the global case. - -Fixes: ce679e8df7ed2 ("net: sched: add support for TCQ_F_NOLOCK subqueues to sch_mqprio") -Cc: John Fastabend <john.fastabend@gmail.com> -Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> ---- - net/sched/sch_mqprio.c | 30 ++++++++++++++++++------------ - 1 file changed, 18 insertions(+), 12 deletions(-) - ---- a/net/sched/sch_mqprio.c -+++ b/net/sched/sch_mqprio.c -@@ -529,22 +529,28 @@ static int mqprio_dump_class_stats(struc - for (i = tc.offset; i < tc.offset + tc.count; i++) { - struct netdev_queue *q = netdev_get_tx_queue(dev, i); - struct Qdisc *qdisc = rtnl_dereference(q->qdisc); -- struct gnet_stats_basic_cpu __percpu *cpu_bstats = NULL; -- struct gnet_stats_queue __percpu *cpu_qstats = NULL; - - spin_lock_bh(qdisc_lock(qdisc)); -+ - if (qdisc_is_percpu_stats(qdisc)) { -- cpu_bstats = qdisc->cpu_bstats; -- cpu_qstats = qdisc->cpu_qstats; -- } -+ qlen = qdisc_qlen_sum(qdisc); - -- qlen = qdisc_qlen_sum(qdisc); -- __gnet_stats_copy_basic(NULL, &sch->bstats, -- cpu_bstats, &qdisc->bstats); -- __gnet_stats_copy_queue(&sch->qstats, -- cpu_qstats, -- &qdisc->qstats, -- qlen); -+ __gnet_stats_copy_basic(NULL, &bstats, -+ qdisc->cpu_bstats, -+ &qdisc->bstats); -+ __gnet_stats_copy_queue(&qstats, -+ qdisc->cpu_qstats, -+ &qdisc->qstats, -+ qlen); -+ } else { -+ qlen += qdisc->q.qlen; -+ bstats.bytes += qdisc->bstats.bytes; -+ bstats.packets += qdisc->bstats.packets; -+ qstats.backlog += qdisc->qstats.backlog; -+ qstats.drops += qdisc->qstats.drops; -+ qstats.requeues += qdisc->qstats.requeues; -+ qstats.overlimits += qdisc->qstats.overlimits; -+ } - spin_unlock_bh(qdisc_lock(qdisc)); - } - diff --git a/patches/Add_localversion_for_-RT_release.patch b/patches/Add_localversion_for_-RT_release.patch index 6b1364508a7c..34da917f8c9e 100644 --- a/patches/Add_localversion_for_-RT_release.patch +++ b/patches/Add_localversion_for_-RT_release.patch @@ -15,4 +15,4 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> --- /dev/null +++ b/localversion-rt @@ -0,0 +1 @@ -+-rt10 ++-rt11 diff --git a/patches/series b/patches/series index 6fee19a265dd..8d9cce749001 100644 --- a/patches/series +++ b/patches/series @@ -85,7 +85,6 @@ tcp__Remove_superfluous_BH-disable_around_listening_hash.patch samples_kfifo__Rename_read_lock_write_lock.patch # Qdics's seqcount removal. -0001-mqprio-Correct-stats-in-mqprio_dump_class_stats.patch 0002-gen_stats-Add-instead-Set-the-value-in-__gnet_stats_.patch 0003-gen_stats-Add-instead-Set-the-value-in-__gnet_stats_.patch 0004-mq-mqprio-Simplify-stats-copy.patch @@ -203,7 +202,6 @@ random__Make_it_work_on_rt.patch ########################################################################### # DRM: ########################################################################### -0001-drm-i915-remember-to-call-i915_sw_fence_fini.patch 0002-drm-Increase-DRM_OBJECT_MAX_PROPERTY-by-18.patch 0003-drm-i915-Use-preempt_disable-enable_rt-where-recomme.patch 0004-drm-i915-Don-t-disable-interrupts-on-PREEMPT_RT-duri.patch |