Patrick McHardy wrote:
diff --git a/include/net/sock.h b/include/net/sock.h
index 9023244..8e88a0e 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -252,6 +252,9 @@ struct sock {
long sk_rcvtimeo;
long sk_sndtimeo;
struct sk_filter *sk_filter;
+#ifdef CONFIG_NETFILTER
+ __u32 sk_mark;
+#endif
Please find a spot that doesn't add holes on 64 bit.
It adds if I insert the member before the function pointers. If I add it
at the end of struct sock, it is ugly but there is no hole. Pahole's output:
/* --- cacheline 8 boundary (512 bytes) --- */
void (*sk_destruct)(struct sock *); /*
512 8 */
__u32 sk_mark; /* 520 4 */
/* size: 528, cachelines: 9 */
/* padding: 4 */
/* paddings: 4, sum paddings: 16 */
/* last cacheline: 16 bytes */
}; /* definitions: 80 */
I'd prefer the following:
diff --git a/include/net/sock.h b/include/net/sock.h
index 9023244..67de401 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -262,6 +262,8 @@ struct sock {
__u32 sk_sndmsg_off;
int sk_write_pending;
void *sk_security;
+ __u32 sk_mark;
+ /* XXX 4 bytes hole on 64 bit */
void (*sk_state_change)(struct sock *sk);
void (*sk_data_ready)(struct sock *sk, int
bytes);
void (*sk_write_space)(struct sock *sk);
--
Attila
-
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
