From: Lance Richardson <lance.richardson@broadcom.com>
To: Ajit Khaparde <ajit.khaparde@broadcom.com>,
Somnath Kotur <somnath.kotur@broadcom.com>,
David Marchand <david.marchand@redhat.com>,
Phil Yang <phil.yang@arm.com>, Joyce Kong <joyce.kong@arm.com>,
Ruifeng Wang <ruifeng.wang@arm.com>,
Honnappa Nagarahalli <honnappa.nagarahalli@arm.com>,
Kalesh AP <kalesh-anakkur.purayil@broadcom.com>,
Rahul Gupta <rahul.gupta@broadcom.com>
Cc: dev@dpdk.org, ferruh.yigit@intel.com
Subject: [dpdk-dev] [PATCH] net/bnxt: fix doorbell barrier location
Date: Fri, 13 Nov 2020 11:04:45 -0500 [thread overview]
Message-ID: <20201113160445.365550-1-lance.richardson@broadcom.com> (raw)
Simplify some doorbell functions now that rte_cio_wmb() has been
eliminated and rte_io_wmb() is equivalent for Arm.
Fix a performance degradation on x86 platforms caused by a
previous Arm performance fix by moving the compiler barrier
closer to the I/O write.
Fixes: f0f5d844d138 ("eal: remove deprecated coherent IO memory barriers")
Fixes: bfc1d45875e2 ("net/bnxt: fix performance for Arm")
Signed-off-by: Lance Richardson <lance.richardson@broadcom.com>
Signed-off-by: Ajit Khaparde <ajit.khaparde@broadcom.com>
---
drivers/net/bnxt/bnxt_ring.h | 37 +++++++++++++++++++-----------------
1 file changed, 20 insertions(+), 17 deletions(-)
diff --git a/drivers/net/bnxt/bnxt_ring.h b/drivers/net/bnxt/bnxt_ring.h
index 3d81f610c..0a4685d16 100644
--- a/drivers/net/bnxt/bnxt_ring.h
+++ b/drivers/net/bnxt/bnxt_ring.h
@@ -82,12 +82,10 @@ void bnxt_free_rxtx_nq_ring(struct bnxt *bp);
static inline void bnxt_db_write(struct bnxt_db_info *db, uint32_t idx)
{
- rte_io_wmb();
-
if (db->db_64)
- rte_write64_relaxed(db->db_key64 | idx, db->doorbell);
+ rte_write64(db->db_key64 | idx, db->doorbell);
else
- rte_write32_relaxed(db->db_key32 | idx, db->doorbell);
+ rte_write32(db->db_key32 | idx, db->doorbell);
}
/* Ring an NQ doorbell and disable interrupts for the ring. */
@@ -96,10 +94,9 @@ static inline void bnxt_db_nq(struct bnxt_cp_ring_info *cpr)
if (unlikely(!cpr->cp_db.db_64))
return;
- rte_io_wmb();
- rte_write64_relaxed(cpr->cp_db.db_key64 | DBR_TYPE_NQ |
- RING_CMP(cpr->cp_ring_struct, cpr->cp_raw_cons),
- cpr->cp_db.doorbell);
+ rte_write64(cpr->cp_db.db_key64 | DBR_TYPE_NQ |
+ RING_CMP(cpr->cp_ring_struct, cpr->cp_raw_cons),
+ cpr->cp_db.doorbell);
}
/* Ring an NQ doorbell and enable interrupts for the ring. */
@@ -108,10 +105,9 @@ static inline void bnxt_db_nq_arm(struct bnxt_cp_ring_info *cpr)
if (unlikely(!cpr->cp_db.db_64))
return;
- rte_io_wmb();
- rte_write64_relaxed(cpr->cp_db.db_key64 | DBR_TYPE_NQ_ARM |
- RING_CMP(cpr->cp_ring_struct, cpr->cp_raw_cons),
- cpr->cp_db.doorbell);
+ rte_write64(cpr->cp_db.db_key64 | DBR_TYPE_NQ_ARM |
+ RING_CMP(cpr->cp_ring_struct, cpr->cp_raw_cons),
+ cpr->cp_db.doorbell);
}
static inline void bnxt_db_cq(struct bnxt_cp_ring_info *cpr)
@@ -119,11 +115,18 @@ static inline void bnxt_db_cq(struct bnxt_cp_ring_info *cpr)
struct bnxt_db_info *db = &cpr->cp_db;
uint32_t idx = RING_CMP(cpr->cp_ring_struct, cpr->cp_raw_cons);
- rte_compiler_barrier();
- if (db->db_64)
- rte_write64_relaxed(db->db_key64 | idx, db->doorbell);
- else
- B_CP_DIS_DB(cpr, cpr->cp_raw_cons);
+ if (db->db_64) {
+ uint64_t key_idx = db->db_key64 | idx;
+ void *doorbell = db->doorbell;
+
+ rte_compiler_barrier();
+ rte_write64_relaxed(key_idx, doorbell);
+ } else {
+ uint32_t cp_raw_cons = cpr->cp_raw_cons;
+
+ rte_compiler_barrier();
+ B_CP_DIS_DB(cpr, cp_raw_cons);
+ }
}
#endif
--
2.25.1
next reply other threads:[~2020-11-13 16:05 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-13 16:04 Lance Richardson [this message]
2020-11-13 17:38 ` Ferruh Yigit
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=20201113160445.365550-1-lance.richardson@broadcom.com \
--to=lance.richardson@broadcom.com \
--cc=ajit.khaparde@broadcom.com \
--cc=david.marchand@redhat.com \
--cc=dev@dpdk.org \
--cc=ferruh.yigit@intel.com \
--cc=honnappa.nagarahalli@arm.com \
--cc=joyce.kong@arm.com \
--cc=kalesh-anakkur.purayil@broadcom.com \
--cc=phil.yang@arm.com \
--cc=rahul.gupta@broadcom.com \
--cc=ruifeng.wang@arm.com \
--cc=somnath.kotur@broadcom.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).