RDMA/rxe: Correct race conditions
Subsystems (2)
v9 cover RDMA/rxe: Correct race conditions
There are several race conditions discovered in the current rdma_rxe driver. They mostly relate to races between normal operations and destroying objects. This patch series
- Makes several minor cleanups in rxe_pool.[ch]
- Replaces the red-black trees currently used by xarrays for indices
- Moves the red-black trees used for keyed objects to rxe_mcast which was the only use case.
- Corrects several reference counting errors
- rebased to current for-next
This patch series applies cleanly to current for-next. commit c0fe82baaeb2 ("Merge tag 'v5.16' into rdma.git for-next")
---
v9
Following a suggestion of Jason moved all the key code into rxe_mcast.c and separated these objects from the pools. Tightened up locking to make changes to ref count and xarray atomic with each other.
Combined things to just for patches.
Dropped the 0008 patch from v8 as not really necessary.
v8
Fixed an additional race in 3/8 which was not handled correctly.
v7
Corrected issues reported by Jason Gunthorpe
v6
Fixed a kzalloc flags bug.
Fixed comment bug reported by 'Kernel Test Robot'.
Changed type of rxe_pool.c in __rxe_fini().
v5
Removed patches already accepted into for-next and addressed comments from Jason Gunthorpe.
v4
Restructured patch series to change to xarray earlier which greatly simplified the changes.
Rebased to current for-next
v3
Changed rxe_alloc to use GFP_KERNEL
Addressed other comments by Jason Gunthorp
Merged the previous 06/10 and 07/10 patches into one since they overlapped Added some minor cleanups as 10/10
v2
Rebased to current for-next.
Added 4 additional patches
Bob Pearson (4):
RDMA/rxe: Move keyed objects to rxe_mcast.c RDMA/rxe: Replace RB tree by xarray for indexes RDMA/rxe: Fix ref error in rxe_av.c RDMA/rxe: Replace mr by rkey in responder resources
drivers/infiniband/sw/rxe/rxe.c | 104 +----- drivers/infiniband/sw/rxe/rxe_av.c | 19 +- drivers/infiniband/sw/rxe/rxe_loc.h | 24 +- drivers/infiniband/sw/rxe/rxe_mcast.c | 436 ++++++++++++++++------ drivers/infiniband/sw/rxe/rxe_mr.c | 1 - drivers/infiniband/sw/rxe/rxe_mw.c | 4 - drivers/infiniband/sw/rxe/rxe_net.c | 35 +- drivers/infiniband/sw/rxe/rxe_pool.c | 498 +++++++++----------------- drivers/infiniband/sw/rxe/rxe_pool.h | 109 +----- drivers/infiniband/sw/rxe/rxe_qp.c | 15 +- drivers/infiniband/sw/rxe/rxe_recv.c | 28 +- drivers/infiniband/sw/rxe/rxe_req.c | 55 +-- drivers/infiniband/sw/rxe/rxe_resp.c | 125 +++++-- drivers/infiniband/sw/rxe/rxe_verbs.c | 38 -- drivers/infiniband/sw/rxe/rxe_verbs.h | 30 +- 15 files changed, 716 insertions(+), 805 deletions(-)
Signature · 1 line
2.32.0
PATCH v9 1/4 RDMA/rxe: Move keyed objects to rxe_mcast.c
Currently there are two different types of objects supported by the pool machinery in rxe_pool.c. One is shared with rdma/core and can be indexed and the other has a key. The keyed type is only used once by rxe_mcast.c and is not shared with rdma/core. This patch separates this type by itself and moves the code into rxe_mcast.c which will allow simplification of the other object types. rxe_mcast.c is mostly re-written.
--- drivers/infiniband/sw/rxe/rxe.c | 19 +- drivers/infiniband/sw/rxe/rxe_loc.h | 19 +- drivers/infiniband/sw/rxe/rxe_mcast.c | 436 +++++++++++++++++++------- drivers/infiniband/sw/rxe/rxe_net.c | 18 -- drivers/infiniband/sw/rxe/rxe_pool.c | 135 -------- drivers/infiniband/sw/rxe/rxe_pool.h | 39 --- drivers/infiniband/sw/rxe/rxe_qp.c | 5 +- drivers/infiniband/sw/rxe/rxe_recv.c | 28 +- drivers/infiniband/sw/rxe/rxe_verbs.c | 26 -- drivers/infiniband/sw/rxe/rxe_verbs.h | 29 +- 10 files changed, 367 insertions(+), 387 deletions(-)
drivers/infiniband/sw/rxe/rxe.c +3 -16
@@ -28,8 +28,6 @@ void rxe_dealloc(struct ib_device *ib_dev)rxe_pool_cleanup (&rxe->cq_pool);rxe_pool_cleanup (&rxe->mr_pool);rxe_pool_cleanup (&rxe->mw_pool); -rxe_pool_cleanup (&rxe->mc_grp_pool); -rxe_pool_cleanup (&rxe->mc_elem_pool);if (rxe->tfm)crypto_free_shash (rxe->tfm);
@@ -158,22 +156,8 @@ static int rxe_init_pools(struct rxe_dev *rxe)if (err) goto err8; - err =rxe_pool_init (rxe, &rxe->mc_grp_pool,RXE_TYPE_MC_GRP , - rxe->attr.max_mcast_grp); -if (err) - goto err9; - - err =rxe_pool_init (rxe, &rxe->mc_elem_pool,RXE_TYPE_MC_ELEM , - rxe->attr.max_total_mcast_qp_attach); -if (err) - goto err10; -return 0 ; -err10: -rxe_pool_cleanup (&rxe->mc_grp_pool); -err9: -rxe_pool_cleanup (&rxe->mw_pool); err8:rxe_pool_cleanup (&rxe->mr_pool); err7:
@@ -206,6 +190,9 @@ static int rxe_init(struct rxe_dev *rxe)if (err)return err; +spin_lock_init (&rxe->mcg_lock); + rxe->mcg_tree =RB_ROOT ; +/* init pending mmap list */ spin_lock_init (&rxe->mmap_offset_lock);spin_lock_init (&rxe->pending_lock);
drivers/infiniband/sw/rxe/rxe_loc.h +5 -14
@@ -40,18 +40,11 @@ void rxe_cq_disable(struct rxe_cq *cq);void rxe_cq_cleanup (struct rxe_pool_elem *arg);/* rxe_mcast.c */ -int rxe_mcast_get_grp (struct rxe_dev *rxe,union ib_gid *mgid, -struct rxe_mc_grp **grp_p); - -int rxe_mcast_add_grp_elem (struct rxe_dev *rxe,struct rxe_qp *qp, -struct rxe_mc_grp *grp); - -int rxe_mcast_drop_grp_elem (struct rxe_dev *rxe,struct rxe_qp *qp, -union ib_gid *mgid); - -void rxe_drop_all_mcast_groups (struct rxe_qp *qp); - -void rxe_mc_cleanup (struct rxe_pool_elem *arg); +struct rxe_mcg *rxe_lookup_mcg (struct rxe_dev *rxe,union ib_gid *mgid); +int rxe_attach_mcast (struct ib_qp *ibqp,union ib_gid *mgid,u16 mlid); +int rxe_detach_mcast (struct ib_qp *ibqp,union ib_gid *mgid,u16 mlid); +void rxe_cleanup_mcast (struct rxe_qp *qp); +void rxe_cleanup_mcg (struct kref *kref);/* rxe_mmap.c */ struct rxe_mmap_info {
@@ -106,8 +99,6 @@ int rxe_prepare(struct rxe_pkt_info *pkt, struct sk_buff *skb);int rxe_xmit_packet (struct rxe_qp *qp,struct rxe_pkt_info *pkt,struct sk_buff *skb);const char *rxe_parent_name (struct rxe_dev *rxe,unsigned int port_num); -int rxe_mcast_add (struct rxe_dev *rxe,union ib_gid *mgid); -int rxe_mcast_delete (struct rxe_dev *rxe,union ib_gid *mgid);/* rxe_qp.c */ int rxe_qp_chk_init (struct rxe_dev *rxe,struct ib_qp_init_attr *init);
drivers/infiniband/sw/rxe/rxe_mcast.c +328 -108
506 lines not on this page · raw message
drivers/infiniband/sw/rxe/rxe_net.c +0 -18
@@ -20,24 +20,6 @@static struct rxe_recv_sockets recv_sockets; -int rxe_mcast_add (struct rxe_dev *rxe,union ib_gid *mgid) -{ -unsigned char ll_addr[ETH_ALEN ]; - -ipv6_eth_mc_map ((struct in6_addr *)mgid->raw, ll_addr); - -return dev_mc_add (rxe->ndev, ll_addr); -} - -int rxe_mcast_delete (struct rxe_dev *rxe,union ib_gid *mgid) -{ -unsigned char ll_addr[ETH_ALEN ]; - -ipv6_eth_mc_map ((struct in6_addr *)mgid->raw, ll_addr); - -return dev_mc_del (rxe->ndev, ll_addr); -} -static struct dst_entry *rxe_find_route4 (struct net_device *ndev,struct in_addr *saddr,struct in_addr *daddr)
drivers/infiniband/sw/rxe/rxe_pool.c +0 -135
156 lines not on this page · raw message
drivers/infiniband/sw/rxe/rxe_pool.h +0 -39
@@ -9,7 +9,6 @@enum rxe_pool_flags {RXE_POOL_INDEX =BIT (1 ), -RXE_POOL_KEY =BIT (2 ),RXE_POOL_NO_ALLOC =BIT (4 ), };
@@ -23,7 +22,6 @@ enum rxe_elem_type {RXE_TYPE_MR ,RXE_TYPE_MW ,RXE_TYPE_MC_GRP , -RXE_TYPE_MC_ELEM , RXE_NUM_TYPES, /* keep me last */ };
@@ -33,9 +31,6 @@ struct rxe_pool_elem {struct kref ref_cnt;struct list_head list; -/* only used if keyed */ -struct rb_node key_node; -/* only used if indexed */ struct rb_node index_node;u32 index;
@@ -62,13 +57,6 @@ struct rxe_pool {u32 max_index;u32 min_index; } index; - -/* only used if keyed */ -struct { -struct rb_root tree; -size_t key_offset; -size_t key_size; - } key; };/* initialize a pool of objects with given limit on
@@ -113,26 +101,6 @@ void __rxe_drop_index(struct rxe_pool_elem *elem);#define rxe_drop_index (obj) __rxe_drop_index(&(obj)->elem) -/* assign a key to a keyed object and insert object into -* pool's rb tree holding and not holding pool_lock -*/ -int __rxe_add_key_locked (struct rxe_pool_elem *elem,void *key); - -#define rxe_add_key_locked (obj, key) __rxe_add_key_locked(&(obj)->elem, key) - -int __rxe_add_key (struct rxe_pool_elem *elem,void *key); - -#define rxe_add_key (obj, key) __rxe_add_key(&(obj)->elem, key) - -/* remove elem from rb tree holding and not holding the pool_lock */ -void __rxe_drop_key_locked (struct rxe_pool_elem *elem); - -#define rxe_drop_key_locked (obj) __rxe_drop_key_locked(&(obj)->elem) - -void __rxe_drop_key (struct rxe_pool_elem *elem); - -#define rxe_drop_key (obj) __rxe_drop_key(&(obj)->elem) -/* lookup an indexed object from index holding and not holding the pool_lock. * takes a reference on object */
@@ -140,13 +108,6 @@ void *rxe_pool_get_index_locked(struct rxe_pool *pool, u32 index);void *rxe_pool_get_index (struct rxe_pool *pool,u32 index); -/* lookup keyed object from key holding and not holding the pool_lock. -* takes a reference on the objecti -*/ -void *rxe_pool_get_key_locked (struct rxe_pool *pool,void *key); - -void *rxe_pool_get_key (struct rxe_pool *pool,void *key); -/* cleanup an object when all references are dropped */ void rxe_elem_release (struct kref *kref);
drivers/infiniband/sw/rxe/rxe_qp.c +2 -3
@@ -188,9 +188,8 @@ static void rxe_qp_init_misc(struct rxe_dev *rxe, struct rxe_qp *qp,break ; } -INIT_LIST_HEAD (&qp->grp_list); +INIT_LIST_HEAD (&qp->mcg_list); -spin_lock_init (&qp->grp_lock);spin_lock_init (&qp->state_lock);atomic_set (&qp->ssn,0 );
@@ -799,7 +798,7 @@ static void rxe_qp_do_cleanup(struct work_struct *work) {struct rxe_qp *qp =container_of (work,typeof (*qp), cleanup_work.work); -rxe_drop_all_mcast_groups (qp); +rxe_cleanup_mcast (qp);if (qp->sq.queue)rxe_queue_cleanup (qp->sq.queue);
drivers/infiniband/sw/rxe/rxe_recv.c +14 -14
@@ -233,32 +233,33 @@ static inline void rxe_rcv_pkt(struct rxe_pkt_info *pkt, struct sk_buff *skb)static void rxe_rcv_mcast_pkt (struct rxe_dev *rxe,struct sk_buff *skb) {struct rxe_pkt_info *pkt =SKB_TO_PKT (skb); -struct rxe_mc_grp *mcg; -struct rxe_mc_elem *mce; +struct rxe_mcg *mcg; +struct rxe_mca *mca, *last;struct rxe_qp *qp; -union ib_gid dgid; +union ib_gid mgid;int err;if (skb->protocol ==htons (ETH_P_IP ))ipv6_addr_set_v4mapped (ip_hdr (skb)->daddr, - (struct in6_addr *)&dgid); + (struct in6_addr *)&mgid);else if (skb->protocol ==htons (ETH_P_IPV6 )) -memcpy (&dgid, &ipv6_hdr (skb)->daddr,sizeof (dgid)); +memcpy (&mgid, &ipv6_hdr (skb)->daddr,sizeof (mgid)); -/* lookup mcast group corresponding to mgid, takes a ref */ - mcg =rxe_pool_get_key (&rxe->mc_grp_pool, &dgid); + mcg =rxe_lookup_mcg (rxe, &mgid);if (!mcg) goto drop;/* mcast group not registered */ -spin_lock_bh (&mcg->mcg_lock); +spin_lock_bh (&mcg->lock); + + last =list_last_entry (&mcg->qp_list,typeof (*last), qp_list);/* this is unreliable datagram service so we let * failures to deliver a multicast packet to a * single QP happen and just move on and try * the rest of them on the list */ -list_for_each_entry (mce, &mcg->qp_list, qp_list) { - qp = mce->qp; +list_for_each_entry (mca, &mcg->qp_list, qp_list) { + qp = mca->qp;/* validate qp for incoming packet */ err =check_type_state (rxe, pkt, qp);
@@ -273,7 +274,7 @@ static void rxe_rcv_mcast_pkt(struct rxe_dev *rxe, struct sk_buff *skb)* skb and pass to the QP. Pass the original skb to * the last QP in the list. */ -if (mce->qp_list.next != &mcg->qp_list) { +if (mca != last) {struct sk_buff *cskb;struct rxe_pkt_info *cpkt;
@@ -298,9 +299,8 @@ static void rxe_rcv_mcast_pkt(struct rxe_dev *rxe, struct sk_buff *skb) } } -spin_unlock_bh (&mcg->mcg_lock); - -rxe_drop_ref (mcg);/* drop ref from rxe_pool_get_key. */ +spin_unlock_bh (&mcg->lock); +kref_put (&mcg->ref_cnt, rxe_cleanup_mcg);if (likely (!skb))return ;
drivers/infiniband/sw/rxe/rxe_verbs.c +0 -26
@@ -999,32 +999,6 @@ static int rxe_map_mr_sg(struct ib_mr *ibmr, struct scatterlist *sg,return n; } -static int rxe_attach_mcast (struct ib_qp *ibqp,union ib_gid *mgid,u16 mlid) -{ -int err; -struct rxe_dev *rxe =to_rdev (ibqp->device); -struct rxe_qp *qp =to_rqp (ibqp); -struct rxe_mc_grp *grp; - -/* takes a ref on grp if successful */ - err =rxe_mcast_get_grp (rxe, mgid, &grp); -if (err) -return err; - - err =rxe_mcast_add_grp_elem (rxe, qp, grp); - -rxe_drop_ref (grp); -return err; -} - -static int rxe_detach_mcast (struct ib_qp *ibqp,union ib_gid *mgid,u16 mlid) -{ -struct rxe_dev *rxe =to_rdev (ibqp->device); -struct rxe_qp *qp =to_rqp (ibqp); - -return rxe_mcast_drop_grp_elem (rxe, qp, mgid); -} -static ssize_t parent_show (struct device *device,struct device_attribute *attr,char *buf) {
drivers/infiniband/sw/rxe/rxe_verbs.h +15 -14
@@ -232,9 +232,7 @@ struct rxe_qp {struct rxe_av pri_av;struct rxe_av alt_av; -/* list of mcast groups qp has joined (for cleanup) */ -struct list_head grp_list; -spinlock_t grp_lock;/* guard grp_list */ +struct list_head mcg_list;struct sk_buff_head req_pkts;struct sk_buff_head resp_pkts;
@@ -353,23 +351,23 @@ struct rxe_mw {u64 length; }; -struct rxe_mc_grp { -struct rxe_pool_elem elem; -spinlock_t mcg_lock;/* guard group */ -struct rxe_dev *rxe; -struct list_head qp_list; +struct rxe_mcg { +struct rb_node node;union ib_gid mgid; +struct list_head qp_list; +struct kref ref_cnt; +struct rxe_dev *rxe; +spinlock_t lock;/* guard qp_list */ int num_qp;u32 qkey;u16 pkey; }; -struct rxe_mc_elem { -struct rxe_pool_elem elem; +struct rxe_mca {struct list_head qp_list; -struct list_head grp_list; +struct list_head mcg_list;struct rxe_qp *qp; -struct rxe_mc_grp *grp; +struct rxe_mcg *mcg; };struct rxe_port {
@@ -400,8 +398,11 @@ struct rxe_dev {struct rxe_pool cq_pool;struct rxe_pool mr_pool;struct rxe_pool mw_pool; -struct rxe_pool mc_grp_pool; -struct rxe_pool mc_elem_pool; + +spinlock_t mcg_lock;/* guard mcg_tree and mcg->qp_list */ +struct rb_root mcg_tree; +int num_mcg; +int num_attach;spinlock_t pending_lock;/* guard pending_mmaps */ struct list_head pending_mmaps;
Signature · 1 line
2.32.0
PATCH v9 2/4 RDMA/rxe: Replace RB tree by xarray for indexes
In reply to Bob PearsonCurrently the rxe driver uses red-black trees to add indices to the rxe object pool. Linux xarrays provide a better way to implement the same functionality for indices. This patch replaces red-black trees by xarrays for indexed objects. Since caller managed locks for indexed objects are not used these APIs are deleted as well.
To avoid double locking since xarray already includes a spinlock replace the rxe_pool rwlock by the spinlock included in xarray.
The RDMA objects are created and destroyed by verbs calls from rdma_core but are looked up from indices or keys from soft IRQs so _bh style locks are the correct type to use.
A private copy of kref_put_lock that calls a private copy of refcount_dec_and_lock which uses _bh locks. This routine generates a sparse warning as does the original refcount_dec_and_lock routine. There does not seem to be a way to annotate this away.
There is only one remaining object type that allocates its own memory, that is MR, so the sense of RXE_POOL_NO_ALLOC is changed to RXE_POOL_ALLOC. Last ditch code is added to free MRs allocated by rxe if applications do not free their objects. rdma/core is responsible for freeing objects it allocated which covers the remaining cases for applications which do not clean up.
--- drivers/infiniband/sw/rxe/rxe.c | 87 +----- drivers/infiniband/sw/rxe/rxe_mr.c | 1 - drivers/infiniband/sw/rxe/rxe_mw.c | 4 - drivers/infiniband/sw/rxe/rxe_pool.c | 371 +++++++++++++------------- drivers/infiniband/sw/rxe/rxe_pool.h | 72 +---- drivers/infiniband/sw/rxe/rxe_verbs.c | 12 - 6 files changed, 205 insertions(+), 342 deletions(-)
drivers/infiniband/sw/rxe/rxe.c +12 -75
@@ -112,83 +112,26 @@ static void rxe_init_ports(struct rxe_dev *rxe) }/* init pools of managed objects */ -static int rxe_init_pools (struct rxe_dev *rxe) +static void rxe_init_pools (struct rxe_dev *rxe) { -int err; - - err =rxe_pool_init (rxe, &rxe->uc_pool,RXE_TYPE_UC , - rxe->max_ucontext); -if (err) - goto err1; - - err =rxe_pool_init (rxe, &rxe->pd_pool,RXE_TYPE_PD , - rxe->attr.max_pd); -if (err) - goto err2; - - err =rxe_pool_init (rxe, &rxe->ah_pool,RXE_TYPE_AH , - rxe->attr.max_ah); -if (err) - goto err3; - - err =rxe_pool_init (rxe, &rxe->srq_pool,RXE_TYPE_SRQ , - rxe->attr.max_srq); -if (err) - goto err4; - - err =rxe_pool_init (rxe, &rxe->qp_pool,RXE_TYPE_QP , - rxe->attr.max_qp); -if (err) - goto err5; - - err =rxe_pool_init (rxe, &rxe->cq_pool,RXE_TYPE_CQ , - rxe->attr.max_cq); -if (err) - goto err6; - - err =rxe_pool_init (rxe, &rxe->mr_pool,RXE_TYPE_MR , - rxe->attr.max_mr); -if (err) - goto err7; - - err =rxe_pool_init (rxe, &rxe->mw_pool,RXE_TYPE_MW , - rxe->attr.max_mw); -if (err) - goto err8; - -return 0 ; - -err8: -rxe_pool_cleanup (&rxe->mr_pool); -err7: -rxe_pool_cleanup (&rxe->cq_pool); -err6: -rxe_pool_cleanup (&rxe->qp_pool); -err5: -rxe_pool_cleanup (&rxe->srq_pool); -err4: -rxe_pool_cleanup (&rxe->ah_pool); -err3: -rxe_pool_cleanup (&rxe->pd_pool); -err2: -rxe_pool_cleanup (&rxe->uc_pool); -err1: -return err; +rxe_pool_init (rxe, &rxe->uc_pool,RXE_TYPE_UC , rxe->max_ucontext); +rxe_pool_init (rxe, &rxe->pd_pool,RXE_TYPE_PD , rxe->attr.max_pd); +rxe_pool_init (rxe, &rxe->ah_pool,RXE_TYPE_AH , rxe->attr.max_ah); +rxe_pool_init (rxe, &rxe->srq_pool,RXE_TYPE_SRQ , rxe->attr.max_srq); +rxe_pool_init (rxe, &rxe->qp_pool,RXE_TYPE_QP , rxe->attr.max_qp); +rxe_pool_init (rxe, &rxe->cq_pool,RXE_TYPE_CQ , rxe->attr.max_cq); +rxe_pool_init (rxe, &rxe->mr_pool,RXE_TYPE_MR , rxe->attr.max_mr); +rxe_pool_init (rxe, &rxe->mw_pool,RXE_TYPE_MW , rxe->attr.max_mw); }/* initialize rxe device state */ -static int rxe_init (struct rxe_dev *rxe) +static void rxe_init (struct rxe_dev *rxe) { -int err; -/* init default device parameters */ rxe_init_device_param (rxe);rxe_init_ports (rxe); - - err =rxe_init_pools (rxe); -if (err) -return err; +rxe_init_pools (rxe);spin_lock_init (&rxe->mcg_lock); rxe->mcg_tree =RB_ROOT ;
@@ -199,8 +142,6 @@ static int rxe_init(struct rxe_dev *rxe)INIT_LIST_HEAD (&rxe->pending_mmaps);mutex_init (&rxe->usdev_lock); - -return 0 ; }void rxe_set_mtu (struct rxe_dev *rxe,unsigned int ndev_mtu)
@@ -222,11 +163,7 @@ void rxe_set_mtu(struct rxe_dev *rxe, unsigned int ndev_mtu)*/ int rxe_add (struct rxe_dev *rxe,unsigned int mtu,const char *ibdev_name) { -int err; - - err =rxe_init (rxe); -if (err) -return err; +rxe_init (rxe);rxe_set_mtu (rxe, mtu);
drivers/infiniband/sw/rxe/rxe_mr.c +0 -1
@@ -691,7 +691,6 @@ int rxe_dereg_mr(struct ib_mr *ibmr, struct ib_udata *udata) mr->state =RXE_MR_STATE_INVALID ;rxe_drop_ref (mr_pd (mr)); -rxe_drop_index (mr);rxe_drop_ref (mr);return 0 ;
drivers/infiniband/sw/rxe/rxe_mw.c +0 -4
@@ -20,7 +20,6 @@ int rxe_alloc_mw(struct ib_mw *ibmw, struct ib_udata *udata)return ret; } -rxe_add_index (mw); mw->rkey = ibmw->rkey = (mw->elem.index <<8 ) |rxe_get_next_key (-1 ); mw->state = (mw->ibmw.type ==IB_MW_TYPE_2 ) ?RXE_MW_STATE_FREE :RXE_MW_STATE_VALID ;
@@ -332,7 +331,4 @@ struct rxe_mw *rxe_lookup_mw(struct rxe_qp *qp, int access, u32 rkey)void rxe_mw_cleanup (struct rxe_pool_elem *elem) { -struct rxe_mw *mw =container_of (elem,typeof (*mw), elem); - -rxe_drop_index (mw); }
drivers/infiniband/sw/rxe/rxe_pool.c +179 -192
505 lines not on this page · raw message
drivers/infiniband/sw/rxe/rxe_pool.h +14 -58
112 lines not on this page · raw message
drivers/infiniband/sw/rxe/rxe_verbs.c +0 -12
@@ -181,7 +181,6 @@ static int rxe_create_ah(struct ib_ah *ibah,return err;/* create index > 0 */ -rxe_add_index (ah); ah->ah_num = ah->elem.index;if (uresp) {
@@ -189,7 +188,6 @@ static int rxe_create_ah(struct ib_ah *ibah, err =copy_to_user (&uresp->ah_num, &ah->ah_num,sizeof (uresp->ah_num));if (err) { -rxe_drop_index (ah);rxe_drop_ref (ah);return -EFAULT ; }
@@ -230,7 +228,6 @@ static int rxe_destroy_ah(struct ib_ah *ibah, u32 flags) {struct rxe_ah *ah =to_rah (ibah); -rxe_drop_index (ah);rxe_drop_ref (ah);return 0 ; }
@@ -437,7 +434,6 @@ static int rxe_create_qp(struct ib_qp *ibqp, struct ib_qp_init_attr *init,if (err)return err; -rxe_add_index (qp); err =rxe_qp_from_init (rxe, qp, pd, init, uresp, ibqp->pd, udata);if (err) goto qp_init;
@@ -445,7 +441,6 @@ static int rxe_create_qp(struct ib_qp *ibqp, struct ib_qp_init_attr *init,return 0 ; qp_init: -rxe_drop_index (qp);rxe_drop_ref (qp);return err; }
@@ -495,7 +490,6 @@ static int rxe_destroy_qp(struct ib_qp *ibqp, struct ib_udata *udata)struct rxe_qp *qp =to_rqp (ibqp);rxe_qp_destroy (qp); -rxe_drop_index (qp);rxe_drop_ref (qp);return 0 ; }
@@ -898,7 +892,6 @@ static struct ib_mr *rxe_get_dma_mr(struct ib_pd *ibpd, int access)if (!mr)return ERR_PTR (-ENOMEM ); -rxe_add_index (mr);rxe_add_ref (pd);rxe_mr_init_dma (pd, access, mr);
@@ -922,7 +915,6 @@ static struct ib_mr *rxe_reg_user_mr(struct ib_pd *ibpd, goto err2; } -rxe_add_index (mr);rxe_add_ref (pd);
@@ -934,7 +926,6 @@ static struct ib_mr *rxe_reg_user_mr(struct ib_pd *ibpd, err3:rxe_drop_ref (pd); -rxe_drop_index (mr);rxe_drop_ref (mr); err2:return ERR_PTR (err);
@@ -957,8 +948,6 @@ static struct ib_mr *rxe_alloc_mr(struct ib_pd *ibpd, enum ib_mr_type mr_type, goto err1; } -rxe_add_index (mr); -rxe_add_ref (pd); err =rxe_mr_init_fast (pd, max_num_sg, mr);
@@ -969,7 +958,6 @@ static struct ib_mr *rxe_alloc_mr(struct ib_pd *ibpd, enum ib_mr_type mr_type, err2:rxe_drop_ref (pd); -rxe_drop_index (mr);rxe_drop_ref (mr); err1:return ERR_PTR (err);
Signature · 1 line
2.32.0
PATCH v9 3/4 RDMA/rxe: Fix ref error in rxe_av.c
In reply to Bob PearsonThe commit referenced below can take a reference to the AH which is never dropped. This only happens in the UD request path. This patch optionally passes that AH back to the caller so that it can hold the reference while the AV is being accessed and then drop it. Code to do this is added to rxe_req.c. The AV is also passed to rxe_prepare in rxe_net.c as an optimization.
--- drivers/infiniband/sw/rxe/rxe_av.c | 19 +++++++++- drivers/infiniband/sw/rxe/rxe_loc.h | 5 ++- drivers/infiniband/sw/rxe/rxe_net.c | 17 +++++---- drivers/infiniband/sw/rxe/rxe_req.c | 55 +++++++++++++++++----------- drivers/infiniband/sw/rxe/rxe_resp.c | 2 +- 5 files changed, 63 insertions(+), 35 deletions(-)
drivers/infiniband/sw/rxe/rxe_av.c +17 -2
@@ -99,11 +99,14 @@ void rxe_av_fill_ip_info(struct rxe_av *av, struct rdma_ah_attr *attr) av->network_type = type; } -struct rxe_av *rxe_get_av (struct rxe_pkt_info *pkt) +struct rxe_av *rxe_get_av (struct rxe_pkt_info *pkt,struct rxe_ah **ahp) {struct rxe_ah *ah;u32 ah_num; +if (ahp) + *ahp =NULL ; +if (!pkt || !pkt->qp)return NULL ;
@@ -117,10 +120,22 @@ struct rxe_av *rxe_get_av(struct rxe_pkt_info *pkt)if (ah_num) {/* only new user provider or kernel client */ ah =rxe_pool_get_index (&pkt->rxe->ah_pool, ah_num); -if (!ah || ah->ah_num != ah_num ||rxe_ah_pd (ah) != pkt->qp->pd) { +if (!ah) {pr_warn ("Unable to find AH matching ah_num\n" );return NULL ; } + +if (rxe_ah_pd (ah) != pkt->qp->pd) { +pr_warn ("PDs don't match for AH and QP\n" ); +rxe_drop_ref (ah); +return NULL ; + } + +if (ahp) + *ahp = ah; +else +rxe_drop_ref (ah); +return &ah->av; }
drivers/infiniband/sw/rxe/rxe_loc.h +3 -2
@@ -19,7 +19,7 @@ void rxe_av_to_attr(struct rxe_av *av, struct rdma_ah_attr *attr);void rxe_av_fill_ip_info (struct rxe_av *av,struct rdma_ah_attr *attr); -struct rxe_av *rxe_get_av (struct rxe_pkt_info *pkt); +struct rxe_av *rxe_get_av (struct rxe_pkt_info *pkt,struct rxe_ah **ahp);/* rxe_cq.c */ int rxe_cq_chk_attr(struct rxe_dev *rxe, struct rxe_cq *cq,
@@ -95,7 +95,8 @@ void rxe_mw_cleanup(struct rxe_pool_elem *arg);/* rxe_net.c */ struct sk_buff *rxe_init_packet (struct rxe_dev *rxe,struct rxe_av *av,int paylen,struct rxe_pkt_info *pkt); -int rxe_prepare (struct rxe_pkt_info *pkt,struct sk_buff *skb); +int rxe_prepare (struct rxe_av *av,struct rxe_pkt_info *pkt, +struct sk_buff *skb);int rxe_xmit_packet (struct rxe_qp *qp,struct rxe_pkt_info *pkt,struct sk_buff *skb);const char *rxe_parent_name (struct rxe_dev *rxe,unsigned int port_num);
drivers/infiniband/sw/rxe/rxe_net.c +9 -8
@@ -271,13 +271,13 @@ static void prepare_ipv6_hdr(struct dst_entry *dst, struct sk_buff *skb, ip6h->payload_len =htons (skb->len -sizeof (*ip6h)); } -static int prepare4 (struct rxe_pkt_info *pkt,struct sk_buff *skb) +static int prepare4 (struct rxe_av *av,struct rxe_pkt_info *pkt, +struct sk_buff *skb) {struct rxe_qp *qp = pkt->qp;struct dst_entry *dst;bool xnet = false;__be16 df =htons (IP_DF ); -struct rxe_av *av =rxe_get_av (pkt);struct in_addr *saddr = &av->sgid_addr._sockaddr_in.sin_addr;struct in_addr *daddr = &av->dgid_addr._sockaddr_in.sin_addr;
@@ -297,11 +297,11 @@ static int prepare4(struct rxe_pkt_info *pkt, struct sk_buff *skb)return 0 ; } -static int prepare6 (struct rxe_pkt_info *pkt,struct sk_buff *skb) +static int prepare6 (struct rxe_av *av,struct rxe_pkt_info *pkt, +struct sk_buff *skb) {struct rxe_qp *qp = pkt->qp;struct dst_entry *dst; -struct rxe_av *av =rxe_get_av (pkt);struct in6_addr *saddr = &av->sgid_addr._sockaddr_in6.sin6_addr;struct in6_addr *daddr = &av->dgid_addr._sockaddr_in6.sin6_addr;
@@ -322,16 +322,17 @@ static int prepare6(struct rxe_pkt_info *pkt, struct sk_buff *skb)return 0 ; } -int rxe_prepare (struct rxe_pkt_info *pkt,struct sk_buff *skb) +int rxe_prepare (struct rxe_av *av,struct rxe_pkt_info *pkt, +struct sk_buff *skb) {int err =0 ;if (skb->protocol ==htons (ETH_P_IP )) - err =prepare4 (pkt, skb); + err =prepare4 (av, pkt, skb);else if (skb->protocol ==htons (ETH_P_IPV6 )) - err =prepare6 (pkt, skb); + err =prepare6 (av, pkt, skb); -if (ether_addr_equal (skb->dev->dev_addr,rxe_get_av (pkt)->dmac)) +if (ether_addr_equal (skb->dev->dev_addr, av->dmac)) pkt->mask |=RXE_LOOPBACK_MASK ;return err;
drivers/infiniband/sw/rxe/rxe_req.c +33 -22
121 lines not on this page · raw message
drivers/infiniband/sw/rxe/rxe_resp.c +1 -1
@@ -632,7 +632,7 @@ static struct sk_buff *prepare_ack_packet(struct rxe_qp *qp,if (ack->mask &RXE_ATMACK_MASK )atmack_set_orig (ack, qp->resp.atomic_orig); - err =rxe_prepare (ack, skb); + err =rxe_prepare (&qp->pri_av, ack, skb);if (err) {kfree_skb (skb);return NULL ;
Signature · 1 line
2.32.0
PATCH v9 4/4 RDMA/rxe: Replace mr by rkey in responder resources
In reply to Bob PearsonCurrently rxe saves a copy of MR in responder resources for RDMA reads. Since the responder resources are never freed just over written if more are needed this MR may not have a reference freed until the QP is destroyed. This patch uses the rkey instead of the MR and on subsequent packets of a multipacket read reply message it looks up the MR from the rkey for each packet. This makes it possible for a user to deregister an MR or unbind a MW on the fly and get correct behaviour.
--- drivers/infiniband/sw/rxe/rxe_qp.c | 10 +-- drivers/infiniband/sw/rxe/rxe_resp.c | 123 ++++++++++++++++++-------- drivers/infiniband/sw/rxe/rxe_verbs.h | 1 - 3 files changed, 87 insertions(+), 47 deletions(-)
drivers/infiniband/sw/rxe/rxe_qp.c +2 -8
@@ -135,12 +135,8 @@ static void free_rd_atomic_resources(struct rxe_qp *qp)void free_rd_atomic_resource (struct rxe_qp *qp,struct resp_res *res) { -if (res->type ==RXE_ATOMIC_MASK ) { +if (res->type ==RXE_ATOMIC_MASK )kfree_skb (res->atomic.skb); - }else if (res->type ==RXE_READ_MASK ) { -if (res->read.mr) -rxe_drop_ref (res->read.mr); - } res->type =0 ; }
@@ -816,10 +812,8 @@ static void rxe_qp_do_cleanup(struct work_struct *work)if (qp->pd)rxe_drop_ref (qp->pd); -if (qp->resp.mr) { +if (qp->resp.mr)rxe_drop_ref (qp->resp.mr); - qp->resp.mr =NULL ; - }if (qp_type (qp) ==IB_QPT_RC )sk_dst_reset (qp->sk->sk);
drivers/infiniband/sw/rxe/rxe_resp.c +85 -38
154 lines not on this page · raw message
drivers/infiniband/sw/rxe/rxe_verbs.h +0 -1
@@ -157,7 +157,6 @@ struct resp_res {struct sk_buff *skb; } atomic;struct { -struct rxe_mr *mr;u64 va_org;u32 rkey;u32 length;
Signature · 1 line
2.32.0