All of lore.kernel.org
 help / color / mirror / Atom feed
From: Mat Martineau <mathew.j.martineau at linux.intel.com>
To: mptcp at lists.01.org
Subject: [MPTCP] [PATCH net-next v4 02/11] sock: Make sk_protocol a 16-bit value
Date: Thu, 19 Dec 2019 14:05:48 -0800	[thread overview]
Message-ID: <20191219220557.17823-3-mathew.j.martineau@linux.intel.com> (raw)
In-Reply-To: 20191219220557.17823-1-mathew.j.martineau@linux.intel.com

[-- Attachment #1: Type: text/plain, Size: 1831 bytes --]

Match the 16-bit width of skbuff->protocol. Fills an 8-bit hole so
sizeof(struct sock) does not change.

v2 -> v3:
 - keep 'sk_type' 2 bytes aligned (Eric)
v1 -> v2:
 - preserve sk_pacing_shift as bit field (Eric)

Co-developed-by: Paolo Abeni <pabeni(a)redhat.com>
Signed-off-by: Paolo Abeni <pabeni(a)redhat.com>
Co-developed-by: Matthieu Baerts <matthieu.baerts(a)tessares.net>
Signed-off-by: Matthieu Baerts <matthieu.baerts(a)tessares.net>
Signed-off-by: Mat Martineau <mathew.j.martineau(a)linux.intel.com>
---
 include/net/sock.h          | 10 +++++-----
 include/trace/events/sock.h |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/net/sock.h b/include/net/sock.h
index 81dc811aad2e..b93cadba1a3b 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -451,15 +451,15 @@ struct sock {
 #define SK_FL_TYPE_MASK    0xffff0000
 #endif
 
-	unsigned int		sk_padding : 1,
+	u8			sk_padding : 1,
 				sk_kern_sock : 1,
 				sk_no_check_tx : 1,
 				sk_no_check_rx : 1,
-				sk_userlocks : 4,
-				sk_protocol  : 8,
-				sk_type      : 16;
-	u16			sk_gso_max_segs;
+				sk_userlocks : 4;
 	u8			sk_pacing_shift;
+	u16			sk_type;
+	u16			sk_protocol;
+	u16			sk_gso_max_segs;
 	unsigned long	        sk_lingertime;
 	struct proto		*sk_prot_creator;
 	rwlock_t		sk_callback_lock;
diff --git a/include/trace/events/sock.h b/include/trace/events/sock.h
index 51fe9f6719eb..3ff12b90048d 100644
--- a/include/trace/events/sock.h
+++ b/include/trace/events/sock.h
@@ -147,7 +147,7 @@ TRACE_EVENT(inet_sock_set_state,
 		__field(__u16, sport)
 		__field(__u16, dport)
 		__field(__u16, family)
-		__field(__u8, protocol)
+		__field(__u16, protocol)
 		__array(__u8, saddr, 4)
 		__array(__u8, daddr, 4)
 		__array(__u8, saddr_v6, 16)
-- 
2.24.1

WARNING: multiple messages have this Message-ID (diff)
From: Mat Martineau <mathew.j.martineau@linux.intel.com>
To: netdev@vger.kernel.org, mptcp@lists.01.org
Cc: Mat Martineau <mathew.j.martineau@linux.intel.com>,
	Paolo Abeni <pabeni@redhat.com>,
	Matthieu Baerts <matthieu.baerts@tessares.net>
Subject: [PATCH net-next v4 02/11] sock: Make sk_protocol a 16-bit value
Date: Thu, 19 Dec 2019 14:05:48 -0800	[thread overview]
Message-ID: <20191219220557.17823-3-mathew.j.martineau@linux.intel.com> (raw)
In-Reply-To: <20191219220557.17823-1-mathew.j.martineau@linux.intel.com>

Match the 16-bit width of skbuff->protocol. Fills an 8-bit hole so
sizeof(struct sock) does not change.

v2 -> v3:
 - keep 'sk_type' 2 bytes aligned (Eric)
v1 -> v2:
 - preserve sk_pacing_shift as bit field (Eric)

Co-developed-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Co-developed-by: Matthieu Baerts <matthieu.baerts@tessares.net>
Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>
Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
---
 include/net/sock.h          | 10 +++++-----
 include/trace/events/sock.h |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/net/sock.h b/include/net/sock.h
index 81dc811aad2e..b93cadba1a3b 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -451,15 +451,15 @@ struct sock {
 #define SK_FL_TYPE_MASK    0xffff0000
 #endif
 
-	unsigned int		sk_padding : 1,
+	u8			sk_padding : 1,
 				sk_kern_sock : 1,
 				sk_no_check_tx : 1,
 				sk_no_check_rx : 1,
-				sk_userlocks : 4,
-				sk_protocol  : 8,
-				sk_type      : 16;
-	u16			sk_gso_max_segs;
+				sk_userlocks : 4;
 	u8			sk_pacing_shift;
+	u16			sk_type;
+	u16			sk_protocol;
+	u16			sk_gso_max_segs;
 	unsigned long	        sk_lingertime;
 	struct proto		*sk_prot_creator;
 	rwlock_t		sk_callback_lock;
diff --git a/include/trace/events/sock.h b/include/trace/events/sock.h
index 51fe9f6719eb..3ff12b90048d 100644
--- a/include/trace/events/sock.h
+++ b/include/trace/events/sock.h
@@ -147,7 +147,7 @@ TRACE_EVENT(inet_sock_set_state,
 		__field(__u16, sport)
 		__field(__u16, dport)
 		__field(__u16, family)
-		__field(__u8, protocol)
+		__field(__u16, protocol)
 		__array(__u8, saddr, 4)
 		__array(__u8, daddr, 4)
 		__array(__u8, saddr_v6, 16)
-- 
2.24.1


             reply	other threads:[~2019-12-19 22:05 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-12-19 22:05 Mat Martineau [this message]
2019-12-19 22:05 ` [PATCH net-next v4 02/11] sock: Make sk_protocol a 16-bit value Mat Martineau
  -- strict thread matches above, loose matches on Subject: below --
2019-12-19 22:19 [MPTCP] Re: [PATCH net-next v4 00/11] David Miller
2019-12-19 22:19 ` David Miller
2019-12-19 22:14 [MPTCP] [PATCH net-next v4 00/11] Multipath TCP: Prerequisites Mat Martineau
2019-12-19 22:14 ` Mat Martineau
2019-12-19 22:05 [MPTCP] [PATCH net-next v4 11/11] skb: add helpers to allocate ext independently from sk_buff Mat Martineau
2019-12-19 22:05 ` Mat Martineau
2019-12-19 22:05 [MPTCP] [PATCH net-next v4 10/11] tcp: clean ext on tx recycle Mat Martineau
2019-12-19 22:05 ` Mat Martineau
2019-12-19 22:05 [MPTCP] [PATCH net-next v4 09/11] tcp: Check for filled TCP option space before SACK Mat Martineau
2019-12-19 22:05 ` Mat Martineau
2019-12-19 22:05 [MPTCP] [PATCH net-next v4 08/11] tcp: Export TCP functions and ops struct Mat Martineau
2019-12-19 22:05 ` Mat Martineau
2019-12-19 22:05 [MPTCP] [PATCH net-next v4 07/11] tcp: coalesce/collapse must respect MPTCP extensions Mat Martineau
2019-12-19 22:05 ` Mat Martineau
2019-12-19 22:05 [MPTCP] [PATCH net-next v4 06/11] mptcp: Add MPTCP to skb extensions Mat Martineau
2019-12-19 22:05 ` Mat Martineau
2019-12-19 22:05 [MPTCP] [PATCH net-next v4 05/11] tcp, ulp: Add clone operation to tcp_ulp_ops Mat Martineau
2019-12-19 22:05 ` Mat Martineau
2019-12-19 22:05 [MPTCP] [PATCH net-next v4 04/11] tcp: Add MPTCP option number Mat Martineau
2019-12-19 22:05 ` Mat Martineau
2019-12-19 22:05 [MPTCP] [PATCH net-next v4 03/11] tcp: Define IPPROTO_MPTCP Mat Martineau
2019-12-19 22:05 ` Mat Martineau
2019-12-19 22:05 [MPTCP] [PATCH net-next v4 01/11] net: Make sock protocol value checks more specific Mat Martineau
2019-12-19 22:05 ` Mat Martineau
2019-12-19 22:05 [MPTCP] [PATCH net-next v4 00/11] Mat Martineau
2019-12-19 22:05 ` Mat Martineau

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=20191219220557.17823-3-mathew.j.martineau@linux.intel.com \
    --to=unknown@example.com \
    /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.