From: Richard Gobert <richardbgobert@gmail.com>
To: Jakub Kicinski <kuba@kernel.org>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>,
davem@davemloft.net, edumazet@google.com, pabeni@redhat.com,
willemdebruijn.kernel@gmail.com, dsahern@kernel.org,
alexander.duyck@gmail.com, shuah@kernel.org,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-kselftest@vger.kernel.org
Subject: [PATCH] net: gro: fix napi_gro_cb zeroed alignment
Date: Tue, 14 May 2024 19:06:15 +0200 [thread overview]
Message-ID: <fca08735-c245-49e5-af72-82900634f144@gmail.com> (raw)
In-Reply-To: <20240514090626.69676cb5@kernel.org>
Add 2 byte padding to napi_gro_cb struct to ensure zeroed member is
aligned after flush_id member was removed in the original commit.
Fixes: 4b0ebbca3e16 ("net: gro: move L3 flush checks to tcp_gro_receive and udp_gro_receive_segment")
Suggested-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Richard Gobert <richardbgobert@gmail.com>
---
include/net/gro.h | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/include/net/gro.h b/include/net/gro.h
index f13634b1f4c1..b9b58c1f8d19 100644
--- a/include/net/gro.h
+++ b/include/net/gro.h
@@ -42,8 +42,7 @@ struct napi_gro_cb {
/* Used in ipv6_gro_receive() and foo-over-udp and esp-in-udp */
u16 proto;
- /* used to support CHECKSUM_COMPLETE for tunneling protocols */
- __wsum csum;
+ u16 pad;
/* Used in napi_gro_cb::free */
#define NAPI_GRO_FREE 1
@@ -85,6 +84,9 @@ struct napi_gro_cb {
u8 is_flist:1;
);
+ /* used to support CHECKSUM_COMPLETE for tunneling protocols */
+ __wsum csum;
+
/* L3 offsets */
union {
struct {
--
2.36.1
next prev parent reply other threads:[~2024-05-14 17:06 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-09 19:08 [PATCH net-next v10 0/3] net: gro: remove network_header use, move p->{flush/flush_id} calculations to L4 Richard Gobert
2024-05-09 19:08 ` [PATCH net-next v10 1/3] net: gro: use cb instead of skb->network_header Richard Gobert
2024-05-13 0:43 ` Willem de Bruijn
2024-05-09 19:08 ` [PATCH net-next v10 2/3] net: gro: move L3 flush checks to tcp_gro_receive and udp_gro_receive_segment Richard Gobert
2024-05-13 0:43 ` Willem de Bruijn
2024-05-14 12:13 ` Geert Uytterhoeven
2024-05-14 14:14 ` Jakub Kicinski
2024-05-14 15:56 ` Richard Gobert
2024-05-14 16:06 ` Jakub Kicinski
2024-05-14 17:06 ` Richard Gobert [this message]
2024-05-14 18:00 ` [PATCH] net: gro: fix napi_gro_cb zeroed alignment patchwork-bot+netdevbpf
2024-05-09 19:08 ` [PATCH net-next v10 3/3] selftests/net: add flush id selftests Richard Gobert
2024-05-13 0:44 ` Willem de Bruijn
2024-05-13 21:50 ` [PATCH net-next v10 0/3] net: gro: remove network_header use, move p->{flush/flush_id} calculations to L4 patchwork-bot+netdevbpf
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=fca08735-c245-49e5-af72-82900634f144@gmail.com \
--to=richardbgobert@gmail.com \
--cc=alexander.duyck@gmail.com \
--cc=davem@davemloft.net \
--cc=dsahern@kernel.org \
--cc=edumazet@google.com \
--cc=geert@linux-m68k.org \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=shuah@kernel.org \
--cc=willemdebruijn.kernel@gmail.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).