From: humbabek <humbabek@gmail.com>
To: unlisted-recipients:; (no To-header on input)
Cc: humbabek <humbabek@gmail.com>,
"David S. Miller" <davem@davemloft.net>,
Willem de Bruijn <willemb@google.com>,
Eric Dumazet <edumazet@google.com>,
Kees Cook <keescook@chromium.org>,
Kirill Tkhai <ktkhai@virtuozzo.com>,
Mike Maloney <maloney@google.com>,
Magnus Karlsson <magnus.karlsson@intel.com>,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH] move smp_rmb() after load of status
Date: Sat, 7 Jul 2018 21:23:17 +0200 [thread overview]
Message-ID: <20180707192319.24771-1-humbabek@gmail.com> (raw)
Signed-off-by: humbabek <humbabek@gmail.com>
---
net/packet/af_packet.c | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index 57634bc3da74..91830ef07c48 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -394,25 +394,30 @@ static void __packet_set_status(struct packet_sock *po, void *frame, int status)
static int __packet_get_status(struct packet_sock *po, void *frame)
{
union tpacket_uhdr h;
-
- smp_rmb();
+ int status;
h.raw = frame;
switch (po->tp_version) {
case TPACKET_V1:
flush_dcache_page(pgv_to_page(&h.h1->tp_status));
- return h.h1->tp_status;
+ status = h.h1->tp_status;
+ break;
case TPACKET_V2:
flush_dcache_page(pgv_to_page(&h.h2->tp_status));
- return h.h2->tp_status;
+ status = h.h2->tp_status;
+ break;
case TPACKET_V3:
flush_dcache_page(pgv_to_page(&h.h3->tp_status));
- return h.h3->tp_status;
+ status = h.h3->tp_status;
+ break;
default:
WARN(1, "TPACKET version not supported.\n");
BUG();
- return 0;
+ status = 0;
+ break;
}
+ smp_rmb();
+ return status;
}
static __u32 tpacket_get_timestamp(struct sk_buff *skb, struct timespec *ts,
--
2.17.1
next reply other threads:[~2018-07-07 19:23 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-07 19:23 humbabek [this message]
2018-07-07 22:34 ` [PATCH] move smp_rmb() after load of status Eric Dumazet
2018-07-08 9:27 ` humbabek
2018-07-08 21:53 ` Willem de Bruijn
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=20180707192319.24771-1-humbabek@gmail.com \
--to=humbabek@gmail.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=keescook@chromium.org \
--cc=ktkhai@virtuozzo.com \
--cc=linux-kernel@vger.kernel.org \
--cc=magnus.karlsson@intel.com \
--cc=maloney@google.com \
--cc=netdev@vger.kernel.org \
--cc=willemb@google.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).