Begin to use rdmavt for qib
v4 cover Begin to use rdmavt for qib
The following series implements the beginning support of rdmavt in the qib driver. The memory registration and protection domain functionality has been moved out of the driver as well as critical qp data structures. More patches will follow to incrementally remove code from qib and use the rdmavt implementation.
This patchset builds on the v3 "Add rdma verbs transport library" patchset.
Changes since v1:
Rebased onto what appears to be the latest branch on Doug's kernel.org repo
(k.o/for-4.4-rc). I can rebase onto something else if needed.
Changes since v2:
Rebased onto k.o/for-4.5 commit: 59caaed7a72a0e3750dfb84636dae6b781559310 Handle removal of rvt_reg_phys_mr()
Changes since v3:
Reworked to handle conflicts introduced after merging with Dougs k.o/for-4.5
---
Dennis Dalessandro (10):
IB/qib: Begin to use rdmavt for verbs
IB/qib: Remove dma.c and use rdmavt version of dma functions IB/qib: Use rdmavt protection domain
IB/qib: Remove most uses of QIB_PERMISSIVE_LID and QIB_MULTICAST_LID_BASE IB/qib: Use rdmavt lid defines in qib
IB/qib: Remove driver specific members from qib qp type IB/qib: Add device specific info prints
IB/qib: Remove qp and mr functionality from qib
IB/qib: Use address handle in rdmavt and remove from qib IB/qib: Remove srq from qib
drivers/infiniband/hw/qib/Kconfig | 2 drivers/infiniband/hw/qib/Makefile | 6 drivers/infiniband/hw/qib/qib.h | 17 + drivers/infiniband/hw/qib/qib_common.h | 2 drivers/infiniband/hw/qib/qib_cq.c | 2 drivers/infiniband/hw/qib/qib_driver.c | 22 + drivers/infiniband/hw/qib/qib_iba7322.c | 2 drivers/infiniband/hw/qib/qib_init.c | 5 drivers/infiniband/hw/qib/qib_intr.c | 2 drivers/infiniband/hw/qib/qib_keys.c | 186 +--------- drivers/infiniband/hw/qib/qib_mad.c | 11 - drivers/infiniband/hw/qib/qib_mmap.c | 18 - drivers/infiniband/hw/qib/qib_mr.c | 490 --------------------------- drivers/infiniband/hw/qib/qib_qp.c | 165 +++++---- drivers/infiniband/hw/qib/qib_rc.c | 105 +++--- drivers/infiniband/hw/qib/qib_ruc.c | 84 ++--- drivers/infiniband/hw/qib/qib_sdma.c | 25 + drivers/infiniband/hw/qib/qib_srq.c | 38 +- drivers/infiniband/hw/qib/qib_sysfs.c | 20 + drivers/infiniband/hw/qib/qib_uc.c | 15 - drivers/infiniband/hw/qib/qib_ud.c | 53 ++- drivers/infiniband/hw/qib/qib_verbs.c | 449 ++++++++----------------- drivers/infiniband/hw/qib/qib_verbs.h | 484 ++++----------------------- drivers/infiniband/hw/qib/qib_verbs_mcast.c | 8 24 files changed, 547 insertions(+), 1664 deletions(-) delete mode 100644 drivers/infiniband/hw/qib/qib_mr.c
Signature · 5 lines
-Denny -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
A message that is not in the archive (sent off-list or not yet received): 20160122204145.2022.26449.stgit-9QXIwq+3FY+1XWohqUldA0EOCMrvLtNR@public.gmane.org
PATCH v4 1/10 IB/qib: Begin to use rdmavt for verbs
This patch begins to make use of rdmavt by registering with it and providing access to the header files. This is just the beginning of rdmavt support in qib.
Most functionality is still being done in the driver, set flags so that rdmavt will let qib continue to handle mr, qp, and cq init.
--- drivers/infiniband/hw/qib/Kconfig | 2 +- drivers/infiniband/hw/qib/qib.h | 1 + drivers/infiniband/hw/qib/qib_init.c | 5 +++-- drivers/infiniband/hw/qib/qib_intr.c | 2 +- drivers/infiniband/hw/qib/qib_mad.c | 5 +++-- drivers/infiniband/hw/qib/qib_sysfs.c | 20 ++++++++++---------- drivers/infiniband/hw/qib/qib_verbs.c | 19 ++++++++++++++----- drivers/infiniband/hw/qib/qib_verbs.h | 8 ++++++-- 8 files changed, 39 insertions(+), 23 deletions(-)
drivers/infiniband/hw/qib/Kconfig +1 -1
@@ -1,6 +1,6 @@ config INFINIBAND_QIB tristate "Intel PCIe HCA support" - depends on 64BIT + depends on 64BIT && INFINIBAND_RDMAVT ---help--- This is a low-level driver for Intel PCIe QLE InfiniBand host channel adapters. This driver does not support the Intel
drivers/infiniband/hw/qib/qib.h +1 -0
@@ -52,6 +52,7 @@#include <linux/kref.h> #include <linux/sched.h> #include <linux/kthread.h> +#include <rdma/rdma_vt.h> #include "qib_common.h" #include "qib_verbs.h"
drivers/infiniband/hw/qib/qib_init.c +3 -2
@@ -42,6 +42,7 @@#ifdef CONFIG_INFINIBAND_QIB_DCA #include <linux/dca.h> #endif +#include <rdma/rdma_vt.h> #include "qib.h" #include "qib_common.h"
@@ -1081,7 +1082,7 @@ void qib_free_devdata(struct qib_devdata *dd)qib_dbg_ibdev_exit (&dd->verbs_dev);#endif free_percpu (dd->int_counter); -ib_dealloc_device (&dd->verbs_dev.ibdev); +ib_dealloc_device (&dd->verbs_dev.rdi.ibdev); }u64 qib_int_counter (struct qib_devdata *dd)
@@ -1171,7 +1172,7 @@ struct qib_devdata *qib_alloc_devdata(struct pci_dev *pdev, size_t extra) bail:if (!list_empty (&dd->list))list_del_init (&dd->list); -ib_dealloc_device (&dd->verbs_dev.ibdev); +ib_dealloc_device (&dd->verbs_dev.rdi.ibdev);return ERR_PTR (ret); }
drivers/infiniband/hw/qib/qib_intr.c +1 -1
@@ -74,7 +74,7 @@ static void signal_ib_event(struct qib_pportdata *ppd, enum ib_event_type ev)struct ib_event event;struct qib_devdata *dd = ppd->dd; - event.device = &dd->verbs_dev.ibdev; + event.device = &dd->verbs_dev.rdi.ibdev; event.element.port_num = ppd->port; event.event = ev;ib_dispatch_event (&event);
drivers/infiniband/hw/qib/qib_mad.c +3 -2
@@ -1028,7 +1028,7 @@ static int set_pkeys(struct qib_devdata *dd, u8 port, u16 *pkeys) (void ) dd->f_set_ib_cfg (ppd,QIB_IB_CFG_PKEYS ,0 ); event.event =IB_EVENT_PKEY_CHANGE ; - event.device = &dd->verbs_dev.ibdev; + event.device = &dd->verbs_dev.rdi.ibdev; event.element.port_num = port;ib_dispatch_event (&event); }
@@ -2483,7 +2483,8 @@ int qib_create_agents(struct qib_ibdev *dev)for (p =0 ; p < dd->num_pports; p++) { ibp = &dd->pport[p].ibport_data; - agent =ib_register_mad_agent (&dev->ibdev, p +1 ,IB_QPT_SMI , + agent =ib_register_mad_agent (&dev->rdi.ibdev, p +1 , +IB_QPT_SMI ,NULL ,0 , send_handler,NULL ,NULL ,0 );if (IS_ERR (agent)) {
drivers/infiniband/hw/qib/qib_sysfs.c +10 -10
@@ -502,7 +502,7 @@ static ssize_t show_rev(struct device *device, struct device_attribute *attr, char *buf) {struct qib_ibdev *dev = - container_of(device, struct qib_ibdev, ibdev.dev); + container_of(device, struct qib_ibdev, rdi.ibdev.dev);return sprintf (buf,"%x\n" ,dd_from_dev (dev)->minrev); }
@@ -511,7 +511,7 @@ static ssize_t show_hca(struct device *device, struct device_attribute *attr, char *buf) {struct qib_ibdev *dev = - container_of(device, struct qib_ibdev, ibdev.dev); + container_of(device, struct qib_ibdev, rdi.ibdev.dev);struct qib_devdata *dd =dd_from_dev (dev);int ret;
@@ -533,7 +533,7 @@ static ssize_t show_boardversion(struct device *device, struct device_attribute *attr, char *buf) { struct qib_ibdev *dev = - container_of(device, struct qib_ibdev, ibdev.dev); + container_of(device, struct qib_ibdev, rdi.ibdev.dev);struct qib_devdata *dd =dd_from_dev (dev);/* The string printed here is already newline-terminated. */
@@ -545,7 +545,7 @@ static ssize_t show_localbus_info(struct device *device, struct device_attribute *attr, char *buf) { struct qib_ibdev *dev = - container_of(device, struct qib_ibdev, ibdev.dev); + container_of(device, struct qib_ibdev, rdi.ibdev.dev);struct qib_devdata *dd =dd_from_dev (dev);/* The string printed here is already newline-terminated. */
@@ -557,7 +557,7 @@ static ssize_t show_nctxts(struct device *device, struct device_attribute *attr, char *buf) { struct qib_ibdev *dev = - container_of(device, struct qib_ibdev, ibdev.dev); + container_of(device, struct qib_ibdev, rdi.ibdev.dev);struct qib_devdata *dd =dd_from_dev (dev);/* Return the number of user ports (contexts) available. */
@@ -572,7 +572,7 @@ static ssize_t show_nfreectxts(struct device *device, struct device_attribute *attr, char *buf) { struct qib_ibdev *dev = - container_of(device, struct qib_ibdev, ibdev.dev); + container_of(device, struct qib_ibdev, rdi.ibdev.dev);struct qib_devdata *dd =dd_from_dev (dev);/* Return the number of free user ports (contexts) available. */
@@ -583,7 +583,7 @@ static ssize_t show_serial(struct device *device, struct device_attribute *attr, char *buf) { struct qib_ibdev *dev = - container_of(device, struct qib_ibdev, ibdev.dev); + container_of(device, struct qib_ibdev, rdi.ibdev.dev);struct qib_devdata *dd =dd_from_dev (dev); buf[sizeof (dd->serial)] ='\0' ;
@@ -597,7 +597,7 @@ static ssize_t store_chip_reset(struct device *device, size_t count) {struct qib_ibdev *dev = - container_of(device, struct qib_ibdev, ibdev.dev); + container_of(device, struct qib_ibdev, rdi.ibdev.dev);struct qib_devdata *dd =dd_from_dev (dev);int ret;
@@ -618,7 +618,7 @@ static ssize_t show_tempsense(struct device *device, struct device_attribute *attr, char *buf) { struct qib_ibdev *dev = - container_of(device, struct qib_ibdev, ibdev.dev); + container_of(device, struct qib_ibdev, rdi.ibdev.dev);struct qib_devdata *dd =dd_from_dev (dev);int ret;int idx;
@@ -778,7 +778,7 @@ bail:*/ int qib_verbs_register_sysfs (struct qib_devdata *dd) { -struct ib_device *dev = &dd->verbs_dev.ibdev; +struct ib_device *dev = &dd->verbs_dev.rdi.ibdev;int i, ret;for (i =0 ; i <ARRAY_SIZE (qib_attributes); ++i) {
drivers/infiniband/hw/qib/qib_verbs.c +14 -5
@@ -2091,7 +2091,7 @@ static int qib_port_immutable(struct ib_device *ibdev, u8 port_num,int qib_register_ib_device (struct qib_devdata *dd) {struct qib_ibdev *dev = &dd->verbs_dev; -struct ib_device *ibdev = &dev->ibdev; +struct ib_device *ibdev = &dev->rdi.ibdev;struct qib_pportdata *ppd = dd->pport;unsigned i, lk_tab_size;int ret;
@@ -2279,7 +2279,17 @@ int qib_register_ib_device(struct qib_devdata *dd)snprintf (ibdev->node_desc,sizeof (ibdev->node_desc),"Intel Infiniband HCA %s" ,init_utsname ()->nodename); - ret =ib_register_device (ibdev, qib_create_port_files); +/* +* Fill in rvt info object. +*/ + dd->verbs_dev.rdi.driver_f.port_callback = qib_create_port_files; + dd->verbs_dev.rdi.dparms.props.max_pd = ib_qib_max_pds; + dd->verbs_dev.rdi.flags = (RVT_FLAG_MR_INIT_DRIVER | +RVT_FLAG_QP_INIT_DRIVER | +RVT_FLAG_CQ_INIT_DRIVER ); + + + ret =rvt_register_device (&dd->verbs_dev.rdi);if (ret) goto err_reg;
@@ -2296,7 +2306,7 @@ int qib_register_ib_device(struct qib_devdata *dd) err_class:qib_free_agents (dev); err_agents: -ib_unregister_device (ibdev); +rvt_unregister_device (&dd->verbs_dev.rdi); err_reg: err_tx:while (!list_empty (&dev->txreq_free)) {
@@ -2325,7 +2335,6 @@ bail:void qib_unregister_ib_device (struct qib_devdata *dd) {struct qib_ibdev *dev = &dd->verbs_dev; -struct ib_device *ibdev = &dev->ibdev;u32 qps_inuse;unsigned lk_tab_size;
@@ -2333,7 +2342,7 @@ void qib_unregister_ib_device(struct qib_devdata *dd)qib_free_agents (dev); -ib_unregister_device (ibdev); +rvt_unregister_device (&dd->verbs_dev.rdi);if (!list_empty (&dev->piowait))qib_dev_err (dd,"piowait list not empty!\n" );
drivers/infiniband/hw/qib/qib_verbs.h +6 -2
@@ -45,6 +45,7 @@#include <linux/completion.h> #include <rdma/ib_pack.h> #include <rdma/ib_user_verbs.h> +#include <rdma/rdma_vt.h> struct qib_ctxtdata ;struct qib_pportdata ;
@@ -752,7 +753,7 @@ struct qib_ibport {struct qib_ibdev { -struct ib_device ibdev; +struct rvt_dev_info rdi;struct list_head pending_mmaps;spinlock_t mmap_offset_lock;/* protect mmap_offset */ u32 mmap_offset;
@@ -845,7 +846,10 @@ static inline struct qib_qp *to_iqp(struct ib_qp *ibqp)static inline struct qib_ibdev *to_idev (struct ib_device *ibdev) { - return container_of(ibdev, struct qib_ibdev, ibdev); +struct rvt_dev_info *rdi; + + rdi = container_of(ibdev, struct rvt_dev_info, ibdev); + return container_of(rdi, struct qib_ibdev, rdi); }/*
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH v4 2/10 IB/qib: Remove dma.c and use rdmavt version of dma functions
In reply to a message not in the archiveThis patch removes the qib_dma.c file and uses the version which has been added to rdmavt.
--- drivers/infiniband/hw/qib/Makefile | 2 +- drivers/infiniband/hw/qib/qib_verbs.c | 3 ++- drivers/infiniband/hw/qib/qib_verbs.h | 2 -- 3 files changed, 3 insertions(+), 4 deletions(-)
drivers/infiniband/hw/qib/Makefile +1 -1
@@ -1,6 +1,6 @@ obj-$(CONFIG_INFINIBAND_QIB) += ib_qib.o -ib_qib-y := qib_cq.o qib_diag.o qib_dma.o qib_driver.o qib_eeprom.o \ +ib_qib-y := qib_cq.o qib_diag.o qib_driver.o qib_eeprom.o \ qib_file_ops.o qib_fs.o qib_init.o qib_intr.o qib_keys.o \ qib_mad.o qib_mmap.o qib_mr.o qib_pcie.o qib_pio_copy.o \ qib_qp.o qib_qsfp.o qib_rc.o qib_ruc.o qib_sdma.o qib_srq.o \
drivers/infiniband/hw/qib/qib_verbs.c +2 -1
@@ -41,6 +41,7 @@#include <linux/mm.h> #include <linux/random.h> #include <linux/vmalloc.h> +#include <rdma/rdma_vt.h> #include "qib.h" #include "qib_common.h"
@@ -2273,7 +2274,7 @@ int qib_register_ib_device(struct qib_devdata *dd) ibdev->detach_mcast = qib_multicast_detach; ibdev->process_mad = qib_process_mad; ibdev->mmap = qib_mmap; - ibdev->dma_ops = &qib_dma_mapping_ops; + ibdev->dma_ops =NULL ; ibdev->get_port_immutable = qib_port_immutable; snprintf(ibdev->node_desc, sizeof(ibdev->node_desc),
drivers/infiniband/hw/qib/qib_verbs.h +0 -2
@@ -1182,6 +1182,4 @@ extern unsigned int ib_qib_max_srq_wrs;extern const u32 ib_qib_rnr_table[]; -extern struct ib_dma_mapping_ops qib_dma_mapping_ops; -#endif /* QIB_VERBS_H */
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH v4 3/10 IB/qib: Use rdmavt protection domain
In reply to a message not in the archiveRemove protection domain datastructure from qib and use rdmavts version.
--- drivers/infiniband/hw/qib/qib_keys.c | 6 ++- drivers/infiniband/hw/qib/qib_mr.c | 2 + drivers/infiniband/hw/qib/qib_ruc.c | 4 +- drivers/infiniband/hw/qib/qib_verbs.c | 66 +++------------------------------ drivers/infiniband/hw/qib/qib_verbs.h | 13 +------ 5 files changed, 12 insertions(+), 79 deletions(-)
drivers/infiniband/hw/qib/qib_keys.c +3 -3
@@ -152,7 +152,7 @@ out:* Check the IB SGE for validity and initialize our internal version * of it. */ -int qib_lkey_ok (struct qib_lkey_table *rkt,struct qib_pd *pd, +int qib_lkey_ok (struct qib_lkey_table *rkt,struct rvt_pd *pd,struct qib_sge *isge,struct ib_sge *sge,int acc) {struct qib_mregion *mr;
@@ -263,7 +263,7 @@ int qib_rkey_ok(struct qib_qp *qp, struct qib_sge *sge,*/ rcu_read_lock ();if (rkey ==0 ) { -struct qib_pd *pd =to_ipd (qp->ibqp.pd); +struct rvt_pd *pd =ibpd_to_rvtpd (qp->ibqp.pd);struct qib_ibdev *dev =to_idev (pd->ibpd.device);if (pd->user)
@@ -341,7 +341,7 @@ bail:int qib_reg_mr (struct qib_qp *qp,struct ib_reg_wr *wr) {struct qib_lkey_table *rkt = &to_idev (qp->ibqp.device)->lk_table; -struct qib_pd *pd =to_ipd (qp->ibqp.pd); +struct rvt_pd *pd =ibpd_to_rvtpd (qp->ibqp.pd);struct qib_mr *mr =to_imr (wr->mr);struct qib_mregion *mrg;u32 key = wr->key;
drivers/infiniband/hw/qib/qib_mr.c +1 -1
@@ -99,7 +99,7 @@ struct ib_mr *qib_get_dma_mr(struct ib_pd *pd, int acc)struct ib_mr *ret;int rval; -if (to_ipd (pd)->user) { +if (ibpd_to_rvtpd (pd)->user) { ret =ERR_PTR (-EPERM ); goto bail; }
drivers/infiniband/hw/qib/qib_ruc.c +2 -2
@@ -84,11 +84,11 @@ static int qib_init_sge(struct qib_qp *qp, struct qib_rwqe *wqe)int i, j, ret;struct ib_wc wc;struct qib_lkey_table *rkt; -struct qib_pd *pd; +struct rvt_pd *pd;struct qib_sge_state *ss; rkt = &to_idev (qp->ibqp.device)->lk_table; - pd =to_ipd (qp->ibqp.srq ? qp->ibqp.srq->pd : qp->ibqp.pd); + pd =ibpd_to_rvtpd (qp->ibqp.srq ? qp->ibqp.srq->pd : qp->ibqp.pd); ss = &qp->r_sge; ss->sg_list = qp->r_sg_list; qp->r_len =0 ;
drivers/infiniband/hw/qib/qib_verbs.c +5 -61
102 lines not on this page · raw message
drivers/infiniband/hw/qib/qib_verbs.h +1 -12
@@ -222,12 +222,6 @@ struct qib_mcast {int n_attached; }; -/* Protection domain */ -struct qib_pd { -struct ib_pd ibpd; -int user;/* non-zero if created from user space */ -}; -/* Address Handle */ struct qib_ah {struct ib_ah ibah;
@@ -819,11 +813,6 @@ static inline struct qib_mr *to_imr(struct ib_mr *ibmr) return container_of(ibmr, struct qib_mr, ibmr); } -static inline struct qib_pd *to_ipd (struct ib_pd *ibpd) -{ - return container_of(ibpd, struct qib_pd, ibpd); -} -static inline struct qib_ah *to_iah (struct ib_ah *ibah) { return container_of(ibah, struct qib_ah, ibah);
@@ -994,7 +983,7 @@ int qib_alloc_lkey(struct qib_mregion *mr, int dma_region);void qib_free_lkey (struct qib_mregion *mr); -int qib_lkey_ok (struct qib_lkey_table *rkt,struct qib_pd *pd, +int qib_lkey_ok (struct qib_lkey_table *rkt,struct rvt_pd *pd,struct qib_sge *isge,struct ib_sge *sge,int acc); int qib_rkey_ok(struct qib_qp *qp, struct qib_sge *sge,
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH v4 4/10 IB/qib: Remove most uses of QIB_PERMISSIVE_LID and QIB_MULTICAST_LID_BASE
In reply to a message not in the archiveThis patch removes most of the uses of QIB_PERMISSIBVE_LID and QIB_MULTICAST_LID_BASE in favor of the recently added IB_* versions. There are still minor uses in AH functions as well as the QIB_* defines but those will be removed in a follow on patch.
--- drivers/infiniband/hw/qib/qib_driver.c | 2 +- drivers/infiniband/hw/qib/qib_mad.c | 4 ++-- drivers/infiniband/hw/qib/qib_qp.c | 5 +++-- drivers/infiniband/hw/qib/qib_ud.c | 11 ++++++----- drivers/infiniband/hw/qib/qib_verbs.c | 2 +- 5 files changed, 13 insertions(+), 11 deletions(-)
drivers/infiniband/hw/qib/qib_driver.c +1 -1
@@ -319,7 +319,7 @@ static u32 qib_rcv_hdrerr(struct qib_ctxtdata *rcd, struct qib_pportdata *ppd,if (tlen <24 ) goto drop; -if (lid <QIB_MULTICAST_LID_BASE ) { +if (lid <be16_to_cpu (IB_MULTICAST_LID_BASE )) { lid &= ~((1 << ppd->lmc) -1 );if (unlikely (lid != ppd->lid)) goto drop;
drivers/infiniband/hw/qib/qib_mad.c +2 -2
@@ -691,7 +691,7 @@ static int subn_set_portinfo(struct ib_smp *smp, struct ib_device *ibdev, lid =be16_to_cpu (pip->lid);/* Must be a valid unicast LID address. */ -if (lid ==0 || lid >=QIB_MULTICAST_LID_BASE ) +if (lid ==0 || lid >=be16_to_cpu (IB_MULTICAST_LID_BASE )) smp->status |=IB_SMP_INVALID_FIELD ;else if (ppd->lid != lid || ppd->lmc != (pip->mkeyprot_resv_lmc &7 )) {if (ppd->lid != lid)
@@ -706,7 +706,7 @@ static int subn_set_portinfo(struct ib_smp *smp, struct ib_device *ibdev, smlid =be16_to_cpu (pip->sm_lid); msl = pip->neighbormtu_mastersmsl &0xF ;/* Must be a valid unicast LID address. */ -if (smlid ==0 || smlid >=QIB_MULTICAST_LID_BASE ) +if (smlid ==0 || smlid >=be16_to_cpu (IB_MULTICAST_LID_BASE )) smp->status |=IB_SMP_INVALID_FIELD ;else if (smlid != ibp->sm_lid || msl != ibp->sm_sl) {spin_lock_irqsave (&ibp->lock, flags);
drivers/infiniband/hw/qib/qib_qp.c +3 -2
@@ -590,14 +590,15 @@ int qib_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, goto inval;if (attr_mask &IB_QP_AV ) { -if (attr->ah_attr.dlid >=QIB_MULTICAST_LID_BASE ) +if (attr->ah_attr.dlid >=be16_to_cpu (IB_MULTICAST_LID_BASE )) goto inval;if (qib_check_ah (qp->ibqp.device, &attr->ah_attr)) goto inval; }if (attr_mask &IB_QP_ALT_PATH ) { -if (attr->alt_ah_attr.dlid >=QIB_MULTICAST_LID_BASE ) +if (attr->alt_ah_attr.dlid >= +be16_to_cpu (IB_MULTICAST_LID_BASE )) goto inval;if (qib_check_ah (qp->ibqp.device, &attr->alt_ah_attr)) goto inval;
drivers/infiniband/hw/qib/qib_ud.c +6 -5
@@ -32,6 +32,7 @@*/ #include <rdma/ib_smi.h> +#include <rdma/ib_verbs.h> #include "qib.h" #include "qib_mad.h"
@@ -278,8 +279,8 @@ int qib_make_ud_req(struct qib_qp *qp) ibp =to_iport (qp->ibqp.device, qp->port_num); ppd =ppd_from_ibp (ibp); ah_attr = &to_iah (wqe->ud_wr.ah)->attr; -if (ah_attr->dlid >=QIB_MULTICAST_LID_BASE ) { -if (ah_attr->dlid !=QIB_PERMISSIVE_LID ) +if (ah_attr->dlid >=be16_to_cpu (IB_MULTICAST_LID_BASE )) { +if (ah_attr->dlid !=be16_to_cpu (IB_LID_PERMISSIVE ))this_cpu_inc (ibp->pmastats->n_multicast_xmit);else this_cpu_inc (ibp->pmastats->n_unicast_xmit);
@@ -368,8 +369,8 @@ int qib_make_ud_req(struct qib_qp *qp)/* * Use the multicast QP if the destination LID is a multicast LID. */ - ohdr->bth[1 ] = ah_attr->dlid >=QIB_MULTICAST_LID_BASE && - ah_attr->dlid !=QIB_PERMISSIVE_LID ? + ohdr->bth[1 ] = ah_attr->dlid >=be16_to_cpu (IB_MULTICAST_LID_BASE ) && + ah_attr->dlid !=be16_to_cpu (IB_LID_PERMISSIVE ) ?cpu_to_be32 (QIB_MULTICAST_QPN ) :cpu_to_be32 (wqe->ud_wr.remote_qpn); ohdr->bth[2 ] =cpu_to_be32 (qp->s_next_psn++ &QIB_PSN_MASK );
@@ -576,7 +577,7 @@ void qib_ud_rcv(struct qib_ibport *ibp, struct qib_ib_header *hdr,/* * Save the LMC lower bits if the destination LID is a unicast LID. */ - wc.dlid_path_bits = dlid >=QIB_MULTICAST_LID_BASE ?0 : + wc.dlid_path_bits = dlid >=be16_to_cpu (IB_MULTICAST_LID_BASE ) ?0 : dlid & ((1 <<ppd_from_ibp (ibp)->lmc) -1 ); wc.port_num = qp->port_num;/* Signal completion event if the solicited bit is set. */
drivers/infiniband/hw/qib/qib_verbs.c +1 -1
@@ -646,7 +646,7 @@ void qib_ib_rcv(struct qib_ctxtdata *rcd, void *rhdr, void *data, u32 tlen)/* Check for a valid destination LID (see ch. 7.11.1). */ lid =be16_to_cpu (hdr->lrh[1 ]); -if (lid <QIB_MULTICAST_LID_BASE ) { +if (lid <be16_to_cpu (IB_MULTICAST_LID_BASE )) { lid &= ~((1 << ppd->lmc) -1 );if (unlikely (lid != ppd->lid)) goto drop;
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH v4 5/10 IB/qib: Use rdmavt lid defines in qib
In reply to a message not in the archiveOriginal patch for AH changes from Kamal Heib <kamalh-VPRAkNaXOzVWk0Htik3J/[email protected]>, split apart from original. This patch also removes the qib specific multicast
lid base and permissive lid defines since they are no longer needed.
Use common LID defines in qib driver.
--- drivers/infiniband/hw/qib/qib_common.h | 2 -- drivers/infiniband/hw/qib/qib_qp.c | 1 + drivers/infiniband/hw/qib/qib_verbs.c | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-)
drivers/infiniband/hw/qib/qib_common.h +0 -2
@@ -742,14 +742,12 @@ struct qib_tid_session_member {#define SIZE_OF_CRC 1#define QIB_DEFAULT_P_KEY 0xFFFF -#define QIB_PERMISSIVE_LID 0xFFFF#define QIB_AETH_CREDIT_SHIFT 24#define QIB_AETH_CREDIT_MASK 0x1F#define QIB_AETH_CREDIT_INVAL 0x1F#define QIB_PSN_MASK 0xFFFFFF#define QIB_MSN_MASK 0xFFFFFF#define QIB_QPN_MASK 0xFFFFFF -#define QIB_MULTICAST_LID_BASE 0xC000#define QIB_EAGER_TID_ID QLOGIC_IB_I_TID_MASK#define QIB_MULTICAST_QPN 0xFFFFFF
drivers/infiniband/hw/qib/qib_qp.c +1 -0
@@ -35,6 +35,7 @@#include <linux/err.h> #include <linux/vmalloc.h> #include <linux/jhash.h> +#include <rdma/rdma_vt.h> #ifdef CONFIG_DEBUG_FS #include <linux/seq_file.h> #endif
drivers/infiniband/hw/qib/qib_verbs.c +2 -2
@@ -1759,8 +1759,8 @@ static int qib_query_gid(struct ib_device *ibdev, u8 port,int qib_check_ah (struct ib_device *ibdev,struct ib_ah_attr *ah_attr) {/* A multicast address requires a GRH (see ch. 8.4.1). */ -if (ah_attr->dlid >=QIB_MULTICAST_LID_BASE && - ah_attr->dlid !=QIB_PERMISSIVE_LID && +if (ah_attr->dlid >=be16_to_cpu (IB_MULTICAST_LID_BASE ) && + ah_attr->dlid !=be16_to_cpu (IB_LID_PERMISSIVE ) && !(ah_attr->ah_flags &IB_AH_GRH )) goto bail; if ((ah_attr->ah_flags & IB_AH_GRH) &&
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH v4 6/10 IB/qib: Remove driver specific members from qib qp type
In reply to a message not in the archiveIn preparation for moving the queue pair data structure to rdmavt the members of the driver specific queue pairs which are not common need to be pushed off to a private driver structure. This structure will be available in the queue pair once moved to rdmavt as a void pointer. This patch while not adding a lot of value in and of itself is a prerequisite to move the queue pair out of the drivers and into rdmavt.
The driver specific, private queue pair data structure should condense as more of the send side code moves to rdmavt.
--- drivers/infiniband/hw/qib/qib_qp.c | 76 ++++++++++++++++++++------------- drivers/infiniband/hw/qib/qib_rc.c | 7 ++- drivers/infiniband/hw/qib/qib_ruc.c | 18 +++++--- drivers/infiniband/hw/qib/qib_sdma.c | 17 +++++-- drivers/infiniband/hw/qib/qib_uc.c | 7 ++- drivers/infiniband/hw/qib/qib_ud.c | 22 +++++----- drivers/infiniband/hw/qib/qib_verbs.c | 61 +++++++++++++++++--------- drivers/infiniband/hw/qib/qib_verbs.h | 26 ++++++++--- 8 files changed, 145 insertions(+), 89 deletions(-)
drivers/infiniband/hw/qib/qib_qp.c +46 -30
@@ -371,10 +371,11 @@ struct qib_qp *qib_lookup_qpn(struct qib_ibport *ibp, u32 qpn)*/ static void qib_reset_qp (struct qib_qp *qp,enum ib_qp_type type) { +struct qib_qp_priv *priv = qp->priv; qp->remote_qpn =0 ; qp->qkey =0 ; qp->qp_access_flags =0 ; -atomic_set (&qp->s_dma_busy,0 ); +atomic_set (&priv->s_dma_busy,0 ); qp->s_flags &=QIB_S_SIGNAL_REQ_WR ; qp->s_hdrwords =0 ; qp->s_wqe =NULL ;
@@ -474,6 +475,7 @@ static void clear_mr_refs(struct qib_qp *qp, int clr_sends)*/ int qib_error_qp (struct qib_qp *qp,enum ib_wc_status err) { +struct qib_qp_priv *priv = qp->priv;struct qib_ibdev *dev =to_idev (qp->ibqp.device);struct ib_wc wc;int ret =0 ;
@@ -492,9 +494,9 @@ int qib_error_qp(struct qib_qp *qp, enum ib_wc_status err) qp->s_flags &= ~QIB_S_ANY_WAIT_SEND ;spin_lock (&dev->pending_lock); -if (!list_empty (&qp->iowait) && !(qp->s_flags &QIB_S_BUSY )) { +if (!list_empty (&priv->iowait) && !(qp->s_flags &QIB_S_BUSY )) { qp->s_flags &= ~QIB_S_ANY_WAIT_IO ; -list_del_init (&qp->iowait); +list_del_init (&priv->iowait); }spin_unlock (&dev->pending_lock);
@@ -504,9 +506,9 @@ int qib_error_qp(struct qib_qp *qp, enum ib_wc_status err)qib_put_mr (qp->s_rdma_mr); qp->s_rdma_mr =NULL ; } -if (qp->s_tx) { -qib_put_txreq (qp->s_tx); - qp->s_tx =NULL ; +if (priv->s_tx) { +qib_put_txreq (priv->s_tx); + priv->s_tx =NULL ; } }
@@ -572,6 +574,7 @@ int qib_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, {struct qib_ibdev *dev =to_idev (ibqp->device);struct qib_qp *qp =to_iqp (ibqp); +struct qib_qp_priv *priv = qp->priv;enum ib_qp_state cur_state, new_state;struct ib_event ev;int lastwqe =0 ;
@@ -699,19 +702,20 @@ int qib_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,if (qp->state !=IB_QPS_RESET ) { qp->state =IB_QPS_RESET ;spin_lock (&dev->pending_lock); -if (!list_empty (&qp->iowait)) -list_del_init (&qp->iowait); +if (!list_empty (&priv->iowait)) +list_del_init (&priv->iowait);spin_unlock (&dev->pending_lock); qp->s_flags &= ~(QIB_S_TIMER |QIB_S_ANY_WAIT );spin_unlock (&qp->s_lock);spin_unlock_irq (&qp->r_lock);/* Stop the sending work queue and retry timer */ -cancel_work_sync (&qp->s_work); +cancel_work_sync (&priv->s_work);del_timer_sync (&qp->s_timer); -wait_event (qp->wait_dma, !atomic_read (&qp->s_dma_busy)); -if (qp->s_tx) { -qib_put_txreq (qp->s_tx); - qp->s_tx =NULL ; +wait_event (priv->wait_dma, + !atomic_read (&priv->s_dma_busy)); +if (priv->s_tx) { +qib_put_txreq (priv->s_tx); + priv->s_tx =NULL ; }remove_qp (dev, qp);wait_event (qp->wait, !atomic_read (&qp->refcount));
@@ -987,7 +991,7 @@ struct ib_qp *qib_create_qp(struct ib_pd *ibpd,size_t sg_list_sz;struct ib_qp *ret;gfp_t gfp; - +struct qib_qp_priv *priv; if (init_attr->cap.max_send_sge > ib_qib_max_sges || init_attr->cap.max_send_wr > ib_qib_max_qp_wrs ||
@@ -1055,11 +1059,18 @@ struct ib_qp *qib_create_qp(struct ib_pd *ibpd, goto bail_swq; }RCU_INIT_POINTER (qp->next,NULL ); - qp->s_hdr =kzalloc (sizeof (*qp->s_hdr), gfp); -if (!qp->s_hdr) { + priv =kzalloc (sizeof (*priv), gfp); +if (!priv) { + ret =ERR_PTR (-ENOMEM ); + goto bail_qp_hdr; + } + priv->owner = qp; + priv->s_hdr =kzalloc (sizeof (*priv->s_hdr), gfp); +if (!priv->s_hdr) { ret =ERR_PTR (-ENOMEM ); goto bail_qp; } + qp->priv = priv; qp->timeout_jiffies =usecs_to_jiffies ((4096UL * (1UL << qp->timeout)) /1000UL );
@@ -1095,11 +1106,11 @@ struct ib_qp *qib_create_qp(struct ib_pd *ibpd,spin_lock_init (&qp->r_rq.lock);atomic_set (&qp->refcount,0 );init_waitqueue_head (&qp->wait); -init_waitqueue_head (&qp->wait_dma); +init_waitqueue_head (&priv->wait_dma);init_timer (&qp->s_timer); qp->s_timer.data = (unsigned long )qp; -INIT_WORK (&qp->s_work, qib_do_send); -INIT_LIST_HEAD (&qp->iowait); +INIT_WORK (&priv->s_work, qib_do_send); +INIT_LIST_HEAD (&priv->iowait);INIT_LIST_HEAD (&qp->rspwait); qp->state =IB_QPS_RESET ; qp->s_wq = swq;
@@ -1189,7 +1200,9 @@ bail_ip:vfree (qp->r_rq.wq);free_qpn (&dev->qpn_table, qp->ibqp.qp_num); bail_qp: -kfree (qp->s_hdr); +kfree (priv->s_hdr); +kfree (priv); +bail_qp_hdr:kfree (qp); bail_swq:vfree (swq);
@@ -1210,23 +1223,24 @@ int qib_destroy_qp(struct ib_qp *ibqp) {struct qib_qp *qp =to_iqp (ibqp);struct qib_ibdev *dev =to_idev (ibqp->device); +struct qib_qp_priv *priv = qp->priv;/* Make sure HW and driver activity is stopped. */ spin_lock_irq (&qp->s_lock);if (qp->state !=IB_QPS_RESET ) { qp->state =IB_QPS_RESET ;spin_lock (&dev->pending_lock); -if (!list_empty (&qp->iowait)) -list_del_init (&qp->iowait); +if (!list_empty (&priv->iowait)) +list_del_init (&priv->iowait);spin_unlock (&dev->pending_lock); qp->s_flags &= ~(QIB_S_TIMER |QIB_S_ANY_WAIT );spin_unlock_irq (&qp->s_lock); -cancel_work_sync (&qp->s_work); +cancel_work_sync (&priv->s_work);del_timer_sync (&qp->s_timer); -wait_event (qp->wait_dma, !atomic_read (&qp->s_dma_busy)); -if (qp->s_tx) { -qib_put_txreq (qp->s_tx); - qp->s_tx =NULL ; +wait_event (priv->wait_dma, !atomic_read (&priv->s_dma_busy)); +if (priv->s_tx) { +qib_put_txreq (priv->s_tx); + priv->s_tx =NULL ; }remove_qp (dev, qp);wait_event (qp->wait, !atomic_read (&qp->refcount));
@@ -1245,7 +1259,8 @@ int qib_destroy_qp(struct ib_qp *ibqp)else vfree (qp->r_rq.wq);vfree (qp->s_wq); -kfree (qp->s_hdr); +kfree (priv->s_hdr); +kfree (priv);kfree (qp);return 0 ; }
@@ -1368,6 +1383,7 @@ void qib_qp_iter_print(struct seq_file *s, struct qib_qp_iter *iter) {struct qib_swqe *wqe;struct qib_qp *qp = iter->qp; +struct qib_qp_priv *priv = qp->priv; wqe =get_swqe_ptr (qp, qp->s_last); seq_printf(s,
@@ -1379,8 +1395,8 @@ void qib_qp_iter_print(struct seq_file *s, struct qib_qp_iter *iter) wqe->wr.opcode, qp->s_hdrwords, qp->s_flags, -atomic_read (&qp->s_dma_busy), - !list_empty (&qp->iowait), +atomic_read (&priv->s_dma_busy), + !list_empty (&priv->iowait), qp->timeout, wqe->ssn, qp->s_lsn,
drivers/infiniband/hw/qib/qib_rc.c +4 -3
@@ -230,6 +230,7 @@ bail:*/ int qib_make_rc_req (struct qib_qp *qp) { +struct qib_qp_priv *priv = qp->priv;struct qib_ibdev *dev =to_idev (qp->ibqp.device);struct qib_other_headers *ohdr;struct qib_sge_state *ss;
@@ -244,9 +245,9 @@ int qib_make_rc_req(struct qib_qp *qp)int ret =0 ;int delta; - ohdr = &qp->s_hdr->u.oth; + ohdr = &priv->s_hdr->u.oth;if (qp->remote_ah_attr.ah_flags &IB_AH_GRH ) - ohdr = &qp->s_hdr->u.l.oth; + ohdr = &priv->s_hdr->u.l.oth;/* * The lock is needed to synchronize between the sending tasklet,
@@ -266,7 +267,7 @@ int qib_make_rc_req(struct qib_qp *qp)if (qp->s_last == qp->s_head) goto bail;/* If DMAs are in progress, we can't flush immediately. */ -if (atomic_read (&qp->s_dma_busy)) { +if (atomic_read (&priv->s_dma_busy)) { qp->s_flags |=QIB_S_WAIT_DMA ; goto bail; }
drivers/infiniband/hw/qib/qib_ruc.c +11 -7
@@ -675,6 +675,7 @@ u32 qib_make_grh(struct qib_ibport *ibp, struct ib_grh *hdr,void qib_make_ruc_header (struct qib_qp *qp,struct qib_other_headers *ohdr,u32 bth0,u32 bth2) { +struct qib_qp_priv *priv = qp->priv;struct qib_ibport *ibp =to_iport (qp->ibqp.device, qp->port_num);u16 lrh0;u32 nwords;
@@ -685,17 +686,18 @@ void qib_make_ruc_header(struct qib_qp *qp, struct qib_other_headers *ohdr, nwords = (qp->s_cur_size + extra_bytes) >>2 ; lrh0 =QIB_LRH_BTH ;if (unlikely (qp->remote_ah_attr.ah_flags &IB_AH_GRH )) { - qp->s_hdrwords +=qib_make_grh (ibp, &qp->s_hdr->u.l.grh, + qp->s_hdrwords +=qib_make_grh (ibp, &priv->s_hdr->u.l.grh, &qp->remote_ah_attr.grh, qp->s_hdrwords, nwords); lrh0 =QIB_LRH_GRH ; } lrh0 |= ibp->sl_to_vl[qp->remote_ah_attr.sl] <<12 | qp->remote_ah_attr.sl <<4 ; - qp->s_hdr->lrh[0 ] =cpu_to_be16 (lrh0); - qp->s_hdr->lrh[1 ] =cpu_to_be16 (qp->remote_ah_attr.dlid); - qp->s_hdr->lrh[2 ] =cpu_to_be16 (qp->s_hdrwords + nwords +SIZE_OF_CRC ); - qp->s_hdr->lrh[3 ] =cpu_to_be16 (ppd_from_ibp (ibp)->lid | + priv->s_hdr->lrh[0 ] =cpu_to_be16 (lrh0); + priv->s_hdr->lrh[1 ] =cpu_to_be16 (qp->remote_ah_attr.dlid); + priv->s_hdr->lrh[2 ] = +cpu_to_be16 (qp->s_hdrwords + nwords +SIZE_OF_CRC ); + priv->s_hdr->lrh[3 ] =cpu_to_be16 (ppd_from_ibp (ibp)->lid | qp->remote_ah_attr.src_path_bits); bth0 |=qib_get_pkey (ibp, qp->s_pkey_index); bth0 |= extra_bytes <<20 ;
@@ -717,7 +719,9 @@ void qib_make_ruc_header(struct qib_qp *qp, struct qib_other_headers *ohdr,*/ void qib_do_send (struct work_struct *work) { - struct qib_qp *qp = container_of(work, struct qib_qp, s_work); + struct qib_qp_priv *priv = container_of(work, struct qib_qp_priv, + s_work); +struct qib_qp *qp = priv->owner;struct qib_ibport *ibp =to_iport (qp->ibqp.device, qp->port_num);struct qib_pportdata *ppd =ppd_from_ibp (ibp);int (*make_req)(struct qib_qp *qp);
@@ -756,7 +760,7 @@ void qib_do_send(struct work_struct *work)* If the packet cannot be sent now, return and * the send tasklet will be woken up later. */ -if (qib_verbs_send (qp, qp->s_hdr, qp->s_hdrwords, +if (qib_verbs_send (qp, priv->s_hdr, qp->s_hdrwords, qp->s_cur_sge, qp->s_cur_size))break ;/* Record that s_hdr is empty. */
drivers/infiniband/hw/qib/qib_sdma.c +11 -6
@@ -513,7 +513,9 @@ int qib_sdma_running(struct qib_pportdata *ppd)static void complete_sdma_err_req (struct qib_pportdata *ppd,struct qib_verbs_txreq *tx) { -atomic_inc (&tx->qp->s_dma_busy); +struct qib_qp_priv *priv = tx->qp->priv; + +atomic_inc (&priv->s_dma_busy);/* no sdma descriptors, so no unmap_desc */ tx->txreq.start_idx =0 ; tx->txreq.next_descq_idx =0 ;
@@ -543,6 +545,7 @@ int qib_sdma_verbs_send(struct qib_pportdata *ppd,u64 sdmadesc[2 ];u32 dwoffset;dma_addr_t addr; +struct qib_qp_priv *priv;spin_lock_irqsave (&ppd->sdma_lock, flags);
@@ -644,8 +647,8 @@ retry: descqp[0 ] |=cpu_to_le64 (SDMA_DESC_DMA_HEAD );if (tx->txreq.flags &QIB_SDMA_TXREQ_F_INTREQ ) descqp[0 ] |=cpu_to_le64 (SDMA_DESC_INTR ); - -atomic_inc (&tx->qp->s_dma_busy); + priv = tx->qp->priv; +atomic_inc (&priv->s_dma_busy); tx->txreq.next_descq_idx = tail; ppd->dd->f_sdma_update_tail (ppd, tail); ppd->sdma_descq_added += tx->txreq.sg_count;
@@ -663,6 +666,7 @@ unmap:unmap_desc (ppd, tail); } qp = tx->qp; + priv = qp->priv;qib_put_txreq (tx);spin_lock (&qp->r_lock);spin_lock (&qp->s_lock);
@@ -679,6 +683,7 @@ unmap: busy: qp = tx->qp; + priv = qp->priv;spin_lock (&qp->s_lock);if (ib_qib_state_ops[qp->state] &QIB_PROCESS_RECV_OK ) {struct qib_ibdev *dev;
@@ -690,16 +695,16 @@ busy:*/ tx->ss = ss; tx->dwords = dwords; - qp->s_tx = tx; + priv->s_tx = tx; dev = &ppd->dd->verbs_dev;spin_lock (&dev->pending_lock); -if (list_empty (&qp->iowait)) { +if (list_empty (&priv->iowait)) {struct qib_ibport *ibp; ibp = &ppd->ibport_data; ibp->n_dmawait++; qp->s_flags |=QIB_S_WAIT_DMA_DESC ; -list_add_tail (&qp->iowait, &dev->dmawait); +list_add_tail (&priv->iowait, &dev->dmawait); }spin_unlock (&dev->pending_lock); qp->s_flags &= ~QIB_S_BUSY ;
drivers/infiniband/hw/qib/qib_uc.c +4 -3
@@ -45,6 +45,7 @@*/ int qib_make_uc_req (struct qib_qp *qp) { +struct qib_qp_priv *priv = qp->priv;struct qib_other_headers *ohdr;struct qib_swqe *wqe;unsigned long flags;
@@ -63,7 +64,7 @@ int qib_make_uc_req(struct qib_qp *qp)if (qp->s_last == qp->s_head) goto bail;/* If DMAs are in progress, we can't flush immediately. */ -if (atomic_read (&qp->s_dma_busy)) { +if (atomic_read (&priv->s_dma_busy)) { qp->s_flags |=QIB_S_WAIT_DMA ; goto bail; }
@@ -72,9 +73,9 @@ int qib_make_uc_req(struct qib_qp *qp) goto done; } - ohdr = &qp->s_hdr->u.oth; + ohdr = &priv->s_hdr->u.oth;if (qp->remote_ah_attr.ah_flags &IB_AH_GRH ) - ohdr = &qp->s_hdr->u.l.oth; + ohdr = &priv->s_hdr->u.l.oth;/* header size in 32-bit words LRH+BTH = (8+12)/4. */ hwords =5 ;
drivers/infiniband/hw/qib/qib_ud.c +12 -10
@@ -235,6 +235,7 @@ drop:*/ int qib_make_ud_req (struct qib_qp *qp) { +struct qib_qp_priv *priv = qp->priv;struct qib_other_headers *ohdr;struct ib_ah_attr *ah_attr;struct qib_pportdata *ppd;
@@ -258,7 +259,7 @@ int qib_make_ud_req(struct qib_qp *qp)if (qp->s_last == qp->s_head) goto bail;/* If DMAs are in progress, we can't flush immediately. */ -if (atomic_read (&qp->s_dma_busy)) { +if (atomic_read (&priv->s_dma_busy)) { qp->s_flags |=QIB_S_WAIT_DMA ; goto bail; }
@@ -295,7 +296,7 @@ int qib_make_ud_req(struct qib_qp *qp)* XXX Instead of waiting, we could queue a * zero length descriptor so we get a callback. */ -if (atomic_read (&qp->s_dma_busy)) { +if (atomic_read (&priv->s_dma_busy)) { qp->s_flags |=QIB_S_WAIT_DMA ; goto bail; }
@@ -325,11 +326,11 @@ int qib_make_ud_req(struct qib_qp *qp)if (ah_attr->ah_flags &IB_AH_GRH ) {/* Header size in 32-bit words. */ - qp->s_hdrwords +=qib_make_grh (ibp, &qp->s_hdr->u.l.grh, + qp->s_hdrwords +=qib_make_grh (ibp, &priv->s_hdr->u.l.grh, &ah_attr->grh, qp->s_hdrwords, nwords); lrh0 =QIB_LRH_GRH ; - ohdr = &qp->s_hdr->u.l.oth; + ohdr = &priv->s_hdr->u.l.oth;/* * Don't worry about sending to locally attached multicast * QPs. It is unspecified by the spec. what happens.
@@ -337,7 +338,7 @@ int qib_make_ud_req(struct qib_qp *qp) }else {/* Header size in 32-bit words. */ lrh0 =QIB_LRH_BTH ; - ohdr = &qp->s_hdr->u.oth; + ohdr = &priv->s_hdr->u.oth; }if (wqe->wr.opcode ==IB_WR_SEND_WITH_IMM ) { qp->s_hdrwords++;
@@ -350,15 +351,16 @@ int qib_make_ud_req(struct qib_qp *qp) lrh0 |=0xF000 ;/* Set VL (see ch. 13.5.3.1) */ else lrh0 |= ibp->sl_to_vl[ah_attr->sl] << 12; - qp->s_hdr->lrh[0 ] =cpu_to_be16 (lrh0); - qp->s_hdr->lrh[1 ] =cpu_to_be16 (ah_attr->dlid);/* DEST LID */ - qp->s_hdr->lrh[2 ] =cpu_to_be16 (qp->s_hdrwords + nwords +SIZE_OF_CRC ); + priv->s_hdr->lrh[0 ] =cpu_to_be16 (lrh0); + priv->s_hdr->lrh[1 ] =cpu_to_be16 (ah_attr->dlid);/* DEST LID */ + priv->s_hdr->lrh[2 ] = +cpu_to_be16 (qp->s_hdrwords + nwords +SIZE_OF_CRC ); lid = ppd->lid;if (lid) { lid |= ah_attr->src_path_bits & ((1 << ppd->lmc) -1 ); - qp->s_hdr->lrh[3 ] =cpu_to_be16 (lid); + priv->s_hdr->lrh[3 ] =cpu_to_be16 (lid); }else - qp->s_hdr->lrh[3 ] =IB_LID_PERMISSIVE ; + priv->s_hdr->lrh[3 ] =IB_LID_PERMISSIVE ;if (wqe->wr.send_flags &IB_SEND_SOLICITED ) bth0 |=IB_BTH_SOLICITED ; bth0 |= extra_bytes <<20 ;
drivers/infiniband/hw/qib/qib_verbs.c +39 -22
203 lines not on this page · raw message
drivers/infiniband/hw/qib/qib_verbs.h +18 -8
@@ -413,6 +413,21 @@ struct qib_ack_entry { };/* +* qib specific data structure that will be hidden from rvt after the queue pair +* is made common. +*/ +struct qib_qp ; +struct qib_qp_priv { +struct qib_ib_header *s_hdr;/* next packet header to send */ +struct list_head iowait;/* link for wait PIO buf */ +atomic_t s_dma_busy; +struct qib_verbs_txreq *s_tx; +struct work_struct s_work; +wait_queue_head_t wait_dma; +struct qib_qp *owner; +}; + +/* * Variables prefixed with s_ are for the requester (sender). * Variables prefixed with r_ are for the responder (receiver). * Variables prefixed with ack_ are for responder replies.
@@ -422,13 +437,13 @@ struct qib_ack_entry {*/ struct qib_qp {struct ib_qp ibqp; +struct qib_qp_priv *priv;/* read mostly fields above and below */ struct ib_ah_attr remote_ah_attr;struct ib_ah_attr alt_ah_attr;struct qib_qp __rcu *next;/* link list for QPN hash table */ struct qib_swqe *s_wq;/* send work queue */ struct qib_mmap_info *ip; -struct qib_ib_header *s_hdr;/* next packet header to send */ unsigned long timeout_jiffies;/* computed from timeout */ enum ib_mtu path_mtu;
@@ -486,11 +501,11 @@ struct qib_qp {spinlock_t s_lock____cacheline_aligned_in_smp ;struct qib_sge_state *s_cur_sge;u32 s_flags; -struct qib_verbs_txreq *s_tx; +struct qib_swqe *s_wqe;struct qib_sge_state s_sge;/* current send request data */ struct qib_mregion *s_rdma_mr; -atomic_t s_dma_busy; +u32 s_cur_size;/* size of send packet in bytes */ u32 s_len;/* total length of s_sge */ u32 s_rdma_read_len;/* total length of s_rdma_read_sge */
@@ -521,11 +536,6 @@ struct qib_qp {struct qib_sge_state s_ack_rdma_sge;struct timer_list s_timer; -struct list_head iowait;/* link for wait PIO buf */ - -struct work_struct s_work; - -wait_queue_head_t wait_dma;struct qib_sge r_sg_list[0 ]/* verified SGEs */ ____cacheline_aligned_in_smp ;
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH v4 7/10 IB/qib: Add device specific info prints
In reply to a message not in the archiveImplement get_card_name and get_pci_dev helper functions for rdmavt for qib.
--- drivers/infiniband/hw/qib/qib.h | 2 ++ drivers/infiniband/hw/qib/qib_driver.c | 16 ++++++++++++++++ drivers/infiniband/hw/qib/qib_verbs.c | 2 ++ 3 files changed, 20 insertions(+), 0 deletions(-)
drivers/infiniband/hw/qib/qib.h +2 -0
@@ -1455,6 +1455,8 @@ u64 qib_sps_ints(void);dma_addr_t qib_map_page (struct pci_dev *,struct page *,unsigned long ,size_t ,int );const char *qib_get_unit_name (int unit); +const char *qib_get_card_name (struct rvt_dev_info *rdi); +struct pci_dev *qib_get_pci_dev (struct rvt_dev_info *rdi);/* * Flush write combining store buffers (if present) and perform a write
drivers/infiniband/hw/qib/qib_driver.c +16 -0
@@ -90,6 +90,22 @@ const char *qib_get_unit_name(int unit)return iname; } +const char *qib_get_card_name (struct rvt_dev_info *rdi) +{ + struct qib_ibdev *ibdev = container_of(rdi, struct qib_ibdev, rdi); +struct qib_devdata *dd =container_of (ibdev, + struct qib_devdata, verbs_dev); +return qib_get_unit_name (dd->unit); +} + +struct pci_dev *qib_get_pci_dev (struct rvt_dev_info *rdi) +{ + struct qib_ibdev *ibdev = container_of(rdi, struct qib_ibdev, rdi); +struct qib_devdata *dd =container_of (ibdev, + struct qib_devdata, verbs_dev); +return dd->pcidev; +} +/* * Return count of units with at least one port ACTIVE. */
drivers/infiniband/hw/qib/qib_verbs.c +2 -0
@@ -2244,6 +2244,8 @@ int qib_register_ib_device(struct qib_devdata *dd)* Fill in rvt info object. */ dd->verbs_dev.rdi.driver_f.port_callback = qib_create_port_files; + dd->verbs_dev.rdi.driver_f.get_card_name = qib_get_card_name; + dd->verbs_dev.rdi.driver_f.get_pci_dev = qib_get_pci_dev; dd->verbs_dev.rdi.dparms.props.max_pd = ib_qib_max_pds; dd->verbs_dev.rdi.flags = (RVT_FLAG_MR_INIT_DRIVER | RVT_FLAG_QP_INIT_DRIVER |
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH v4 8/10 IB/qib: Remove qp and mr functionality from qib
In reply to a message not in the archiveRemove qp and mr support from qib and use rdmavt. These two changes cannot be reasonably be split apart into separate patches because they depend on each other in mulitple places. This paves the way to remove even more functions in subsequent patches.
---
Changes since v2:
Handle removal of rvt_reg_phys_mr()
drivers/infiniband/hw/qib/Makefile | 4 drivers/infiniband/hw/qib/qib.h | 14 - drivers/infiniband/hw/qib/qib_cq.c | 2 drivers/infiniband/hw/qib/qib_driver.c | 4 drivers/infiniband/hw/qib/qib_keys.c | 184 +--------- drivers/infiniband/hw/qib/qib_mmap.c | 18 - drivers/infiniband/hw/qib/qib_mr.c | 490 --------------------------- drivers/infiniband/hw/qib/qib_qp.c | 74 ++-- drivers/infiniband/hw/qib/qib_rc.c | 98 +++-- drivers/infiniband/hw/qib/qib_ruc.c | 58 ++- drivers/infiniband/hw/qib/qib_sdma.c | 8 drivers/infiniband/hw/qib/qib_srq.c | 28 +- drivers/infiniband/hw/qib/qib_uc.c | 8 drivers/infiniband/hw/qib/qib_ud.c | 16 - drivers/infiniband/hw/qib/qib_verbs.c | 176 ++++------ drivers/infiniband/hw/qib/qib_verbs.h | 432 +++--------------------- drivers/infiniband/hw/qib/qib_verbs_mcast.c | 8 17 files changed, 308 insertions(+), 1314 deletions(-) delete mode 100644 drivers/infiniband/hw/qib/qib_mr.c
drivers/infiniband/hw/qib/Makefile +2 -2
@@ -1,8 +1,8 @@ obj-$(CONFIG_INFINIBAND_QIB) += ib_qib.o ib_qib-y := qib_cq.o qib_diag.o qib_driver.o qib_eeprom.o \ - qib_file_ops.o qib_fs.o qib_init.o qib_intr.o qib_keys.o \ - qib_mad.o qib_mmap.o qib_mr.o qib_pcie.o qib_pio_copy.o \ + qib_file_ops.o qib_fs.o qib_init.o qib_intr.o \ + qib_mad.o qib_mmap.o qib_pcie.o qib_pio_copy.o \ qib_qp.o qib_qsfp.o qib_rc.o qib_ruc.o qib_sdma.o qib_srq.o \ qib_sysfs.o qib_twsi.o qib_tx.o qib_uc.o qib_ud.o \ qib_user_pages.o qib_user_sdma.o qib_verbs_mcast.o qib_iba7220.o \
drivers/infiniband/hw/qib/qib.h +7 -7
@@ -231,7 +231,7 @@ struct qib_ctxtdata {/* ctxt rcvhdrq head offset */ u32 head;/* lookaside fields */ -struct qib_qp *lookaside_qp; +struct rvt_qp *lookaside_qp;u32 lookaside_qpn;/* QPs waiting for context processing */ struct list_head qp_wait_list;
@@ -241,7 +241,7 @@ struct qib_ctxtdata {#endif }; -struct qib_sge_state ; +struct rvt_sge_state ;struct qib_sdma_txreq {int flags;
@@ -259,14 +259,14 @@ struct qib_sdma_desc {struct qib_verbs_txreq {struct qib_sdma_txreq txreq; -struct qib_qp *qp; -struct qib_swqe *wqe; +struct rvt_qp *qp; +struct rvt_swqe *wqe;u32 dwords;u16 hdr_dwords;u16 hdr_inx;struct qib_pio_header *align_buf; -struct qib_mregion *mr; -struct qib_sge_state *ss; +struct rvt_mregion *mr; +struct rvt_sge_state *ss; };#define QIB_SDMA_TXREQ_F_USELARGEBUF 0x1
@@ -1324,7 +1324,7 @@ void __qib_sdma_intr(struct qib_pportdata *);void qib_sdma_intr (struct qib_pportdata *);void qib_user_sdma_send_desc (struct qib_pportdata *dd,struct list_head *pktlist); -int qib_sdma_verbs_send (struct qib_pportdata *,struct qib_sge_state *, +int qib_sdma_verbs_send (struct qib_pportdata *,struct rvt_sge_state *,u32 ,struct qib_verbs_txreq *);/* ppd->sdma_lock should be locked before calling this. */ int qib_sdma_make_progress (struct qib_pportdata *dd);
drivers/infiniband/hw/qib/qib_cq.c +1 -1
@@ -466,7 +466,7 @@ int qib_resize_cq(struct ib_cq *ibcq, int cqe, struct ib_udata *udata)if (cq->ip) {struct qib_ibdev *dev =to_idev (ibcq->device); -struct qib_mmap_info *ip = cq->ip; +struct rvt_mmap_info *ip = cq->ip;qib_update_mmap_info (dev, ip, sz, wc);
drivers/infiniband/hw/qib/qib_driver.c +2 -2
@@ -322,7 +322,7 @@ static u32 qib_rcv_hdrerr(struct qib_ctxtdata *rcd, struct qib_pportdata *ppd,struct qib_ib_header *hdr = (struct qib_ib_header *) rhdr;struct qib_other_headers *ohdr =NULL ;struct qib_ibport *ibp = &ppd->ibport_data; -struct qib_qp *qp =NULL ; +struct rvt_qp *qp =NULL ;u32 tlen =qib_hdrget_length_in_bytes (rhf_addr);u16 lid =be16_to_cpu (hdr->lrh[1 ]);int lnh =be16_to_cpu (hdr->lrh[0 ]) &3 ;
@@ -472,7 +472,7 @@ u32 qib_kreceive(struct qib_ctxtdata *rcd, u32 *llic, u32 *npkts)u32 eflags, etype, tlen, i =0 , updegr =0 , crcs =0 ;int last;u64 lval; -struct qib_qp *qp, *nqp; +struct rvt_qp *qp, *nqp; l = rcd->head; rhf_addr = (__le32 *) rcd->rcvhdrq + l + dd->rhf_offset;
drivers/infiniband/hw/qib/qib_keys.c +15 -169
259 lines not on this page · raw message
drivers/infiniband/hw/qib/qib_mmap.c +9 -9
@@ -41,12 +41,12 @@/** * qib_release_mmap_info - free mmap info structure -* @ref: a pointer to the kref within struct qib_mmap_info +* @ref: a pointer to the kref within struct rvt_mmap_info */ void qib_release_mmap_info (struct kref *ref) { -struct qib_mmap_info *ip = - container_of(ref, struct qib_mmap_info, ref); +struct rvt_mmap_info *ip = + container_of(ref, struct rvt_mmap_info, ref);struct qib_ibdev *dev =to_idev (ip->context->device);spin_lock_irq (&dev->pending_lock);
@@ -63,14 +63,14 @@ void qib_release_mmap_info(struct kref *ref)*/ static void qib_vma_open (struct vm_area_struct *vma) { -struct qib_mmap_info *ip = vma->vm_private_data; +struct rvt_mmap_info *ip = vma->vm_private_data;kref_get (&ip->ref); }static void qib_vma_close (struct vm_area_struct *vma) { -struct qib_mmap_info *ip = vma->vm_private_data; +struct rvt_mmap_info *ip = vma->vm_private_data;kref_put (&ip->ref, qib_release_mmap_info); }
@@ -91,7 +91,7 @@ int qib_mmap(struct ib_ucontext *context, struct vm_area_struct *vma)struct qib_ibdev *dev =to_idev (context->device);unsigned long offset = vma->vm_pgoff <<PAGE_SHIFT ;unsigned long size = vma->vm_end - vma->vm_start; -struct qib_mmap_info *ip, *pp; +struct rvt_mmap_info *ip, *pp;int ret = -EINVAL ;/*
@@ -128,11 +128,11 @@ done:/* * Allocate information for qib_mmap */ -struct qib_mmap_info *qib_create_mmap_info (struct qib_ibdev *dev, +struct rvt_mmap_info *qib_create_mmap_info (struct qib_ibdev *dev,u32 size,struct ib_ucontext *context,void *obj) { -struct qib_mmap_info *ip; +struct rvt_mmap_info *ip; ip =kmalloc (sizeof (*ip),GFP_KERNEL );if (!ip)
@@ -157,7 +157,7 @@ bail:return ip; } -void qib_update_mmap_info (struct qib_ibdev *dev,struct qib_mmap_info *ip, +void qib_update_mmap_info (struct qib_ibdev *dev,struct rvt_mmap_info *ip,u32 size,void *obj) { size =PAGE_ALIGN (size);
drivers/infiniband/hw/qib/qib_mr.c deleted +0 -490
490 lines not on this page · raw message
drivers/infiniband/hw/qib/qib_qp.c +37 -37
245 lines not on this page · raw message
drivers/infiniband/hw/qib/qib_rc.c +49 -49
338 lines not on this page · raw message
drivers/infiniband/hw/qib/qib_ruc.c +29 -29
171 lines not on this page · raw message
drivers/infiniband/hw/qib/qib_sdma.c +4 -4
@@ -533,12 +533,12 @@ static void complete_sdma_err_req(struct qib_pportdata *ppd,* 3) The SGE addresses are suitable for passing to dma_map_single(). */ int qib_sdma_verbs_send (struct qib_pportdata *ppd, -struct qib_sge_state *ss,u32 dwords, +struct rvt_sge_state *ss,u32 dwords,struct qib_verbs_txreq *tx) {unsigned long flags; -struct qib_sge *sge; -struct qib_qp *qp; +struct rvt_sge *sge; +struct rvt_qp *qp;int ret =0 ;u16 tail;__le64 *descqp;
@@ -624,7 +624,7 @@ retry:if (--ss->num_sge) *sge = *ss->sg_list++; }else if (sge->length ==0 && sge->mr->lkey) { -if (++sge->n >=QIB_SEGSZ ) { +if (++sge->n >=RVT_SEGSZ ) {if (++sge->m >= sge->mr->mapsz)break ; sge->n =0 ;
drivers/infiniband/hw/qib/qib_srq.c +14 -14
@@ -49,12 +49,12 @@ int qib_post_srq_receive(struct ib_srq *ibsrq, struct ib_recv_wr *wr, struct ib_recv_wr **bad_wr) {struct qib_srq *srq =to_isrq (ibsrq); -struct qib_rwq *wq; +struct rvt_rwq *wq;unsigned long flags;int ret;for (; wr; wr = wr->next) { -struct qib_rwqe *wqe; +struct rvt_rwqe *wqe;u32 next;int i;
@@ -132,8 +132,8 @@ struct ib_srq *qib_create_srq(struct ib_pd *ibpd, srq->rq.size = srq_init_attr->attr.max_wr +1 ; srq->rq.max_sge = srq_init_attr->attr.max_sge; sz =sizeof (struct ib_sge ) * srq->rq.max_sge + -sizeof (struct qib_rwqe ); - srq->rq.wq =vmalloc_user (sizeof (struct qib_rwq ) + srq->rq.size * sz); +sizeof (struct rvt_rwqe ); + srq->rq.wq =vmalloc_user (sizeof (struct rvt_rwq ) + srq->rq.size * sz);if (!srq->rq.wq) { ret =ERR_PTR (-ENOMEM ); goto bail_srq;
@@ -145,7 +145,7 @@ struct ib_srq *qib_create_srq(struct ib_pd *ibpd,*/ if (udata && udata->outlen >=sizeof (__u64)) {int err; -u32 s =sizeof (struct qib_rwq ) + srq->rq.size * sz; +u32 s =sizeof (struct rvt_rwq ) + srq->rq.size * sz; srq->ip = qib_create_mmap_info(dev, s, ibpd->uobject->context,
@@ -213,12 +213,12 @@ int qib_modify_srq(struct ib_srq *ibsrq, struct ib_srq_attr *attr, struct ib_udata *udata) {struct qib_srq *srq =to_isrq (ibsrq); -struct qib_rwq *wq; +struct rvt_rwq *wq;int ret =0 ;if (attr_mask &IB_SRQ_MAX_WR ) { -struct qib_rwq *owq; -struct qib_rwqe *p; +struct rvt_rwq *owq; +struct rvt_rwqe *p;u32 sz, size, n, head, tail;/* Check that the requested sizes are below the limits. */
@@ -229,10 +229,10 @@ int qib_modify_srq(struct ib_srq *ibsrq, struct ib_srq_attr *attr, goto bail; } - sz =sizeof (struct qib_rwqe ) + + sz =sizeof (struct rvt_rwqe ) + srq->rq.max_sge *sizeof (struct ib_sge ); size = attr->max_wr +1 ; - wq =vmalloc_user (sizeof (struct qib_rwq ) + size * sz); + wq =vmalloc_user (sizeof (struct rvt_rwq ) + size * sz);if (!wq) { ret = -ENOMEM ; goto bail;
@@ -279,7 +279,7 @@ int qib_modify_srq(struct ib_srq *ibsrq, struct ib_srq_attr *attr, n =0 ; p = wq->wq;while (tail != head) { -struct qib_rwqe *wqe; +struct rvt_rwqe *wqe;int i; wqe =get_rwqe_ptr (&srq->rq, tail);
@@ -288,7 +288,7 @@ int qib_modify_srq(struct ib_srq *ibsrq, struct ib_srq_attr *attr,for (i =0 ; i < wqe->num_sge; i++) p->sg_list[i] = wqe->sg_list[i]; n++; - p = (struct qib_rwqe *)((char *) p + sz); + p = (struct rvt_rwqe *)((char *)p + sz);if (++tail >= srq->rq.size) tail =0 ; }
@@ -303,9 +303,9 @@ int qib_modify_srq(struct ib_srq *ibsrq, struct ib_srq_attr *attr,vfree (owq);if (srq->ip) { -struct qib_mmap_info *ip = srq->ip; +struct rvt_mmap_info *ip = srq->ip;struct qib_ibdev *dev =to_idev (srq->ibsrq.device); -u32 s =sizeof (struct qib_rwq ) + size * sz; +u32 s =sizeof (struct rvt_rwq ) + size * sz;qib_update_mmap_info (dev, ip, s, wq);
drivers/infiniband/hw/qib/qib_uc.c +4 -4
@@ -43,11 +43,11 @@* * Return 1 if constructed; otherwise, return 0. */ -int qib_make_uc_req (struct qib_qp *qp) +int qib_make_uc_req (struct rvt_qp *qp) {struct qib_qp_priv *priv = qp->priv;struct qib_other_headers *ohdr; -struct qib_swqe *wqe; +struct rvt_swqe *wqe;unsigned long flags;u32 hwords;u32 bth0;
@@ -241,7 +241,7 @@ unlock:* Called at interrupt level. */ void qib_uc_rcv (struct qib_ibport *ibp,struct qib_ib_header *hdr, -int has_grh,void *data,u32 tlen,struct qib_qp *qp) +int has_grh,void *data,u32 tlen,struct rvt_qp *qp) {struct qib_other_headers *ohdr;u32 opcode;
@@ -439,7 +439,7 @@ rdma_first:int ok;/* Check rkey */ - ok =qib_rkey_ok (qp, &qp->r_sge.sge, qp->r_len, + ok =rvt_rkey_ok (qp, &qp->r_sge.sge, qp->r_len, vaddr, rkey,IB_ACCESS_REMOTE_WRITE );if (unlikely (!ok)) goto drop;
drivers/infiniband/hw/qib/qib_ud.c +8 -8
@@ -47,15 +47,15 @@* Note that the receive interrupt handler may be calling qib_ud_rcv() * while this is being called. */ -static void qib_ud_loopback (struct qib_qp *sqp,struct qib_swqe *swqe) +static void qib_ud_loopback (struct rvt_qp *sqp,struct rvt_swqe *swqe) {struct qib_ibport *ibp =to_iport (sqp->ibqp.device, sqp->port_num);struct qib_pportdata *ppd; -struct qib_qp *qp; +struct rvt_qp *qp;struct ib_ah_attr *ah_attr;unsigned long flags; -struct qib_sge_state ssge; -struct qib_sge *sge; +struct rvt_sge_state ssge; +struct rvt_sge *sge;struct ib_wc wc;u32 length;enum ib_qp_type sqptype, dqptype;
@@ -190,7 +190,7 @@ static void qib_ud_loopback(struct qib_qp *sqp, struct qib_swqe *swqe)if (--ssge.num_sge) *sge = *ssge.sg_list++; }else if (sge->length ==0 && sge->mr->lkey) { -if (++sge->n >=QIB_SEGSZ ) { +if (++sge->n >=RVT_SEGSZ ) {if (++sge->m >= sge->mr->mapsz)break ; sge->n =0 ;
@@ -233,14 +233,14 @@ drop:* * Return 1 if constructed; otherwise, return 0. */ -int qib_make_ud_req (struct qib_qp *qp) +int qib_make_ud_req (struct rvt_qp *qp) {struct qib_qp_priv *priv = qp->priv;struct qib_other_headers *ohdr;struct ib_ah_attr *ah_attr;struct qib_pportdata *ppd;struct qib_ibport *ibp; -struct qib_swqe *wqe; +struct rvt_swqe *wqe;unsigned long flags;u32 nwords;u32 extra_bytes;
@@ -429,7 +429,7 @@ static unsigned qib_lookup_pkey(struct qib_ibport *ibp, u16 pkey)* Called at interrupt level. */ void qib_ud_rcv (struct qib_ibport *ibp,struct qib_ib_header *hdr, -int has_grh,void *data,u32 tlen,struct qib_qp *qp) +int has_grh,void *data,u32 tlen,struct rvt_qp *qp) {struct qib_other_headers *ohdr;int opcode;
drivers/infiniband/hw/qib/qib_verbs.c +71 -105
479 lines not on this page · raw message
drivers/infiniband/hw/qib/qib_verbs.h +52 -380
623 lines not on this page · raw message
drivers/infiniband/hw/qib/qib_verbs_mcast.c +4 -4
@@ -39,7 +39,7 @@* qib_mcast_qp_alloc - alloc a struct to link a QP to mcast GID struct * @qp: the QP to link */ -static struct qib_mcast_qp *qib_mcast_qp_alloc (struct qib_qp *qp) +static struct qib_mcast_qp *qib_mcast_qp_alloc (struct rvt_qp *qp) {struct qib_mcast_qp *mqp;
@@ -56,7 +56,7 @@ bail:static void qib_mcast_qp_free (struct qib_mcast_qp *mqp) { -struct qib_qp *qp = mqp->qp; +struct rvt_qp *qp = mqp->qp;/* Notify qib_destroy_qp() if it is waiting. */ if (atomic_dec_and_test (&qp->refcount))
@@ -224,7 +224,7 @@ bail:int qib_multicast_attach (struct ib_qp *ibqp,union ib_gid *gid,u16 lid) { -struct qib_qp *qp =to_iqp (ibqp); +struct rvt_qp *qp =to_iqp (ibqp);struct qib_ibdev *dev =to_idev (ibqp->device);struct qib_ibport *ibp;struct qib_mcast *mcast;
@@ -282,7 +282,7 @@ bail:int qib_multicast_detach (struct ib_qp *ibqp,union ib_gid *gid,u16 lid) { -struct qib_qp *qp =to_iqp (ibqp); +struct rvt_qp *qp =to_iqp (ibqp);struct qib_ibdev *dev =to_idev (ibqp->device);struct qib_ibport *ibp =to_iport (ibqp->device, qp->port_num);struct qib_mcast *mcast =NULL ;
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
A message that is not in the archive (sent off-list or not yet received): 20160122204525.2022.20568.stgit-9QXIwq+3FY+1XWohqUldA0EOCMrvLtNR@public.gmane.org
Re: [PATCH v4 08/10] IB/qib: Remove qp and mr functionality from qib
Quoted 4 lines · Dennis Dalessandro
Remove qp and mr support from qib and use rdmavt. These two changes cannot be reasonably be split apart into separate patches because they depend on each other in mulitple places. This paves the way to remove even more functions in subsequent patches.
This seems to have removed support for mapping MRs in the QIB drivers, as there doesn't seem to be any map_mr_sg method in either rdmavt or qib in the current tree.
Whilke we're at it: the mess in check_driver_override and check_support will break the first time someone changes any method calls. Type safety exists for a dricking reason - fix this mess to write a little more code but be type savfe and don't rely on the ordering of fields or you can keep the pieces as soon as this junk breaks. And it will break soon!
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
A message that is not in the archive (sent off-list or not yet received): [email protected]
Re: [PATCH v4 08/10] IB/qib: Remove qp and mr functionality from qib
Quoted 9 lines · Christoph Hellwig
Quoted 4 lines · Dennis Dalessandro
Remove qp and mr support from qib and use rdmavt. These two changes cannot be reasonably be split apart into separate patches because they depend on each other in mulitple places. This paves the way to remove even more functions in subsequent patches.
This seems to have removed support for mapping MRs in the QIB drivers, as there doesn't seem to be any
map_mr_sgmethod in either rdmavt or qib in the current tree.
I think this is the stuff that didn't actually even work in qib and when I moved stuff to rdmavt I just left it out. Actually I ported it then dropped that patch:
https://www.mail-archive.com/[email protected]/msg30636.html
Quoted 6 lines
Whilke we're at it: the mess in
check_driver_overrideandcheck_supportwill break the first time someone changes any method calls. Type safety exists for a dricking reason - fix this mess to write a little more code but be type savfe and don't rely on the ordering of fields or you can keep the pieces as soon as this junk breaks. And it will break soon!
We'll look into this. I'm certainly not opposed to adding more code and if you have any ideas to improve it, feel free to throw them out.
-Denny
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
A message that is not in the archive (sent off-list or not yet received): 20160406182928.GA24948-W4f6Xiosr+yv7QzWx2u06xL4W9x8LtSr@public.gmane.org
Re: [PATCH v4 08/10] IB/qib: Remove qp and mr functionality from qib
Ooops, sorry - I forgot about that discussion. Would have helped to mention that in the commit logs, though.
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH v4 9/10 IB/qib: Use address handle in rdmavt and remove from qib
In reply to a message not in the archiveOriginal patch from Kamal Heib <kamalh-VPRAkNaXOzVWk0Htik3J/[email protected]>, split apart from original.
Remove AH from qib and use rdmavt version.
--- drivers/infiniband/hw/qib/qib_iba7322.c | 2 drivers/infiniband/hw/qib/qib_mad.c | 2 drivers/infiniband/hw/qib/qib_qp.c | 7 +- drivers/infiniband/hw/qib/qib_ruc.c | 2 drivers/infiniband/hw/qib/qib_ud.c | 4 - drivers/infiniband/hw/qib/qib_verbs.c | 126 ++----------------------------- drivers/infiniband/hw/qib/qib_verbs.h | 20 ----- 7 files changed, 20 insertions(+), 143 deletions(-)
drivers/infiniband/hw/qib/qib_iba7322.c +1 -1
@@ -5515,7 +5515,7 @@ static void try_7322_ipg(struct qib_pportdata *ppd) ret =PTR_ERR (ah); else { send_buf->ah = ah; - ibp->smi_ah =to_iah (ah); + ibp->smi_ah =ibah_to_rvtah (ah); ret =0 ; } }else {
drivers/infiniband/hw/qib/qib_mad.c +1 -1
@@ -109,7 +109,7 @@ static void qib_send_trap(struct qib_ibport *ibp, void *data, unsigned len) ret =PTR_ERR (ah); else { send_buf->ah = ah; - ibp->sm_ah =to_iah (ah); + ibp->sm_ah =ibah_to_rvtah (ah); ret =0 ; } }else
drivers/infiniband/hw/qib/qib_qp.c +4 -3
@@ -439,7 +439,8 @@ static void clear_mr_refs(struct rvt_qp *qp, int clr_sends)if (qp->ibqp.qp_type ==IB_QPT_UD || qp->ibqp.qp_type ==IB_QPT_SMI || qp->ibqp.qp_type ==IB_QPT_GSI ) -atomic_dec (&to_iah (wqe->ud_wr.ah)->refcount); +atomic_dec ( + &ibah_to_rvtah (wqe->ud_wr.ah)->refcount);if (++qp->s_last >= qp->s_size) qp->s_last =0 ; }
@@ -596,7 +597,7 @@ int qib_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,if (attr_mask &IB_QP_AV ) {if (attr->ah_attr.dlid >=be16_to_cpu (IB_MULTICAST_LID_BASE )) goto inval; -if (qib_check_ah (qp->ibqp.device, &attr->ah_attr)) +if (rvt_check_ah (qp->ibqp.device, &attr->ah_attr)) goto inval; }
@@ -604,7 +605,7 @@ int qib_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,if (attr->alt_ah_attr.dlid >=be16_to_cpu (IB_MULTICAST_LID_BASE )) goto inval; -if (qib_check_ah (qp->ibqp.device, &attr->alt_ah_attr)) +if (rvt_check_ah (qp->ibqp.device, &attr->alt_ah_attr)) goto inval;if (attr->alt_pkey_index >=qib_get_npkeys (dd_from_dev (dev))) goto inval;
drivers/infiniband/hw/qib/qib_ruc.c +1 -1
@@ -789,7 +789,7 @@ void qib_send_complete(struct rvt_qp *qp, struct rvt_swqe *wqe,if (qp->ibqp.qp_type ==IB_QPT_UD || qp->ibqp.qp_type ==IB_QPT_SMI || qp->ibqp.qp_type ==IB_QPT_GSI ) -atomic_dec (&to_iah (wqe->ud_wr.ah)->refcount); +atomic_dec (&ibah_to_rvtah (wqe->ud_wr.ah)->refcount);/* See ch. 11.2.4.1 and 10.7.3.1 */ if (!(qp->s_flags & QIB_S_SIGNAL_REQ_WR) ||
drivers/infiniband/hw/qib/qib_ud.c +2 -2
@@ -77,7 +77,7 @@ static void qib_ud_loopback(struct rvt_qp *sqp, struct rvt_swqe *swqe) goto drop; } - ah_attr = &to_iah (swqe->ud_wr.ah)->attr; + ah_attr = &ibah_to_rvtah (swqe->ud_wr.ah)->attr; ppd =ppd_from_ibp (ibp);if (qp->ibqp.qp_num >1 ) {
@@ -279,7 +279,7 @@ int qib_make_ud_req(struct rvt_qp *qp)/* Construct the header. */ ibp =to_iport (qp->ibqp.device, qp->port_num); ppd =ppd_from_ibp (ibp); - ah_attr = &to_iah (wqe->ud_wr.ah)->attr; + ah_attr = &ibah_to_rvtah (wqe->ud_wr.ah)->attr;if (ah_attr->dlid >=be16_to_cpu (IB_MULTICAST_LID_BASE )) {if (ah_attr->dlid !=be16_to_cpu (IB_LID_PERMISSIVE ))this_cpu_inc (ibp->pmastats->n_multicast_xmit);
drivers/infiniband/hw/qib/qib_verbs.c +9 -117
165 lines not on this page · raw message
drivers/infiniband/hw/qib/qib_verbs.h +2 -18
@@ -222,13 +222,6 @@ struct qib_mcast {int n_attached; }; -/* Address Handle */ -struct qib_ah { -struct ib_ah ibah; -struct ib_ah_attr attr; -atomic_t refcount; -}; -/* * This structure is used to contain the head pointer, tail pointer, * and completion queue entries as a single memory allocation so
@@ -419,8 +412,8 @@ struct qib_ibport {struct rvt_qp __rcu *qp0;struct rvt_qp __rcu *qp1;struct ib_mad_agent *send_agent;/* agent for SMI (traps) */ -struct qib_ah *sm_ah; -struct qib_ah *smi_ah; +struct rvt_ah *sm_ah; +struct rvt_ah *smi_ah;struct rb_root mcast_tree;spinlock_t lock;/* protect changes in this struct */
@@ -511,10 +504,6 @@ struct qib_ibdev {u32 n_piowait;u32 n_txwait; -u32 n_pds_allocated;/* number of PDs allocated for device */ -spinlock_t n_pds_lock; -u32 n_ahs_allocated;/* number of AHs allocated for device */ -spinlock_t n_ahs_lock;u32 n_cqs_allocated;/* number of CQs allocated for device */ spinlock_t n_cqs_lock;u32 n_qps_allocated;/* number of QPs allocated for device */
@@ -545,11 +534,6 @@ struct qib_verbs_counters {u32 vl15_dropped; }; -static inline struct qib_ah *to_iah (struct ib_ah *ibah) -{ - return container_of(ibah, struct qib_ah, ibah); -} -static inline struct qib_cq *to_icq (struct ib_cq *ibcq) { return container_of(ibcq, struct qib_cq, ibcq);
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH v4 10/10 IB/qib: Remove srq from qib
In reply to a message not in the archiveRemove srq from qib now that it has been moved into rdmavt.
--- drivers/infiniband/hw/qib/qib_qp.c | 2 +- drivers/infiniband/hw/qib/qib_ruc.c | 4 ++-- drivers/infiniband/hw/qib/qib_srq.c | 10 +++++----- drivers/infiniband/hw/qib/qib_verbs.h | 13 ------------- 4 files changed, 8 insertions(+), 21 deletions(-)
drivers/infiniband/hw/qib/qib_qp.c +1 -1
@@ -1046,7 +1046,7 @@ struct ib_qp *qib_create_qp(struct ib_pd *ibpd, sz =sizeof (*qp); sg_list_sz =0 ;if (init_attr->srq) { -struct qib_srq *srq =to_isrq (init_attr->srq); +struct rvt_srq *srq =ibsrq_to_rvtsrq (init_attr->srq);if (srq->rq.max_sge >1 ) sg_list_sz = sizeof(*qp->r_sg_list) *
drivers/infiniband/hw/qib/qib_ruc.c +2 -2
@@ -141,14 +141,14 @@ int qib_get_rwqe(struct rvt_qp *qp, int wr_id_only)unsigned long flags;struct rvt_rq *rq;struct rvt_rwq *wq; -struct qib_srq *srq; +struct rvt_srq *srq;struct rvt_rwqe *wqe;void (*handler)(struct ib_event *,void *);u32 tail;int ret;if (qp->ibqp.srq) { - srq =to_isrq (qp->ibqp.srq); + srq =ibsrq_to_rvtsrq (qp->ibqp.srq); handler = srq->ibsrq.event_handler; rq = &srq->rq; }else {
drivers/infiniband/hw/qib/qib_srq.c +5 -5
@@ -48,7 +48,7 @@int qib_post_srq_receive (struct ib_srq *ibsrq,struct ib_recv_wr *wr,struct ib_recv_wr **bad_wr) { -struct qib_srq *srq =to_isrq (ibsrq); +struct rvt_srq *srq =ibsrq_to_rvtsrq (ibsrq);struct rvt_rwq *wq;unsigned long flags;int ret;
@@ -103,7 +103,7 @@ struct ib_srq *qib_create_srq(struct ib_pd *ibpd, struct ib_udata *udata) {struct qib_ibdev *dev =to_idev (ibpd->device); -struct qib_srq *srq; +struct rvt_srq *srq;u32 sz;struct ib_srq *ret;
@@ -212,7 +212,7 @@ int qib_modify_srq(struct ib_srq *ibsrq, struct ib_srq_attr *attr,enum ib_srq_attr_mask attr_mask, struct ib_udata *udata) { - struct qib_srq *srq = to_isrq(ibsrq); + struct rvt_srq *srq = ibsrq_to_rvtsrq(ibsrq);struct rvt_rwq *wq;int ret =0 ;
@@ -350,7 +350,7 @@ bail:int qib_query_srq (struct ib_srq *ibsrq,struct ib_srq_attr *attr) { -struct qib_srq *srq =to_isrq (ibsrq); +struct rvt_srq *srq =ibsrq_to_rvtsrq (ibsrq); attr->max_wr = srq->rq.size -1 ; attr->max_sge = srq->rq.max_sge;
@@ -364,7 +364,7 @@ int qib_query_srq(struct ib_srq *ibsrq, struct ib_srq_attr *attr)*/ int qib_destroy_srq (struct ib_srq *ibsrq) { -struct qib_srq *srq =to_isrq (ibsrq); +struct rvt_srq *srq =ibsrq_to_rvtsrq (ibsrq);struct qib_ibdev *dev =to_idev (ibsrq->device);spin_lock (&dev->n_srqs_lock);
drivers/infiniband/hw/qib/qib_verbs.h +0 -13
@@ -251,14 +251,6 @@ struct qib_cq {struct rvt_mmap_info *ip; }; -struct qib_srq { -struct ib_srq ibsrq; -struct rvt_rq rq; -struct rvt_mmap_info *ip; -/* send signal when number of RWQEs < limit */ -u32 limit; -}; -/* * qib specific data structure that will be hidden from rvt after the queue pair * is made common.
@@ -539,11 +531,6 @@ static inline struct qib_cq *to_icq(struct ib_cq *ibcq) return container_of(ibcq, struct qib_cq, ibcq); } -static inline struct qib_srq *to_isrq (struct ib_srq *ibsrq) -{ - return container_of(ibsrq, struct qib_srq, ibsrq); -} -static inline struct rvt_qp *to_iqp (struct ib_qp *ibqp) { return container_of(ibqp, struct rvt_qp, ibqp);
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html