From: Lai Jiangshan <laijs@cn.fujitsu.com>
To: Ingo Molnar <mingo@elte.hu>
Cc: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>,
Christoph Lameter <cl@linux-foundation.org>,
Pekka Enberg <penberg@kernel.org>,
Eric Dumazet <eric.dumazet@gmail.com>,
"David S. Miller" <davem@davemloft.net>,
Matt Mackall <mpm@selenic.com>,
linux-mm@kvack.org, linux-kernel@vger.kernel.org,
netdev@vger.kernel.org
Subject: [PATCH 4/4] net,rcu: don't assume the size of struct rcu_head
Date: Tue, 01 Mar 2011 16:03:44 +0800 [thread overview]
Message-ID: <4D6CA860.3020409@cn.fujitsu.com> (raw)
struct dst_entry assumes the size of struct rcu_head as 2 * sizeof(long)
and manually adds pads for aligning for "__refcnt".
When the size of struct rcu_head is changed, these manual padding
is wrong. Use __attribute__((aligned (64))) instead.
Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
---
diff --git a/include/net/dst.h b/include/net/dst.h
index 93b0310..4ef6c4a 100644
--- a/include/net/dst.h
+++ b/include/net/dst.h
@@ -62,8 +62,6 @@ struct dst_entry {
struct hh_cache *hh;
#ifdef CONFIG_XFRM
struct xfrm_state *xfrm;
-#else
- void *__pad1;
#endif
int (*input)(struct sk_buff*);
int (*output)(struct sk_buff*);
@@ -74,23 +72,18 @@ struct dst_entry {
#ifdef CONFIG_NET_CLS_ROUTE
__u32 tclassid;
-#else
- __u32 __pad2;
#endif
/*
* Align __refcnt to a 64 bytes alignment
* (L1_CACHE_SIZE would be too much)
- */
-#ifdef CONFIG_64BIT
- long __pad_to_align_refcnt[1];
-#endif
- /*
+ *
* __refcnt wants to be on a different cache line from
* input/output/ops or performance tanks badly
*/
- atomic_t __refcnt; /* client references */
+ atomic_t __refcnt /* client references */
+ __attribute__((aligned (64)));
int __use;
unsigned long lastuse;
union {
WARNING: multiple messages have this Message-ID (diff)
From: Lai Jiangshan <laijs@cn.fujitsu.com>
To: Ingo Molnar <mingo@elte.hu>
Cc: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>,
Christoph Lameter <cl@linux-foundation.org>,
Pekka Enberg <penberg@kernel.org>,
Eric Dumazet <eric.dumazet@gmail.com>,
"David S. Miller" <davem@davemloft.net>,
Matt Mackall <mpm@selenic.com>,
linux-mm@kvack.org, linux-kernel@vger.kernel.org,
netdev@vger.kernel.org
Subject: [PATCH 4/4] net,rcu: don't assume the size of struct rcu_head
Date: Tue, 01 Mar 2011 16:03:44 +0800 [thread overview]
Message-ID: <4D6CA860.3020409@cn.fujitsu.com> (raw)
struct dst_entry assumes the size of struct rcu_head as 2 * sizeof(long)
and manually adds pads for aligning for "__refcnt".
When the size of struct rcu_head is changed, these manual padding
is wrong. Use __attribute__((aligned (64))) instead.
Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
---
diff --git a/include/net/dst.h b/include/net/dst.h
index 93b0310..4ef6c4a 100644
--- a/include/net/dst.h
+++ b/include/net/dst.h
@@ -62,8 +62,6 @@ struct dst_entry {
struct hh_cache *hh;
#ifdef CONFIG_XFRM
struct xfrm_state *xfrm;
-#else
- void *__pad1;
#endif
int (*input)(struct sk_buff*);
int (*output)(struct sk_buff*);
@@ -74,23 +72,18 @@ struct dst_entry {
#ifdef CONFIG_NET_CLS_ROUTE
__u32 tclassid;
-#else
- __u32 __pad2;
#endif
/*
* Align __refcnt to a 64 bytes alignment
* (L1_CACHE_SIZE would be too much)
- */
-#ifdef CONFIG_64BIT
- long __pad_to_align_refcnt[1];
-#endif
- /*
+ *
* __refcnt wants to be on a different cache line from
* input/output/ops or performance tanks badly
*/
- atomic_t __refcnt; /* client references */
+ atomic_t __refcnt /* client references */
+ __attribute__((aligned (64)));
int __use;
unsigned long lastuse;
union {
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next reply other threads:[~2011-03-01 8:02 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-01 8:03 Lai Jiangshan [this message]
2011-03-01 8:03 ` [PATCH 4/4] net,rcu: don't assume the size of struct rcu_head Lai Jiangshan
2011-03-01 8:16 ` David Miller
2011-03-01 8:16 ` David Miller
2011-03-01 8:20 ` Eric Dumazet
2011-03-01 8:20 ` Eric Dumazet
2011-03-01 8:20 ` Eric Dumazet
2011-03-01 8:53 ` [PATCH 4/4 V2] " Lai Jiangshan
2011-03-01 8:53 ` Lai Jiangshan
2011-03-01 9:20 ` Eric Dumazet
2011-03-01 9:20 ` Eric Dumazet
2011-03-01 9:20 ` Eric Dumazet
2011-03-02 2:46 ` Lai Jiangshan
2011-03-02 2:46 ` Lai Jiangshan
2011-03-02 3:02 ` Eric Dumazet
2011-03-02 3:02 ` Eric Dumazet
2011-03-02 3:02 ` Eric Dumazet
2011-03-01 8:20 ` [PATCH 4/4] " Eric Dumazet
2011-03-01 8:20 ` Eric Dumazet
2011-03-01 8:20 ` Eric Dumazet
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=4D6CA860.3020409@cn.fujitsu.com \
--to=laijs@cn.fujitsu.com \
--cc=cl@linux-foundation.org \
--cc=davem@davemloft.net \
--cc=eric.dumazet@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mingo@elte.hu \
--cc=mpm@selenic.com \
--cc=netdev@vger.kernel.org \
--cc=paulmck@linux.vnet.ibm.com \
--cc=penberg@kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.