From: Andrew Morton <akpm@osdl.org>
To: gww@btinternet.com, s.rivoir@gts.it, linux-kernel@vger.kernel.org
Subject: Re: 2.6.9-rc3-mm2
Date: Mon, 4 Oct 2004 14:39:53 -0700 [thread overview]
Message-ID: <20041004143953.10e6d764.akpm@osdl.org> (raw)
In-Reply-To: <20041004143253.50a82050.akpm@osdl.org>
Andrew Morton <akpm@osdl.org> wrote:
>
> Could you try this patch? It'll locate the bug for us.
Don't worry about this - Ingo found it.
You could try these instead:
--- 25/include/linux/netfilter_ipv4/ip_conntrack.h~conntrack-preempt-safety-fix Mon Oct 4 14:36:19 2004
+++ 25-akpm/include/linux/netfilter_ipv4/ip_conntrack.h Mon Oct 4 14:37:02 2004
@@ -311,10 +311,11 @@ struct ip_conntrack_stat
unsigned int expect_delete;
};
-#define CONNTRACK_STAT_INC(count) \
- do { \
- per_cpu(ip_conntrack_stat, get_cpu()).count++; \
- put_cpu(); \
+#define CONNTRACK_STAT_INC(count) \
+ do { \
+ preempt_disable(); \
+ per_cpu(ip_conntrack_stat, smp_processor_id()).count++; \
+ preempt_disable(); \
} while (0)
/* eg. PROVIDES_CONNTRACK(ftp); */
_
--- 25/include/net/neighbour.h~neigh_stat-preempt-fix-fix Mon Oct 4 14:39:22 2004
+++ 25-akpm/include/net/neighbour.h Mon Oct 4 14:39:22 2004
@@ -113,8 +113,9 @@ struct neigh_statistics
#define NEIGH_CACHE_STAT_INC(tbl, field) \
do { \
- (per_cpu_ptr((tbl)->stats, get_cpu())->field)++; \
- put_cpu(); \
+ preempt_disable(); \
+ (per_cpu_ptr((tbl)->stats, smp_processor_id())->field)++; \
+ preempt_enable(); \
} while (0)
struct neighbour
_
next prev parent reply other threads:[~2004-10-04 21:48 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-10-04 9:02 2.6.9-rc3-mm2 Andrew Morton
2004-10-04 10:36 ` 2.6.9-rc3-mm2 Mathieu Segaud
2004-10-04 15:39 ` 2.6.9-rc3-mm2 Norberto Bensa
[not found] ` <87k6u6mp5z.fsf@barad-dur.crans.org>
2004-10-04 16:33 ` 2.6.9-rc3-mm2 Norberto Bensa
2004-10-04 12:15 ` 2.6.9-rc3-mm2 Stephane Jourdois
2004-10-05 0:36 ` 2.6.9-rc3-mm2 Andrew Rodland
2004-10-05 17:45 ` 2.6.9-rc3-mm2 Stephane Jourdois
2004-10-04 12:46 ` 2.6.9-rc3-mm2 Stefano Rivoir
2004-10-04 19:18 ` 2.6.9-rc3-mm2 Andrew Morton
2004-10-04 21:12 ` 2.6.9-rc3-mm2 Grant Wilson
2004-10-04 21:32 ` 2.6.9-rc3-mm2 Andrew Morton
2004-10-04 21:39 ` Andrew Morton [this message]
2004-10-04 21:52 ` 2.6.9-rc3-mm2 Grant Wilson
2004-10-04 22:02 ` 2.6.9-rc3-mm2 Hua Zhong
2004-10-04 22:11 ` 2.6.9-rc3-mm2 Grant Wilson
2004-10-05 6:56 ` 2.6.9-rc3-mm2 Stefano Rivoir
2004-10-04 17:13 ` 2.6.9-rc3-mm2 Pasi Savolainen
2004-10-05 9:25 ` 2.6.9-rc3-mm2 Peter Zijlstra
2004-10-05 9:30 ` 2.6.9-rc3-mm2 Peter Zijlstra
2004-10-05 12:06 ` 2.6.9-rc3-mm2 Hugh Dickins
2004-10-05 13:28 ` 2.6.9-rc3-mm2 Peter Zijlstra
2004-10-06 10:54 ` 2.6.9-rc3-mm2 Hugh Dickins
2004-10-06 10:57 ` 2.6.9-rc3-mm2 Ingo Molnar
2004-10-07 0:53 ` 2.6.9-rc3-mm2 Pasi Savolainen
2004-10-04 17:19 ` 2.6.9-rc3-mm2 (compile stats) John Cherry
2004-10-04 19:56 ` 2.6.9-rc3-mm2 Christian Borntraeger
2004-10-04 21:39 ` 2.6.9-rc3-mm2 Dominik Karall
2004-10-04 23:41 ` 2.6.9-rc3-mm2 ip_conntrack problems Ed Tomlinson
2004-10-05 0:08 ` Andrew Morton
2004-10-05 23:13 ` Ed Tomlinson
2004-10-05 23:53 ` Andrew Morton
2004-10-05 3:12 ` 2.6.9-rc3-mm2 Andrew Rodland
2004-10-05 9:25 ` 2.6.9-rc3-mm2 Dominik Karall
2004-10-05 14:07 ` 2.6.9-rc3-mm2 Dominik Karall
2004-10-05 14:21 ` 2.6.9-rc3-mm2 Con Kolivas
2004-10-15 1:38 ` 2.6.9-rc3-mm2 Rusty Russell
2004-10-15 1:44 ` 2.6.9-rc3-mm2 Andrew Morton
2004-10-15 2:05 ` 2.6.9-rc3-mm2 Rusty Russell
2004-10-15 2:09 ` 2.6.9-rc3-mm2 Andrew Morton
2004-10-15 3:07 ` 2.6.9-rc3-mm2 Rusty Russell
2004-10-04 10:40 2.6.9-rc3-mm2 Karsten Wiese
2004-10-06 20:28 ` 2.6.9-rc3-mm2 Hanna Linder
2004-10-04 14:34 2.6.9-rc3-mm2 Karsten Wiese
2004-10-04 19:23 ` 2.6.9-rc3-mm2 Andrew Morton
2004-10-04 19:25 ` 2.6.9-rc3-mm2 Andrew Morton
2004-10-04 21:26 ` 2.6.9-rc3-mm2 Ingo Molnar
2004-10-04 21:35 ` 2.6.9-rc3-mm2 Andrew Morton
2004-10-04 21:37 ` 2.6.9-rc3-mm2 Andrew Morton
2004-10-04 21:48 ` 2.6.9-rc3-mm2 Ingo Molnar
2004-10-05 0:05 ` 2.6.9-rc3-mm2 Karsten Wiese
2004-10-05 0:17 ` 2.6.9-rc3-mm2 Andrew Morton
2004-10-07 5:55 2.6.9-rc3-mm2 Sid Boyce
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20041004143953.10e6d764.akpm@osdl.org \
--to=akpm@osdl.org \
--cc=gww@btinternet.com \
--cc=linux-kernel@vger.kernel.org \
--cc=s.rivoir@gts.it \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome