| Message ID | 20180212180819.82556-5-marcel@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | hw/pvrdma: PVRDMA device implementation | expand |
On 2018/2/13 2:08, Marcel Apfelbaum wrote: > From: Yuval Shaia <yuval.shaia@oracle.com> > > As all mapping for this device are from driver to device, > declare wrappers on top of pci_dma_*map functions. > > In addition, declare macros to be used for debug messages. > > Reviewed-by: Dotan Barak <dotanb@mellanox.com> > Signed-off-by: Yuval Shaia <yuval.shaia@oracle.com> > Signed-off-by: Marcel Apfelbaum <marcel@redhat.com> Reviewed-by: Zhu Yanjun <yanjun.zhu@oracle.com> Zhu Yanjun > --- > hw/Makefile.objs | 1 + > hw/rdma/Makefile.objs | 3 +++ > hw/rdma/rdma_utils.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ > hw/rdma/rdma_utils.h | 43 +++++++++++++++++++++++++++++++++++++++++++ > 4 files changed, 98 insertions(+) > create mode 100644 hw/rdma/Makefile.objs > create mode 100644 hw/rdma/rdma_utils.c > create mode 100644 hw/rdma/rdma_utils.h > > diff --git a/hw/Makefile.objs b/hw/Makefile.objs > index cf4cb2010b..6a0ffe0afd 100644 > --- a/hw/Makefile.objs > +++ b/hw/Makefile.objs > @@ -18,6 +18,7 @@ devices-dirs-$(CONFIG_IPMI) += ipmi/ > devices-dirs-$(CONFIG_SOFTMMU) += isa/ > devices-dirs-$(CONFIG_SOFTMMU) += misc/ > devices-dirs-$(CONFIG_SOFTMMU) += net/ > +devices-dirs-$(CONFIG_SOFTMMU) += rdma/ > devices-dirs-$(CONFIG_SOFTMMU) += nvram/ > devices-dirs-$(CONFIG_SOFTMMU) += pci/ > devices-dirs-$(CONFIG_PCI) += pci-bridge/ pci-host/ > diff --git a/hw/rdma/Makefile.objs b/hw/rdma/Makefile.objs > new file mode 100644 > index 0000000000..cdffe4a9a3 > --- /dev/null > +++ b/hw/rdma/Makefile.objs > @@ -0,0 +1,3 @@ > +ifeq ($(CONFIG_RDMA),y) > +obj-$(CONFIG_PCI) += rdma_utils.o > +endif > diff --git a/hw/rdma/rdma_utils.c b/hw/rdma/rdma_utils.c > new file mode 100644 > index 0000000000..0e5caffd40 > --- /dev/null > +++ b/hw/rdma/rdma_utils.c > @@ -0,0 +1,51 @@ > +/* > + * QEMU paravirtual RDMA - Generic RDMA backend > + * > + * Copyright (C) 2018 Oracle > + * Copyright (C) 2018 Red Hat Inc > + * > + * Authors: > + * Yuval Shaia <yuval.shaia@oracle.com> > + * Marcel Apfelbaum <marcel@redhat.com> > + * > + * This work is licensed under the terms of the GNU GPL, version 2 or later. > + * See the COPYING file in the top-level directory. > + * > + */ > + > +#include "rdma_utils.h" > + > +void *rdma_pci_dma_map(PCIDevice *dev, dma_addr_t addr, dma_addr_t plen) > +{ > + void *p; > + hwaddr len = plen; > + > + if (!addr) { > + pr_dbg("addr is NULL\n"); > + return NULL; > + } > + > + p = pci_dma_map(dev, addr, &len, DMA_DIRECTION_TO_DEVICE); > + if (!p) { > + pr_dbg("Fail in pci_dma_map, addr=0x%llx, len=%ld\n", > + (long long unsigned int)addr, len); > + return NULL; > + } > + > + if (len != plen) { > + rdma_pci_dma_unmap(dev, p, len); > + return NULL; > + } > + > + pr_dbg("0x%llx -> %p (len=%ld)\n", (long long unsigned int)addr, p, len); > + > + return p; > +} > + > +void rdma_pci_dma_unmap(PCIDevice *dev, void *buffer, dma_addr_t len) > +{ > + pr_dbg("%p\n", buffer); > + if (buffer) { > + pci_dma_unmap(dev, buffer, len, DMA_DIRECTION_TO_DEVICE, 0); > + } > +} > diff --git a/hw/rdma/rdma_utils.h b/hw/rdma/rdma_utils.h > new file mode 100644 > index 0000000000..cdac910e24 > --- /dev/null > +++ b/hw/rdma/rdma_utils.h > @@ -0,0 +1,43 @@ > +/* > + * RDMA device: Debug utilities > + * > + * Copyright (C) 2018 Oracle > + * Copyright (C) 2018 Red Hat Inc > + * > + * > + * Authors: > + * Yuval Shaia <yuval.shaia@oracle.com> > + * Marcel Apfelbaum <marcel@redhat.com> > + * > + * This work is licensed under the terms of the GNU GPL, version 2 or later. > + * See the COPYING file in the top-level directory. > + * > + */ > + > +#ifndef RDMA_UTILS_H > +#define RDMA_UTILS_H > + > +#include <qemu/osdep.h> > +#include <include/hw/pci/pci.h> > +#include <include/sysemu/dma.h> > + > +#define pr_info(fmt, ...) \ > + fprintf(stdout, "%s: %-20s (%3d): " fmt, "pvrdma", __func__, __LINE__,\ > + ## __VA_ARGS__) > + > +#define pr_err(fmt, ...) \ > + fprintf(stderr, "%s: Error at %-20s (%3d): " fmt, "pvrdma", __func__, \ > + __LINE__, ## __VA_ARGS__) > + > +#ifdef PVRDMA_DEBUG > +#define pr_dbg(fmt, ...) \ > + fprintf(stdout, "%s: %-20s (%3d): " fmt, "pvrdma", __func__, __LINE__,\ > + ## __VA_ARGS__) > +#else > +#define pr_dbg(fmt, ...) > +#endif > + > +void *rdma_pci_dma_map(PCIDevice *dev, dma_addr_t addr, dma_addr_t plen); > +void rdma_pci_dma_unmap(PCIDevice *dev, void *buffer, dma_addr_t len); > + > +#endif
diff --git a/hw/Makefile.objs b/hw/Makefile.objs index cf4cb2010b..6a0ffe0afd 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -18,6 +18,7 @@ devices-dirs-$(CONFIG_IPMI) += ipmi/ devices-dirs-$(CONFIG_SOFTMMU) += isa/ devices-dirs-$(CONFIG_SOFTMMU) += misc/ devices-dirs-$(CONFIG_SOFTMMU) += net/ +devices-dirs-$(CONFIG_SOFTMMU) += rdma/ devices-dirs-$(CONFIG_SOFTMMU) += nvram/ devices-dirs-$(CONFIG_SOFTMMU) += pci/ devices-dirs-$(CONFIG_PCI) += pci-bridge/ pci-host/ diff --git a/hw/rdma/Makefile.objs b/hw/rdma/Makefile.objs new file mode 100644 index 0000000000..cdffe4a9a3 --- /dev/null +++ b/hw/rdma/Makefile.objs @@ -0,0 +1,3 @@ +ifeq ($(CONFIG_RDMA),y) +obj-$(CONFIG_PCI) += rdma_utils.o +endif diff --git a/hw/rdma/rdma_utils.c b/hw/rdma/rdma_utils.c new file mode 100644 index 0000000000..0e5caffd40 --- /dev/null +++ b/hw/rdma/rdma_utils.c @@ -0,0 +1,51 @@ +/* + * QEMU paravirtual RDMA - Generic RDMA backend + * + * Copyright (C) 2018 Oracle + * Copyright (C) 2018 Red Hat Inc + * + * Authors: + * Yuval Shaia <yuval.shaia@oracle.com> + * Marcel Apfelbaum <marcel@redhat.com> + * + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + * + */ + +#include "rdma_utils.h" + +void *rdma_pci_dma_map(PCIDevice *dev, dma_addr_t addr, dma_addr_t plen) +{ + void *p; + hwaddr len = plen; + + if (!addr) { + pr_dbg("addr is NULL\n"); + return NULL; + } + + p = pci_dma_map(dev, addr, &len, DMA_DIRECTION_TO_DEVICE); + if (!p) { + pr_dbg("Fail in pci_dma_map, addr=0x%llx, len=%ld\n", + (long long unsigned int)addr, len); + return NULL; + } + + if (len != plen) { + rdma_pci_dma_unmap(dev, p, len); + return NULL; + } + + pr_dbg("0x%llx -> %p (len=%ld)\n", (long long unsigned int)addr, p, len); + + return p; +} + +void rdma_pci_dma_unmap(PCIDevice *dev, void *buffer, dma_addr_t len) +{ + pr_dbg("%p\n", buffer); + if (buffer) { + pci_dma_unmap(dev, buffer, len, DMA_DIRECTION_TO_DEVICE, 0); + } +} diff --git a/hw/rdma/rdma_utils.h b/hw/rdma/rdma_utils.h new file mode 100644 index 0000000000..cdac910e24 --- /dev/null +++ b/hw/rdma/rdma_utils.h @@ -0,0 +1,43 @@ +/* + * RDMA device: Debug utilities + * + * Copyright (C) 2018 Oracle + * Copyright (C) 2018 Red Hat Inc + * + * + * Authors: + * Yuval Shaia <yuval.shaia@oracle.com> + * Marcel Apfelbaum <marcel@redhat.com> + * + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + * + */ + +#ifndef RDMA_UTILS_H +#define RDMA_UTILS_H + +#include <qemu/osdep.h> +#include <include/hw/pci/pci.h> +#include <include/sysemu/dma.h> + +#define pr_info(fmt, ...) \ + fprintf(stdout, "%s: %-20s (%3d): " fmt, "pvrdma", __func__, __LINE__,\ + ## __VA_ARGS__) + +#define pr_err(fmt, ...) \ + fprintf(stderr, "%s: Error at %-20s (%3d): " fmt, "pvrdma", __func__, \ + __LINE__, ## __VA_ARGS__) + +#ifdef PVRDMA_DEBUG +#define pr_dbg(fmt, ...) \ + fprintf(stdout, "%s: %-20s (%3d): " fmt, "pvrdma", __func__, __LINE__,\ + ## __VA_ARGS__) +#else +#define pr_dbg(fmt, ...) +#endif + +void *rdma_pci_dma_map(PCIDevice *dev, dma_addr_t addr, dma_addr_t plen); +void rdma_pci_dma_unmap(PCIDevice *dev, void *buffer, dma_addr_t len); + +#endif