From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id E8B0E41CE5; Mon, 20 Feb 2023 10:07:18 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CFD2B42FC6; Mon, 20 Feb 2023 10:07:18 +0100 (CET) Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by mails.dpdk.org (Postfix) with ESMTP id CD23242FBA for ; Mon, 20 Feb 2023 10:07:17 +0100 (CET) Received: from dggpeml500024.china.huawei.com (unknown [172.30.72.54]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4PKxM44kvnz16Nt7; Mon, 20 Feb 2023 17:04:48 +0800 (CST) Received: from localhost.localdomain (10.50.163.32) by dggpeml500024.china.huawei.com (7.185.36.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.17; Mon, 20 Feb 2023 17:07:15 +0800 From: Chengwen Feng To: , , Ruifeng Wang , Dongdong Liu , Yisen Zhuang CC: , Chengwen Feng Subject: [PATCH v2] net/hns3: support IOVA as VA Date: Mon, 20 Feb 2023 09:00:49 +0000 Message-ID: <20230220090049.54088-1-fengchengwen@huawei.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230214071141.50155-1-fengchengwen@huawei.com> References: <20230214071141.50155-1-fengchengwen@huawei.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.50.163.32] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To dggpeml500024.china.huawei.com (7.185.36.10) X-CFilter-Loop: Reflected X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Claim PMD supports pmd_supports_disable_iova_as_pa. Signed-off-by: Chengwen Feng Reviewed-by: Ruifeng Wang Acked-by: Dongdong Liu --- v2: modify commit head which address Thomas's comment add reviewed and acked by of v1. --- drivers/net/hns3/hns3_rxtx_vec_neon.h | 2 +- drivers/net/hns3/hns3_rxtx_vec_sve.c | 13 +++++++++---- drivers/net/hns3/meson.build | 7 +------ 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/net/hns3/hns3_rxtx_vec_neon.h b/drivers/net/hns3/hns3_rxtx_vec_neon.h index 55d9bf817d..6c49c70fc7 100644 --- a/drivers/net/hns3/hns3_rxtx_vec_neon.h +++ b/drivers/net/hns3/hns3_rxtx_vec_neon.h @@ -13,7 +13,7 @@ static inline void hns3_vec_tx(volatile struct hns3_desc *desc, struct rte_mbuf *pkt) { uint64x2_t val1 = { - pkt->buf_iova + pkt->data_off, + rte_pktmbuf_iova(pkt), ((uint64_t)pkt->data_len) << HNS3_TXD_SEND_SIZE_SHIFT }; uint64x2_t val2 = { diff --git a/drivers/net/hns3/hns3_rxtx_vec_sve.c b/drivers/net/hns3/hns3_rxtx_vec_sve.c index 6f23ba674d..4bf933882a 100644 --- a/drivers/net/hns3/hns3_rxtx_vec_sve.c +++ b/drivers/net/hns3/hns3_rxtx_vec_sve.c @@ -261,10 +261,10 @@ hns3_rxq_rearm_mbuf_sve(struct hns3_rx_queue *rxq) for (i = 0; i < HNS3_DEFAULT_RXQ_REARM_THRESH; i += REARM_LOOP_STEP_NUM, rxep += REARM_LOOP_STEP_NUM, rxdp += REARM_LOOP_STEP_NUM) { uint64_t iova[REARM_LOOP_STEP_NUM]; - iova[0] = rxep[0].mbuf->buf_iova; - iova[1] = rxep[1].mbuf->buf_iova; - iova[2] = rxep[2].mbuf->buf_iova; - iova[3] = rxep[3].mbuf->buf_iova; + iova[0] = rte_mbuf_iova_get(rxep[0].mbuf); + iova[1] = rte_mbuf_iova_get(rxep[1].mbuf); + iova[2] = rte_mbuf_iova_get(rxep[2].mbuf); + iova[3] = rte_mbuf_iova_get(rxep[3].mbuf); svuint64_t siova = svld1_u64(PG64_256BIT, iova); siova = svadd_n_u64_z(PG64_256BIT, siova, RTE_PKTMBUF_HEADROOM); svuint64_t ol_base = svdup_n_u64(0); @@ -397,8 +397,13 @@ hns3_tx_fill_hw_ring_sve(struct hns3_tx_queue *txq, pg = svwhilelt_b64_u32(i, nb_pkts); base_addr = svld1_u64(pg, (uint64_t *)pkts); /* calc mbuf's field buf_iova address */ +#if RTE_IOVA_AS_PA buf_iova = svadd_n_u64_z(pg, base_addr, offsetof(struct rte_mbuf, buf_iova)); +#else + buf_iova = svadd_n_u64_z(pg, base_addr, + offsetof(struct rte_mbuf, buf_addr)); +#endif /* calc mbuf's field data_off address */ data_off = svadd_n_u64_z(pg, base_addr, offsetof(struct rte_mbuf, data_off)); diff --git a/drivers/net/hns3/meson.build b/drivers/net/hns3/meson.build index e1a5afa2ec..b8c0f80a20 100644 --- a/drivers/net/hns3/meson.build +++ b/drivers/net/hns3/meson.build @@ -13,12 +13,6 @@ if arch_subdir != 'x86' and arch_subdir != 'arm' or not dpdk_conf.get('RTE_ARCH_ subdir_done() endif -if dpdk_conf.get('RTE_IOVA_AS_PA') == 0 - build = false - reason = 'driver does not support disabling IOVA as PA mode' - subdir_done() -endif - sources = files( 'hns3_cmd.c', 'hns3_dcb.c', @@ -38,6 +32,7 @@ sources = files( 'hns3_common.c', 'hns3_dump.c', ) +pmd_supports_disable_iova_as_pa = true deps += ['hash'] -- 2.17.1