| Message ID | 20190129100850.18840-2-kamalheib1@gmail.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | fa40718804a1c164b62c95ca626f26308be44257 |
| Delegated to: | Jason Gunthorpe |
| Headers | show |
| Series | RDMA/rxe: Fix loopback marking | expand |
On Tue, Jan 29, 2019 at 12:08:49PM +0200, Kamal Heib wrote: > Move the function rxe_init_av() to rxe_av.c file and use it instead of > calling rxe_av_from_attr() and rxe_av_fill_ip_info(), also remove the > unused rxe_dev parameter from rxe_init_av(). > > Signed-off-by: Kamal Heib <kamalheib1@gmail.com> > --- > drivers/infiniband/sw/rxe/rxe_av.c | 6 ++++++ > drivers/infiniband/sw/rxe/rxe_loc.h | 1 + > drivers/infiniband/sw/rxe/rxe_qp.c | 7 ++----- > drivers/infiniband/sw/rxe/rxe_verbs.c | 11 ++--------- > 4 files changed, 11 insertions(+), 14 deletions(-) > > diff --git a/drivers/infiniband/sw/rxe/rxe_av.c b/drivers/infiniband/sw/rxe/rxe_av.c > index 26fe8d7dbc55..27a7dec18874 100644 > --- a/drivers/infiniband/sw/rxe/rxe_av.c > +++ b/drivers/infiniband/sw/rxe/rxe_av.c > @@ -34,6 +34,12 @@ > #include "rxe.h" > #include "rxe_loc.h" > > +void rxe_init_av(struct rdma_ah_attr *attr, struct rxe_av *av) > +{ > + rxe_av_from_attr(rdma_ah_get_port_num(attr), av, attr); > + rxe_av_fill_ip_info(av, attr); > +} > + > int rxe_av_chk_attr(struct rxe_dev *rxe, struct rdma_ah_attr *attr) > { > struct rxe_port *port; > diff --git a/drivers/infiniband/sw/rxe/rxe_loc.h b/drivers/infiniband/sw/rxe/rxe_loc.h > index a65fbd0ff42e..b517a6c86922 100644 > --- a/drivers/infiniband/sw/rxe/rxe_loc.h > +++ b/drivers/infiniband/sw/rxe/rxe_loc.h > @@ -35,6 +35,7 @@ > #define RXE_LOC_H > > /* rxe_av.c */ > +void rxe_init_av(struct rdma_ah_attr *attr, struct rxe_av *av); > > int rxe_av_chk_attr(struct rxe_dev *rxe, struct rdma_ah_attr *attr); > > diff --git a/drivers/infiniband/sw/rxe/rxe_qp.c b/drivers/infiniband/sw/rxe/rxe_qp.c > index fd86fd2fbb26..be5d76b2bcca 100644 > --- a/drivers/infiniband/sw/rxe/rxe_qp.c > +++ b/drivers/infiniband/sw/rxe/rxe_qp.c > @@ -631,14 +631,11 @@ int rxe_qp_from_attr(struct rxe_qp *qp, struct ib_qp_attr *attr, int mask, > qp->attr.qkey = attr->qkey; > > if (mask & IB_QP_AV) { > - rxe_av_from_attr(attr->port_num, &qp->pri_av, &attr->ah_attr); > - rxe_av_fill_ip_info(&qp->pri_av, &attr->ah_attr); > + rxe_init_av(&attr->ah_attr, &qp->pri_av); > } > > if (mask & IB_QP_ALT_PATH) { > - rxe_av_from_attr(attr->alt_port_num, &qp->alt_av, > - &attr->alt_ah_attr); > - rxe_av_fill_ip_info(&qp->alt_av, &attr->alt_ah_attr); > + rxe_init_av(&attr->alt_ah_attr, &qp->alt_av); > qp->attr.alt_port_num = attr->alt_port_num; > qp->attr.alt_pkey_index = attr->alt_pkey_index; > qp->attr.alt_timeout = attr->alt_timeout; > diff --git a/drivers/infiniband/sw/rxe/rxe_verbs.c b/drivers/infiniband/sw/rxe/rxe_verbs.c > index 3d01247a28db..cc5a05124ece 100644 > --- a/drivers/infiniband/sw/rxe/rxe_verbs.c > +++ b/drivers/infiniband/sw/rxe/rxe_verbs.c > @@ -210,13 +210,6 @@ static int rxe_dealloc_pd(struct ib_pd *ibpd) > return 0; > } > > -static void rxe_init_av(struct rxe_dev *rxe, struct rdma_ah_attr *attr, > - struct rxe_av *av) > -{ > - rxe_av_from_attr(rdma_ah_get_port_num(attr), av, attr); > - rxe_av_fill_ip_info(av, attr); > -} > - > static struct ib_ah *rxe_create_ah(struct ib_pd *ibpd, > struct rdma_ah_attr *attr, > u32 flags, > @@ -239,7 +232,7 @@ static struct ib_ah *rxe_create_ah(struct ib_pd *ibpd, > rxe_add_ref(pd); > ah->pd = pd; > > - rxe_init_av(rxe, attr, &ah->av); > + rxe_init_av(attr, &ah->av); > return &ah->ibah; > } > > @@ -253,7 +246,7 @@ static int rxe_modify_ah(struct ib_ah *ibah, struct rdma_ah_attr *attr) > if (err) > return err; > > - rxe_init_av(rxe, attr, &ah->av); > + rxe_init_av(attr, &ah->av); > return 0; > } Reviewed-by: Yuval Shaia <yuval.shaia@oracle.com> > > -- > 2.20.1 >
On 2019/1/29 18:08, Kamal Heib wrote: > Move the function rxe_init_av() to rxe_av.c file and use it instead of > calling rxe_av_from_attr() and rxe_av_fill_ip_info(), also remove the > unused rxe_dev parameter from rxe_init_av(). > > Signed-off-by: Kamal Heib <kamalheib1@gmail.com> Reviewed-by: Zhu Yanjun<yanjun.zhu@oracle.com> > --- > drivers/infiniband/sw/rxe/rxe_av.c | 6 ++++++ > drivers/infiniband/sw/rxe/rxe_loc.h | 1 + > drivers/infiniband/sw/rxe/rxe_qp.c | 7 ++----- > drivers/infiniband/sw/rxe/rxe_verbs.c | 11 ++--------- > 4 files changed, 11 insertions(+), 14 deletions(-) > > diff --git a/drivers/infiniband/sw/rxe/rxe_av.c b/drivers/infiniband/sw/rxe/rxe_av.c > index 26fe8d7dbc55..27a7dec18874 100644 > --- a/drivers/infiniband/sw/rxe/rxe_av.c > +++ b/drivers/infiniband/sw/rxe/rxe_av.c > @@ -34,6 +34,12 @@ > #include "rxe.h" > #include "rxe_loc.h" > > +void rxe_init_av(struct rdma_ah_attr *attr, struct rxe_av *av) > +{ > + rxe_av_from_attr(rdma_ah_get_port_num(attr), av, attr); > + rxe_av_fill_ip_info(av, attr); > +} > + > int rxe_av_chk_attr(struct rxe_dev *rxe, struct rdma_ah_attr *attr) > { > struct rxe_port *port; > diff --git a/drivers/infiniband/sw/rxe/rxe_loc.h b/drivers/infiniband/sw/rxe/rxe_loc.h > index a65fbd0ff42e..b517a6c86922 100644 > --- a/drivers/infiniband/sw/rxe/rxe_loc.h > +++ b/drivers/infiniband/sw/rxe/rxe_loc.h > @@ -35,6 +35,7 @@ > #define RXE_LOC_H > > /* rxe_av.c */ > +void rxe_init_av(struct rdma_ah_attr *attr, struct rxe_av *av); > > int rxe_av_chk_attr(struct rxe_dev *rxe, struct rdma_ah_attr *attr); > > diff --git a/drivers/infiniband/sw/rxe/rxe_qp.c b/drivers/infiniband/sw/rxe/rxe_qp.c > index fd86fd2fbb26..be5d76b2bcca 100644 > --- a/drivers/infiniband/sw/rxe/rxe_qp.c > +++ b/drivers/infiniband/sw/rxe/rxe_qp.c > @@ -631,14 +631,11 @@ int rxe_qp_from_attr(struct rxe_qp *qp, struct ib_qp_attr *attr, int mask, > qp->attr.qkey = attr->qkey; > > if (mask & IB_QP_AV) { > - rxe_av_from_attr(attr->port_num, &qp->pri_av, &attr->ah_attr); > - rxe_av_fill_ip_info(&qp->pri_av, &attr->ah_attr); > + rxe_init_av(&attr->ah_attr, &qp->pri_av); > } > > if (mask & IB_QP_ALT_PATH) { > - rxe_av_from_attr(attr->alt_port_num, &qp->alt_av, > - &attr->alt_ah_attr); > - rxe_av_fill_ip_info(&qp->alt_av, &attr->alt_ah_attr); > + rxe_init_av(&attr->alt_ah_attr, &qp->alt_av); > qp->attr.alt_port_num = attr->alt_port_num; > qp->attr.alt_pkey_index = attr->alt_pkey_index; > qp->attr.alt_timeout = attr->alt_timeout; > diff --git a/drivers/infiniband/sw/rxe/rxe_verbs.c b/drivers/infiniband/sw/rxe/rxe_verbs.c > index 3d01247a28db..cc5a05124ece 100644 > --- a/drivers/infiniband/sw/rxe/rxe_verbs.c > +++ b/drivers/infiniband/sw/rxe/rxe_verbs.c > @@ -210,13 +210,6 @@ static int rxe_dealloc_pd(struct ib_pd *ibpd) > return 0; > } > > -static void rxe_init_av(struct rxe_dev *rxe, struct rdma_ah_attr *attr, > - struct rxe_av *av) > -{ > - rxe_av_from_attr(rdma_ah_get_port_num(attr), av, attr); > - rxe_av_fill_ip_info(av, attr); > -} > - > static struct ib_ah *rxe_create_ah(struct ib_pd *ibpd, > struct rdma_ah_attr *attr, > u32 flags, > @@ -239,7 +232,7 @@ static struct ib_ah *rxe_create_ah(struct ib_pd *ibpd, > rxe_add_ref(pd); > ah->pd = pd; > > - rxe_init_av(rxe, attr, &ah->av); > + rxe_init_av(attr, &ah->av); > return &ah->ibah; > } > > @@ -253,7 +246,7 @@ static int rxe_modify_ah(struct ib_ah *ibah, struct rdma_ah_attr *attr) > if (err) > return err; > > - rxe_init_av(rxe, attr, &ah->av); > + rxe_init_av(attr, &ah->av); > return 0; > } >
diff --git a/drivers/infiniband/sw/rxe/rxe_av.c b/drivers/infiniband/sw/rxe/rxe_av.c index 26fe8d7dbc55..27a7dec18874 100644 --- a/drivers/infiniband/sw/rxe/rxe_av.c +++ b/drivers/infiniband/sw/rxe/rxe_av.c @@ -34,6 +34,12 @@ #include "rxe.h" #include "rxe_loc.h" +void rxe_init_av(struct rdma_ah_attr *attr, struct rxe_av *av) +{ + rxe_av_from_attr(rdma_ah_get_port_num(attr), av, attr); + rxe_av_fill_ip_info(av, attr); +} + int rxe_av_chk_attr(struct rxe_dev *rxe, struct rdma_ah_attr *attr) { struct rxe_port *port; diff --git a/drivers/infiniband/sw/rxe/rxe_loc.h b/drivers/infiniband/sw/rxe/rxe_loc.h index a65fbd0ff42e..b517a6c86922 100644 --- a/drivers/infiniband/sw/rxe/rxe_loc.h +++ b/drivers/infiniband/sw/rxe/rxe_loc.h @@ -35,6 +35,7 @@ #define RXE_LOC_H /* rxe_av.c */ +void rxe_init_av(struct rdma_ah_attr *attr, struct rxe_av *av); int rxe_av_chk_attr(struct rxe_dev *rxe, struct rdma_ah_attr *attr); diff --git a/drivers/infiniband/sw/rxe/rxe_qp.c b/drivers/infiniband/sw/rxe/rxe_qp.c index fd86fd2fbb26..be5d76b2bcca 100644 --- a/drivers/infiniband/sw/rxe/rxe_qp.c +++ b/drivers/infiniband/sw/rxe/rxe_qp.c @@ -631,14 +631,11 @@ int rxe_qp_from_attr(struct rxe_qp *qp, struct ib_qp_attr *attr, int mask, qp->attr.qkey = attr->qkey; if (mask & IB_QP_AV) { - rxe_av_from_attr(attr->port_num, &qp->pri_av, &attr->ah_attr); - rxe_av_fill_ip_info(&qp->pri_av, &attr->ah_attr); + rxe_init_av(&attr->ah_attr, &qp->pri_av); } if (mask & IB_QP_ALT_PATH) { - rxe_av_from_attr(attr->alt_port_num, &qp->alt_av, - &attr->alt_ah_attr); - rxe_av_fill_ip_info(&qp->alt_av, &attr->alt_ah_attr); + rxe_init_av(&attr->alt_ah_attr, &qp->alt_av); qp->attr.alt_port_num = attr->alt_port_num; qp->attr.alt_pkey_index = attr->alt_pkey_index; qp->attr.alt_timeout = attr->alt_timeout; diff --git a/drivers/infiniband/sw/rxe/rxe_verbs.c b/drivers/infiniband/sw/rxe/rxe_verbs.c index 3d01247a28db..cc5a05124ece 100644 --- a/drivers/infiniband/sw/rxe/rxe_verbs.c +++ b/drivers/infiniband/sw/rxe/rxe_verbs.c @@ -210,13 +210,6 @@ static int rxe_dealloc_pd(struct ib_pd *ibpd) return 0; } -static void rxe_init_av(struct rxe_dev *rxe, struct rdma_ah_attr *attr, - struct rxe_av *av) -{ - rxe_av_from_attr(rdma_ah_get_port_num(attr), av, attr); - rxe_av_fill_ip_info(av, attr); -} - static struct ib_ah *rxe_create_ah(struct ib_pd *ibpd, struct rdma_ah_attr *attr, u32 flags, @@ -239,7 +232,7 @@ static struct ib_ah *rxe_create_ah(struct ib_pd *ibpd, rxe_add_ref(pd); ah->pd = pd; - rxe_init_av(rxe, attr, &ah->av); + rxe_init_av(attr, &ah->av); return &ah->ibah; } @@ -253,7 +246,7 @@ static int rxe_modify_ah(struct ib_ah *ibah, struct rdma_ah_attr *attr) if (err) return err; - rxe_init_av(rxe, attr, &ah->av); + rxe_init_av(attr, &ah->av); return 0; }
Move the function rxe_init_av() to rxe_av.c file and use it instead of calling rxe_av_from_attr() and rxe_av_fill_ip_info(), also remove the unused rxe_dev parameter from rxe_init_av(). Signed-off-by: Kamal Heib <kamalheib1@gmail.com> --- drivers/infiniband/sw/rxe/rxe_av.c | 6 ++++++ drivers/infiniband/sw/rxe/rxe_loc.h | 1 + drivers/infiniband/sw/rxe/rxe_qp.c | 7 ++----- drivers/infiniband/sw/rxe/rxe_verbs.c | 11 ++--------- 4 files changed, 11 insertions(+), 14 deletions(-)