From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 70B7CA09E0; Fri, 13 Nov 2020 17:05:40 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id A855CC8A6; Fri, 13 Nov 2020 17:05:36 +0100 (CET) Received: from mail-pf1-f193.google.com (mail-pf1-f193.google.com [209.85.210.193]) by dpdk.org (Postfix) with ESMTP id 07B90C88E for ; Fri, 13 Nov 2020 17:05:33 +0100 (CET) Received: by mail-pf1-f193.google.com with SMTP id q5so7976216pfk.6 for ; Fri, 13 Nov 2020 08:05:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:cc:subject:date:message-id:mime-version; bh=vsQdfmfkFbKE+9QCRsp0qxWRIixp1shgLk0x+xScHFk=; b=SfMlNBMQHPyyb4vV7G/AeZoiKVBdxMbIM2eVKaRTcCe/JtKHpxzqSGfZhKcaED+7m0 q4KtYgttHUEa+nRqYm+XzRYC3a9THW20Bc9PBYvW7szmZD9OrBjzI72fARDdOqXBPSzn A13RTWcxyF3knLVhm63cC767wa4ArfOCBPEeg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version; bh=vsQdfmfkFbKE+9QCRsp0qxWRIixp1shgLk0x+xScHFk=; b=RupTamAiotxFv0x7v4SekT1VkF3qBEPAC9OjAYyW1qVPSPDK4q18fyXtIByrlM939Y csJcMPzg1m73cWmw3khTR80arK3AWAYisFJiWdvKb7UNvLkWYd11lS+HYx+bhvWPvydN yLiLbTrGAfA6be8PmeNibmpjHI4eBXF7gB+w/5snFhKxB2lKnBMuqWje5exoHj5z7zPR YwOtlbdSdlMSziZqIiQt11cdmFvxZMdHy97x74Ma5EpTyHpcOwe0F0UEsUmgi2XDC5TD c/TPRa4JEJHecKsBXoj5GAHsKqHHxfwVjMkAFei8dIt9nS395fDIKfY6FNhjeujL+qdJ 2hEQ== X-Gm-Message-State: AOAM530a8mze0RbdzznC66KaVMAvk8mamZe46jyRF3+JnXYtvNxY3V6D Tt7nIEXuDndIbJddVfoE/HC0wA== X-Google-Smtp-Source: ABdhPJzibNU/XywH7GW6+swaaU9q5VjhO6XZGE2O1iAj3ukv61ZBBU+euXLANfeHAmwyuRL3m+g7Og== X-Received: by 2002:a63:b05:: with SMTP id 5mr2533579pgl.267.1605283528191; Fri, 13 Nov 2020 08:05:28 -0800 (PST) Received: from localhost.localdomain ([192.19.231.250]) by smtp.gmail.com with ESMTPSA id t74sm10045584pfc.47.2020.11.13.08.05.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Nov 2020 08:05:26 -0800 (PST) From: Lance Richardson To: Ajit Khaparde , Somnath Kotur , David Marchand , Phil Yang , Joyce Kong , Ruifeng Wang , Honnappa Nagarahalli , Kalesh AP , Rahul Gupta Cc: dev@dpdk.org, ferruh.yigit@intel.com Date: Fri, 13 Nov 2020 11:04:45 -0500 Message-Id: <20201113160445.365550-1-lance.richardson@broadcom.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Type: text/plain Content-Transfer-Encoding: 8bit X-Content-Filtered-By: Mailman/MimeDel 2.1.15 Subject: [dpdk-dev] [PATCH] net/bnxt: fix doorbell barrier location X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 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 Signed-off-by: Ajit Khaparde --- 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