diff options
author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2014-02-04 12:35:44 -0500 |
---|---|---|
committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2014-02-04 12:35:44 -0500 |
commit | b2667fa8e558c363960625f0af2226291d55943b (patch) | |
tree | f2807cb979ca50dcaf8a29debb9e9a53eb8afc9e | |
parent | 61990abfa064105952c2b7d8f6c31b03f55baa7d (diff) | |
download | longterm-queue-2.6.34-b2667fa8e558c363960625f0af2226291d55943b.tar.gz |
drop_monitor: fix transient bisection failure due to __rcuv2.6.34.15-rc1
One of the drop monitor commits adds an __rcu, and then it is
removed in a subsequent commit. So the full series builds, but
if you are bisecting, it introduces a build failure if you land
on the wrong commit.
The sparse __rcu annotation did not exist until 2.6.37+ kernels.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
3 files changed, 10 insertions, 9 deletions
diff --git a/queue/drop_monitor-Make-updating-data-skb-smp-safe.patch b/queue/drop_monitor-Make-updating-data-skb-smp-safe.patch index 3e9fd5a..d55de7b 100644 --- a/queue/drop_monitor-Make-updating-data-skb-smp-safe.patch +++ b/queue/drop_monitor-Make-updating-data-skb-smp-safe.patch @@ -1,4 +1,4 @@ -From e0b09eaad80b6506e81d9974d6a9412bd40eb0b5 Mon Sep 17 00:00:00 2001 +From 50de6a24bbe63c4598e2cd78eb97e4ca19b131ad Mon Sep 17 00:00:00 2001 From: Neil Horman <nhorman@tuxdriver.com> Date: Fri, 27 Apr 2012 10:11:49 +0000 Subject: [PATCH] drop_monitor: Make updating data->skb smp safe @@ -16,13 +16,14 @@ Reported-by: Eric Dumazet <eric.dumazet@gmail.com> CC: David Miller <davem@davemloft.net> Acked-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net> +[PG: The "__rcu" sparse addition is only present in 2.6.37+ kernels.] Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> --- net/core/drop_monitor.c | 70 ++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 54 insertions(+), 16 deletions(-) diff --git a/net/core/drop_monitor.c b/net/core/drop_monitor.c -index e596db9fefd0..5dc913e91f3a 100644 +index e596db9fefd0..0b8aba761930 100644 --- a/net/core/drop_monitor.c +++ b/net/core/drop_monitor.c @@ -46,7 +46,7 @@ static DEFINE_MUTEX(trace_state_mutex); @@ -30,7 +31,7 @@ index e596db9fefd0..5dc913e91f3a 100644 struct per_cpu_dm_data { struct work_struct dm_alert_work; - struct sk_buff *skb; -+ struct sk_buff __rcu *skb; ++ struct sk_buff /* __rcu <-- only 2.6.37+ */ *skb; atomic_t dm_hit_count; struct timer_list send_timer; }; diff --git a/queue/drop_monitor-dont-sleep-in-atomic-context.patch b/queue/drop_monitor-dont-sleep-in-atomic-context.patch index 2b47d3d..a60db38 100644 --- a/queue/drop_monitor-dont-sleep-in-atomic-context.patch +++ b/queue/drop_monitor-dont-sleep-in-atomic-context.patch @@ -1,4 +1,4 @@ -From abb384f785bf88c8c7e71d66d55a089fba754d2b Mon Sep 17 00:00:00 2001 +From ccc31edd0d03b63bf64d188a4d899ef1f832b822 Mon Sep 17 00:00:00 2001 From: Eric Dumazet <edumazet@google.com> Date: Mon, 4 Jun 2012 00:18:19 +0000 Subject: [PATCH] drop_monitor: dont sleep in atomic context @@ -45,7 +45,7 @@ Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> 1 file changed, 33 insertions(+), 68 deletions(-) diff --git a/net/core/drop_monitor.c b/net/core/drop_monitor.c -index 6e78ea3e87f2..cd3f2b942991 100644 +index 58c57fcc67ad..cd3f2b942991 100644 --- a/net/core/drop_monitor.c +++ b/net/core/drop_monitor.c @@ -33,9 +33,6 @@ @@ -63,7 +63,7 @@ index 6e78ea3e87f2..cd3f2b942991 100644 struct per_cpu_dm_data { - struct work_struct dm_alert_work; -- struct sk_buff __rcu *skb; +- struct sk_buff /* __rcu <-- only 2.6.37+ */ *skb; - atomic_t dm_hit_count; - struct timer_list send_timer; - int cpu; diff --git a/queue/drop_monitor-prevent-init-path-from-scheduling-on-th.patch b/queue/drop_monitor-prevent-init-path-from-scheduling-on-th.patch index 6aceb35..f362634 100644 --- a/queue/drop_monitor-prevent-init-path-from-scheduling-on-th.patch +++ b/queue/drop_monitor-prevent-init-path-from-scheduling-on-th.patch @@ -1,4 +1,4 @@ -From 691be7fa9ac0506dbd144276e496a2af99d12dd6 Mon Sep 17 00:00:00 2001 +From 4015caaa1649885ce78d5c4cdb8e1517caec8422 Mon Sep 17 00:00:00 2001 From: Neil Horman <nhorman@tuxdriver.com> Date: Tue, 1 May 2012 08:18:02 +0000 Subject: [PATCH] drop_monitor: prevent init path from scheduling on the wrong @@ -32,11 +32,11 @@ Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/net/core/drop_monitor.c b/net/core/drop_monitor.c -index 5dc913e91f3a..6e78ea3e87f2 100644 +index 0b8aba761930..58c57fcc67ad 100644 --- a/net/core/drop_monitor.c +++ b/net/core/drop_monitor.c @@ -49,6 +49,7 @@ struct per_cpu_dm_data { - struct sk_buff __rcu *skb; + struct sk_buff /* __rcu <-- only 2.6.37+ */ *skb; atomic_t dm_hit_count; struct timer_list send_timer; + int cpu; |