[dpdk-dev] [PATCH v2 1/4] mem: remove physical address aliases

Hemant Agrawal hemant.agrawal at oss.nxp.com
Thu Sep 17 12:53:28 CEST 2020


On 9/17/2020 4:11 PM, Thomas Monjalon wrote:
> Remove the deprecated unioned fields phys_addr
> from the structures rte_memseg and rte_memzone.
> They are replaced with the fields iova which are at the same offsets.
>
> Signed-off-by: Thomas Monjalon <thomas at monjalon.net>
> Acked-by: Andrew Rybchenko <arybchenko at solarflare.com>
> Acked-by: Anatoly Burakov <anatoly.burakov at intel.com>
> ---
>   doc/guides/rel_notes/release_20_11.rst            |  4 ++++
>   drivers/bus/fslmc/portal/dpaa2_hw_pvt.h           |  2 +-
>   drivers/common/dpaax/dpaax_iova_table.c           |  2 +-
>   drivers/compress/qat/qat_comp.c                   |  2 +-
>   drivers/compress/qat/qat_comp_pmd.c               |  2 +-
>   drivers/crypto/ccp/ccp_dev.c                      |  2 +-
>   drivers/crypto/octeontx/otx_cryptodev_hw_access.c |  2 +-
>   drivers/crypto/virtio/virtio_cryptodev.c          |  6 +++---
>   drivers/net/ice/base/ice_osdep.h                  |  2 +-
>   drivers/net/pfe/base/pfe.h                        |  2 +-
>   lib/librte_eal/include/rte_memory.h               |  6 +-----
>   lib/librte_eal/include/rte_memzone.h              |  6 +-----
>   lib/librte_kni/rte_kni.c                          | 14 +++++++-------
>   13 files changed, 24 insertions(+), 28 deletions(-)
>
> diff --git a/doc/guides/rel_notes/release_20_11.rst b/doc/guides/rel_notes/release_20_11.rst
> index b729bdf200..c49e612c43 100644
> --- a/doc/guides/rel_notes/release_20_11.rst
> +++ b/doc/guides/rel_notes/release_20_11.rst
> @@ -84,6 +84,10 @@ API Changes
>      Also, make sure to start the actual text at the margin.
>      =======================================================
>   
> +* mem: Removed the unioned field ``phys_addr`` from
> +  the structures ``rte_memseg`` and ``rte_memzone``.
> +  The field ``iova`` is remaining from the old unions.
> +
>   * mbuf: Removed the unioned field ``refcnt_atomic`` from
>     the structures ``rte_mbuf`` and ``rte_mbuf_ext_shared_info``.
>     The field ``refcnt`` is remaining from the old unions.
> diff --git a/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h b/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h
> index 35423df12b..2dd53c63ba 100644
> --- a/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h
> +++ b/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h
> @@ -368,7 +368,7 @@ static phys_addr_t dpaa2_mem_vtop(uint64_t vaddr)
>   
>   	memseg = rte_mem_virt2memseg((void *)(uintptr_t)vaddr, NULL);
>   	if (memseg)
> -		return memseg->phys_addr + RTE_PTR_DIFF(vaddr, memseg->addr);
> +		return memseg->iova + RTE_PTR_DIFF(vaddr, memseg->addr);
>   	return (size_t)NULL;
>   }
>   
> diff --git a/drivers/common/dpaax/dpaax_iova_table.c b/drivers/common/dpaax/dpaax_iova_table.c
> index 5ba8ed1933..91bee65e7b 100644
> --- a/drivers/common/dpaax/dpaax_iova_table.c
> +++ b/drivers/common/dpaax/dpaax_iova_table.c
> @@ -440,7 +440,7 @@ dpaax_memevent_walk_memsegs(const struct rte_memseg_list *msl __rte_unused,
>   			    void *arg __rte_unused)
>   {
>   	DPAAX_DEBUG("Walking for %p (pa=%"PRIu64") and len %zu",
> -		    ms->addr, ms->phys_addr, len);
> +		    ms->addr, ms->iova, len);
>   	dpaax_iova_table_update(rte_mem_virt2phy(ms->addr), ms->addr, len);
>   	return 0;
>   }


Acked-by: Hemant Agrawal <hemant.agrawal at nxp.com>




More information about the dev mailing list