From: Netanel Belgazal <netanel@annapurnalabs.com>
To: linux-kernel@vger.kernel.org, davem@davemloft.net,
netdev@vger.kernel.org
Cc: Netanel Belgazal <netanel@annapurnalabs.com>,
dwmw@amazon.com, zorik@annapurnalabs.com, alex@annapurnalabs.com,
saeed@annapurnalabs.com, msw@amazon.com, aliguori@amazon.com,
nafea@annapurnalabs.com
Subject: [PATCH net 10/18] net/ena: use READ_ONCE to access completion descriptors
Date: Sun, 20 Nov 2016 10:45:39 +0200 [thread overview]
Message-ID: <1479631547-29354-11-git-send-email-netanel@annapurnalabs.com> (raw)
In-Reply-To: <1479631547-29354-1-git-send-email-netanel@annapurnalabs.com>
Completion descriptors are accessed from the driver and from the device.
To avoid reading the old value, use READ_ONCE macro.
Signed-off-by: Netanel Belgazal <netanel@annapurnalabs.com>
---
drivers/net/ethernet/amazon/ena/ena_com.h | 1 +
drivers/net/ethernet/amazon/ena/ena_eth_com.c | 8 ++++----
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/amazon/ena/ena_com.h b/drivers/net/ethernet/amazon/ena/ena_com.h
index 6883ee5..f8cdce0 100644
--- a/drivers/net/ethernet/amazon/ena/ena_com.h
+++ b/drivers/net/ethernet/amazon/ena/ena_com.h
@@ -33,6 +33,7 @@
#ifndef ENA_COM
#define ENA_COM
+#include <linux/compiler.h>
#include <linux/delay.h>
#include <linux/dma-mapping.h>
#include <linux/gfp.h>
diff --git a/drivers/net/ethernet/amazon/ena/ena_eth_com.c b/drivers/net/ethernet/amazon/ena/ena_eth_com.c
index 539c536..f999305 100644
--- a/drivers/net/ethernet/amazon/ena/ena_eth_com.c
+++ b/drivers/net/ethernet/amazon/ena/ena_eth_com.c
@@ -45,7 +45,7 @@ static inline struct ena_eth_io_rx_cdesc_base *ena_com_get_next_rx_cdesc(
cdesc = (struct ena_eth_io_rx_cdesc_base *)(io_cq->cdesc_addr.virt_addr
+ (head_masked * io_cq->cdesc_entry_size_in_bytes));
- desc_phase = (cdesc->status & ENA_ETH_IO_RX_CDESC_BASE_PHASE_MASK) >>
+ desc_phase = (READ_ONCE(cdesc->status) & ENA_ETH_IO_RX_CDESC_BASE_PHASE_MASK) >>
ENA_ETH_IO_RX_CDESC_BASE_PHASE_SHIFT;
if (desc_phase != expected_phase)
@@ -141,7 +141,7 @@ static inline u16 ena_com_cdesc_rx_pkt_get(struct ena_com_io_cq *io_cq,
ena_com_cq_inc_head(io_cq);
count++;
- last = (cdesc->status & ENA_ETH_IO_RX_CDESC_BASE_LAST_MASK) >>
+ last = (READ_ONCE(cdesc->status) & ENA_ETH_IO_RX_CDESC_BASE_LAST_MASK) >>
ENA_ETH_IO_RX_CDESC_BASE_LAST_SHIFT;
} while (!last);
@@ -489,13 +489,13 @@ int ena_com_tx_comp_req_id_get(struct ena_com_io_cq *io_cq, u16 *req_id)
* expected, it mean that the device still didn't update
* this completion.
*/
- cdesc_phase = cdesc->flags & ENA_ETH_IO_TX_CDESC_PHASE_MASK;
+ cdesc_phase = READ_ONCE(cdesc->flags) & ENA_ETH_IO_TX_CDESC_PHASE_MASK;
if (cdesc_phase != expected_phase)
return -EAGAIN;
ena_com_cq_inc_head(io_cq);
- *req_id = cdesc->req_id;
+ *req_id = READ_ONCE(cdesc->req_id);
return 0;
}
--
1.9.1
next prev parent reply other threads:[~2016-11-20 8:46 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-20 8:45 [PATCH net 00/18] Update ENA driver to version 1.1.2 Netanel Belgazal
2016-11-20 8:45 ` [PATCH net 01/18] net/ena: remove RFS support from device feature list Netanel Belgazal
2016-11-20 8:45 ` [PATCH net 02/18] net/ena: fix queues number calculation Netanel Belgazal
2016-11-20 8:45 ` [PATCH net 03/18] net/ena: use napi_schedule_irqoff when possible Netanel Belgazal
2016-11-20 8:45 ` [PATCH net 04/18] net/ena: reduce the severity of ena printouts Netanel Belgazal
2016-11-20 8:45 ` [PATCH net 05/18] net/ena: add hardware hints capability to the driver Netanel Belgazal
2016-11-20 8:45 ` [PATCH net 06/18] net/ena: fix ethtool RSS flow configuration Netanel Belgazal
2016-11-20 8:45 ` [PATCH net 07/18] net/ena: refactor ena_get_stats64 to be atomic context safe Netanel Belgazal
2016-11-20 10:09 ` kbuild test robot
2016-11-20 18:59 ` Netanel Belgazal
2016-11-21 16:23 ` kbuild test robot
2016-11-20 8:45 ` [PATCH net 08/18] net/ena: change sizeof() argument to be the type pointer Netanel Belgazal
2016-11-20 8:45 ` [PATCH net 09/18] net/ena: change condition for host attribute configuration Netanel Belgazal
2016-11-20 8:45 ` Netanel Belgazal [this message]
2016-11-20 8:45 ` [PATCH net 11/18] net/ena: fix potential access to freed memory during device reset Netanel Belgazal
2016-11-20 8:45 ` [PATCH net 12/18] net/ena: refactor skb allocation Netanel Belgazal
2016-11-20 8:45 ` [PATCH net 13/18] net/ena: remove redundant logic in napi callback for busy poll mode Netanel Belgazal
2016-11-20 8:45 ` [PATCH net 14/18] net/ena: add IPv6 extended protocols to ena_admin_flow_hash_proto Netanel Belgazal
2016-11-20 8:45 ` [PATCH net 15/18] net/ena: remove affinity hint from the driver Netanel Belgazal
2016-11-20 8:45 ` [PATCH net 16/18] net/ena: fix error handling when probe fails Netanel Belgazal
2016-11-20 8:45 ` [PATCH net 17/18] net/ena: fix NULL dereference when removing the driver after device reset faild Netanel Belgazal
2016-11-20 8:45 ` [PATCH net 18/18] net/ena: change driver's default timeouts and increase driver version Netanel Belgazal
2016-11-20 15:24 ` [PATCH net 00/18] Update ENA driver to version 1.1.2 David Miller
2016-11-20 18:53 ` Netanel Belgazal
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=1479631547-29354-11-git-send-email-netanel@annapurnalabs.com \
--to=netanel@annapurnalabs.com \
--cc=alex@annapurnalabs.com \
--cc=aliguori@amazon.com \
--cc=davem@davemloft.net \
--cc=dwmw@amazon.com \
--cc=linux-kernel@vger.kernel.org \
--cc=msw@amazon.com \
--cc=nafea@annapurnalabs.com \
--cc=netdev@vger.kernel.org \
--cc=saeed@annapurnalabs.com \
--cc=zorik@annapurnalabs.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).