mirror of
https://github.com/linuxkit/linuxkit.git
synced 2025-07-21 10:09:07 +00:00
Merge pull request #3093 from TiejunChina/master-dev
update -rt to 4.14.53-rt34
This commit is contained in:
commit
2c8438f64b
@ -1,5 +1,5 @@
|
||||
kernel:
|
||||
image: linuxkit/kernel:4.14.40-rt
|
||||
image: linuxkit/kernel:4.14.53-rt
|
||||
cmdline: "console=tty0"
|
||||
init:
|
||||
- linuxkit/init:0e4af96fecc8f752c80d41c0b7d06570cc1dc6b2
|
||||
|
@ -221,14 +221,14 @@ ifeq ($(ARCH),x86_64)
|
||||
$(eval $(call kernel,4.17.4,4.17.x,$(EXTRA),$(DEBUG)))
|
||||
$(eval $(call kernel,4.14.53,4.14.x,$(EXTRA),$(DEBUG)))
|
||||
$(eval $(call kernel,4.14.53,4.14.x,,-dbg))
|
||||
$(eval $(call kernel,4.14.40,4.14.x,-rt,))
|
||||
$(eval $(call kernel,4.14.53,4.14.x,-rt,))
|
||||
$(eval $(call kernel,4.9.111,4.9.x,$(EXTRA),$(DEBUG)))
|
||||
$(eval $(call kernel,4.4.139,4.4.x,$(EXTRA),$(DEBUG)))
|
||||
|
||||
else ifeq ($(ARCH),aarch64)
|
||||
$(eval $(call kernel,4.17.4,4.17.x,$(EXTRA),$(DEBUG)))
|
||||
$(eval $(call kernel,4.14.53,4.14.x,$(EXTRA),$(DEBUG)))
|
||||
$(eval $(call kernel,4.14.40,4.14.x,-rt,))
|
||||
$(eval $(call kernel,4.14.53,4.14.x,-rt,))
|
||||
|
||||
else ifeq ($(ARCH),s390x)
|
||||
$(eval $(call kernel,4.17.4,4.17.x,$(EXTRA),$(DEBUG)))
|
||||
|
@ -0,0 +1,59 @@
|
||||
From 1f9863a3348be088896f745bca5cf5a31d1d2c96 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
||||
Date: Wed, 11 Apr 2018 11:27:44 +0200
|
||||
Subject: [PATCH 001/418] Revert mm/vmstat.c: fix vmstat_update() preemption
|
||||
BUG
|
||||
|
||||
commit 97731753d44d5efcb95b994dc952c0e8195b3e96 upstream
|
||||
|
||||
This patch reverts commit c7f26ccfb2c3 ("mm/vmstat.c: fix
|
||||
vmstat_update() preemption BUG").
|
||||
Steven saw a "using smp_processor_id() in preemptible" message and
|
||||
added a preempt_disable() section around it to keep it quiet. This is
|
||||
not the right thing to do it does not fix the real problem.
|
||||
|
||||
vmstat_update() is invoked by a kworker on a specific CPU. This worker
|
||||
it bound to this CPU. The name of the worker was "kworker/1:1" so it
|
||||
should have been a worker which was bound to CPU1. A worker which can
|
||||
run on any CPU would have a `u' before the first digit.
|
||||
|
||||
smp_processor_id() can be used in a preempt-enabled region as long as
|
||||
the task is bound to a single CPU which is the case here. If it could
|
||||
run on an arbitrary CPU then this is the problem we have an should seek
|
||||
to resolve.
|
||||
Not only this smp_processor_id() must not be migrated to another CPU but
|
||||
also refresh_cpu_vm_stats() which might access wrong per-CPU variables.
|
||||
Not to mention that other code relies on the fact that such a worker
|
||||
runs on one specific CPU only.
|
||||
|
||||
Therefore I revert that commit and we should look instead what broke the
|
||||
affinity mask of the kworker.
|
||||
|
||||
Cc: Steven J. Hill <steven.hill@cavium.com>
|
||||
Cc: Tejun Heo <htejun@gmail.com>
|
||||
Cc: Andrew Morton <akpm@linux-foundation.org>
|
||||
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
||||
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
|
||||
---
|
||||
mm/vmstat.c | 2 --
|
||||
1 file changed, 2 deletions(-)
|
||||
|
||||
diff --git a/mm/vmstat.c b/mm/vmstat.c
|
||||
index e085b13c572e..4bb13e72ac97 100644
|
||||
--- a/mm/vmstat.c
|
||||
+++ b/mm/vmstat.c
|
||||
@@ -1770,11 +1770,9 @@ static void vmstat_update(struct work_struct *w)
|
||||
* to occur in the future. Keep on running the
|
||||
* update worker thread.
|
||||
*/
|
||||
- preempt_disable();
|
||||
queue_delayed_work_on(smp_processor_id(), mm_percpu_wq,
|
||||
this_cpu_ptr(&vmstat_work),
|
||||
round_jiffies_relative(sysctl_stat_interval));
|
||||
- preempt_enable();
|
||||
}
|
||||
}
|
||||
|
||||
--
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From c4e599b49e5c8d708a5aae50cba3885c08e14f10 Mon Sep 17 00:00:00 2001
|
||||
From 0ff9e891f4b361a8909d6f062f5137f041d6adaa Mon Sep 17 00:00:00 2001
|
||||
From: Boqun Feng <boqun.feng@gmail.com>
|
||||
Date: Fri, 9 Mar 2018 14:56:28 +0800
|
||||
Subject: [PATCH 001/414] rtmutex: Make rt_mutex_futex_unlock() safe for
|
||||
Subject: [PATCH 002/418] rtmutex: Make rt_mutex_futex_unlock() safe for
|
||||
irq-off callsites
|
||||
|
||||
Upstream commit 6b0ef92fee2a3189eba6d6b827b247cb4f6da7e9
|
||||
@ -123,5 +123,5 @@ index 65cc0cb984e6..940633c63254 100644
|
||||
if (postunlock)
|
||||
rt_mutex_postunlock(&wake_q);
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From 931e32f1e9d36b8c7ca0f365cdb203b146881193 Mon Sep 17 00:00:00 2001
|
||||
From 7b28fe258efc9f3d9dbac60f39826d57845ff991 Mon Sep 17 00:00:00 2001
|
||||
From: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
|
||||
Date: Tue, 19 Sep 2017 15:36:42 -0700
|
||||
Subject: [PATCH 002/414] rcu: Suppress lockdep false-positive ->boost_mtx
|
||||
Subject: [PATCH 003/418] rcu: Suppress lockdep false-positive ->boost_mtx
|
||||
complaints
|
||||
|
||||
Upstream commit bcda31a2659497df39d6bedfbdf17498b4f4ac89
|
||||
@ -26,7 +26,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
||||
1 file changed, 2 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/kernel/rcu/tree_plugin.h b/kernel/rcu/tree_plugin.h
|
||||
index fed95fa941e6..4428c8edb074 100644
|
||||
index 8b3102d22823..181e2487c8b8 100644
|
||||
--- a/kernel/rcu/tree_plugin.h
|
||||
+++ b/kernel/rcu/tree_plugin.h
|
||||
@@ -31,11 +31,10 @@
|
||||
@ -52,5 +52,5 @@ index fed95fa941e6..4428c8edb074 100644
|
||||
/*
|
||||
* If this was the last task on the expedited lists,
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From d689ef6876481d308cbbd28351b8130e474c3363 Mon Sep 17 00:00:00 2001
|
||||
From e90c5da25d3a76acf44c248eb76fe0b6794174dd Mon Sep 17 00:00:00 2001
|
||||
From: Mikulas Patocka <mpatocka@redhat.com>
|
||||
Date: Fri, 10 Nov 2017 12:29:34 -0500
|
||||
Subject: [PATCH 003/414] brd: remove unused brd_mutex
|
||||
Subject: [PATCH 004/418] brd: remove unused brd_mutex
|
||||
|
||||
Upstream commit 15f7b41f70ddcca3b555bd0fdc7c8da7466b517e
|
||||
|
||||
@ -28,5 +28,5 @@ index 2d7178f7754e..c1cf87718c2e 100644
|
||||
{
|
||||
pgoff_t idx;
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From 520763c6d6fd5b219945a64ecbd55e53d3da02db Mon Sep 17 00:00:00 2001
|
||||
From 36d6a35ae79ce5699704c987d3b4d3eb2de6e7db Mon Sep 17 00:00:00 2001
|
||||
From: Christoffer Dall <christoffer.dall@linaro.org>
|
||||
Date: Fri, 8 Sep 2017 07:07:13 -0700
|
||||
Subject: [PATCH 004/414] KVM: arm/arm64: Remove redundant preemptible checks
|
||||
Subject: [PATCH 005/418] KVM: arm/arm64: Remove redundant preemptible checks
|
||||
|
||||
Upstream commit 5a24575032971c5a9a4580417a791c427ebdb8e5
|
||||
|
||||
@ -40,5 +40,5 @@ index 9bee849db682..0c5d846ba809 100644
|
||||
}
|
||||
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From 01a042ced8c75ed10fd78fa8209831f0ef009057 Mon Sep 17 00:00:00 2001
|
||||
From c9e312daee80f74ba3e2b50da2ea33336f6846e8 Mon Sep 17 00:00:00 2001
|
||||
From: Tejun Heo <tj@kernel.org>
|
||||
Date: Tue, 9 Jan 2018 07:21:15 -0800
|
||||
Subject: [PATCH 005/414] string: drop __must_check from strscpy() and restore
|
||||
Subject: [PATCH 006/418] string: drop __must_check from strscpy() and restore
|
||||
strscpy() usages in cgroup
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
@ -64,5 +64,5 @@ index cfd83eb2f926..96115bf561b4 100644
|
||||
#ifndef __HAVE_ARCH_STRCAT
|
||||
extern char * strcat(char *, const char *);
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From 9349f5838334cb833010161e09660abee2f51b31 Mon Sep 17 00:00:00 2001
|
||||
From 5217a4b31298b5ff1082bd88e6ac8054780b6aaf Mon Sep 17 00:00:00 2001
|
||||
From: Scott Wood <swood@redhat.com>
|
||||
Date: Sun, 21 Jan 2018 03:28:54 -0600
|
||||
Subject: [PATCH 006/414] iommu/amd: Use raw locks on atomic context paths
|
||||
Subject: [PATCH 007/418] iommu/amd: Use raw locks on atomic context paths
|
||||
|
||||
Upstream commit 27790398c2aed917828dc3c6f81240d57f1584c9
|
||||
|
||||
@ -20,10 +20,10 @@ Signed-off-by: Joerg Roedel <jroedel@suse.de>
|
||||
3 files changed, 18 insertions(+), 18 deletions(-)
|
||||
|
||||
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
|
||||
index 99a2a57b6cfd..5e519630eefb 100644
|
||||
index 10190e361a13..ff50337fe3ba 100644
|
||||
--- a/drivers/iommu/amd_iommu.c
|
||||
+++ b/drivers/iommu/amd_iommu.c
|
||||
@@ -1054,9 +1054,9 @@ static int iommu_queue_command_sync(struct amd_iommu *iommu,
|
||||
@@ -1056,9 +1056,9 @@ static int iommu_queue_command_sync(struct amd_iommu *iommu,
|
||||
unsigned long flags;
|
||||
int ret;
|
||||
|
||||
@ -35,7 +35,7 @@ index 99a2a57b6cfd..5e519630eefb 100644
|
||||
|
||||
return ret;
|
||||
}
|
||||
@@ -1082,7 +1082,7 @@ static int iommu_completion_wait(struct amd_iommu *iommu)
|
||||
@@ -1084,7 +1084,7 @@ static int iommu_completion_wait(struct amd_iommu *iommu)
|
||||
|
||||
build_completion_wait(&cmd, (u64)&iommu->cmd_sem);
|
||||
|
||||
@ -44,7 +44,7 @@ index 99a2a57b6cfd..5e519630eefb 100644
|
||||
|
||||
iommu->cmd_sem = 0;
|
||||
|
||||
@@ -1093,7 +1093,7 @@ static int iommu_completion_wait(struct amd_iommu *iommu)
|
||||
@@ -1095,7 +1095,7 @@ static int iommu_completion_wait(struct amd_iommu *iommu)
|
||||
ret = wait_on_sem(&iommu->cmd_sem);
|
||||
|
||||
out_unlock:
|
||||
@ -53,7 +53,7 @@ index 99a2a57b6cfd..5e519630eefb 100644
|
||||
|
||||
return ret;
|
||||
}
|
||||
@@ -3618,7 +3618,7 @@ static struct irq_remap_table *get_irq_table(u16 devid, bool ioapic)
|
||||
@@ -3620,7 +3620,7 @@ static struct irq_remap_table *get_irq_table(u16 devid, bool ioapic)
|
||||
goto out_unlock;
|
||||
|
||||
/* Initialize table spin-lock */
|
||||
@ -62,7 +62,7 @@ index 99a2a57b6cfd..5e519630eefb 100644
|
||||
|
||||
if (ioapic)
|
||||
/* Keep the first 32 indexes free for IOAPIC interrupts */
|
||||
@@ -3677,7 +3677,7 @@ static int alloc_irq_index(u16 devid, int count)
|
||||
@@ -3679,7 +3679,7 @@ static int alloc_irq_index(u16 devid, int count)
|
||||
if (!table)
|
||||
return -ENODEV;
|
||||
|
||||
@ -71,7 +71,7 @@ index 99a2a57b6cfd..5e519630eefb 100644
|
||||
|
||||
/* Scan table for free entries */
|
||||
for (c = 0, index = table->min_index;
|
||||
@@ -3700,7 +3700,7 @@ static int alloc_irq_index(u16 devid, int count)
|
||||
@@ -3702,7 +3702,7 @@ static int alloc_irq_index(u16 devid, int count)
|
||||
index = -ENOSPC;
|
||||
|
||||
out:
|
||||
@ -80,7 +80,7 @@ index 99a2a57b6cfd..5e519630eefb 100644
|
||||
|
||||
return index;
|
||||
}
|
||||
@@ -3721,7 +3721,7 @@ static int modify_irte_ga(u16 devid, int index, struct irte_ga *irte,
|
||||
@@ -3723,7 +3723,7 @@ static int modify_irte_ga(u16 devid, int index, struct irte_ga *irte,
|
||||
if (!table)
|
||||
return -ENOMEM;
|
||||
|
||||
@ -89,7 +89,7 @@ index 99a2a57b6cfd..5e519630eefb 100644
|
||||
|
||||
entry = (struct irte_ga *)table->table;
|
||||
entry = &entry[index];
|
||||
@@ -3732,7 +3732,7 @@ static int modify_irte_ga(u16 devid, int index, struct irte_ga *irte,
|
||||
@@ -3734,7 +3734,7 @@ static int modify_irte_ga(u16 devid, int index, struct irte_ga *irte,
|
||||
if (data)
|
||||
data->ref = entry;
|
||||
|
||||
@ -98,7 +98,7 @@ index 99a2a57b6cfd..5e519630eefb 100644
|
||||
|
||||
iommu_flush_irt(iommu, devid);
|
||||
iommu_completion_wait(iommu);
|
||||
@@ -3754,9 +3754,9 @@ static int modify_irte(u16 devid, int index, union irte *irte)
|
||||
@@ -3756,9 +3756,9 @@ static int modify_irte(u16 devid, int index, union irte *irte)
|
||||
if (!table)
|
||||
return -ENOMEM;
|
||||
|
||||
@ -110,7 +110,7 @@ index 99a2a57b6cfd..5e519630eefb 100644
|
||||
|
||||
iommu_flush_irt(iommu, devid);
|
||||
iommu_completion_wait(iommu);
|
||||
@@ -3778,9 +3778,9 @@ static void free_irte(u16 devid, int index)
|
||||
@@ -3780,9 +3780,9 @@ static void free_irte(u16 devid, int index)
|
||||
if (!table)
|
||||
return;
|
||||
|
||||
@ -122,7 +122,7 @@ index 99a2a57b6cfd..5e519630eefb 100644
|
||||
|
||||
iommu_flush_irt(iommu, devid);
|
||||
iommu_completion_wait(iommu);
|
||||
@@ -4359,7 +4359,7 @@ int amd_iommu_update_ga(int cpu, bool is_run, void *data)
|
||||
@@ -4361,7 +4361,7 @@ int amd_iommu_update_ga(int cpu, bool is_run, void *data)
|
||||
if (!irt)
|
||||
return -ENODEV;
|
||||
|
||||
@ -131,7 +131,7 @@ index 99a2a57b6cfd..5e519630eefb 100644
|
||||
|
||||
if (ref->lo.fields_vapic.guest_mode) {
|
||||
if (cpu >= 0)
|
||||
@@ -4368,7 +4368,7 @@ int amd_iommu_update_ga(int cpu, bool is_run, void *data)
|
||||
@@ -4370,7 +4370,7 @@ int amd_iommu_update_ga(int cpu, bool is_run, void *data)
|
||||
barrier();
|
||||
}
|
||||
|
||||
@ -176,5 +176,5 @@ index f6b24c7d8b70..7521745dc2a5 100644
|
||||
/* Pointer to PCI device of this IOMMU */
|
||||
struct pci_dev *dev;
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From b906b00cd362b81ac8c584c5323c103ed49e5a8b Mon Sep 17 00:00:00 2001
|
||||
From f139b736cc22cafcb207795386fe46e0a8fea151 Mon Sep 17 00:00:00 2001
|
||||
From: Scott Wood <swood@redhat.com>
|
||||
Date: Sun, 28 Jan 2018 14:22:19 -0600
|
||||
Subject: [PATCH 007/414] iommu/amd: Don't use dev_data in
|
||||
Subject: [PATCH 008/418] iommu/amd: Don't use dev_data in
|
||||
irte_ga_set_affinity()
|
||||
|
||||
Upstream commit 01ee04badefd296eb7a4430497373be9b7b16783
|
||||
@ -18,10 +18,10 @@ Signed-off-by: Joerg Roedel <jroedel@suse.de>
|
||||
1 file changed, 1 insertion(+), 3 deletions(-)
|
||||
|
||||
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
|
||||
index 5e519630eefb..f8051e20d889 100644
|
||||
index ff50337fe3ba..388ec5e98ef5 100644
|
||||
--- a/drivers/iommu/amd_iommu.c
|
||||
+++ b/drivers/iommu/amd_iommu.c
|
||||
@@ -3861,10 +3861,8 @@ static void irte_ga_set_affinity(void *entry, u16 devid, u16 index,
|
||||
@@ -3863,10 +3863,8 @@ static void irte_ga_set_affinity(void *entry, u16 devid, u16 index,
|
||||
u8 vector, u32 dest_apicid)
|
||||
{
|
||||
struct irte_ga *irte = (struct irte_ga *) entry;
|
||||
@ -34,5 +34,5 @@ index 5e519630eefb..f8051e20d889 100644
|
||||
irte->lo.fields_remap.destination = dest_apicid;
|
||||
modify_irte_ga(devid, index, irte, NULL);
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,38 +0,0 @@
|
||||
From 24cf22a0af51ede25f532a63abc0651f31892f6a Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
||||
Date: Thu, 22 Mar 2018 16:22:33 +0100
|
||||
Subject: [PATCH 009/414] iommu/amd: Take into account that alloc_dev_data()
|
||||
may return NULL
|
||||
|
||||
Upstream commit 39ffe39545cd5cb5b8cee9f0469165cf24dc62c2
|
||||
|
||||
find_dev_data() does not check whether the return value alloc_dev_data()
|
||||
is NULL. This was okay once because the pointer was returned once as-is.
|
||||
Since commit df3f7a6e8e85 ("iommu/amd: Use is_attach_deferred
|
||||
call-back") the pointer may be used within find_dev_data() so a NULL
|
||||
check is required.
|
||||
|
||||
Cc: Baoquan He <bhe@redhat.com>
|
||||
Fixes: df3f7a6e8e85 ("iommu/amd: Use is_attach_deferred call-back")
|
||||
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
||||
Signed-off-by: Joerg Roedel <jroedel@suse.de>
|
||||
---
|
||||
drivers/iommu/amd_iommu.c | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
|
||||
index 1d9ba3e59fb0..e42992fcebca 100644
|
||||
--- a/drivers/iommu/amd_iommu.c
|
||||
+++ b/drivers/iommu/amd_iommu.c
|
||||
@@ -311,6 +311,8 @@ static struct iommu_dev_data *find_dev_data(u16 devid)
|
||||
|
||||
if (dev_data == NULL) {
|
||||
dev_data = alloc_dev_data(devid);
|
||||
+ if (!dev_data)
|
||||
+ return NULL;
|
||||
|
||||
if (translation_pre_enabled(iommu))
|
||||
dev_data->defer_attach = true;
|
||||
--
|
||||
2.17.0
|
||||
|
@ -1,7 +1,7 @@
|
||||
From 072abaf533882390fe60b431f8b60cd30f183a11 Mon Sep 17 00:00:00 2001
|
||||
From eec0129e06a60a46f1f09a329f850a248af0e4ea Mon Sep 17 00:00:00 2001
|
||||
From: Scott Wood <swood@redhat.com>
|
||||
Date: Wed, 14 Feb 2018 17:36:28 -0600
|
||||
Subject: [PATCH 008/414] iommu/amd: Avoid locking get_irq_table() from atomic
|
||||
Subject: [PATCH 009/418] iommu/amd: Avoid locking get_irq_table() from atomic
|
||||
context
|
||||
|
||||
Upstream commit df42a04b15f19a842393dc98a84cbc52b1f8ed49
|
||||
@ -36,10 +36,10 @@ Signed-off-by: Joerg Roedel <jroedel@suse.de>
|
||||
1 file changed, 22 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
|
||||
index f8051e20d889..1d9ba3e59fb0 100644
|
||||
index 388ec5e98ef5..e42992fcebca 100644
|
||||
--- a/drivers/iommu/amd_iommu.c
|
||||
+++ b/drivers/iommu/amd_iommu.c
|
||||
@@ -3586,7 +3586,22 @@ static void set_dte_irq_entry(u16 devid, struct irq_remap_table *table)
|
||||
@@ -3588,7 +3588,22 @@ static void set_dte_irq_entry(u16 devid, struct irq_remap_table *table)
|
||||
amd_iommu_dev_table[devid].data[2] = dte;
|
||||
}
|
||||
|
||||
@ -63,7 +63,7 @@ index f8051e20d889..1d9ba3e59fb0 100644
|
||||
{
|
||||
struct irq_remap_table *table = NULL;
|
||||
struct amd_iommu *iommu;
|
||||
@@ -3673,7 +3688,7 @@ static int alloc_irq_index(u16 devid, int count)
|
||||
@@ -3675,7 +3690,7 @@ static int alloc_irq_index(u16 devid, int count)
|
||||
if (!iommu)
|
||||
return -ENODEV;
|
||||
|
||||
@ -72,7 +72,7 @@ index f8051e20d889..1d9ba3e59fb0 100644
|
||||
if (!table)
|
||||
return -ENODEV;
|
||||
|
||||
@@ -3717,7 +3732,7 @@ static int modify_irte_ga(u16 devid, int index, struct irte_ga *irte,
|
||||
@@ -3719,7 +3734,7 @@ static int modify_irte_ga(u16 devid, int index, struct irte_ga *irte,
|
||||
if (iommu == NULL)
|
||||
return -EINVAL;
|
||||
|
||||
@ -81,7 +81,7 @@ index f8051e20d889..1d9ba3e59fb0 100644
|
||||
if (!table)
|
||||
return -ENOMEM;
|
||||
|
||||
@@ -3750,7 +3765,7 @@ static int modify_irte(u16 devid, int index, union irte *irte)
|
||||
@@ -3752,7 +3767,7 @@ static int modify_irte(u16 devid, int index, union irte *irte)
|
||||
if (iommu == NULL)
|
||||
return -EINVAL;
|
||||
|
||||
@ -90,7 +90,7 @@ index f8051e20d889..1d9ba3e59fb0 100644
|
||||
if (!table)
|
||||
return -ENOMEM;
|
||||
|
||||
@@ -3774,7 +3789,7 @@ static void free_irte(u16 devid, int index)
|
||||
@@ -3776,7 +3791,7 @@ static void free_irte(u16 devid, int index)
|
||||
if (iommu == NULL)
|
||||
return;
|
||||
|
||||
@ -99,7 +99,7 @@ index f8051e20d889..1d9ba3e59fb0 100644
|
||||
if (!table)
|
||||
return;
|
||||
|
||||
@@ -4092,7 +4107,7 @@ static int irq_remapping_alloc(struct irq_domain *domain, unsigned int virq,
|
||||
@@ -4094,7 +4109,7 @@ static int irq_remapping_alloc(struct irq_domain *domain, unsigned int virq,
|
||||
return ret;
|
||||
|
||||
if (info->type == X86_IRQ_ALLOC_TYPE_IOAPIC) {
|
||||
@ -108,7 +108,7 @@ index f8051e20d889..1d9ba3e59fb0 100644
|
||||
index = info->ioapic_pin;
|
||||
else
|
||||
ret = -ENOMEM;
|
||||
@@ -4353,7 +4368,7 @@ int amd_iommu_update_ga(int cpu, bool is_run, void *data)
|
||||
@@ -4355,7 +4370,7 @@ int amd_iommu_update_ga(int cpu, bool is_run, void *data)
|
||||
if (!iommu)
|
||||
return -ENODEV;
|
||||
|
||||
@ -118,5 +118,5 @@ index f8051e20d889..1d9ba3e59fb0 100644
|
||||
return -ENODEV;
|
||||
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From 863473ee01efb23dcc2bbe8c7f93e2e6355b06ab Mon Sep 17 00:00:00 2001
|
||||
From 53ff4b0f4c2a4ae8eea46b71b11b9fc5a7d79a11 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
||||
Date: Thu, 22 Mar 2018 16:22:34 +0100
|
||||
Subject: [PATCH 010/414] iommu/amd: Turn dev_data_list into a lock less list
|
||||
Subject: [PATCH 010/418] iommu/amd: Turn dev_data_list into a lock less list
|
||||
|
||||
Upstream commit 779da73273fc4c4c6f41579a95e4fb7880a1720e
|
||||
|
||||
@ -101,5 +101,5 @@ index 7521745dc2a5..16b1404da58c 100644
|
||||
u16 devid; /* PCI Device ID */
|
||||
u16 alias; /* Alias Device ID */
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From 7cb31bdffcda0eecb44fe97161cca58de406b30d Mon Sep 17 00:00:00 2001
|
||||
From 1645ac08eb6be3c6b2900de419f578ed5f91ecf4 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
||||
Date: Thu, 22 Mar 2018 16:22:35 +0100
|
||||
Subject: [PATCH 011/414] iommu/amd: Split domain id out of
|
||||
Subject: [PATCH 011/418] iommu/amd: Split domain id out of
|
||||
amd_iommu_devtable_lock
|
||||
|
||||
Upstream commit 2bc00180890427dcc092b2f2b0d03c904bcade29
|
||||
@ -64,5 +64,5 @@ index 1babecd37819..250b6354fae5 100644
|
||||
|
||||
#define DEFINE_FREE_PT_FN(LVL, FN) \
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From 8ecb90107b650a4db6b9226e0c0049642a1172c9 Mon Sep 17 00:00:00 2001
|
||||
From 37ded533c97f8424a00e051c4351ab2515717457 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
||||
Date: Thu, 22 Mar 2018 16:22:36 +0100
|
||||
Subject: [PATCH 012/414] iommu/amd: Split irq_lookup_table out of the
|
||||
Subject: [PATCH 012/418] iommu/amd: Split irq_lookup_table out of the
|
||||
amd_iommu_devtable_lock
|
||||
|
||||
Upstream commit ea6166f4b83e9cfba1c18f46a764d50045682fe5
|
||||
@ -52,5 +52,5 @@ index 250b6354fae5..2cedb0caec73 100644
|
||||
return table;
|
||||
}
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From ab23fbb1785b1b4d6746dc36c507bf0a8991be7d Mon Sep 17 00:00:00 2001
|
||||
From 7faa3de9da88db7a577fbc9d11c095425c7de802 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
||||
Date: Thu, 22 Mar 2018 16:22:37 +0100
|
||||
Subject: [PATCH 013/414] iommu/amd: Remove the special case from
|
||||
Subject: [PATCH 013/418] iommu/amd: Remove the special case from
|
||||
alloc_irq_table()
|
||||
|
||||
Upstream commit fde65dd3d3096e8f6ecc7bbe544eb91f4220772c
|
||||
@ -96,5 +96,5 @@ index 2cedb0caec73..fc23b89d2372 100644
|
||||
index = alloc_irq_index(devid, nr_irqs);
|
||||
}
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From cf22088f7362c4376ce97060706eab7ba9300cac Mon Sep 17 00:00:00 2001
|
||||
From c148dfef5e405f1d7f74ac4e667b19007bc31fd1 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
||||
Date: Thu, 22 Mar 2018 16:22:38 +0100
|
||||
Subject: [PATCH 014/414] iommu/amd: Use `table' instead `irt' as variable name
|
||||
Subject: [PATCH 014/418] iommu/amd: Use `table' instead `irt' as variable name
|
||||
in amd_iommu_update_ga()
|
||||
|
||||
Upstream commit 4fde541c9dc114c5b448ad34b0286fe8b7c550f1
|
||||
@ -54,5 +54,5 @@ index fc23b89d2372..bfda5f26ea50 100644
|
||||
iommu_flush_irt(iommu, devid);
|
||||
iommu_completion_wait(iommu);
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From 8adc34a18946fcff0e5642de8ed48e358abdb601 Mon Sep 17 00:00:00 2001
|
||||
From ef80165d12b76356146a32c6b43e45e98f052ae9 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
||||
Date: Thu, 22 Mar 2018 16:22:39 +0100
|
||||
Subject: [PATCH 015/414] iommu/amd: Factor out setting the remap table for a
|
||||
Subject: [PATCH 015/418] iommu/amd: Factor out setting the remap table for a
|
||||
devid
|
||||
|
||||
Upstream commit 2fcc1e8ac4a8514c64f946178fc36c2e30e56a41
|
||||
@ -68,5 +68,5 @@ index bfda5f26ea50..d4eeb91afa36 100644
|
||||
out:
|
||||
iommu_completion_wait(iommu);
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From b2cd3595f6f7461fed03b9fdd6ae08901108db2c Mon Sep 17 00:00:00 2001
|
||||
From 6224ad75694b7e9aa332a504f1da722c416a4cf3 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
||||
Date: Thu, 22 Mar 2018 16:22:40 +0100
|
||||
Subject: [PATCH 016/414] iommu/amd: Drop the lock while allocating new irq
|
||||
Subject: [PATCH 016/418] iommu/amd: Drop the lock while allocating new irq
|
||||
remap table
|
||||
|
||||
Upstream commit 993ca6e063a69a0c65ca42ed449b6bc1b3844151
|
||||
@ -133,5 +133,5 @@ index d4eeb91afa36..8b6e515b395e 100644
|
||||
}
|
||||
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From ad8625266d3c4e93f6b170604dc5ba25dbafd0f7 Mon Sep 17 00:00:00 2001
|
||||
From 9d350d7dff14fe5881062bb1dd588fe1bf19719d Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
||||
Date: Thu, 22 Mar 2018 16:22:41 +0100
|
||||
Subject: [PATCH 017/414] iommu/amd: Make amd_iommu_devtable_lock a spin_lock
|
||||
Subject: [PATCH 017/418] iommu/amd: Make amd_iommu_devtable_lock a spin_lock
|
||||
|
||||
Upstream commit 2cd1083d79a0a8c223af430ca97884c28a1e2fc0
|
||||
|
||||
@ -75,5 +75,5 @@ index 8b6e515b395e..f685026e6d9e 100644
|
||||
|
||||
static void protection_domain_free(struct protection_domain *domain)
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From 584da253bb5bca9e60d72dca8df1d60574457530 Mon Sep 17 00:00:00 2001
|
||||
From cf3885d685d1115031da5d5963a9152b11cf9f36 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
||||
Date: Thu, 22 Mar 2018 16:22:42 +0100
|
||||
Subject: [PATCH 018/414] iommu/amd: Return proper error code in
|
||||
Subject: [PATCH 018/418] iommu/amd: Return proper error code in
|
||||
irq_remapping_alloc()
|
||||
|
||||
Upstream commit 29d049be9438278c47253a74cf8d0ddf36bd5d68
|
||||
@ -42,5 +42,5 @@ index f685026e6d9e..f61c2dab5490 100644
|
||||
} else {
|
||||
index = alloc_irq_index(devid, nr_irqs);
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From ae8d11384afb52f7d1a2afe9ea44fdec48b5642e Mon Sep 17 00:00:00 2001
|
||||
From d2540f23d6110bdea14e3b9b8af69ee71909096f Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Gleixner <tglx@linutronix.de>
|
||||
Date: Wed, 20 Dec 2017 17:12:50 +0100
|
||||
Subject: [PATCH 019/414] timers: Use static keys for
|
||||
Subject: [PATCH 019/418] timers: Use static keys for
|
||||
migrate_enable/nohz_active
|
||||
|
||||
The members migrate_enable and nohz_active in the timer/hrtimer per CPU
|
||||
@ -283,5 +283,5 @@ index 9fe525f410bf..b24232985960 100644
|
||||
|
||||
/*
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From 6cdd07db109099455b4fcaad8446d5cced9df7e9 Mon Sep 17 00:00:00 2001
|
||||
From 437a57e7664994a510190bfaff01026cd7e75422 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Gleixner <tglx@linutronix.de>
|
||||
Date: Wed, 20 Dec 2017 17:12:51 +0100
|
||||
Subject: [PATCH 020/414] hrtimer: Correct blantanly wrong comment
|
||||
Subject: [PATCH 020/418] hrtimer: Correct blantanly wrong comment
|
||||
|
||||
The protection of a hrtimer which runs its callback against migration to a
|
||||
different CPU has nothing to do with hard interrupt context.
|
||||
@ -38,5 +38,5 @@ index 883fef2926e9..65543d31af32 100644
|
||||
raw_spin_unlock(&cpu_base->lock);
|
||||
trace_hrtimer_expire_entry(timer, now);
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From f62ec4e980194574862b0329315cf2b36cd10751 Mon Sep 17 00:00:00 2001
|
||||
From b9a845a61b4f2fd293791e8a6f3b3031ba03308d Mon Sep 17 00:00:00 2001
|
||||
From: Anna-Maria Gleixner <anna-maria@linutronix.de>
|
||||
Date: Wed, 20 Dec 2017 17:12:52 +0100
|
||||
Subject: [PATCH 021/414] hrtimer: Fix kerneldoc for struct hrtimer_cpu_base
|
||||
Subject: [PATCH 021/418] hrtimer: Fix kerneldoc for struct hrtimer_cpu_base
|
||||
|
||||
The sequence '/**' marks the start of a struct description. Add the
|
||||
missing second asterisk. While at it adapt the ordering of the struct
|
||||
@ -44,5 +44,5 @@ index 79b2a8d29d8c..b3a382be8db0 100644
|
||||
* @nr_retries: Total number of hrtimer interrupt retries
|
||||
* @nr_hangs: Total number of hrtimer interrupt hangs
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From 4130d51df9d8bf1cdc31936212773fa9aae4e54e Mon Sep 17 00:00:00 2001
|
||||
From 3f2ef191049442d38c95443f4a85062a403cb21a Mon Sep 17 00:00:00 2001
|
||||
From: Anna-Maria Gleixner <anna-maria@linutronix.de>
|
||||
Date: Wed, 20 Dec 2017 17:12:53 +0100
|
||||
Subject: [PATCH 022/414] hrtimer: Cleanup clock argument in
|
||||
Subject: [PATCH 022/418] hrtimer: Cleanup clock argument in
|
||||
schedule_hrtimeout_range_clock()
|
||||
|
||||
schedule_hrtimeout_range_clock() uses an integer for the clock id
|
||||
@ -84,5 +84,5 @@ index 65543d31af32..790841b59433 100644
|
||||
* Make the current task sleep until the given expiry time has
|
||||
* elapsed. The routine will return immediately unless
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From 3177fadb000eacc66a94abca08bd560bd2b6bcdf Mon Sep 17 00:00:00 2001
|
||||
From 7bceac6c2181a2ce1ba209d1fc6afb626dbab4c7 Mon Sep 17 00:00:00 2001
|
||||
From: Anna-Maria Gleixner <anna-maria@linutronix.de>
|
||||
Date: Wed, 20 Dec 2017 17:12:54 +0100
|
||||
Subject: [PATCH 023/414] hrtimer: Fix hrtimer function description
|
||||
Subject: [PATCH 023/418] hrtimer: Fix hrtimer function description
|
||||
|
||||
The hrtimer_start[_range_ns]() starts a timer reliable on this CPU only
|
||||
when HRTIMER_MODE_PINNED is set. Furthermore the HRTIMER_MODE_PINNED mode
|
||||
@ -64,5 +64,5 @@ index 790841b59433..6460aa2d9b25 100644
|
||||
void hrtimer_init(struct hrtimer *timer, clockid_t clock_id,
|
||||
enum hrtimer_mode mode)
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From 849a4dda6d5b76e03d3c91ef404402e7b7812c46 Mon Sep 17 00:00:00 2001
|
||||
From 79c700b613fe56d7318ab41bc9184cd8572006ec Mon Sep 17 00:00:00 2001
|
||||
From: Anna-Maria Gleixner <anna-maria@linutronix.de>
|
||||
Date: Wed, 20 Dec 2017 17:12:56 +0100
|
||||
Subject: [PATCH 024/414] hrtimer: Cleanup hrtimer_mode enum
|
||||
Subject: [PATCH 024/418] hrtimer: Cleanup hrtimer_mode enum
|
||||
|
||||
It's not obvious that the HRTIMER_MODE variants are bit combinations
|
||||
because all modes are hard coded constants.
|
||||
@ -47,5 +47,5 @@ index 4e6a8841dcbe..28f267cf2851 100644
|
||||
|
||||
/*
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From b47bd57802cb10af5b096f6d6c850a4ce1c58cb0 Mon Sep 17 00:00:00 2001
|
||||
From 734fc4622933368429263530e951f67c458070eb Mon Sep 17 00:00:00 2001
|
||||
From: Anna-Maria Gleixner <anna-maria@linutronix.de>
|
||||
Date: Wed, 20 Dec 2017 17:12:58 +0100
|
||||
Subject: [PATCH 025/414] tracing/hrtimer: Print hrtimer mode in hrtimer_start
|
||||
Subject: [PATCH 025/418] tracing/hrtimer: Print hrtimer mode in hrtimer_start
|
||||
tracepoint
|
||||
|
||||
The hrtimer_start tracepoint lacks the mode information. The mode is
|
||||
@ -117,5 +117,5 @@ index 6460aa2d9b25..476fe683e8ed 100644
|
||||
}
|
||||
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From de61806cf2311994d697a907900cd71e4255df17 Mon Sep 17 00:00:00 2001
|
||||
From 551c25858df0438915d8addafa70afbb12779d35 Mon Sep 17 00:00:00 2001
|
||||
From: Anna-Maria Gleixner <anna-maria@linutronix.de>
|
||||
Date: Wed, 20 Dec 2017 17:12:59 +0100
|
||||
Subject: [PATCH 026/414] hrtimer: Switch for loop to _ffs() evaluation
|
||||
Subject: [PATCH 026/418] hrtimer: Switch for loop to _ffs() evaluation
|
||||
|
||||
Looping over all clock bases to find active bits is suboptimal if not all
|
||||
bases are active.
|
||||
@ -86,5 +86,5 @@ index 476fe683e8ed..85f9335d0d60 100644
|
||||
|
||||
while ((node = timerqueue_getnext(&base->active))) {
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From 743a7e5c5a00389d149c5baf47e4baf7345de67c Mon Sep 17 00:00:00 2001
|
||||
From 1ca83795806184362986a22e2a4dd0d5ac30eddd Mon Sep 17 00:00:00 2001
|
||||
From: Anna-Maria Gleixner <anna-maria@linutronix.de>
|
||||
Date: Wed, 20 Dec 2017 17:13:00 +0100
|
||||
Subject: [PATCH 027/414] hrtimer: Store running timer in hrtimer_clock_base
|
||||
Subject: [PATCH 027/418] hrtimer: Store running timer in hrtimer_clock_base
|
||||
|
||||
The pointer to the currently running timer is stored in hrtimer_cpu_base
|
||||
before the base lock is dropped and the callback is invoked.
|
||||
@ -195,5 +195,5 @@ index 85f9335d0d60..bedfc2865901 100644
|
||||
|
||||
static void __hrtimer_run_queues(struct hrtimer_cpu_base *cpu_base, ktime_t now)
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From d68428306aadc4282164f1696f6da0a354235739 Mon Sep 17 00:00:00 2001
|
||||
From bbc2c2e88a6682df03351e2a3c19593de4c08d3e Mon Sep 17 00:00:00 2001
|
||||
From: Anna-Maria Gleixner <anna-maria@linutronix.de>
|
||||
Date: Wed, 20 Dec 2017 17:13:01 +0100
|
||||
Subject: [PATCH 028/414] hrtimer: Make room in struct hrtimer_cpu_base
|
||||
Subject: [PATCH 028/418] hrtimer: Make room in struct hrtimer_cpu_base
|
||||
|
||||
The upcoming softirq based hrtimers support requires an additional field in
|
||||
the hrtimer_cpu_base struct, which would grow the struct size beyond a
|
||||
@ -35,5 +35,5 @@ index 1bae7b9f071d..56e56bcb6f0f 100644
|
||||
#endif
|
||||
struct hrtimer_clock_base clock_base[HRTIMER_MAX_CLOCK_BASES];
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From 79e04e38a6c7c3a1259ad00ba8b1f462c90d78fa Mon Sep 17 00:00:00 2001
|
||||
From 036160e2bf23c43f7a7eb4482cd372c2c5983389 Mon Sep 17 00:00:00 2001
|
||||
From: Anna-Maria Gleixner <anna-maria@linutronix.de>
|
||||
Date: Wed, 20 Dec 2017 17:13:02 +0100
|
||||
Subject: [PATCH 029/414] hrtimer: Reduce conditional code (hres_active)
|
||||
Subject: [PATCH 029/418] hrtimer: Reduce conditional code (hres_active)
|
||||
|
||||
The hrtimer_cpu_base struct has the CONFIG_HIGH_RES_TIMERS conditional
|
||||
struct member hres_active. All related functions to this member are
|
||||
@ -153,5 +153,5 @@ index bedfc2865901..7e0490143275 100644
|
||||
return 0;
|
||||
}
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From 0c28a3a42a6c4524828e0de3f8683df0715e4a30 Mon Sep 17 00:00:00 2001
|
||||
From 5f845b534ffc9f5a653f45bddf0dc4e99dd6a510 Mon Sep 17 00:00:00 2001
|
||||
From: Anna-Maria Gleixner <anna-maria@linutronix.de>
|
||||
Date: Wed, 20 Dec 2017 17:13:03 +0100
|
||||
Subject: [PATCH 030/414] hrtimer: Use accesor functions instead of direct
|
||||
Subject: [PATCH 030/418] hrtimer: Use accesor functions instead of direct
|
||||
access
|
||||
|
||||
__hrtimer_hres_active() is now available unconditionally. Replace the
|
||||
@ -38,5 +38,5 @@ index 7e0490143275..85882d5da523 100644
|
||||
|
||||
raw_spin_lock(&base->lock);
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From a9e0b8eb976e20f6043041423f00062a292d61c7 Mon Sep 17 00:00:00 2001
|
||||
From 454c4ff0fb355b4dafad0f616d12cbdf1a6521db Mon Sep 17 00:00:00 2001
|
||||
From: Anna-Maria Gleixner <anna-maria@linutronix.de>
|
||||
Date: Wed, 20 Dec 2017 17:13:04 +0100
|
||||
Subject: [PATCH 031/414] hrtimer: Make the remote enqueue check unconditional
|
||||
Subject: [PATCH 031/418] hrtimer: Make the remote enqueue check unconditional
|
||||
|
||||
hrtimer_cpu_base.expires_next is used to cache the next event armed in the
|
||||
timer hardware. The value is used to check whether an hrtimer can be
|
||||
@ -140,5 +140,5 @@ index 85882d5da523..b1016aabc73a 100644
|
||||
}
|
||||
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From b9f89574e69f7b1f18dbf0518330f559e841bf2b Mon Sep 17 00:00:00 2001
|
||||
From 0f5e672a02807d10c8772c839d358cb498ec6d9f Mon Sep 17 00:00:00 2001
|
||||
From: Anna-Maria Gleixner <anna-maria@linutronix.de>
|
||||
Date: Wed, 20 Dec 2017 17:13:05 +0100
|
||||
Subject: [PATCH 032/414] hrtimer: Make hrtimer_cpu_base.next_timer handling
|
||||
Subject: [PATCH 032/418] hrtimer: Make hrtimer_cpu_base.next_timer handling
|
||||
unconditional
|
||||
|
||||
hrtimer_cpu_base.next_timer stores the pointer to the next expiring timer
|
||||
@ -101,5 +101,5 @@ index b1016aabc73a..e01c2e78c032 100644
|
||||
}
|
||||
/*
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From 45b61c6a2e3b71d48921aea76713c19795905c5a Mon Sep 17 00:00:00 2001
|
||||
From 528276dfeb134c7e8f46afdced23ebb1c7da0c8b Mon Sep 17 00:00:00 2001
|
||||
From: Anna-Maria Gleixner <anna-maria@linutronix.de>
|
||||
Date: Wed, 20 Dec 2017 17:13:06 +0100
|
||||
Subject: [PATCH 033/414] hrtimer: Make hrtimer_reprogramm() unconditional
|
||||
Subject: [PATCH 033/418] hrtimer: Make hrtimer_reprogramm() unconditional
|
||||
|
||||
hrtimer_reprogram() needs to be available unconditionally for softirq based
|
||||
hrtimers. Move the function and all required struct members out of the
|
||||
@ -189,5 +189,5 @@ index e01c2e78c032..37085a13f19a 100644
|
||||
* Clock realtime was set
|
||||
*
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From 296b6f8f96067a3acd75a96325e47bc48684b724 Mon Sep 17 00:00:00 2001
|
||||
From 679e677ed43106bfa23fcd7fa318acf826e27113 Mon Sep 17 00:00:00 2001
|
||||
From: Anna-Maria Gleixner <anna-maria@linutronix.de>
|
||||
Date: Wed, 20 Dec 2017 17:13:07 +0100
|
||||
Subject: [PATCH 034/414] hrtimer: Make hrtimer_force_reprogramm()
|
||||
Subject: [PATCH 034/418] hrtimer: Make hrtimer_force_reprogramm()
|
||||
unconditionally available
|
||||
|
||||
hrtimer_force_reprogram() needs to be available unconditionally for softirq
|
||||
@ -107,5 +107,5 @@ index 37085a13f19a..5fd669dd46be 100644
|
||||
|
||||
#endif /* CONFIG_HIGH_RES_TIMERS */
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From f4b8779db8b944689effad2ade03a5ac5d1e3cfa Mon Sep 17 00:00:00 2001
|
||||
From 748812cb4f5a3b85cb2ba72c6edb68e390137b84 Mon Sep 17 00:00:00 2001
|
||||
From: Anna-Maria Gleixner <anna-maria@linutronix.de>
|
||||
Date: Wed, 20 Dec 2017 17:13:08 +0100
|
||||
Subject: [PATCH 035/414] hrtimer: Unify handling of hrtimer remove
|
||||
Subject: [PATCH 035/418] hrtimer: Unify handling of hrtimer remove
|
||||
|
||||
When the first hrtimer on the current CPU is removed,
|
||||
hrtimer_force_reprogram() is invoked but only when
|
||||
@ -90,5 +90,5 @@ index 5fd669dd46be..ce9a3ef7a796 100644
|
||||
|
||||
/*
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From b565edf2df1347c8d0fe93057c5da89786b20107 Mon Sep 17 00:00:00 2001
|
||||
From bf1446f64f73dad06295e748afb019d24f7cb3ef Mon Sep 17 00:00:00 2001
|
||||
From: Anna-Maria Gleixner <anna-maria@linutronix.de>
|
||||
Date: Wed, 20 Dec 2017 17:13:09 +0100
|
||||
Subject: [PATCH 036/414] hrtimer: Unify handling of remote enqueue
|
||||
Subject: [PATCH 036/418] hrtimer: Unify handling of remote enqueue
|
||||
|
||||
hrtimer_reprogram() is conditionally invoked from hrtimer_start_range_ns()
|
||||
when hrtimer_cpu_base.hres_active is true.
|
||||
@ -154,5 +154,5 @@ index b24232985960..34415f2b3f04 100644
|
||||
|
||||
static unsigned long round_jiffies_common(unsigned long j, int cpu,
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From 8cdb34edfcfc64ca7dbf397f0f9235f2d8d6762f Mon Sep 17 00:00:00 2001
|
||||
From fb8fd05821b83cac5e75caf3cd2e7d7f939e9df8 Mon Sep 17 00:00:00 2001
|
||||
From: Anna-Maria Gleixner <anna-maria@linutronix.de>
|
||||
Date: Wed, 20 Dec 2017 17:13:10 +0100
|
||||
Subject: [PATCH 037/414] hrtimer: Make remote enqueue decision less
|
||||
Subject: [PATCH 037/418] hrtimer: Make remote enqueue decision less
|
||||
restrictive
|
||||
|
||||
The current decision whether a timer can be queued on a remote CPU checks
|
||||
@ -34,5 +34,5 @@ index 35d7d0c8c3d6..1b2866645c83 100644
|
||||
|
||||
static inline
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From fb9c6739c8274982180e104abd48a945f9aa8349 Mon Sep 17 00:00:00 2001
|
||||
From 9f9520ee32930e264c6c3b96bcbff47d3e1d3535 Mon Sep 17 00:00:00 2001
|
||||
From: Anna-Maria Gleixner <anna-maria@linutronix.de>
|
||||
Date: Wed, 20 Dec 2017 17:13:11 +0100
|
||||
Subject: [PATCH 038/414] hrtimer: Remove base argument from
|
||||
Subject: [PATCH 038/418] hrtimer: Remove base argument from
|
||||
hrtimer_reprogram()
|
||||
|
||||
hrtimer_reprogram() must have access to the hrtimer_clock_base of the new
|
||||
@ -52,5 +52,5 @@ index 1b2866645c83..9030dcb3ef14 100644
|
||||
unlock_hrtimer_base(timer, &flags);
|
||||
}
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From c898510c489084e806002595da513370d3088901 Mon Sep 17 00:00:00 2001
|
||||
From 2902f951d983fd0c1ba2c263f8cefaaf9920dddf Mon Sep 17 00:00:00 2001
|
||||
From: Anna-Maria Gleixner <anna-maria@linutronix.de>
|
||||
Date: Wed, 20 Dec 2017 17:13:12 +0100
|
||||
Subject: [PATCH 039/414] hrtimer: Split hrtimer_start_range_ns()
|
||||
Subject: [PATCH 039/418] hrtimer: Split hrtimer_start_range_ns()
|
||||
|
||||
Preparatory patch for softirq based hrtimers to avoid code duplication. No
|
||||
functional change.
|
||||
@ -77,5 +77,5 @@ index 9030dcb3ef14..687a8d903a18 100644
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(hrtimer_start_range_ns);
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From 277b1870d5329ddfbb1343c8627a8f83b4250f45 Mon Sep 17 00:00:00 2001
|
||||
From 02981f05fa68ffe985a592dc05e55aab21ade52d Mon Sep 17 00:00:00 2001
|
||||
From: Anna-Maria Gleixner <anna-maria@linutronix.de>
|
||||
Date: Wed, 20 Dec 2017 17:13:13 +0100
|
||||
Subject: [PATCH 040/414] hrtimer: Split __hrtimer_get_next_event()
|
||||
Subject: [PATCH 040/418] hrtimer: Split __hrtimer_get_next_event()
|
||||
|
||||
Preparatory patch for softirq based hrtimers to avoid code duplication. No
|
||||
functional change.
|
||||
@ -54,5 +54,5 @@ index 687a8d903a18..2382bc5d8e4d 100644
|
||||
|
||||
static inline ktime_t hrtimer_update_base(struct hrtimer_cpu_base *base)
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From 5cd854bf805216d2a22f14c9f29d0cc51f7cdc66 Mon Sep 17 00:00:00 2001
|
||||
From 98dc570c5d061de989184f864ecfb6ce8d37908d Mon Sep 17 00:00:00 2001
|
||||
From: Anna-Maria Gleixner <anna-maria@linutronix.de>
|
||||
Date: Wed, 20 Dec 2017 17:13:14 +0100
|
||||
Subject: [PATCH 041/414] hrtimer: Use irqsave/irqrestore around
|
||||
Subject: [PATCH 041/418] hrtimer: Use irqsave/irqrestore around
|
||||
__run_hrtimer()
|
||||
|
||||
__run_hrtimer() is called with the hrtimer_cpu_base.lock held and
|
||||
@ -147,5 +147,5 @@ index 2382bc5d8e4d..86cdc9a76911 100644
|
||||
|
||||
/*
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From d16c4975b23e4429a198b5bcc16d46e12eaad23c Mon Sep 17 00:00:00 2001
|
||||
From d748cf5fda146e95ece2f26bbb5355989feb2c0c Mon Sep 17 00:00:00 2001
|
||||
From: Anna-Maria Gleixner <anna-maria@linutronix.de>
|
||||
Date: Wed, 20 Dec 2017 17:13:15 +0100
|
||||
Subject: [PATCH 042/414] hrtimer: Add clock bases and hrtimer mode for soft
|
||||
Subject: [PATCH 042/418] hrtimer: Add clock bases and hrtimer mode for soft
|
||||
irq context
|
||||
|
||||
hrtimer callback functions are always executed in hard interrupt
|
||||
@ -114,5 +114,5 @@ index 86cdc9a76911..b5121845d12c 100644
|
||||
};
|
||||
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From fcbfa28f6d81a03a9145742c7765ef00c42b1e06 Mon Sep 17 00:00:00 2001
|
||||
From 8eacbcb00c9529dab3e37cfd52c28c8812c075d0 Mon Sep 17 00:00:00 2001
|
||||
From: Anna-Maria Gleixner <anna-maria@linutronix.de>
|
||||
Date: Wed, 20 Dec 2017 17:13:16 +0100
|
||||
Subject: [PATCH 043/414] hrtimer: Prepare handling of hard and softirq based
|
||||
Subject: [PATCH 043/418] hrtimer: Prepare handling of hard and softirq based
|
||||
hrtimers
|
||||
|
||||
The softirq based hrtimer can utilize most of the existing hrtimers
|
||||
@ -118,5 +118,5 @@ index b5121845d12c..9a1f2b00c847 100644
|
||||
}
|
||||
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From 4070b8e3ab87c596835bede6b35be54a03fa515b Mon Sep 17 00:00:00 2001
|
||||
From f5e86c469b7c959867c9f4cb475ba5a116655ea6 Mon Sep 17 00:00:00 2001
|
||||
From: Anna-Maria Gleixner <anna-maria@linutronix.de>
|
||||
Date: Wed, 20 Dec 2017 17:13:17 +0100
|
||||
Subject: [PATCH 044/414] hrtimer: Implement support for softirq based hrtimers
|
||||
Subject: [PATCH 044/418] hrtimer: Implement support for softirq based hrtimers
|
||||
|
||||
hrtimer callbacks are always invoked in hard interrupt context. Several
|
||||
users in tree require soft interrupt context for their callbacks and
|
||||
@ -502,5 +502,5 @@ index 9a1f2b00c847..66d7a12d7256 100644
|
||||
|
||||
/**
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From f32935dba4227215f4872b837873273cb08784ba Mon Sep 17 00:00:00 2001
|
||||
From 19acab9d8df9e75cfa7ec3ef85cd681573fda33e Mon Sep 17 00:00:00 2001
|
||||
From: Anna-Maria Gleixner <anna-maria@linutronix.de>
|
||||
Date: Wed, 20 Dec 2017 17:13:18 +0100
|
||||
Subject: [PATCH 045/414] hrtimer: Implement SOFT/HARD clock base selection
|
||||
Subject: [PATCH 045/418] hrtimer: Implement SOFT/HARD clock base selection
|
||||
|
||||
All prerequisites to handle hrtimers for expiry in either hard or soft
|
||||
interrupt context are in place.
|
||||
@ -57,5 +57,5 @@ index 66d7a12d7256..9947480ad731 100644
|
||||
void hrtimer_init(struct hrtimer *timer, clockid_t clock_id,
|
||||
enum hrtimer_mode mode)
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From 7e4dacaced7572790d1378572a6cad20845d15e7 Mon Sep 17 00:00:00 2001
|
||||
From 2cbedaf9c22fa9c7b29f6e31ac181afd7d604783 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Gleixner <tglx@linutronix.de>
|
||||
Date: Thu, 23 Nov 2017 16:39:11 +0100
|
||||
Subject: [PATCH 046/414] can/bcm: Replace hrtimer_tasklet with softirq based
|
||||
Subject: [PATCH 046/418] can/bcm: Replace hrtimer_tasklet with softirq based
|
||||
hrtimer
|
||||
|
||||
Switch the timer to HRTIMER_MODE_SOFT, which executed the timer
|
||||
@ -317,5 +317,5 @@ index 13690334efa3..9cc67ac257f1 100644
|
||||
|
||||
/* now we can register for can_ids, if we added a new bcm_op */
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From b28f5667a2a0e339de56b877e2caeabe3cb52ca5 Mon Sep 17 00:00:00 2001
|
||||
From b598f6cc9629cfae9153cad4f169cd94de94b74d Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Gleixner <tglx@linutronix.de>
|
||||
Date: Thu, 23 Nov 2017 16:39:12 +0100
|
||||
Subject: [PATCH 047/414] mac80211_hwsim: Replace hrtimer tasklet with softirq
|
||||
Subject: [PATCH 047/418] mac80211_hwsim: Replace hrtimer tasklet with softirq
|
||||
hrtimer
|
||||
|
||||
Switch the timer to HRTIMER_MODE_SOFT, which executed the timer
|
||||
@ -137,5 +137,5 @@ index d686ba10fecc..4afcdee4f8e2 100644
|
||||
spin_lock_bh(&hwsim_radio_lock);
|
||||
list_add_tail(&data->list, &hwsim_radios);
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From 25822e33d44a3895a02f0f051e8b39377ab74c4c Mon Sep 17 00:00:00 2001
|
||||
From ab4e9cdebdecf8afc31c2175eeef0ee491edd893 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Gleixner <tglx@linutronix.de>
|
||||
Date: Thu, 23 Nov 2017 16:39:13 +0100
|
||||
Subject: [PATCH 048/414] xfrm: Replace hrtimer tasklet with softirq hrtimer
|
||||
Subject: [PATCH 048/418] xfrm: Replace hrtimer tasklet with softirq hrtimer
|
||||
|
||||
Switch the timer to HRTIMER_MODE_SOFT, which executed the timer
|
||||
callback in softirq context and remove the hrtimer_tasklet.
|
||||
@ -32,7 +32,7 @@ index db99efb2d1d0..a7b95ffbbf8b 100644
|
||||
struct xfrm_state_offload xso;
|
||||
|
||||
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
|
||||
index 8f13fb57eab5..25cf36faa4d2 100644
|
||||
index 6c4ec69e11a0..77f52dc790ec 100644
|
||||
--- a/net/xfrm/xfrm_state.c
|
||||
+++ b/net/xfrm/xfrm_state.c
|
||||
@@ -427,7 +427,7 @@ static void xfrm_put_mode(struct xfrm_mode *mode)
|
||||
@ -116,7 +116,7 @@ index 8f13fb57eab5..25cf36faa4d2 100644
|
||||
list_add(&x->km.all, &net->xfrm.state_all);
|
||||
hlist_add_head_rcu(&x->bydst, net->xfrm.state_bydst + h);
|
||||
h = xfrm_src_hash(net, daddr, saddr, family);
|
||||
@@ -1545,7 +1550,8 @@ int xfrm_state_update(struct xfrm_state *x)
|
||||
@@ -1546,7 +1551,8 @@ int xfrm_state_update(struct xfrm_state *x)
|
||||
memcpy(&x1->lft, &x->lft, sizeof(x1->lft));
|
||||
x1->km.dying = 0;
|
||||
|
||||
@ -126,7 +126,7 @@ index 8f13fb57eab5..25cf36faa4d2 100644
|
||||
if (x1->curlft.use_time)
|
||||
xfrm_state_check_expire(x1);
|
||||
|
||||
@@ -1569,7 +1575,7 @@ int xfrm_state_check_expire(struct xfrm_state *x)
|
||||
@@ -1570,7 +1576,7 @@ int xfrm_state_check_expire(struct xfrm_state *x)
|
||||
if (x->curlft.bytes >= x->lft.hard_byte_limit ||
|
||||
x->curlft.packets >= x->lft.hard_packet_limit) {
|
||||
x->km.state = XFRM_STATE_EXPIRED;
|
||||
@ -136,5 +136,5 @@ index 8f13fb57eab5..25cf36faa4d2 100644
|
||||
}
|
||||
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From 42bcae097379d479e0df8f959fd02e01b465fdc2 Mon Sep 17 00:00:00 2001
|
||||
From 07f6a6cd6f185c258b51f5868df1099d8ac0409f Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Gleixner <tglx@linutronix.de>
|
||||
Date: Thu, 23 Nov 2017 16:39:14 +0100
|
||||
Subject: [PATCH 049/414] softirq: Remove tasklet_hrtimer
|
||||
Subject: [PATCH 049/418] softirq: Remove tasklet_hrtimer
|
||||
|
||||
There are no more tasklet_hrtimer users of this interface.
|
||||
Remove it.
|
||||
@ -113,5 +113,5 @@ index e89c3b0cff6d..359cec869172 100644
|
||||
{
|
||||
int cpu;
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From 87b0744dcb085fdb3894b682c27aff630a245369 Mon Sep 17 00:00:00 2001
|
||||
From 24d5357d77a69078fc98402de3aab60d653b3fa8 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Gleixner <tglx@linutronix.de>
|
||||
Date: Thu, 23 Nov 2017 16:39:15 +0100
|
||||
Subject: [PATCH 050/414] ALSA/dummy: Replace tasklet with softirq hrtimer
|
||||
Subject: [PATCH 050/418] ALSA/dummy: Replace tasklet with softirq hrtimer
|
||||
|
||||
The tasklet is used to defer the execution of snd_pcm_period_elapsed() to
|
||||
the softirq context. Using the HRTIMER_MODE_SOFT mode invokes the timer
|
||||
@ -101,5 +101,5 @@ index c0939a0164a6..549e014ecc0d 100644
|
||||
}
|
||||
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From 72c4503e32e667180b324dbfbd27d70be2977562 Mon Sep 17 00:00:00 2001
|
||||
From 0057023498b6d4b22530b1dfbe73ecbc8ffad56d Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Gleixner <tglx@linutronix.de>
|
||||
Date: Thu, 23 Nov 2017 16:39:16 +0100
|
||||
Subject: [PATCH 051/414] usb/gadget/NCM: Replace tasklet with softirq hrtimer
|
||||
Subject: [PATCH 051/418] usb/gadget/NCM: Replace tasklet with softirq hrtimer
|
||||
|
||||
The tx_tasklet tasklet is used in invoke the hrtimer (task_timer) in
|
||||
softirq context. This can be also achieved without the tasklet but
|
||||
@ -98,5 +98,5 @@ index 45b334ceaf2e..5f24e6d3b6eb 100644
|
||||
ncm_string_defs[0].id = 0;
|
||||
usb_free_all_descriptors(f);
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From 30d225bd318c7d54b729bcf76ef5a7e88bd5c546 Mon Sep 17 00:00:00 2001
|
||||
From c49af3d9c660a7a707a2df5d9de7476078ea0d4e Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Gleixner <tglx@linutronix.de>
|
||||
Date: Thu, 23 Nov 2017 16:39:17 +0100
|
||||
Subject: [PATCH 052/414] net/mvpp2: Replace tasklet with softirq hrtimer
|
||||
Subject: [PATCH 052/418] net/mvpp2: Replace tasklet with softirq hrtimer
|
||||
|
||||
The tx_done_tasklet tasklet is used in invoke the hrtimer
|
||||
(mvpp2_hr_timer_cb) in softirq context. This can be also achieved without
|
||||
@ -134,5 +134,5 @@ index 529be74f609d..b1d7378b131c 100644
|
||||
}
|
||||
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From 8b8a0dc21253584aa11d73bc8556a67daa901feb Mon Sep 17 00:00:00 2001
|
||||
From b6c2b5989660b182405f3934877171c0a96c4dcc Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
||||
Date: Wed, 9 Mar 2016 10:51:06 +0100
|
||||
Subject: [PATCH 053/414] arm: at91: do not disable/enable clocks in a row
|
||||
Subject: [PATCH 053/418] arm: at91: do not disable/enable clocks in a row
|
||||
|
||||
Currently the driver will disable the clock and enable it one line later
|
||||
if it is switching from periodic mode into one shot.
|
||||
@ -93,5 +93,5 @@ index 9de47d4d2d9e..4f45be268e52 100644
|
||||
.set_state_oneshot = tc_set_oneshot,
|
||||
},
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From 86dbb8631a7a242cfa68176d0fa434360cc9f2ce Mon Sep 17 00:00:00 2001
|
||||
From 09e618ba20c6ff837af1ce439e27e0979ae617b9 Mon Sep 17 00:00:00 2001
|
||||
From: Grygorii Strashko <grygorii.strashko@ti.com>
|
||||
Date: Fri, 11 Sep 2015 21:21:23 +0300
|
||||
Subject: [PATCH 054/414] ARM: smp: Move clear_tasks_mm_cpumask() call to
|
||||
Subject: [PATCH 054/418] ARM: smp: Move clear_tasks_mm_cpumask() call to
|
||||
__cpu_die()
|
||||
|
||||
When running with the RT-kernel (4.1.5-rt5) on TI OMAP dra7-evm and trying
|
||||
@ -87,5 +87,5 @@ index c9a0a5299827..7e5122af96ca 100644
|
||||
* platform_cpu_kill() is generally expected to do the powering off
|
||||
* and/or cutting of clocks to the dying CPU. Optionally, this may
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From 9f2487b25f2e8ffbafbe315bcf5befefa920cb89 Mon Sep 17 00:00:00 2001
|
||||
From 8b2112f6afd9643d70f46582f0602be382b62eef Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Gleixner <tglx@linutronix.de>
|
||||
Date: Fri, 6 Nov 2015 18:51:03 +0100
|
||||
Subject: [PATCH 055/414] rtmutex: Handle non enqueued waiters gracefully
|
||||
Subject: [PATCH 055/418] rtmutex: Handle non enqueued waiters gracefully
|
||||
|
||||
Yimin debugged that in case of a PI wakeup in progress when
|
||||
rt_mutex_start_proxy_lock() calls task_blocks_on_rt_mutex() the latter
|
||||
@ -33,5 +33,5 @@ index 940633c63254..fe7f97edc94e 100644
|
||||
|
||||
debug_rt_mutex_print_deadlock(waiter);
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From 1e763f13882ae919defe08421e1964f5cb429110 Mon Sep 17 00:00:00 2001
|
||||
From 1ee4bc5017c2dfc14b348a6a131223a148ca89d2 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
||||
Date: Wed, 14 Sep 2016 11:52:17 +0200
|
||||
Subject: [PATCH 056/414] rbtree: include rcu.h because we use it
|
||||
Subject: [PATCH 056/418] rbtree: include rcu.h because we use it
|
||||
|
||||
Since commit c1adf20052d8 ("Introduce rb_replace_node_rcu()")
|
||||
rbtree_augmented.h uses RCU related data structures but does not include
|
||||
@ -39,5 +39,5 @@ index ece43e882b56..7d012faa509a 100644
|
||||
struct latch_tree_node {
|
||||
struct rb_node node[2];
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From 04c557c3e0d947e2084a4de10bc56aa8372ff6e1 Mon Sep 17 00:00:00 2001
|
||||
From ecf53d6e5fac47f5613f8adef21d9a3aa9928e7d Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
||||
Date: Fri, 21 Oct 2016 10:54:50 +0200
|
||||
Subject: [PATCH 057/414] rxrpc: remove unused static variables
|
||||
Subject: [PATCH 057/418] rxrpc: remove unused static variables
|
||||
|
||||
The rxrpc_security_methods and rxrpc_security_sem user has been removed
|
||||
in 648af7fca159 ("rxrpc: Absorb the rxkad security module"). This was
|
||||
@ -28,5 +28,5 @@ index e9f428351293..c4479afe8ae7 100644
|
||||
[RXRPC_SECURITY_NONE] = &rxrpc_no_security,
|
||||
#ifdef CONFIG_RXKAD
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From 3bb9ec8538c6fbe78e7d1000cdb90d5dc9fef5de Mon Sep 17 00:00:00 2001
|
||||
From 2f94baea30383e8da5bca2d7854c92d64ad22c37 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
||||
Date: Wed, 4 Oct 2017 09:55:58 +0200
|
||||
Subject: [PATCH 058/414] mfd: syscon: atmel-smc: include string.h
|
||||
Subject: [PATCH 058/418] mfd: syscon: atmel-smc: include string.h
|
||||
|
||||
The string.h header file is needed for the memset() definition. The RT
|
||||
build fails because it is not pulled in via other header files.
|
||||
@ -24,5 +24,5 @@ index 7d77948567d7..0adbd2e796fe 100644
|
||||
/**
|
||||
* atmel_smc_cs_conf_init - initialize a SMC CS conf
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From 5fb42773ca3ff7b4d7106a80ca60df8ce46bc95c Mon Sep 17 00:00:00 2001
|
||||
From 88a1052fc359232c614fe07d2331b21fc5f1cdd0 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
||||
Date: Mon, 4 Dec 2017 13:11:10 +0100
|
||||
Subject: [PATCH 059/414] sched/swait: include wait.h
|
||||
Subject: [PATCH 059/418] sched/swait: include wait.h
|
||||
|
||||
kbuild bot reported against an intermediate RT patch that the build
|
||||
fails with:
|
||||
@ -37,5 +37,5 @@ index c98aaf677466..84f9745365ff 100644
|
||||
|
||||
/*
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From 563b91d9d3b7a337be9c292b216f6e40c2bf48d7 Mon Sep 17 00:00:00 2001
|
||||
From 501738a0c05a729a4cdfdc465d67b69d307ed5ca Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
||||
Date: Fri, 28 Oct 2016 23:05:11 +0200
|
||||
Subject: [PATCH 060/414] NFSv4: replace seqcount_t with a seqlock_t
|
||||
Subject: [PATCH 060/418] NFSv4: replace seqcount_t with a seqlock_t
|
||||
|
||||
The raw_write_seqcount_begin() in nfs4_reclaim_open_state() bugs me
|
||||
because it maps to preempt_disable() in -RT which I can't have at this
|
||||
@ -44,7 +44,7 @@ index 606dd3871f66..fa41eb75b4d8 100644
|
||||
mutex_unlock(&sp->so_delegreturn_mutex);
|
||||
put_nfs_open_context(ctx);
|
||||
diff --git a/fs/nfs/nfs4_fs.h b/fs/nfs/nfs4_fs.h
|
||||
index dcfcf7fd7438..c4498ba4d97b 100644
|
||||
index a73144b3cb8c..0c403d280b96 100644
|
||||
--- a/fs/nfs/nfs4_fs.h
|
||||
+++ b/fs/nfs/nfs4_fs.h
|
||||
@@ -112,7 +112,7 @@ struct nfs4_state_owner {
|
||||
@ -57,10 +57,10 @@ index dcfcf7fd7438..c4498ba4d97b 100644
|
||||
};
|
||||
|
||||
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
|
||||
index ae8f43d270d6..e95055c73ef0 100644
|
||||
index 8ff98bbe479b..610abc7392d7 100644
|
||||
--- a/fs/nfs/nfs4proc.c
|
||||
+++ b/fs/nfs/nfs4proc.c
|
||||
@@ -2642,7 +2642,7 @@ static int _nfs4_open_and_get_state(struct nfs4_opendata *opendata,
|
||||
@@ -2686,7 +2686,7 @@ static int _nfs4_open_and_get_state(struct nfs4_opendata *opendata,
|
||||
unsigned int seq;
|
||||
int ret;
|
||||
|
||||
@ -69,7 +69,7 @@ index ae8f43d270d6..e95055c73ef0 100644
|
||||
|
||||
ret = _nfs4_proc_open(opendata);
|
||||
if (ret != 0)
|
||||
@@ -2680,7 +2680,7 @@ static int _nfs4_open_and_get_state(struct nfs4_opendata *opendata,
|
||||
@@ -2724,7 +2724,7 @@ static int _nfs4_open_and_get_state(struct nfs4_opendata *opendata,
|
||||
|
||||
if (d_inode(dentry) == state->inode) {
|
||||
nfs_inode_attach_open_context(ctx);
|
||||
@ -131,5 +131,5 @@ index 45873ed92057..c487a1ca7106 100644
|
||||
}
|
||||
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From 263c7527d57fce678a521bd94fdb46da18ea5296 Mon Sep 17 00:00:00 2001
|
||||
From c685af47c8ba64119584512bb0881367c104e439 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
||||
Date: Thu, 21 Sep 2017 15:35:57 +0200
|
||||
Subject: [PATCH 061/414] Bluetooth: avoid recursive locking in
|
||||
Subject: [PATCH 061/418] Bluetooth: avoid recursive locking in
|
||||
hci_send_to_channel()
|
||||
|
||||
Mart reported a deadlock in -RT in the call path:
|
||||
@ -72,5 +72,5 @@ index 65d734c165bd..923e9a271872 100644
|
||||
}
|
||||
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From 664685618c427ebd0ab812c5e0c60f1fe27babef Mon Sep 17 00:00:00 2001
|
||||
From e6ea419645846e97bf9b1a6434b6822c9997193b Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
||||
Date: Thu, 21 Sep 2017 17:21:40 +0200
|
||||
Subject: [PATCH 062/414] iommu/iova: Use raw_cpu_ptr() instead of
|
||||
Subject: [PATCH 062/418] iommu/iova: Use raw_cpu_ptr() instead of
|
||||
get_cpu_ptr() for ->fq
|
||||
|
||||
get_cpu_ptr() disabled preemption and returns the ->fq object of the
|
||||
@ -44,5 +44,5 @@ index 33edfa794ae9..b30900025c62 100644
|
||||
EXPORT_SYMBOL_GPL(queue_iova);
|
||||
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From 47736832b2310bb49311025ba0e61fe80124cd94 Mon Sep 17 00:00:00 2001
|
||||
From 4c708f244439a8be64e98c3181a9622d6f7a27b7 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
||||
Date: Thu, 5 Oct 2017 14:38:52 +0200
|
||||
Subject: [PATCH 063/414] greybus: audio: don't inclide rwlock.h directly.
|
||||
Subject: [PATCH 063/418] greybus: audio: don't inclide rwlock.h directly.
|
||||
|
||||
rwlock.h should not be included directly. Instead linux/splinlock.h
|
||||
should be included. One thing it does is to break the RT build.
|
||||
@ -32,5 +32,5 @@ index aa6508b44fab..045696ce85c7 100644
|
||||
|
||||
#include "audio_manager.h"
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From 0e7a72ced9f507028a2fd2f593bac4c974d3bb85 Mon Sep 17 00:00:00 2001
|
||||
From a465d491485f432fbfdfa5e72f6cc97604bbed6f Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
||||
Date: Thu, 5 Oct 2017 14:38:52 +0200
|
||||
Subject: [PATCH 064/414] xen/9pfs: don't inclide rwlock.h directly.
|
||||
Subject: [PATCH 064/418] xen/9pfs: don't inclide rwlock.h directly.
|
||||
|
||||
rwlock.h should not be included directly. Instead linux/splinlock.h
|
||||
should be included. One thing it does is to break the RT build.
|
||||
@ -30,5 +30,5 @@ index 325c56043007..a3f577e81c79 100644
|
||||
#include <net/9p/client.h>
|
||||
#include <net/9p/transport.h>
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From 5c2ada25bae668725a91b9c3d968ba297f9d83e2 Mon Sep 17 00:00:00 2001
|
||||
From 64f7609a4afaa3ae86b180e6b390ab61c7297756 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
||||
Date: Thu, 30 Nov 2017 16:06:13 +0100
|
||||
Subject: [PATCH 065/414] drm/i915: properly init lockdep class
|
||||
Subject: [PATCH 065/418] drm/i915: properly init lockdep class
|
||||
|
||||
The code has an ifdef and uses two functions to either init the bare
|
||||
spinlock or init it and set a lock-class. It is possible to do the same
|
||||
@ -33,5 +33,5 @@ index c597ce277a04..c1108d3921f8 100644
|
||||
INIT_LIST_HEAD(&tl->requests);
|
||||
i915_syncmap_init(&tl->sync);
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From ec5fd96756a5ba739aa063ec489a5969052b17a9 Mon Sep 17 00:00:00 2001
|
||||
From 2824c3956bf820cd38b0f3a08216efbef33788bc Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Gleixner <tglx@linutronix.de>
|
||||
Date: Fri, 22 Dec 2017 15:51:15 +0100
|
||||
Subject: [PATCH 066/414] timerqueue: Document return values of
|
||||
Subject: [PATCH 066/418] timerqueue: Document return values of
|
||||
timerqueue_add/del()
|
||||
|
||||
The return values of timerqueue_add/del() are not documented in the kernel doc
|
||||
@ -41,5 +41,5 @@ index 4a720ed4fdaf..0d54bcbc8170 100644
|
||||
bool timerqueue_del(struct timerqueue_head *head, struct timerqueue_node *node)
|
||||
{
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From 56c6ab8998f8c01e128cd6abf7721efaccfbd17b Mon Sep 17 00:00:00 2001
|
||||
From c60dd1b0d2dacd22df582b78b3ef708cf9e6d118 Mon Sep 17 00:00:00 2001
|
||||
From: Allen Pais <allen.pais@oracle.com>
|
||||
Date: Fri, 13 Dec 2013 09:44:41 +0530
|
||||
Subject: [PATCH 067/414] sparc64: use generic rwsem spinlocks rt
|
||||
Subject: [PATCH 067/418] sparc64: use generic rwsem spinlocks rt
|
||||
|
||||
Signed-off-by: Allen Pais <allen.pais@oracle.com>
|
||||
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
||||
@ -29,5 +29,5 @@ index 4e83f950713e..7f9d71523763 100644
|
||||
config GENERIC_HWEIGHT
|
||||
bool
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From bd0fdb707a3a6f12d982868ec34545529180ba3c Mon Sep 17 00:00:00 2001
|
||||
From 0f6e08944cbaa658d44e566453df5842b8ce1821 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
||||
Date: Tue, 19 Mar 2013 14:44:30 +0100
|
||||
Subject: [PATCH 068/414] kernel/SRCU: provide a static initializer
|
||||
Subject: [PATCH 068/418] kernel/SRCU: provide a static initializer
|
||||
|
||||
There are macros for static initializer for the three out of four
|
||||
possible notifier types, that are:
|
||||
@ -161,5 +161,5 @@ index a949f4f9e4d7..85ae8c0dddb4 100644
|
||||
#define DEFINE_STATIC_SRCU(name) __DEFINE_SRCU(name, static)
|
||||
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From 014036dc7301ff7b0787a4a0b08cd83497a5facb Mon Sep 17 00:00:00 2001
|
||||
From ea6612c14ec2799b3cfbefe06ba925dbe056e5af Mon Sep 17 00:00:00 2001
|
||||
From: "bigeasy@linutronix.de" <bigeasy@linutronix.de>
|
||||
Date: Fri, 23 Mar 2018 18:17:36 +0100
|
||||
Subject: [PATCH 069/414] target: drop spin_lock_assert() + irqs_disabled()
|
||||
Subject: [PATCH 069/418] target: drop spin_lock_assert() + irqs_disabled()
|
||||
combo checks
|
||||
|
||||
There are a few functions which check for if the lock is held
|
||||
@ -64,5 +64,5 @@ index e6d51135d105..b00829995131 100644
|
||||
return 0;
|
||||
/*
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From 1c5e16bc89fc0e8ce205056a152e0e315fafea96 Mon Sep 17 00:00:00 2001
|
||||
From 86cd8a7ab1b4d258a8d7aa3cbf4bf82b3d857f6f Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
||||
Date: Tue, 4 Apr 2017 12:50:16 +0200
|
||||
Subject: [PATCH 070/414] kernel: sched: Provide a pointer to the valid CPU
|
||||
Subject: [PATCH 070/418] kernel: sched: Provide a pointer to the valid CPU
|
||||
mask
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
@ -219,10 +219,10 @@ index 2fd1694ac1d0..98f4fb696289 100644
|
||||
}
|
||||
|
||||
diff --git a/drivers/infiniband/hw/hfi1/affinity.c b/drivers/infiniband/hw/hfi1/affinity.c
|
||||
index a97055dd4fbd..6a624e733abc 100644
|
||||
index b5fab55cc275..4b32a4e8d5da 100644
|
||||
--- a/drivers/infiniband/hw/hfi1/affinity.c
|
||||
+++ b/drivers/infiniband/hw/hfi1/affinity.c
|
||||
@@ -576,7 +576,7 @@ int hfi1_get_proc_affinity(int node)
|
||||
@@ -575,7 +575,7 @@ int hfi1_get_proc_affinity(int node)
|
||||
struct hfi1_affinity_node *entry;
|
||||
cpumask_var_t diff, hw_thread_mask, available_mask, intrs_mask;
|
||||
const struct cpumask *node_mask,
|
||||
@ -231,7 +231,7 @@ index a97055dd4fbd..6a624e733abc 100644
|
||||
struct hfi1_affinity_node_list *affinity = &node_affinity;
|
||||
struct cpu_mask_set *set = &affinity->proc;
|
||||
|
||||
@@ -584,7 +584,7 @@ int hfi1_get_proc_affinity(int node)
|
||||
@@ -583,7 +583,7 @@ int hfi1_get_proc_affinity(int node)
|
||||
* check whether process/context affinity has already
|
||||
* been set
|
||||
*/
|
||||
@ -240,7 +240,7 @@ index a97055dd4fbd..6a624e733abc 100644
|
||||
hfi1_cdbg(PROC, "PID %u %s affinity set to CPU %*pbl",
|
||||
current->pid, current->comm,
|
||||
cpumask_pr_args(proc_mask));
|
||||
@@ -595,7 +595,7 @@ int hfi1_get_proc_affinity(int node)
|
||||
@@ -594,7 +594,7 @@ int hfi1_get_proc_affinity(int node)
|
||||
cpu = cpumask_first(proc_mask);
|
||||
cpumask_set_cpu(cpu, &set->used);
|
||||
goto done;
|
||||
@ -295,10 +295,10 @@ index 9396c1807cc3..a42fcd4735cb 100644
|
||||
if (weight == 1 && !test_bit(cpu, qib_cpulist))
|
||||
if (!find_hca(cpu, &unit) && unit >= 0)
|
||||
diff --git a/fs/proc/array.c b/fs/proc/array.c
|
||||
index e6094a15ef30..230dcf56e85a 100644
|
||||
index 4ac811e1a26c..9dcb40690cde 100644
|
||||
--- a/fs/proc/array.c
|
||||
+++ b/fs/proc/array.c
|
||||
@@ -361,9 +361,9 @@ static inline void task_context_switch_counts(struct seq_file *m,
|
||||
@@ -386,9 +386,9 @@ static inline void task_context_switch_counts(struct seq_file *m,
|
||||
static void task_cpus_allowed(struct seq_file *m, struct task_struct *task)
|
||||
{
|
||||
seq_printf(m, "Cpus_allowed:\t%*pb\n",
|
||||
@ -325,10 +325,10 @@ index 8062e6cc607c..53ee20e0b168 100644
|
||||
.mm = NULL, \
|
||||
.active_mm = &init_mm, \
|
||||
diff --git a/include/linux/sched.h b/include/linux/sched.h
|
||||
index 41354690e4e3..5bd2ab2df9d4 100644
|
||||
index e04919aa8201..64d8d0794689 100644
|
||||
--- a/include/linux/sched.h
|
||||
+++ b/include/linux/sched.h
|
||||
@@ -578,7 +578,8 @@ struct task_struct {
|
||||
@@ -618,7 +618,8 @@ struct task_struct {
|
||||
|
||||
unsigned int policy;
|
||||
int nr_cpus_allowed;
|
||||
@ -338,7 +338,7 @@ index 41354690e4e3..5bd2ab2df9d4 100644
|
||||
|
||||
#ifdef CONFIG_PREEMPT_RCU
|
||||
int rcu_read_lock_nesting;
|
||||
@@ -1315,7 +1316,7 @@ extern struct pid *cad_pid;
|
||||
@@ -1355,7 +1356,7 @@ extern struct pid *cad_pid;
|
||||
#define PF_KTHREAD 0x00200000 /* I am a kernel thread */
|
||||
#define PF_RANDOMIZE 0x00400000 /* Randomize virtual address space */
|
||||
#define PF_SWAPWRITE 0x00800000 /* Allowed to write to swap */
|
||||
@ -375,7 +375,7 @@ index 98c91bd341b4..04c3ebd7a9a9 100644
|
||||
* One for us, one for whoever does the "release_task()" (usually
|
||||
* parent)
|
||||
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
|
||||
index 8cf36b30a006..c12765ab3a3a 100644
|
||||
index f287dcbe8cb2..5909b525f668 100644
|
||||
--- a/kernel/sched/core.c
|
||||
+++ b/kernel/sched/core.c
|
||||
@@ -960,7 +960,7 @@ static struct rq *__migrate_task(struct rq *rq, struct rq_flags *rf,
|
||||
@ -507,7 +507,7 @@ index 8cf36b30a006..c12765ab3a3a 100644
|
||||
* - any previously selected CPU might disappear through hotplug
|
||||
*
|
||||
* Use __set_task_cpu() to avoid calling sched_class::migrate_task_rq,
|
||||
@@ -4162,7 +4162,7 @@ static int __sched_setscheduler(struct task_struct *p,
|
||||
@@ -4147,7 +4147,7 @@ static int __sched_setscheduler(struct task_struct *p,
|
||||
* the entire root_domain to become SCHED_DEADLINE. We
|
||||
* will also fail if there's no bandwidth available.
|
||||
*/
|
||||
@ -516,7 +516,7 @@ index 8cf36b30a006..c12765ab3a3a 100644
|
||||
rq->rd->dl_bw.bw == 0) {
|
||||
task_rq_unlock(rq, p, &rf);
|
||||
return -EPERM;
|
||||
@@ -4756,7 +4756,7 @@ long sched_getaffinity(pid_t pid, struct cpumask *mask)
|
||||
@@ -4741,7 +4741,7 @@ long sched_getaffinity(pid_t pid, struct cpumask *mask)
|
||||
goto out_unlock;
|
||||
|
||||
raw_spin_lock_irqsave(&p->pi_lock, flags);
|
||||
@ -525,7 +525,7 @@ index 8cf36b30a006..c12765ab3a3a 100644
|
||||
raw_spin_unlock_irqrestore(&p->pi_lock, flags);
|
||||
|
||||
out_unlock:
|
||||
@@ -5321,7 +5321,7 @@ int task_can_attach(struct task_struct *p,
|
||||
@@ -5306,7 +5306,7 @@ int task_can_attach(struct task_struct *p,
|
||||
* allowed nodes is unnecessary. Thus, cpusets are not
|
||||
* applicable for such threads. This prevents checking for
|
||||
* success of set_cpus_allowed_ptr() on all attached tasks
|
||||
@ -534,7 +534,7 @@ index 8cf36b30a006..c12765ab3a3a 100644
|
||||
*/
|
||||
if (p->flags & PF_NO_SETAFFINITY) {
|
||||
ret = -EINVAL;
|
||||
@@ -5348,7 +5348,7 @@ int migrate_task_to(struct task_struct *p, int target_cpu)
|
||||
@@ -5333,7 +5333,7 @@ int migrate_task_to(struct task_struct *p, int target_cpu)
|
||||
if (curr_cpu == target_cpu)
|
||||
return 0;
|
||||
|
||||
@ -543,7 +543,7 @@ index 8cf36b30a006..c12765ab3a3a 100644
|
||||
return -EINVAL;
|
||||
|
||||
/* TODO: This is not properly updating schedstats */
|
||||
@@ -5485,7 +5485,7 @@ static void migrate_tasks(struct rq *dead_rq, struct rq_flags *rf)
|
||||
@@ -5470,7 +5470,7 @@ static void migrate_tasks(struct rq *dead_rq, struct rq_flags *rf)
|
||||
put_prev_task(rq, next);
|
||||
|
||||
/*
|
||||
@ -591,7 +591,7 @@ index 2511aba36b89..7b9bc1de0e6c 100644
|
||||
/*
|
||||
* We have to ensure that we have at least one bit
|
||||
diff --git a/kernel/sched/deadline.c b/kernel/sched/deadline.c
|
||||
index 4ae5c1ea90e2..72a396253dc0 100644
|
||||
index 501f17c642ab..a55cb8ce395d 100644
|
||||
--- a/kernel/sched/deadline.c
|
||||
+++ b/kernel/sched/deadline.c
|
||||
@@ -504,7 +504,7 @@ static struct rq *dl_task_offline_migration(struct rq *rq, struct task_struct *p
|
||||
@ -751,10 +751,10 @@ index 5c09ddf8c832..d1916d33f7ff 100644
|
||||
flags);
|
||||
env.flags |= LBF_ALL_PINNED;
|
||||
diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c
|
||||
index 470a0c9e93de..a892c5e0ed41 100644
|
||||
index bba2217652ff..590c6eea6974 100644
|
||||
--- a/kernel/sched/rt.c
|
||||
+++ b/kernel/sched/rt.c
|
||||
@@ -1592,7 +1592,7 @@ static void put_prev_task_rt(struct rq *rq, struct task_struct *p)
|
||||
@@ -1594,7 +1594,7 @@ static void put_prev_task_rt(struct rq *rq, struct task_struct *p)
|
||||
static int pick_rt_task(struct rq *rq, struct task_struct *p, int cpu)
|
||||
{
|
||||
if (!task_running(rq, p) &&
|
||||
@ -763,7 +763,7 @@ index 470a0c9e93de..a892c5e0ed41 100644
|
||||
return 1;
|
||||
return 0;
|
||||
}
|
||||
@@ -1727,7 +1727,7 @@ static struct rq *find_lock_lowest_rq(struct task_struct *task, struct rq *rq)
|
||||
@@ -1729,7 +1729,7 @@ static struct rq *find_lock_lowest_rq(struct task_struct *task, struct rq *rq)
|
||||
* Also make sure that it wasn't scheduled on its rq.
|
||||
*/
|
||||
if (unlikely(task_rq(task) != rq ||
|
||||
@ -812,5 +812,5 @@ index 5522692100ba..8b4be8e1802a 100644
|
||||
trace_foo_with_template_simple("HELLO", cnt);
|
||||
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From 3afe2037283d5bff1b403d802e93ab44e8ec9d4b Mon Sep 17 00:00:00 2001
|
||||
From a667e33b49a6dbdb90ed035b84bd1fdbee4456be Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
||||
Date: Sat, 27 May 2017 19:02:06 +0200
|
||||
Subject: [PATCH 071/414] kernel/sched/core: add migrate_disable()
|
||||
Subject: [PATCH 071/418] kernel/sched/core: add migrate_disable()
|
||||
|
||||
---
|
||||
include/linux/preempt.h | 23 +++++++
|
||||
@ -53,10 +53,10 @@ index 5bd3f151da78..81c69aeab662 100644
|
||||
|
||||
#ifdef MODULE
|
||||
diff --git a/include/linux/sched.h b/include/linux/sched.h
|
||||
index 5bd2ab2df9d4..0ab4cec5c7ec 100644
|
||||
index 64d8d0794689..c22e7b475dd9 100644
|
||||
--- a/include/linux/sched.h
|
||||
+++ b/include/linux/sched.h
|
||||
@@ -580,6 +580,13 @@ struct task_struct {
|
||||
@@ -620,6 +620,13 @@ struct task_struct {
|
||||
int nr_cpus_allowed;
|
||||
const cpumask_t *cpus_ptr;
|
||||
cpumask_t cpus_mask;
|
||||
@ -85,7 +85,7 @@ index 9fb239e12b82..5801e516ba63 100644
|
||||
* Callback to arch code if there's nosmp or maxcpus=0 on the
|
||||
* boot command line:
|
||||
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
|
||||
index c12765ab3a3a..1d8f359903c2 100644
|
||||
index 5909b525f668..1fffb66e599a 100644
|
||||
--- a/kernel/sched/core.c
|
||||
+++ b/kernel/sched/core.c
|
||||
@@ -1023,7 +1023,15 @@ void set_cpus_allowed_common(struct task_struct *p, const struct cpumask *new_ma
|
||||
@ -144,7 +144,7 @@ index c12765ab3a3a..1d8f359903c2 100644
|
||||
dest_cpu = cpumask_any_and(cpu_valid_mask, new_mask);
|
||||
if (task_running(rq, p) || p->state == TASK_WAKING) {
|
||||
struct migration_arg arg = { p, dest_cpu };
|
||||
@@ -6760,3 +6789,100 @@ const u32 sched_prio_to_wmult[40] = {
|
||||
@@ -6745,3 +6774,100 @@ const u32 sched_prio_to_wmult[40] = {
|
||||
/* 10 */ 39045157, 49367440, 61356676, 76695844, 95443717,
|
||||
/* 15 */ 119304647, 148102320, 186737708, 238609294, 286331153,
|
||||
};
|
||||
@ -261,5 +261,5 @@ index 2f93e4a2d9f6..3108da1ee253 100644
|
||||
#undef PN
|
||||
#undef __PN
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From 97df7f1c21cc0f118f328d37baaa815a7598f71f Mon Sep 17 00:00:00 2001
|
||||
From 302178ccea60a034d07f9cd06b0125e0b7593eef Mon Sep 17 00:00:00 2001
|
||||
From: "Steven Rostedt (VMware)" <rostedt@goodmis.org>
|
||||
Date: Thu, 21 Sep 2017 16:22:49 -0400
|
||||
Subject: [PATCH 072/414] tracing: Reverse the order of trace_types_lock and
|
||||
Subject: [PATCH 072/418] tracing: Reverse the order of trace_types_lock and
|
||||
event_mutex
|
||||
|
||||
In order to make future changes where we need to call
|
||||
@ -22,7 +22,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
||||
2 files changed, 20 insertions(+), 16 deletions(-)
|
||||
|
||||
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
|
||||
index 76bcc80b893e..2d74c9054e94 100644
|
||||
index 520ecaf61dc4..4bf8880fe702 100644
|
||||
--- a/kernel/trace/trace.c
|
||||
+++ b/kernel/trace/trace.c
|
||||
@@ -7671,6 +7671,7 @@ static int instance_mkdir(const char *name)
|
||||
@ -195,5 +195,5 @@ index d53268a4e167..1b87157edbff 100644
|
||||
}
|
||||
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From d8eb45e589f7d743c84f977b513a6cbd68c5ea8c Mon Sep 17 00:00:00 2001
|
||||
From 96c040ce706162c43b425440eda48cef9bdebd06 Mon Sep 17 00:00:00 2001
|
||||
From: "Steven Rostedt (VMware)" <rostedt@goodmis.org>
|
||||
Date: Fri, 22 Sep 2017 16:59:02 -0400
|
||||
Subject: [PATCH 073/414] ring-buffer: Rewrite trace_recursive_(un)lock() to be
|
||||
Subject: [PATCH 073/418] ring-buffer: Rewrite trace_recursive_(un)lock() to be
|
||||
simpler
|
||||
|
||||
The current method to prevent the ring buffer from entering into a recursize
|
||||
@ -119,5 +119,5 @@ index 36f018b15392..29bad749560a 100644
|
||||
|
||||
/**
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From 0260035447656440e07552084b049f2557771aba Mon Sep 17 00:00:00 2001
|
||||
From dbc516c436397e139294abec327a70aa52704927 Mon Sep 17 00:00:00 2001
|
||||
From: Tom Zanussi <tom.zanussi@linux.intel.com>
|
||||
Date: Fri, 22 Sep 2017 14:58:18 -0500
|
||||
Subject: [PATCH 074/414] tracing: Remove lookups from tracing_map hitcount
|
||||
Subject: [PATCH 074/418] tracing: Remove lookups from tracing_map hitcount
|
||||
|
||||
Lookups inflate the hitcount, making it essentially useless. Only
|
||||
inserts and updates should really affect the hitcount anyway, so
|
||||
@ -32,5 +32,5 @@ index 305039b122fa..07e75344725b 100644
|
||||
}
|
||||
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From d82878711f489e0ab7256c0bccaed2516cc316ba Mon Sep 17 00:00:00 2001
|
||||
From 90f5524788c6192f4982a18f5fd6eefaf717558d Mon Sep 17 00:00:00 2001
|
||||
From: Tom Zanussi <tom.zanussi@linux.intel.com>
|
||||
Date: Fri, 22 Sep 2017 14:58:19 -0500
|
||||
Subject: [PATCH 075/414] tracing: Increase tracing map KEYS_MAX size
|
||||
Subject: [PATCH 075/418] tracing: Increase tracing map KEYS_MAX size
|
||||
|
||||
The current default for the number of subkeys in a compound key is 2,
|
||||
which is too restrictive. Increase it to a more realistic value of 3.
|
||||
@ -30,5 +30,5 @@ index ab0ca77331d0..5b5bbf8ae550 100644
|
||||
#define TRACING_MAP_FIELDS_MAX (TRACING_MAP_KEYS_MAX + \
|
||||
TRACING_MAP_VALS_MAX)
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From 180c8a6d2132ea7101c5209321f5afff44db523a Mon Sep 17 00:00:00 2001
|
||||
From 22812092d861a7d031fbc0ff6e5ce2cf26a86605 Mon Sep 17 00:00:00 2001
|
||||
From: Tom Zanussi <tom.zanussi@linux.intel.com>
|
||||
Date: Fri, 22 Sep 2017 14:58:20 -0500
|
||||
Subject: [PATCH 076/414] tracing: Make traceprobe parsing code reusable
|
||||
Subject: [PATCH 076/418] tracing: Make traceprobe parsing code reusable
|
||||
|
||||
traceprobe_probes_write() and traceprobe_command() actually contain
|
||||
nothing that ties them to kprobes - the code is generically useful for
|
||||
@ -28,7 +28,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
||||
6 files changed, 103 insertions(+), 103 deletions(-)
|
||||
|
||||
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
|
||||
index 2d74c9054e94..2ce9e0eee9ec 100644
|
||||
index 4bf8880fe702..f76dd9df0c77 100644
|
||||
--- a/kernel/trace/trace.c
|
||||
+++ b/kernel/trace/trace.c
|
||||
@@ -8265,6 +8265,92 @@ void ftrace_dump(enum ftrace_dump_mode oops_dump_mode)
|
||||
@ -125,7 +125,7 @@ index 2d74c9054e94..2ce9e0eee9ec 100644
|
||||
{
|
||||
int ring_buf_size;
|
||||
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
|
||||
index 401b0639116f..418facf3389c 100644
|
||||
index 851cd1605085..221591636530 100644
|
||||
--- a/kernel/trace/trace.h
|
||||
+++ b/kernel/trace/trace.h
|
||||
@@ -1755,6 +1755,13 @@ void trace_printk_start_comm(void);
|
||||
@ -320,10 +320,10 @@ index dc39472ca9e4..a0d750e3d17c 100644
|
||||
static nokprobe_inline int
|
||||
__get_data_size(struct trace_probe *tp, struct pt_regs *regs)
|
||||
diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c
|
||||
index 14d3af6a2953..f89a12a1c8f3 100644
|
||||
index 7197ff9f0bbd..2db5a19833ed 100644
|
||||
--- a/kernel/trace/trace_uprobe.c
|
||||
+++ b/kernel/trace/trace_uprobe.c
|
||||
@@ -645,7 +645,7 @@ static int probes_open(struct inode *inode, struct file *file)
|
||||
@@ -647,7 +647,7 @@ static int probes_open(struct inode *inode, struct file *file)
|
||||
static ssize_t probes_write(struct file *file, const char __user *buffer,
|
||||
size_t count, loff_t *ppos)
|
||||
{
|
||||
@ -333,5 +333,5 @@ index 14d3af6a2953..f89a12a1c8f3 100644
|
||||
|
||||
static const struct file_operations uprobe_events_ops = {
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From 8ec6c38a5590b63fe522ad4143d1ffb5f5166a5c Mon Sep 17 00:00:00 2001
|
||||
From 70a6e0e8d8281767cbb5cce28381ff4fd7f4a990 Mon Sep 17 00:00:00 2001
|
||||
From: Tom Zanussi <tom.zanussi@linux.intel.com>
|
||||
Date: Fri, 22 Sep 2017 14:58:21 -0500
|
||||
Subject: [PATCH 077/414] tracing: Clean up hist_field_flags enum
|
||||
Subject: [PATCH 077/418] tracing: Clean up hist_field_flags enum
|
||||
|
||||
As we add more flags, specifying explicit integers for the flag values
|
||||
becomes more unwieldy and error-prone - switch them over to left-shift
|
||||
@ -49,5 +49,5 @@ index 7eb975a2d0e1..4f6b6406d6ec 100644
|
||||
|
||||
struct hist_trigger_attrs {
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From a1c53738433410a2c14cb1f3678441c54d1db478 Mon Sep 17 00:00:00 2001
|
||||
From 05a79715ee35f8e4df5533fddc771a9aa63c7729 Mon Sep 17 00:00:00 2001
|
||||
From: Tom Zanussi <tom.zanussi@linux.intel.com>
|
||||
Date: Fri, 22 Sep 2017 14:58:22 -0500
|
||||
Subject: [PATCH 078/414] tracing: Add hist_field_name() accessor
|
||||
Subject: [PATCH 078/418] tracing: Add hist_field_name() accessor
|
||||
|
||||
In preparation for hist_fields that won't be strictly based on
|
||||
trace_event_fields, add a new hist_field_name() accessor to allow that
|
||||
@ -180,5 +180,5 @@ index 4f6b6406d6ec..4dc39e3efb21 100644
|
||||
const char *flags_str = get_hist_field_flags(hist_field);
|
||||
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From 6e1dac2b7eea67d875f3028d91bb163aff840e2a Mon Sep 17 00:00:00 2001
|
||||
From 01db72914258d658c65914107bb55f07cce90257 Mon Sep 17 00:00:00 2001
|
||||
From: Tom Zanussi <tom.zanussi@linux.intel.com>
|
||||
Date: Fri, 22 Sep 2017 14:58:23 -0500
|
||||
Subject: [PATCH 079/414] tracing: Reimplement log2
|
||||
Subject: [PATCH 079/418] tracing: Reimplement log2
|
||||
|
||||
log2 as currently implemented applies only to u64 trace_event_field
|
||||
derived fields, and assumes that anything it's applied to is a u64
|
||||
@ -120,5 +120,5 @@ index 4dc39e3efb21..4eddc1933079 100644
|
||||
}
|
||||
}
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From 35e9c475fc07eda583d1727c5b2c85d105fd3823 Mon Sep 17 00:00:00 2001
|
||||
From 2c0d4e4c1cdefd51e1e4d7f7897a6547116ea328 Mon Sep 17 00:00:00 2001
|
||||
From: Tom Zanussi <tom.zanussi@linux.intel.com>
|
||||
Date: Mon, 15 Jan 2018 20:51:35 -0600
|
||||
Subject: [PATCH 080/414] tracing: Move hist trigger Documentation to
|
||||
Subject: [PATCH 080/418] tracing: Move hist trigger Documentation to
|
||||
histogram.txt
|
||||
|
||||
The hist trigger Documentation takes up a large part of events.txt -
|
||||
@ -3150,5 +3150,5 @@ index 000000000000..b2145f44b190
|
||||
+ Entries: 7
|
||||
+ Dropped: 0
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From e262dcbfd00fe5c2f193d4.16.10d69cf5ca9abac Mon Sep 17 00:00:00 2001
|
||||
From 8e1ab3990c05e88fd17bcf0bdd474428f3dce918 Mon Sep 17 00:00:00 2001
|
||||
From: Tom Zanussi <tom.zanussi@linux.intel.com>
|
||||
Date: Mon, 15 Jan 2018 20:51:36 -0600
|
||||
Subject: [PATCH 081/414] tracing: Add Documentation for log2 modifier
|
||||
Subject: [PATCH 081/418] tracing: Add Documentation for log2 modifier
|
||||
|
||||
Add a line for the log2 modifier, to keep it aligned with
|
||||
tracing/README.
|
||||
@ -29,5 +29,5 @@ index b2145f44b190..a4143f04a097 100644
|
||||
Note that in general the semantics of a given field aren't
|
||||
interpreted when applying a modifier to it, but there are some
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From e3eb9cd483d81edaa250fa7395cdd415b606e8c7 Mon Sep 17 00:00:00 2001
|
||||
From b049db6b373697ec94a0762fc49c4b153fedb85c Mon Sep 17 00:00:00 2001
|
||||
From: Vedang Patel <vedang.patel@intel.com>
|
||||
Date: Mon, 15 Jan 2018 20:51:37 -0600
|
||||
Subject: [PATCH 082/414] tracing: Add support to detect and avoid duplicates
|
||||
Subject: [PATCH 082/418] tracing: Add support to detect and avoid duplicates
|
||||
|
||||
A duplicate in the tracing_map hash table is when 2 different entries
|
||||
have the same key and, as a result, the key_hash. This is possible due
|
||||
@ -120,5 +120,5 @@ index 07e75344725b..b30f3439f27f 100644
|
||||
}
|
||||
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From 0b1125ff0b3c07711cd1c2124e77278c8a9b2f58 Mon Sep 17 00:00:00 2001
|
||||
From 0fd3610c03bd5395eabca6794b0197d54cbb1b83 Mon Sep 17 00:00:00 2001
|
||||
From: Vedang Patel <vedang.patel@intel.com>
|
||||
Date: Mon, 15 Jan 2018 20:51:38 -0600
|
||||
Subject: [PATCH 083/414] tracing: Remove code which merges duplicates
|
||||
Subject: [PATCH 083/418] tracing: Remove code which merges duplicates
|
||||
|
||||
We now have the logic to detect and remove duplicates in the
|
||||
tracing_map hash table. The code which merges duplicates in the
|
||||
@ -198,5 +198,5 @@ index 5b5bbf8ae550..de57887c0670 100644
|
||||
void (*elt_clear)(struct tracing_map_elt *elt);
|
||||
void (*elt_init)(struct tracing_map_elt *elt);
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From 11ff5d3b6ba01f2c71565819d070cade4f827cb8 Mon Sep 17 00:00:00 2001
|
||||
From 749ae55d84a1c7dc284b0401bca3036a7ca380af Mon Sep 17 00:00:00 2001
|
||||
From: Tom Zanussi <tom.zanussi@linux.intel.com>
|
||||
Date: Mon, 15 Jan 2018 20:51:39 -0600
|
||||
Subject: [PATCH 084/414] ring-buffer: Add interface for setting absolute time
|
||||
Subject: [PATCH 084/418] ring-buffer: Add interface for setting absolute time
|
||||
stamps
|
||||
|
||||
Define a new function, tracing_set_time_stamp_abs(), which can be used
|
||||
@ -68,7 +68,7 @@ index 29bad749560a..2be361b63c7b 100644
|
||||
|
||||
static inline unsigned long rb_page_entries(struct buffer_page *bpage)
|
||||
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
|
||||
index 2ce9e0eee9ec..97cdcfe88596 100644
|
||||
index f76dd9df0c77..9102a63de0b6 100644
|
||||
--- a/kernel/trace/trace.c
|
||||
+++ b/kernel/trace/trace.c
|
||||
@@ -2269,7 +2269,7 @@ trace_event_buffer_lock_reserve(struct ring_buffer **current_rb,
|
||||
@ -119,7 +119,7 @@ index 2ce9e0eee9ec..97cdcfe88596 100644
|
||||
struct trace_iterator iter;
|
||||
void *spare;
|
||||
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
|
||||
index 418facf3389c..d02143043ac2 100644
|
||||
index 221591636530..0506c4cdfeba 100644
|
||||
--- a/kernel/trace/trace.h
|
||||
+++ b/kernel/trace/trace.h
|
||||
@@ -273,6 +273,7 @@ struct trace_array {
|
||||
@ -140,5 +140,5 @@ index 418facf3389c..d02143043ac2 100644
|
||||
* The global tracer (top) should be the first trace array added,
|
||||
* but we check the flag anyway.
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From 2aa6001fd69d29a4a37b6830f08ce08cef476397 Mon Sep 17 00:00:00 2001
|
||||
From 894bc1fe03522eff1a45b8262e4e959c76b4c3fc Mon Sep 17 00:00:00 2001
|
||||
From: Tom Zanussi <tom.zanussi@linux.intel.com>
|
||||
Date: Mon, 15 Jan 2018 20:51:40 -0600
|
||||
Subject: [PATCH 085/414] ring-buffer: Redefine the unimplemented
|
||||
Subject: [PATCH 085/418] ring-buffer: Redefine the unimplemented
|
||||
RINGBUF_TYPE_TIME_STAMP
|
||||
|
||||
RINGBUF_TYPE_TIME_STAMP is defined but not used, and from what I can
|
||||
@ -326,5 +326,5 @@ index 2be361b63c7b..e48989ff0427 100644
|
||||
ring_buffer_normalize_time_stamp(buffer,
|
||||
cpu_buffer->cpu, ts);
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From b5895d8584d43c5118e2f0bdc9e06457c0f08132 Mon Sep 17 00:00:00 2001
|
||||
From 01962ea941a67756a5193d333d90872abe579ca8 Mon Sep 17 00:00:00 2001
|
||||
From: Tom Zanussi <tom.zanussi@linux.intel.com>
|
||||
Date: Mon, 15 Jan 2018 20:51:41 -0600
|
||||
Subject: [PATCH 086/414] tracing: Add timestamp_mode trace file
|
||||
Subject: [PATCH 086/418] tracing: Add timestamp_mode trace file
|
||||
|
||||
Add a new option flag indicating whether or not the ring buffer is in
|
||||
'absolute timestamp' mode.
|
||||
@ -62,7 +62,7 @@ index d4601df6e72e..54213e5c23f6 100644
|
||||
|
||||
Directory for the Hardware Latency Detector.
|
||||
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
|
||||
index 97cdcfe88596..1c2e0296e713 100644
|
||||
index 9102a63de0b6..96f0b9ac910d 100644
|
||||
--- a/kernel/trace/trace.c
|
||||
+++ b/kernel/trace/trace.c
|
||||
@@ -4520,6 +4520,9 @@ static const char readme_msg[] =
|
||||
@ -141,5 +141,5 @@ index 97cdcfe88596..1c2e0296e713 100644
|
||||
|
||||
#if defined(CONFIG_TRACER_MAX_TRACE) || defined(CONFIG_HWLAT_TRACER)
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From 3fd9b06808eb8a4788adefc36600615d4303977f Mon Sep 17 00:00:00 2001
|
||||
From 8c050da361b56aedad4fc65903e6637eef917800 Mon Sep 17 00:00:00 2001
|
||||
From: Tom Zanussi <tom.zanussi@linux.intel.com>
|
||||
Date: Mon, 15 Jan 2018 20:51:42 -0600
|
||||
Subject: [PATCH 087/414] tracing: Give event triggers access to
|
||||
Subject: [PATCH 087/418] tracing: Give event triggers access to
|
||||
ring_buffer_event
|
||||
|
||||
The ring_buffer event can provide a timestamp that may be useful to
|
||||
@ -53,7 +53,7 @@ index 2bcb4dc6df1a..aefc80f2909b 100644
|
||||
return true;
|
||||
if (eflags & EVENT_FILE_FL_PID_FILTER)
|
||||
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
|
||||
index d02143043ac2..b123c626b159 100644
|
||||
index 0506c4cdfeba..e2e12710d53c 100644
|
||||
--- a/kernel/trace/trace.h
|
||||
+++ b/kernel/trace/trace.h
|
||||
@@ -1296,7 +1296,7 @@ __event_trigger_test_discard(struct trace_event_file *file,
|
||||
@ -137,7 +137,7 @@ index c57e5369b0c2..77079c79b6d4 100644
|
||||
|
||||
static struct event_trigger_ops hist_enable_trigger_ops = {
|
||||
diff --git a/kernel/trace/trace_events_trigger.c b/kernel/trace/trace_events_trigger.c
|
||||
index f2ac9d44f6c4..9b0fe3198932 100644
|
||||
index b413fab7d75b..9dd8b9ce2594 100644
|
||||
--- a/kernel/trace/trace_events_trigger.c
|
||||
+++ b/kernel/trace/trace_events_trigger.c
|
||||
@@ -63,7 +63,8 @@ void trigger_data_free(struct event_trigger_data *data)
|
||||
@ -186,7 +186,7 @@ index f2ac9d44f6c4..9b0fe3198932 100644
|
||||
}
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(event_triggers_post_call);
|
||||
@@ -909,7 +910,8 @@ void set_named_trigger_data(struct event_trigger_data *data,
|
||||
@@ -911,7 +912,8 @@ void set_named_trigger_data(struct event_trigger_data *data,
|
||||
}
|
||||
|
||||
static void
|
||||
@ -196,7 +196,7 @@ index f2ac9d44f6c4..9b0fe3198932 100644
|
||||
{
|
||||
if (tracing_is_on())
|
||||
return;
|
||||
@@ -918,7 +920,8 @@ traceon_trigger(struct event_trigger_data *data, void *rec)
|
||||
@@ -920,7 +922,8 @@ traceon_trigger(struct event_trigger_data *data, void *rec)
|
||||
}
|
||||
|
||||
static void
|
||||
@ -206,7 +206,7 @@ index f2ac9d44f6c4..9b0fe3198932 100644
|
||||
{
|
||||
if (tracing_is_on())
|
||||
return;
|
||||
@@ -933,7 +936,8 @@ traceon_count_trigger(struct event_trigger_data *data, void *rec)
|
||||
@@ -935,7 +938,8 @@ traceon_count_trigger(struct event_trigger_data *data, void *rec)
|
||||
}
|
||||
|
||||
static void
|
||||
@ -216,7 +216,7 @@ index f2ac9d44f6c4..9b0fe3198932 100644
|
||||
{
|
||||
if (!tracing_is_on())
|
||||
return;
|
||||
@@ -942,7 +946,8 @@ traceoff_trigger(struct event_trigger_data *data, void *rec)
|
||||
@@ -944,7 +948,8 @@ traceoff_trigger(struct event_trigger_data *data, void *rec)
|
||||
}
|
||||
|
||||
static void
|
||||
@ -226,7 +226,7 @@ index f2ac9d44f6c4..9b0fe3198932 100644
|
||||
{
|
||||
if (!tracing_is_on())
|
||||
return;
|
||||
@@ -1039,13 +1044,15 @@ static struct event_command trigger_traceoff_cmd = {
|
||||
@@ -1041,7 +1046,8 @@ static struct event_command trigger_traceoff_cmd = {
|
||||
|
||||
#ifdef CONFIG_TRACER_SNAPSHOT
|
||||
static void
|
||||
@ -234,7 +234,9 @@ index f2ac9d44f6c4..9b0fe3198932 100644
|
||||
+snapshot_trigger(struct event_trigger_data *data, void *rec,
|
||||
+ struct ring_buffer_event *event)
|
||||
{
|
||||
tracing_snapshot();
|
||||
struct trace_event_file *file = data->private_data;
|
||||
|
||||
@@ -1052,7 +1058,8 @@ snapshot_trigger(struct event_trigger_data *data, void *rec)
|
||||
}
|
||||
|
||||
static void
|
||||
@ -244,7 +246,7 @@ index f2ac9d44f6c4..9b0fe3198932 100644
|
||||
{
|
||||
if (!data->count)
|
||||
return;
|
||||
@@ -1053,7 +1060,7 @@ snapshot_count_trigger(struct event_trigger_data *data, void *rec)
|
||||
@@ -1060,7 +1067,7 @@ snapshot_count_trigger(struct event_trigger_data *data, void *rec)
|
||||
if (data->count != -1)
|
||||
(data->count)--;
|
||||
|
||||
@ -253,7 +255,7 @@ index f2ac9d44f6c4..9b0fe3198932 100644
|
||||
}
|
||||
|
||||
static int
|
||||
@@ -1132,13 +1139,15 @@ static __init int register_trigger_snapshot_cmd(void) { return 0; }
|
||||
@@ -1139,13 +1146,15 @@ static __init int register_trigger_snapshot_cmd(void) { return 0; }
|
||||
#define STACK_SKIP 3
|
||||
|
||||
static void
|
||||
@ -271,7 +273,7 @@ index f2ac9d44f6c4..9b0fe3198932 100644
|
||||
{
|
||||
if (!data->count)
|
||||
return;
|
||||
@@ -1146,7 +1155,7 @@ stacktrace_count_trigger(struct event_trigger_data *data, void *rec)
|
||||
@@ -1153,7 +1162,7 @@ stacktrace_count_trigger(struct event_trigger_data *data, void *rec)
|
||||
if (data->count != -1)
|
||||
(data->count)--;
|
||||
|
||||
@ -280,7 +282,7 @@ index f2ac9d44f6c4..9b0fe3198932 100644
|
||||
}
|
||||
|
||||
static int
|
||||
@@ -1208,7 +1217,8 @@ static __init void unregister_trigger_traceon_traceoff_cmds(void)
|
||||
@@ -1215,7 +1224,8 @@ static __init void unregister_trigger_traceon_traceoff_cmds(void)
|
||||
}
|
||||
|
||||
static void
|
||||
@ -290,7 +292,7 @@ index f2ac9d44f6c4..9b0fe3198932 100644
|
||||
{
|
||||
struct enable_trigger_data *enable_data = data->private_data;
|
||||
|
||||
@@ -1219,7 +1229,8 @@ event_enable_trigger(struct event_trigger_data *data, void *rec)
|
||||
@@ -1226,7 +1236,8 @@ event_enable_trigger(struct event_trigger_data *data, void *rec)
|
||||
}
|
||||
|
||||
static void
|
||||
@ -300,7 +302,7 @@ index f2ac9d44f6c4..9b0fe3198932 100644
|
||||
{
|
||||
struct enable_trigger_data *enable_data = data->private_data;
|
||||
|
||||
@@ -1233,7 +1244,7 @@ event_enable_count_trigger(struct event_trigger_data *data, void *rec)
|
||||
@@ -1240,7 +1251,7 @@ event_enable_count_trigger(struct event_trigger_data *data, void *rec)
|
||||
if (data->count != -1)
|
||||
(data->count)--;
|
||||
|
||||
@ -310,5 +312,5 @@ index f2ac9d44f6c4..9b0fe3198932 100644
|
||||
|
||||
int event_enable_trigger_print(struct seq_file *m,
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From fc4a1cc917f4909f034c823cfb2e828a1559c12e Mon Sep 17 00:00:00 2001
|
||||
From a1ff7598f798bf9a0cd383388b1f6fc59158499e Mon Sep 17 00:00:00 2001
|
||||
From: Tom Zanussi <tom.zanussi@linux.intel.com>
|
||||
Date: Mon, 15 Jan 2018 20:51:43 -0600
|
||||
Subject: [PATCH 088/414] tracing: Add ring buffer event param to hist field
|
||||
Subject: [PATCH 088/418] tracing: Add ring buffer event param to hist field
|
||||
functions
|
||||
|
||||
Some events such as timestamps require access to a ring_buffer_event
|
||||
@ -145,5 +145,5 @@ index 77079c79b6d4..9126be52ff4d 100644
|
||||
|
||||
static void hist_trigger_stacktrace_print(struct seq_file *m,
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From c8cc6e5e6baa1414f1227d1fe4affc3fa3842956 Mon Sep 17 00:00:00 2001
|
||||
From b441bdabcb62630b995577ffb882a330e1230081 Mon Sep 17 00:00:00 2001
|
||||
From: Tom Zanussi <tom.zanussi@linux.intel.com>
|
||||
Date: Mon, 15 Jan 2018 20:51:44 -0600
|
||||
Subject: [PATCH 089/414] tracing: Break out hist trigger assignment parsing
|
||||
Subject: [PATCH 089/418] tracing: Break out hist trigger assignment parsing
|
||||
|
||||
This will make it easier to add variables, and makes the parsing code
|
||||
cleaner regardless.
|
||||
@ -114,5 +114,5 @@ index 9126be52ff4d..4935290fd1e8 100644
|
||||
goto free;
|
||||
}
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From 925384a56703b5e682209c577065141be3d02727 Mon Sep 17 00:00:00 2001
|
||||
From 2bace2378c6fac1967958883ec49397c777fd52d Mon Sep 17 00:00:00 2001
|
||||
From: Tom Zanussi <tom.zanussi@linux.intel.com>
|
||||
Date: Mon, 15 Jan 2018 20:51:45 -0600
|
||||
Subject: [PATCH 090/414] tracing: Add hist trigger timestamp support
|
||||
Subject: [PATCH 090/418] tracing: Add hist trigger timestamp support
|
||||
|
||||
Add support for a timestamp event field. This is actually a 'pseudo-'
|
||||
event field in that it behaves like it's part of the event record, but
|
||||
@ -248,5 +248,5 @@ index 4935290fd1e8..cd80bca34cec 100644
|
||||
test->ops->free(test->ops, test);
|
||||
}
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From f8c4644971e9b33a73439cc4a2c1fd8a3883e608 Mon Sep 17 00:00:00 2001
|
||||
From 757a116d1821b4e7205fa89aa8952cf2a5145448 Mon Sep 17 00:00:00 2001
|
||||
From: Tom Zanussi <tom.zanussi@linux.intel.com>
|
||||
Date: Mon, 15 Jan 2018 20:51:46 -0600
|
||||
Subject: [PATCH 091/414] tracing: Add per-element variable support to
|
||||
Subject: [PATCH 091/418] tracing: Add per-element variable support to
|
||||
tracing_map
|
||||
|
||||
In order to allow information to be passed between trace events, add
|
||||
@ -228,5 +228,5 @@ index de57887c0670..053eb92b2d31 100644
|
||||
unsigned int i,
|
||||
unsigned int key_offset,
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From 1d45a475f024995a68ce32590ac7f2e2c16f7b8f Mon Sep 17 00:00:00 2001
|
||||
From 13ddac3670783cf9d59da3b1a6fefe4d4c98ad86 Mon Sep 17 00:00:00 2001
|
||||
From: Tom Zanussi <tom.zanussi@linux.intel.com>
|
||||
Date: Mon, 15 Jan 2018 20:51:47 -0600
|
||||
Subject: [PATCH 092/414] tracing: Add hist_data member to hist_field
|
||||
Subject: [PATCH 092/418] tracing: Add hist_data member to hist_field
|
||||
|
||||
Allow hist_data access via hist_field. Some users of hist_fields
|
||||
require or will require more access to the associated hist_data.
|
||||
@ -84,5 +84,5 @@ index cd80bca34cec..ec58902145e9 100644
|
||||
ret = -ENOMEM;
|
||||
goto out;
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From 8c493fb158d587e3fbdcb572f5f44709c04b4080 Mon Sep 17 00:00:00 2001
|
||||
From 824b2e6a8b7ad3d12bafbd08c4607e42a6b7e746 Mon Sep 17 00:00:00 2001
|
||||
From: Tom Zanussi <tom.zanussi@linux.intel.com>
|
||||
Date: Mon, 15 Jan 2018 20:51:48 -0600
|
||||
Subject: [PATCH 093/414] tracing: Add usecs modifier for hist trigger
|
||||
Subject: [PATCH 093/418] tracing: Add usecs modifier for hist trigger
|
||||
timestamps
|
||||
|
||||
Appending .usecs onto a common_timestamp field will cause the
|
||||
@ -41,7 +41,7 @@ index a4143f04a097..25c94730d3fe 100644
|
||||
Note that in general the semantics of a given field aren't
|
||||
interpreted when applying a modifier to it, but there are some
|
||||
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
|
||||
index 1c2e0296e713..6aef03230842 100644
|
||||
index 96f0b9ac910d..9d199ebdc0cb 100644
|
||||
--- a/kernel/trace/trace.c
|
||||
+++ b/kernel/trace/trace.c
|
||||
@@ -1170,6 +1170,14 @@ static struct {
|
||||
@ -72,7 +72,7 @@ index 1c2e0296e713..6aef03230842 100644
|
||||
"\t trigger or to start a hist trigger but not log any events\n"
|
||||
"\t until told to do so. 'continue' can be used to start or\n"
|
||||
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
|
||||
index b123c626b159..64ba9e1d4c38 100644
|
||||
index e2e12710d53c..92936a6fc29e 100644
|
||||
--- a/kernel/trace/trace.h
|
||||
+++ b/kernel/trace/trace.h
|
||||
@@ -289,6 +289,8 @@ extern void trace_array_put(struct trace_array *tr);
|
||||
@ -166,5 +166,5 @@ index ec58902145e9..6d268e25d051 100644
|
||||
return flags_str;
|
||||
}
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From d2e809dd6c585dc55b2effa0907b64d9746c5f2c Mon Sep 17 00:00:00 2001
|
||||
From c036038343bf211c28892bdd819624ac83c90135 Mon Sep 17 00:00:00 2001
|
||||
From: Tom Zanussi <tom.zanussi@linux.intel.com>
|
||||
Date: Mon, 15 Jan 2018 20:51:49 -0600
|
||||
Subject: [PATCH 094/414] tracing: Add variable support to hist triggers
|
||||
Subject: [PATCH 094/418] tracing: Add variable support to hist triggers
|
||||
|
||||
Add support for saving the value of a current event's event field by
|
||||
assigning it to a variable that can be read by a subsequent event.
|
||||
@ -784,5 +784,5 @@ index 6d268e25d051..b4301542bb4a 100644
|
||||
ret = 0;
|
||||
goto out_free;
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From 472418ca534a8ceaa363f21b5b2a2c4a9d4753cc Mon Sep 17 00:00:00 2001
|
||||
From 64310c13b5bd98fea0da2be71497bc593c51635f Mon Sep 17 00:00:00 2001
|
||||
From: Tom Zanussi <tom.zanussi@linux.intel.com>
|
||||
Date: Mon, 15 Jan 2018 20:51:50 -0600
|
||||
Subject: [PATCH 095/414] tracing: Account for variables in named trigger
|
||||
Subject: [PATCH 095/418] tracing: Account for variables in named trigger
|
||||
compatibility
|
||||
|
||||
Named triggers must also have the same set of variables in order to be
|
||||
@ -47,5 +47,5 @@ index b4301542bb4a..68ff2491edd0 100644
|
||||
|
||||
for (i = 0; i < hist_data->n_sort_keys; i++) {
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From 72482a9d923e2d7fb067be707391268171b17421 Mon Sep 17 00:00:00 2001
|
||||
From 01ad16a4b2f9769b5b9cda086b748b83390df603 Mon Sep 17 00:00:00 2001
|
||||
From: Tom Zanussi <tom.zanussi@linux.intel.com>
|
||||
Date: Mon, 15 Jan 2018 20:51:51 -0600
|
||||
Subject: [PATCH 096/414] tracing: Move get_hist_field_flags()
|
||||
Subject: [PATCH 096/418] tracing: Move get_hist_field_flags()
|
||||
|
||||
Move get_hist_field_flags() to make it more easily accessible for new
|
||||
code (and keep the move separate from new functionality).
|
||||
@ -79,5 +79,5 @@ index 68ff2491edd0..c6c24d6d2be8 100644
|
||||
{
|
||||
const char *field_name = hist_field_name(hist_field, 0);
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
@ -1,7 +1,7 @@
|
||||
From 125e31bde34445f9374487842b10f5634dc2fcca Mon Sep 17 00:00:00 2001
|
||||
From 79dc3193df67d3d2b6dd7adfe882613065da48e2 Mon Sep 17 00:00:00 2001
|
||||
From: Tom Zanussi <tom.zanussi@linux.intel.com>
|
||||
Date: Mon, 15 Jan 2018 20:51:52 -0600
|
||||
Subject: [PATCH 097/414] tracing: Add simple expression support to hist
|
||||
Subject: [PATCH 097/418] tracing: Add simple expression support to hist
|
||||
triggers
|
||||
|
||||
Add support for simple addition, subtraction, and unary expressions
|
||||
@ -630,5 +630,5 @@ index c6c24d6d2be8..d2f01f3f26e1 100644
|
||||
|
||||
if (hist_data->fields[i]->flags & HIST_FIELD_FL_HEX) {
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user