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 C24B6A00C4; Thu, 29 Sep 2022 07:48:56 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AA85A40FAE; Thu, 29 Sep 2022 07:48:56 +0200 (CEST) Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by mails.dpdk.org (Postfix) with ESMTP id 4029E40E5A for ; Thu, 29 Sep 2022 07:48:55 +0200 (CEST) Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 28T447R5026617; Wed, 28 Sep 2022 22:48:50 -0700 Received: from nam04-mw2-obe.outbound.protection.outlook.com (mail-mw2nam04lp2169.outbound.protection.outlook.com [104.47.73.169]) by mx0a-0016f401.pphosted.com (PPS) with ESMTPS id 3jvrvjk1va-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 28 Sep 2022 22:48:49 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dxU6XwRanrL0IkMHtoleWnvCWrUhEeAYTBSNCRJfSEXEfmD0VmpHo6xaRpzd/Tbv2byPEhk9gx50X3auS5/QHY0GVkx/+ub9pzUpyN1bXBxgrdasr9zjoyGx/Yp4Y4/GiwXSmJWlHbBVraXjofAdrEhwpDsitk5PgWtosCjNnkWRCXR7amfILGhTUTLAq5AFFOAdqgpbUpM3cUl71NwkKWD4hvhTvrHzstdQDEtpf4lbVMhY0hm6gPmTmEYvUZ37ajlLzaMncWCezhkAgqzIbLh9hWE0o6FnJT0D4HYlX+6uDz3OfggZ4BPvpXpKAK3yfZR9WROd97m9bIEPKzCT4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=WQxI29vT3T3MYwOpHS6tvDlBb89ecCMmOlHe9+oIdIo=; b=G0aYNOZ/lTonJo9jXDqZUL/m8z0ej5JAHL3LPicVUGSAV7uqtnRFnsa/t6lmPp/MNHG/AROQsrXgJSb/E84xneBglIQ/t7EUvIYopsmsjScS3b8TyzyofZyOPsy666gv881aPRZmms08bjpsHuPS6XEw/k4cS5BLOwC0DPQF0DDOXjDagbFT97cWp4bCqKL4QWa6/kcTCWooGwJ/Zs2E3Mefefwl5AccuzjHfa2JIUs3kXlYeFd6DzT41KEkF0NzrpWe8ZNYL9DKSMfQsA9Y/vXOtTZ6ZJeFJv9goKF1y8d2tK9Tn7I9Sru92QI3PzGIGKQlYORadYT3k8/RMjsSAA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=marvell.com; dmarc=pass action=none header.from=marvell.com; dkim=pass header.d=marvell.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.onmicrosoft.com; s=selector1-marvell-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=WQxI29vT3T3MYwOpHS6tvDlBb89ecCMmOlHe9+oIdIo=; b=FILtzn0Bfe1hGN28MW/pnPtztkZCntZbr8UNquG8vQiYxwVI41TQ3h/9s+smsI0aapcpxc+R4jkYu8t4gCFWoc5sDnVivThPA36fEjrlhkFS8GnjDNibNuU5dUAfRTabQg3x0xXYNvdzCIlWJvNOc15w89VuFgcClWrNYyAyZL4= Received: from PH0PR18MB4425.namprd18.prod.outlook.com (2603:10b6:510:ef::13) by MN2PR18MB3573.namprd18.prod.outlook.com (2603:10b6:208:265::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.19; Thu, 29 Sep 2022 05:48:47 +0000 Received: from PH0PR18MB4425.namprd18.prod.outlook.com ([fe80::16f8:9275:a441:cfec]) by PH0PR18MB4425.namprd18.prod.outlook.com ([fe80::16f8:9275:a441:cfec%5]) with mapi id 15.20.5676.017; Thu, 29 Sep 2022 05:48:47 +0000 From: Shijith Thotton To: Olivier Matz CC: "dev@dpdk.org" , Pavan Nikhilesh Bhagavatula , "Honnappa.Nagarahalli@arm.com" , "bruce.richardson@intel.com" , Jerin Jacob Kollanukkaran , "mb@smartsharesystems.com" , "stephen@networkplumber.org" , "thomas@monjalon.net" , "david.marchand@redhat.com" , Nicolas Chautru , Ciara Power , Konstantin Ananyev , Chengwen Feng , Kevin Laatz , Reshma Pattan , Maxime Coquelin , Chenbo Xia Subject: RE: [EXT] Re: [PATCH v3 1/5] build: add meson option to configure IOVA mode as VA Thread-Topic: [EXT] Re: [PATCH v3 1/5] build: add meson option to configure IOVA mode as VA Thread-Index: AQHYzcIAd5A2+efpoUe6/GthYy23Pq301tOAgAEMDeA= Date: Thu, 29 Sep 2022 05:48:47 +0000 Message-ID: References: <20220907134340.3629224-1-sthotton@marvell.com> <4fbe435f0d86ef1bc7930bdb5847f41e2042f693.1663767715.git.sthotton@marvell.com> In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-publictraffictype: Email x-ms-traffictypediagnostic: PH0PR18MB4425:EE_|MN2PR18MB3573:EE_ x-ms-office365-filtering-correlation-id: 13e79f49-f6fd-4dc2-888b-08daa1de46e4 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: X7BTwkG2Qj6HUjd5MjDKnxCxGQDGfGQKwsUJUyARdfrU4aGaw1huLnX9s7gtLfz0qmF3daRVdWoYDVEzZTfNG5wzBjfi52ytEZeH9fq0GjxonSXZ5//yleoUuxmmHsrtUoyy+caT2d78zaojfcxiVNdxqrV4tfIJodWhV2DejwTWe8oxN4ypbMSx9NDc2NbaXsds+QaJzrpLGe661hUo/KldtchPH4Qw/mQZCEVux/cBnCg427mcKztiSTMIDT57gEOpfn13htd1I75hAEOMvQOsFRnuUakpHOL5usIaJPDusRdio6Xxy6qujUruA6adjoJL18+mPpqyLLPAFdU/GbWsqSHMtt8h1aIPJKmw8xA4Twv6Wu4n+Tk9Zyx+sAQSRCLkGj4NHOiVQFYtKQ4OWWJd1IlqJYA5L5mg4TPjAnc92D4EAZLCY6J+sD2wdy7LOQgandMDKHDHK6PRMSqMxcZpeS6dy8+92Nk+sC3BEDS/BrsOExN9DACYfbQ29IGJmLcqoOL+cw7yXrfVBtpRKhhWSbykUCNqVvKIC2giWtwuo5Dr4x1aLITse9l9tRqvZcPuvb4NZs9G6uYKm3VifhKUQ6gRKVBsOWj2oDEPlNW7fq7N9aqNZCBGYdkQttzMGYzTNdxJq6aFKQ+kTWZ3mYq7sApSEWsCIJDNMQ+tgBbIjAPoygTmNNvQU88FYZfRoxjl7BoBjAsjjWGCbE89rkUKYSg6968P2X+HsYlgnhujQlaVJD3cnLQdQmtCEtRXgB52DqpfJAETW5E2A27E7A== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PH0PR18MB4425.namprd18.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(4636009)(396003)(376002)(39860400002)(366004)(346002)(136003)(451199015)(6916009)(54906003)(316002)(7416002)(86362001)(7696005)(8936002)(52536014)(41300700001)(30864003)(33656002)(186003)(8676002)(5660300002)(66946007)(66476007)(66556008)(64756008)(4326008)(76116006)(6506007)(66446008)(2906002)(83380400001)(26005)(9686003)(55016003)(38070700005)(478600001)(71200400001)(122000001)(38100700002)(559001)(579004); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?lO18AjBDMn8Aa1j3Yel16aTYbz4vv6HoYsosbK2hBMjbvmBegYwEVzz5i/TT?= =?us-ascii?Q?LzjO5C7S229GloYrKQBrAnJEH8C/UnqC6uR3QJhkLbTU8QQs8TPXxnhzHWHV?= =?us-ascii?Q?UVaPT+y0ZTOauPfB0xeaCOiqxLO68LVJn3mbBtc6+Jb1x3gVvx8fu6qcMXE9?= =?us-ascii?Q?QWY1StDO/GfOoTEM563Xy3XYLHINPJH/dwXDpIHADSoNLkxG7t+lrJXqincy?= =?us-ascii?Q?Bx7Qwo+cw6mNWVDVsJekFmT+EIwj9GomCMp0HWr0ES94tfguVQTQvd6yxS3i?= =?us-ascii?Q?AzORSvIcOW0z92mJEo2hp0XqUJDlcmVpOKAdEjxh7uoV1BCoHJehOClBRUp0?= =?us-ascii?Q?9xXVDkooCkovRRGSAAMlJydiTzJPVW3bc0kgRrcYTRWZK25N/7ikzlUtjXrq?= =?us-ascii?Q?q8b8dGPqj9eHIDHfIU52S+tyIhqhaZNHHALeUBk/QarOYnXI2cTCYU4LSVXH?= =?us-ascii?Q?hybHm9T05AnJ+LxEw2tBmSJ0Wpn+37GJK1SPZZTKL0Tuou74B2108nXzGX8O?= =?us-ascii?Q?IeKROtVpirfV50zIQ4CBe7/lK/Bhf7/k4jDXdcb94R3y5sFmNB4axy5Jjlok?= =?us-ascii?Q?GpZd9m7SGInBFEeg7/Wo6JTngLUmGrVpxhnLf2/sLMm41BXOWqyLFSu457qH?= =?us-ascii?Q?2OSQEX4yaLGa5CVmUcRWJjh9WwUe/dqQo3yXd0Hjp1BFIRRHL2J+9qGTlEvE?= =?us-ascii?Q?UapuQecKKtv8bw3oWtPjLHamA7Fue7kP2osjy1aUVznTw3Lt96fxpQ0bFxbE?= =?us-ascii?Q?0CpWKnqWgvfljrOIQzz41dbHXcV3igQac/mnTgtRLLtVJM1R3rZSMtWnvpyk?= =?us-ascii?Q?/JGATIJBoMAffxAQwuk8LqpK8N+X3OWIhc+CS6SCUOUSKrsTACeuwH6PdhdK?= =?us-ascii?Q?RGqHcvaKkd1fWhi9meUhwTAAhg2h83yhWmpRcfnNjGUI2OuVZVBBjhpHU5xm?= =?us-ascii?Q?ZEQ1Qax0QzqF25v3aQk/OMr1+PU472m7dGBSIrgHc3ShnPp2XkNWG8AbXwSN?= =?us-ascii?Q?mJAXu1cyY4x/Jj4NQwxbAPPQb63qqOBuWZxJ43XmFkPEG0Xo/cSh1hEY3wce?= =?us-ascii?Q?11oTNn2WtGLOY8R19tqzLTrwfgu2BgerhORl/slyHZt35pBOslQ58r4iCFVR?= =?us-ascii?Q?KOZY4eE3cdJDI2nnh5TR4LfDQeWkpM0YYzRmH9EC4GUZJejXr22H9lDvBRHp?= =?us-ascii?Q?7TlpbqyAWktwnovI191ADy2wcdoyN9oHR5q+GgfE0n7V7m9cGBc1J7FgTneo?= =?us-ascii?Q?p3gMnk9RjqMKapcpnhuJG/Lehb5v+DY8E9h9aTrytcTDBxWeAKr+iv5EJEHA?= =?us-ascii?Q?IulvvYP22HxmKVzP2lHx8sCmbjyoviFzcjikQdMFg76g4d2LuFYAnCbKAp6x?= =?us-ascii?Q?v1dJvTyUUf127KoHNi14WJkI7kHEbT2ZFeKHn5aMrCXTnnm0Gbc4ggVsb9zP?= =?us-ascii?Q?rNvXyvcguZZAWOtPw4t5tmFLWutQNwWMzoYeVN4/phXaxq5tgDkTdQIeASqb?= =?us-ascii?Q?ypx9J5sPjaicNclreLfzg5zD1w/npZ5ivdY4kSXuEHXZuf3ngnjCbt1S7fhq?= =?us-ascii?Q?O8RLZeQBaDdWIKyySrUl/Bp6HwFQXSnqN8ucKnMR?= Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: marvell.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: PH0PR18MB4425.namprd18.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 13e79f49-f6fd-4dc2-888b-08daa1de46e4 X-MS-Exchange-CrossTenant-originalarrivaltime: 29 Sep 2022 05:48:47.0384 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 70e1fb47-1155-421d-87fc-2e58f638b6e0 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: vlGG8PvtT8TGxcNAnYKdHZ185O7t0eRgqTVDP6niPfI8PMfYJp4IkVSw6gRs4NSb9a99gkpHLX65wxAYIKUy8A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR18MB3573 X-Proofpoint-GUID: wtlf2j0ESS-QncvNehuTBh3FkCbUvnd_ X-Proofpoint-ORIG-GUID: wtlf2j0ESS-QncvNehuTBh3FkCbUvnd_ X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.895,Hydra:6.0.528,FMLib:17.11.122.1 definitions=2022-09-29_03,2022-09-29_01,2022-06-22_01 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 >> IOVA mode in DPDK is either PA or VA. The new build option iova_as_va >> configures the mode to VA at compile time and prevents setting it to PA >> at runtime. For now, all drivers which are not always enabled are >> disabled with this option. Supported driver can set the flag >> pmd_iova_as_va in its build file to enable build. >> >> mbuf structure holds the physical (PA) and virtual address (VA) of a >> buffer. if IOVA mode is set to VA, PA is redundant as it is the same as >> VA. So PA field need not be updated and marked invalid if the build is >> configured to use only VA. >> >> Signed-off-by: Shijith Thotton >> --- >> app/test-bbdev/test_bbdev_perf.c | 2 +- >> app/test-crypto-perf/cperf_test_common.c | 5 +-- >> app/test/test_bpf.c | 2 +- >> app/test/test_dmadev.c | 33 ++++++--------- >> app/test/test_mbuf.c | 12 +++--- >> app/test/test_pcapng.c | 2 +- >> config/meson.build | 1 + >> drivers/meson.build | 6 +++ >> lib/eal/linux/eal.c | 7 +++ >> lib/mbuf/rte_mbuf.c | 8 ++-- >> lib/mbuf/rte_mbuf.h | 17 +++++--- >> lib/mbuf/rte_mbuf_core.h | 10 +++++ >> lib/vhost/vhost.h | 2 +- >> lib/vhost/vhost_crypto.c | 54 ++++++++++++++++++------ >> meson_options.txt | 2 + >> 15 files changed, 109 insertions(+), 54 deletions(-) >> >> diff --git a/app/test-bbdev/test_bbdev_perf.c b/app/test- >bbdev/test_bbdev_perf.c >> index 8fab52d821..f6aa25b67d 100644 >> --- a/app/test-bbdev/test_bbdev_perf.c >> +++ b/app/test-bbdev/test_bbdev_perf.c >> @@ -1001,7 +1001,7 @@ init_op_data_objs(struct rte_bbdev_op_data *bufs, >> seg->length); >> memcpy(data, seg->addr, seg->length); >> m_head->buf_addr =3D data; >> - m_head->buf_iova =3D rte_malloc_virt2iova(data); >> + rte_mbuf_iova_set(m_head, >rte_malloc_virt2iova(data)); > >Wouldn't it be better to have a preliminary patch that replaces direct >accesses to m->buf_iova by rte_mbuf_iova_*() functions in app and libs? >This would make this commit smaller to read. =20 Yes. I will add this change in v4. > >If I understand properly, the drivers/ part has to be done at the same tim= e >than setting "pmd_iova_as_va" in the meson config. > This approach was taken as per previous discussions. Also removing buf_iova= from a PMD would require proper testing and performance checks. Current approach would give ample time for this. >> m_head->data_off =3D 0; >> m_head->data_len =3D seg->length; >> } else { >> diff --git a/app/test-crypto-perf/cperf_test_common.c b/app/test-crypto- >perf/cperf_test_common.c >> index 00aadc9a47..27646cd619 100644 >> --- a/app/test-crypto-perf/cperf_test_common.c >> +++ b/app/test-crypto-perf/cperf_test_common.c >> @@ -26,8 +26,7 @@ fill_single_seg_mbuf(struct rte_mbuf *m, struct >rte_mempool *mp, >> /* start of buffer is after mbuf structure and priv data */ >> m->priv_size =3D 0; >> m->buf_addr =3D (char *)m + mbuf_hdr_size; >> - m->buf_iova =3D rte_mempool_virt2iova(obj) + >> - mbuf_offset + mbuf_hdr_size; >> + rte_mbuf_iova_set(m, rte_mempool_virt2iova(obj) + mbuf_offset + >mbuf_hdr_size); >> m->buf_len =3D segment_sz; >> m->data_len =3D data_len; >> m->pkt_len =3D data_len; >> @@ -58,7 +57,7 @@ fill_multi_seg_mbuf(struct rte_mbuf *m, struct >rte_mempool *mp, >> /* start of buffer is after mbuf structure and priv data */ >> m->priv_size =3D 0; >> m->buf_addr =3D (char *)m + mbuf_hdr_size; >> - m->buf_iova =3D next_seg_phys_addr; >> + rte_mbuf_iova_set(m, next_seg_phys_addr); >> next_seg_phys_addr +=3D mbuf_hdr_size + segment_sz; >> m->buf_len =3D segment_sz; >> m->data_len =3D data_len; >> diff --git a/app/test/test_bpf.c b/app/test/test_bpf.c >> index 97f500809e..f5af5e8a3f 100644 >> --- a/app/test/test_bpf.c >> +++ b/app/test/test_bpf.c >> @@ -2600,7 +2600,7 @@ dummy_mbuf_prep(struct rte_mbuf *mb, uint8_t >buf[], uint32_t buf_len, >> uint8_t *db; >> >> mb->buf_addr =3D buf; >> - mb->buf_iova =3D (uintptr_t)buf; >> + rte_mbuf_iova_set(mb, (uintptr_t)buf); >> mb->buf_len =3D buf_len; >> rte_mbuf_refcnt_set(mb, 1); >> >> diff --git a/app/test/test_dmadev.c b/app/test/test_dmadev.c >> index 9e8e101f40..8306947eda 100644 >> --- a/app/test/test_dmadev.c >> +++ b/app/test/test_dmadev.c >> @@ -110,8 +110,8 @@ do_multi_copies(int16_t dev_id, uint16_t vchan, >> for (j =3D 0; j < COPY_LEN/sizeof(uint64_t); j++) >> src_data[j] =3D rte_rand(); >> >> - if (rte_dma_copy(dev_id, vchan, srcs[i]->buf_iova + srcs[i]- >>data_off, >> - dsts[i]->buf_iova + dsts[i]->data_off, COPY_LEN, >0) !=3D id_count++) >> + if (rte_dma_copy(dev_id, vchan, rte_pktmbuf_iova_offset(srcs[i], >0), >> + rte_pktmbuf_iova_offset(dsts[i], 0), COPY_LEN, >0) !=3D id_count++) >> ERR_RETURN("Error with rte_dma_copy for buffer %u\n", >i); >> } >> rte_dma_submit(dev_id, vchan); >> @@ -317,9 +317,8 @@ test_failure_in_full_burst(int16_t dev_id, uint16_t >vchan, bool fence, >> rte_dma_stats_get(dev_id, vchan, &baseline); /* get a baseline set of >stats */ >> for (i =3D 0; i < COMP_BURST_SZ; i++) { >> int id =3D rte_dma_copy(dev_id, vchan, >> - (i =3D=3D fail_idx ? 0 : (srcs[i]->buf_iova + srcs[i]- >>data_off)), >> - dsts[i]->buf_iova + dsts[i]->data_off, >> - COPY_LEN, OPT_FENCE(i)); >> + (i =3D=3D fail_idx ? 0 : >rte_pktmbuf_iova_offset(srcs[i], 0)), >> + rte_pktmbuf_iova_offset(dsts[i], 0), >COPY_LEN, OPT_FENCE(i)); >> if (id < 0) >> ERR_RETURN("Error with rte_dma_copy for buffer %u\n", >i); >> if (i =3D=3D fail_idx) >> @@ -407,9 +406,8 @@ test_individual_status_query_with_failure(int16_t >dev_id, uint16_t vchan, bool f >> >> for (j =3D 0; j < COMP_BURST_SZ; j++) { >> int id =3D rte_dma_copy(dev_id, vchan, >> - (j =3D=3D fail_idx ? 0 : (srcs[j]->buf_iova + srcs[j]- >>data_off)), >> - dsts[j]->buf_iova + dsts[j]->data_off, >> - COPY_LEN, OPT_FENCE(j)); >> + (j =3D=3D fail_idx ? 0 : >rte_pktmbuf_iova_offset(srcs[j], 0)), >> + rte_pktmbuf_iova_offset(dsts[j], 0), >COPY_LEN, OPT_FENCE(j)); >> if (id < 0) >> ERR_RETURN("Error with rte_dma_copy for buffer %u\n", >j); >> if (j =3D=3D fail_idx) >> @@ -470,9 +468,8 @@ test_single_item_status_query_with_failure(int16_t >dev_id, uint16_t vchan, >> >> for (j =3D 0; j < COMP_BURST_SZ; j++) { >> int id =3D rte_dma_copy(dev_id, vchan, >> - (j =3D=3D fail_idx ? 0 : (srcs[j]->buf_iova + srcs[j]- >>data_off)), >> - dsts[j]->buf_iova + dsts[j]->data_off, >> - COPY_LEN, 0); >> + (j =3D=3D fail_idx ? 0 : >rte_pktmbuf_iova_offset(srcs[j], 0)), >> + rte_pktmbuf_iova_offset(dsts[j], 0), >COPY_LEN, 0); >> if (id < 0) >> ERR_RETURN("Error with rte_dma_copy for buffer %u\n", >j); >> if (j =3D=3D fail_idx) >> @@ -529,15 +526,14 @@ test_multi_failure(int16_t dev_id, uint16_t vchan, >struct rte_mbuf **srcs, struc >> >> /* enqueue and gather completions in one go */ >> for (j =3D 0; j < COMP_BURST_SZ; j++) { >> - uintptr_t src =3D srcs[j]->buf_iova + srcs[j]->data_off; >> + uintptr_t src =3D rte_pktmbuf_iova_offset(srcs[j], 0); >> /* set up for failure if the current index is anywhere is the fails >array */ >> for (i =3D 0; i < num_fail; i++) >> if (j =3D=3D fail[i]) >> src =3D 0; >> >> - int id =3D rte_dma_copy(dev_id, vchan, >> - src, dsts[j]->buf_iova + dsts[j]->data_off, >> - COPY_LEN, 0); >> + int id =3D rte_dma_copy(dev_id, vchan, src, >rte_pktmbuf_iova_offset(dsts[j], 0), >> + COPY_LEN, 0); >> if (id < 0) >> ERR_RETURN("Error with rte_dma_copy for buffer %u\n", >j); >> } >> @@ -565,15 +561,14 @@ test_multi_failure(int16_t dev_id, uint16_t vchan, >struct rte_mbuf **srcs, struc >> >> /* enqueue and gather completions in bursts, but getting errors one at= a >time */ >> for (j =3D 0; j < COMP_BURST_SZ; j++) { >> - uintptr_t src =3D srcs[j]->buf_iova + srcs[j]->data_off; >> + uintptr_t src =3D rte_pktmbuf_iova_offset(srcs[j], 0); >> /* set up for failure if the current index is anywhere is the fails >array */ >> for (i =3D 0; i < num_fail; i++) >> if (j =3D=3D fail[i]) >> src =3D 0; >> >> - int id =3D rte_dma_copy(dev_id, vchan, >> - src, dsts[j]->buf_iova + dsts[j]->data_off, >> - COPY_LEN, 0); >> + int id =3D rte_dma_copy(dev_id, vchan, src, >rte_pktmbuf_iova_offset(dsts[j], 0), >> + COPY_LEN, 0); >> if (id < 0) >> ERR_RETURN("Error with rte_dma_copy for buffer %u\n", >j); >> } >> diff --git a/app/test/test_mbuf.c b/app/test/test_mbuf.c >> index e09b2549ca..45431f2c9c 100644 >> --- a/app/test/test_mbuf.c >> +++ b/app/test/test_mbuf.c >> @@ -1232,11 +1232,13 @@ test_failing_mbuf_sanity_check(struct >rte_mempool *pktmbuf_pool) >> return -1; >> } >> >> - badbuf =3D *buf; >> - badbuf.buf_iova =3D 0; >> - if (verify_mbuf_check_panics(&badbuf)) { >> - printf("Error with bad-physaddr mbuf test\n"); >> - return -1; >> + if (!RTE_IOVA_AS_VA) { >> + badbuf =3D *buf; >> + rte_mbuf_iova_set(&badbuf, 0); >> + if (verify_mbuf_check_panics(&badbuf)) { >> + printf("Error with bad-physaddr mbuf test\n"); >> + return -1; >> + } >> } >> >> badbuf =3D *buf; >> diff --git a/app/test/test_pcapng.c b/app/test/test_pcapng.c >> index 320dacea34..abbf00f6da 100644 >> --- a/app/test/test_pcapng.c >> +++ b/app/test/test_pcapng.c >> @@ -40,7 +40,7 @@ dummy_mbuf_prep(struct rte_mbuf *mb, uint8_t buf[], >uint32_t buf_len, >> uint8_t *db; >> >> mb->buf_addr =3D buf; >> - mb->buf_iova =3D (uintptr_t)buf; >> + rte_mbuf_iova_set(mb, (uintptr_t)buf); >> mb->buf_len =3D buf_len; >> rte_mbuf_refcnt_set(mb, 1); >> >> diff --git a/config/meson.build b/config/meson.build >> index 7f7b6c92fd..6b6c3e7eb6 100644 >> --- a/config/meson.build >> +++ b/config/meson.build >> @@ -309,6 +309,7 @@ endif >> if get_option('mbuf_refcnt_atomic') >> dpdk_conf.set('RTE_MBUF_REFCNT_ATOMIC', true) >> endif >> +dpdk_conf.set10('RTE_IOVA_AS_VA', get_option('iova_as_va')) >> >> compile_time_cpuflags =3D [] >> subdir(arch_subdir) >> diff --git a/drivers/meson.build b/drivers/meson.build >> index 376a64f4da..989770cffd 100644 >> --- a/drivers/meson.build >> +++ b/drivers/meson.build >> @@ -105,6 +105,7 @@ foreach subpath:subdirs >> ext_deps =3D [] >> pkgconfig_extra_libs =3D [] >> testpmd_sources =3D [] >> + pmd_iova_as_va =3D false > >This option should be documented, however I don't know where is the proper >place. A comment here would be a good start I think. > =20 Will add. >I'm trying to find a more explicit name, but it's not easy. >What do you think about pmd_supports_disable_iova_as_pa? > Makes sense. I will change to pmd_supports_disable_iova_as_pa. >Explicit is always better, it could avoid someone adding a new driver to >blindly copy the flag from a template driver. > >> >> if not enable_drivers.contains(drv_path) >> build =3D false >> @@ -122,6 +123,11 @@ foreach subpath:subdirs >> # pull in driver directory which should update all the loca= l variables >> subdir(drv_path) >> >> + if dpdk_conf.get('RTE_IOVA_AS_VA') =3D=3D 1 and not pmd_iov= a_as_va and >not always_enable.contains(drv_path) >> + build =3D false >> + reason =3D 'driver does not support IOVA as VA mode' >> + endif >> + >> # get dependency objs from strings >> shared_deps =3D ext_deps >> static_deps =3D ext_deps >> diff --git a/lib/eal/linux/eal.c b/lib/eal/linux/eal.c >> index 37d29643a5..b70c4dcc5f 100644 >> --- a/lib/eal/linux/eal.c >> +++ b/lib/eal/linux/eal.c >> @@ -1127,6 +1127,13 @@ rte_eal_init(int argc, char **argv) >> return -1; >> } >> >> + if (rte_eal_iova_mode() =3D=3D RTE_IOVA_PA && RTE_IOVA_AS_VA) { >> + rte_eal_init_alert( >> + "Cannot use IOVA as 'PA' since build is configured to use >only 'VA'"); >> + rte_errno =3D EINVAL; >> + return -1; >> + } >> + >> RTE_LOG(INFO, EAL, "Selected IOVA mode '%s'\n", >> rte_eal_iova_mode() =3D=3D RTE_IOVA_PA ? "PA" : "VA"); >> >> diff --git a/lib/mbuf/rte_mbuf.c b/lib/mbuf/rte_mbuf.c >> index a2307cebe6..5af290c53a 100644 >> --- a/lib/mbuf/rte_mbuf.c >> +++ b/lib/mbuf/rte_mbuf.c >> @@ -89,7 +89,7 @@ rte_pktmbuf_init(struct rte_mempool *mp, >> /* start of buffer is after mbuf structure and priv data */ >> m->priv_size =3D priv_size; >> m->buf_addr =3D (char *)m + mbuf_size; >> - m->buf_iova =3D rte_mempool_virt2iova(m) + mbuf_size; >> + rte_mbuf_iova_set(m, rte_mempool_virt2iova(m) + mbuf_size); >> m->buf_len =3D (uint16_t)buf_len; >> >> /* keep some headroom between start of buffer and data */ >> @@ -187,8 +187,8 @@ __rte_pktmbuf_init_extmem(struct rte_mempool *mp, >> RTE_ASSERT(ctx->off + ext_mem->elt_size <=3D ext_mem->buf_len); >> >> m->buf_addr =3D RTE_PTR_ADD(ext_mem->buf_ptr, ctx->off); >> - m->buf_iova =3D ext_mem->buf_iova =3D=3D RTE_BAD_IOVA ? >> - RTE_BAD_IOVA : (ext_mem->buf_iova + ctx->off); >> + rte_mbuf_iova_set(m, ext_mem->buf_iova =3D=3D RTE_BAD_IOVA ? >RTE_BAD_IOVA : >> + (ext_mem- >>buf_iova + ctx->off)); >> >> ctx->off +=3D ext_mem->elt_size; >> if (ctx->off + ext_mem->elt_size > ext_mem->buf_len) { >> @@ -388,7 +388,7 @@ int rte_mbuf_check(const struct rte_mbuf *m, int >is_header, >> *reason =3D "bad mbuf pool"; >> return -1; >> } >> - if (m->buf_iova =3D=3D 0) { >> + if (m->buf_iova =3D=3D 0 && !RTE_IOVA_AS_VA) { >> *reason =3D "bad IO addr"; >> return -1; >> } >> diff --git a/lib/mbuf/rte_mbuf.h b/lib/mbuf/rte_mbuf.h >> index 9811e8c760..05be146bc2 100644 >> --- a/lib/mbuf/rte_mbuf.h >> +++ b/lib/mbuf/rte_mbuf.h >> @@ -146,7 +146,7 @@ static inline uint16_t rte_pktmbuf_priv_size(struct >rte_mempool *mp); >> static inline rte_iova_t >> rte_mbuf_data_iova(const struct rte_mbuf *mb) >> { >> - return mb->buf_iova + mb->data_off; >> + return (RTE_IOVA_AS_VA ? (uint64_t)mb->buf_addr : mb->buf_iova) + >mb->data_off; > >nit: cast should be rte_iova_t instead of uint64_t =20 Will change. > >> } >> >> /** >> @@ -164,7 +164,7 @@ rte_mbuf_data_iova(const struct rte_mbuf *mb) >> static inline rte_iova_t >> rte_mbuf_data_iova_default(const struct rte_mbuf *mb) >> { >> - return mb->buf_iova + RTE_PKTMBUF_HEADROOM; >> + return (RTE_IOVA_AS_VA ? (uint64_t)mb->buf_addr : mb->buf_iova) + >RTE_PKTMBUF_HEADROOM; >> } > >same here > Will change. >> >> /** >> @@ -469,6 +469,13 @@ rte_mbuf_ext_refcnt_update(struct >rte_mbuf_ext_shared_info *shinfo, >> __ATOMIC_ACQ_REL); >> } >> >> +static inline void >> +rte_mbuf_iova_set(struct rte_mbuf *m, rte_iova_t iova) >> +{ >> + if (!RTE_IOVA_AS_VA) >> + m->buf_iova =3D iova; >> +} >> + >> /** Mbuf prefetch */ >> #define RTE_MBUF_PREFETCH_TO_FREE(m) do { \ >> if ((m) !=3D NULL) \ >> @@ -1056,7 +1063,7 @@ rte_pktmbuf_attach_extbuf(struct rte_mbuf *m, void >*buf_addr, >> RTE_ASSERT(shinfo->free_cb !=3D NULL); >> >> m->buf_addr =3D buf_addr; >> - m->buf_iova =3D buf_iova; >> + rte_mbuf_iova_set(m, buf_iova); >> m->buf_len =3D buf_len; >> >> m->data_len =3D 0; >> @@ -1143,7 +1150,7 @@ static inline void rte_pktmbuf_attach(struct rte_m= buf >*mi, struct rte_mbuf *m) >> >> mi->data_off =3D m->data_off; >> mi->data_len =3D m->data_len; >> - mi->buf_iova =3D m->buf_iova; >> + rte_mbuf_iova_set(mi, m->buf_iova); >> mi->buf_addr =3D m->buf_addr; >> mi->buf_len =3D m->buf_len; >> >> @@ -1245,7 +1252,7 @@ static inline void rte_pktmbuf_detach(struct rte_m= buf >*m) >> >> m->priv_size =3D priv_size; >> m->buf_addr =3D (char *)m + mbuf_size; >> - m->buf_iova =3D rte_mempool_virt2iova(m) + mbuf_size; >> + rte_mbuf_iova_set(m, rte_mempool_virt2iova(m) + mbuf_size); >> m->buf_len =3D (uint16_t)buf_len; >> rte_pktmbuf_reset_headroom(m); >> m->data_len =3D 0; >> diff --git a/lib/mbuf/rte_mbuf_core.h b/lib/mbuf/rte_mbuf_core.h >> index 3d6ddd6773..c6292e7252 100644 >> --- a/lib/mbuf/rte_mbuf_core.h >> +++ b/lib/mbuf/rte_mbuf_core.h >> @@ -581,6 +581,8 @@ struct rte_mbuf { >> void *buf_addr; /**< Virtual address of segment buffer. */ >> /** >> * Physical address of segment buffer. >> + * This field is invalid if the build is configured to use only >> + * virtual address as IOVA (i.e. RTE_IOVA_AS_VA is 1). >> * Force alignment to 8-bytes, so as to ensure we have the exact >> * same mbuf cacheline0 layout for 32-bit and 64-bit. This makes >> * working on vector drivers easier. > >If the field is invalid, can't we add an #if condition ? I mean: > >#if !RTE_IOVA_AS_VA > rte_iova_t buf_iova; >#else > uint64_t dummy; >#endif > >I think it is preferable, because it would ensure that we never use >buf_iova when RTE_IOVA_AS_VA is set (especially useful when compiling >out-of-tree drivers). > >This would certainly require to change some of the static inline >functions to use #if instead of if(), but I think it's worth the effort. > > =20 Agree. I will change in v4. >> @@ -848,8 +850,12 @@ struct rte_mbuf_ext_shared_info { >> * @param o >> * The offset into the data to calculate address from. >> */ >> +#if RTE_IOVA_AS_VA >> +#define rte_pktmbuf_iova_offset(m, o) rte_pktmbuf_mtod_offset(m, >rte_iova_t, o) >> +#else >> #define rte_pktmbuf_iova_offset(m, o) \ >> (rte_iova_t)((m)->buf_iova + (m)->data_off + (o)) >> +#endif >> >> /** >> * A macro that returns the IO address that points to the start of the >> @@ -858,7 +864,11 @@ struct rte_mbuf_ext_shared_info { >> * @param m >> * The packet mbuf. >> */ >> +#if RTE_IOVA_AS_VA >> +#define rte_pktmbuf_iova(m) rte_pktmbuf_mtod(m, rte_iova_t) >> +#else >> #define rte_pktmbuf_iova(m) rte_pktmbuf_iova_offset(m, 0) >> +#endif >> >> #ifdef __cplusplus >> } >> diff --git a/lib/vhost/vhost.h b/lib/vhost/vhost.h >> index 782d916ae0..05cde6e118 100644 >> --- a/lib/vhost/vhost.h >> +++ b/lib/vhost/vhost.h >> @@ -967,7 +967,7 @@ restore_mbuf(struct rte_mbuf *m) >> /* start of buffer is after mbuf structure and priv data */ >> >> m->buf_addr =3D (char *)m + mbuf_size; >> - m->buf_iova =3D rte_mempool_virt2iova(m) + mbuf_size; >> + rte_mbuf_iova_set(m, rte_mempool_virt2iova(m) + mbuf_size); >> m =3D m->next; >> } >> } >> diff --git a/lib/vhost/vhost_crypto.c b/lib/vhost/vhost_crypto.c >> index 54946f46d9..7b50735796 100644 >> --- a/lib/vhost/vhost_crypto.c >> +++ b/lib/vhost/vhost_crypto.c >> @@ -823,11 +823,17 @@ prepare_sym_cipher_op(struct vhost_crypto >*vcrypto, struct rte_crypto_op *op, >> switch (vcrypto->option) { >> case RTE_VHOST_CRYPTO_ZERO_COPY_ENABLE: >> m_src->data_len =3D cipher->para.src_data_len; >> - m_src->buf_iova =3D gpa_to_hpa(vcrypto->dev, desc->addr, >> - cipher->para.src_data_len); >> + if (!RTE_IOVA_AS_VA) { >> + m_src->buf_iova =3D >> + gpa_to_hpa(vcrypto->dev, desc->addr, cipher- >>para.src_data_len); >> + if (unlikely(m_src->buf_iova =3D=3D 0)) { >> + VC_LOG_ERR("zero_copy may fail due to cross >page data"); >> + ret =3D VIRTIO_CRYPTO_ERR; >> + goto error_exit; >> + } >> + } >> m_src->buf_addr =3D get_data_ptr(vc_req, desc, >VHOST_ACCESS_RO); >> - if (unlikely(m_src->buf_iova =3D=3D 0 || >> - m_src->buf_addr =3D=3D NULL)) { >> + if (unlikely(m_src->buf_addr =3D=3D NULL)) { >> VC_LOG_ERR("zero_copy may fail due to cross page >data"); >> ret =3D VIRTIO_CRYPTO_ERR; >> goto error_exit; >> @@ -867,10 +873,17 @@ prepare_sym_cipher_op(struct vhost_crypto >*vcrypto, struct rte_crypto_op *op, >> >> switch (vcrypto->option) { >> case RTE_VHOST_CRYPTO_ZERO_COPY_ENABLE: >> - m_dst->buf_iova =3D gpa_to_hpa(vcrypto->dev, >> - desc->addr, cipher->para.dst_data_len); >> + if (!RTE_IOVA_AS_VA) { >> + m_dst->buf_iova =3D >> + gpa_to_hpa(vcrypto->dev, desc->addr, cipher- >>para.dst_data_len); >> + if (unlikely(m_dst->buf_iova =3D=3D 0)) { >> + VC_LOG_ERR("zero_copy may fail due to cross >page data"); >> + ret =3D VIRTIO_CRYPTO_ERR; >> + goto error_exit; >> + } >> + } >> m_dst->buf_addr =3D get_data_ptr(vc_req, desc, >VHOST_ACCESS_RW); >> - if (unlikely(m_dst->buf_iova =3D=3D 0 || m_dst->buf_addr =3D=3D NULL)= ) { >> + if (unlikely(m_dst->buf_addr =3D=3D NULL)) { >> VC_LOG_ERR("zero_copy may fail due to cross page >data"); >> ret =3D VIRTIO_CRYPTO_ERR; >> goto error_exit; >> @@ -980,11 +993,17 @@ prepare_sym_chain_op(struct vhost_crypto *vcrypto, >struct rte_crypto_op *op, >> case RTE_VHOST_CRYPTO_ZERO_COPY_ENABLE: >> m_src->data_len =3D chain->para.src_data_len; >> m_dst->data_len =3D chain->para.dst_data_len; >> - >> - m_src->buf_iova =3D gpa_to_hpa(vcrypto->dev, desc->addr, >> - chain->para.src_data_len); >> + if (!RTE_IOVA_AS_VA) { >> + m_src->buf_iova =3D >> + gpa_to_hpa(vcrypto->dev, desc->addr, chain- >>para.src_data_len); >> + if (unlikely(m_src->buf_iova =3D=3D 0)) { >> + VC_LOG_ERR("zero_copy may fail due to cross >page data"); >> + ret =3D VIRTIO_CRYPTO_ERR; >> + goto error_exit; >> + } >> + } >> m_src->buf_addr =3D get_data_ptr(vc_req, desc, >VHOST_ACCESS_RO); >> - if (unlikely(m_src->buf_iova =3D=3D 0 || m_src->buf_addr =3D=3D NULL)= ) { >> + if (unlikely(m_src->buf_addr =3D=3D NULL)) { >> VC_LOG_ERR("zero_copy may fail due to cross page >data"); >> ret =3D VIRTIO_CRYPTO_ERR; >> goto error_exit; >> @@ -1024,10 +1043,17 @@ prepare_sym_chain_op(struct vhost_crypto >*vcrypto, struct rte_crypto_op *op, >> >> switch (vcrypto->option) { >> case RTE_VHOST_CRYPTO_ZERO_COPY_ENABLE: >> - m_dst->buf_iova =3D gpa_to_hpa(vcrypto->dev, >> - desc->addr, chain->para.dst_data_len); >> + if (!RTE_IOVA_AS_VA) { >> + m_dst->buf_iova =3D >> + gpa_to_hpa(vcrypto->dev, desc->addr, chain- >>para.dst_data_len); >> + if (unlikely(m_dst->buf_iova =3D=3D 0)) { >> + VC_LOG_ERR("zero_copy may fail due to cross >page data"); >> + ret =3D VIRTIO_CRYPTO_ERR; >> + goto error_exit; >> + } >> + } >> m_dst->buf_addr =3D get_data_ptr(vc_req, desc, >VHOST_ACCESS_RW); >> - if (unlikely(m_dst->buf_iova =3D=3D 0 || m_dst->buf_addr =3D=3D NULL)= ) { >> + if (unlikely(m_dst->buf_addr =3D=3D NULL)) { >> VC_LOG_ERR("zero_copy may fail due to cross page >data"); >> ret =3D VIRTIO_CRYPTO_ERR; >> goto error_exit; >> diff --git a/meson_options.txt b/meson_options.txt >> index 7c220ad68d..f0fa6cf04c 100644 >> --- a/meson_options.txt >> +++ b/meson_options.txt >> @@ -44,6 +44,8 @@ option('platform', type: 'string', value: 'native', de= scription: >> 'Platform to build, either "native", "generic" or a SoC. Please = refer to the >Linux build guide for more information.') >> option('enable_trace_fp', type: 'boolean', value: false, description: >> 'enable fast path trace points.') >> +option('iova_as_va', type: 'boolean', value: false, description: >> + 'Build which only supports IOVA as VA mode. Unsupported drivers = are >disabled.') > >I wonder if we can find a better name for the option. Currently, it is a b= it >confusing to me, because iova_as_va=3Dfalse does not mean that iova_as_va = is >disabled. > >What about iova_as_pa=3Dtrue|false, or enable_iova_as_pa=3Dtrue|false, or >disable_iova_as_pa=3Dtrue|false? > =20 Agree. Will go with the option enable_iova_as_pa and will rename macro to R= TE_IOVA_AS_PA. >The help string is maybe easier to find, something like >"Enable or disable support for IOVA as PA mode." > >We can also explain that enabling this option removes the buf_iova field f= rom >the mbuf. > >> option('tests', type: 'boolean', value: true, description: >> 'build unit tests') >> option('use_hpet', type: 'boolean', value: false, description: >> -- >> 2.25.1 >>