| Message ID | 20180828070952.17824-1-yanjun.zhu@oracle.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [1/1] IB/rxe: Remove redudant variable rxe | expand |
On Tue, Aug 28, 2018 at 03:09:52AM -0400, Zhu Yanjun wrote: > After the commit ("IB/rxe: Simplify rxe_find_route() to > avoid GID query for netdev"), in the functions rxe_prepare, > prepare4 and prepare6, the variable rxe is not needed. > > Fix: commit ("IB/rxe: Simplify rxe_find_route() to avoid GID > query for netdev") It is better to be squashed into this commit. I'll resend v2 of that commit with your changes. Thanks > Signed-off-by: Zhu Yanjun <yanjun.zhu@oracle.com> > --- > drivers/infiniband/sw/rxe/rxe_loc.h | 3 +-- > drivers/infiniband/sw/rxe/rxe_net.c | 15 +++++++-------- > drivers/infiniband/sw/rxe/rxe_req.c | 2 +- > drivers/infiniband/sw/rxe/rxe_resp.c | 2 +- > 4 files changed, 10 insertions(+), 12 deletions(-) > > diff --git a/drivers/infiniband/sw/rxe/rxe_loc.h b/drivers/infiniband/sw/rxe/rxe_loc.h > index 87d14f7ef21b..8e305422adbb 100644 > --- a/drivers/infiniband/sw/rxe/rxe_loc.h > +++ b/drivers/infiniband/sw/rxe/rxe_loc.h > @@ -144,8 +144,7 @@ void rxe_loopback(struct sk_buff *skb); > int rxe_send(struct rxe_pkt_info *pkt, struct sk_buff *skb); > 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_dev *rxe, struct rxe_pkt_info *pkt, > - struct sk_buff *skb, u32 *crc); > +int rxe_prepare(struct rxe_pkt_info *pkt, struct sk_buff *skb, u32 *crc); > enum rdma_link_layer rxe_link_layer(struct rxe_dev *rxe, unsigned int port_num); > const char *rxe_parent_name(struct rxe_dev *rxe, unsigned int port_num); > struct device *rxe_dma_device(struct rxe_dev *rxe); > diff --git a/drivers/infiniband/sw/rxe/rxe_net.c b/drivers/infiniband/sw/rxe/rxe_net.c > index 12981242ff44..08441a23022f 100644 > --- a/drivers/infiniband/sw/rxe/rxe_net.c > +++ b/drivers/infiniband/sw/rxe/rxe_net.c > @@ -368,8 +368,8 @@ 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_dev *rxe, struct rxe_pkt_info *pkt, > - struct sk_buff *skb, struct rxe_av *av) > +static int prepare4(struct rxe_pkt_info *pkt, struct sk_buff *skb, > + struct rxe_av *av) > { > struct rxe_qp *qp = pkt->qp; > struct dst_entry *dst; > @@ -397,8 +397,8 @@ static int prepare4(struct rxe_dev *rxe, struct rxe_pkt_info *pkt, > return 0; > } > > -static int prepare6(struct rxe_dev *rxe, struct rxe_pkt_info *pkt, > - struct sk_buff *skb, struct rxe_av *av) > +static int prepare6(struct rxe_pkt_info *pkt, struct sk_buff *skb, > + struct rxe_av *av) > { > struct rxe_qp *qp = pkt->qp; > struct dst_entry *dst; > @@ -425,16 +425,15 @@ static int prepare6(struct rxe_dev *rxe, struct rxe_pkt_info *pkt, > return 0; > } > > -int rxe_prepare(struct rxe_dev *rxe, struct rxe_pkt_info *pkt, > - struct sk_buff *skb, u32 *crc) > +int rxe_prepare(struct rxe_pkt_info *pkt, struct sk_buff *skb, u32 *crc) > { > int err = 0; > struct rxe_av *av = rxe_get_av(pkt); > > if (av->network_type == RDMA_NETWORK_IPV4) > - err = prepare4(rxe, pkt, skb, av); > + err = prepare4(pkt, skb, av); > else if (av->network_type == RDMA_NETWORK_IPV6) > - err = prepare6(rxe, pkt, skb, av); > + err = prepare6(pkt, skb, av); > > *crc = rxe_icrc_hdr(pkt, skb); > > diff --git a/drivers/infiniband/sw/rxe/rxe_req.c b/drivers/infiniband/sw/rxe/rxe_req.c > index 8be27238a86e..84d35520781c 100644 > --- a/drivers/infiniband/sw/rxe/rxe_req.c > +++ b/drivers/infiniband/sw/rxe/rxe_req.c > @@ -476,7 +476,7 @@ static int fill_packet(struct rxe_qp *qp, struct rxe_send_wqe *wqe, > u32 *p; > int err; > > - err = rxe_prepare(rxe, pkt, skb, &crc); > + err = rxe_prepare(pkt, skb, &crc); > if (err) > return err; > > diff --git a/drivers/infiniband/sw/rxe/rxe_resp.c b/drivers/infiniband/sw/rxe/rxe_resp.c > index aa5833318372..c1948d406528 100644 > --- a/drivers/infiniband/sw/rxe/rxe_resp.c > +++ b/drivers/infiniband/sw/rxe/rxe_resp.c > @@ -637,7 +637,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(rxe, ack, skb, &crc); > + err = rxe_prepare(ack, skb, &crc); > if (err) { > kfree_skb(skb); > return NULL; > -- > 2.17.1 >
On 2018/8/28 16:56, Leon Romanovsky wrote: > On Tue, Aug 28, 2018 at 03:09:52AM -0400, Zhu Yanjun wrote: >> After the commit ("IB/rxe: Simplify rxe_find_route() to >> avoid GID query for netdev"), in the functions rxe_prepare, >> prepare4 and prepare6, the variable rxe is not needed. >> >> Fix: commit ("IB/rxe: Simplify rxe_find_route() to avoid GID >> query for netdev") > It is better to be squashed into this commit. > I'll resend v2 of that commit with your changes. OK. wait for v2. Zhu Yanjun > > Thanks > >> Signed-off-by: Zhu Yanjun <yanjun.zhu@oracle.com> >> --- >> drivers/infiniband/sw/rxe/rxe_loc.h | 3 +-- >> drivers/infiniband/sw/rxe/rxe_net.c | 15 +++++++-------- >> drivers/infiniband/sw/rxe/rxe_req.c | 2 +- >> drivers/infiniband/sw/rxe/rxe_resp.c | 2 +- >> 4 files changed, 10 insertions(+), 12 deletions(-) >> >> diff --git a/drivers/infiniband/sw/rxe/rxe_loc.h b/drivers/infiniband/sw/rxe/rxe_loc.h >> index 87d14f7ef21b..8e305422adbb 100644 >> --- a/drivers/infiniband/sw/rxe/rxe_loc.h >> +++ b/drivers/infiniband/sw/rxe/rxe_loc.h >> @@ -144,8 +144,7 @@ void rxe_loopback(struct sk_buff *skb); >> int rxe_send(struct rxe_pkt_info *pkt, struct sk_buff *skb); >> 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_dev *rxe, struct rxe_pkt_info *pkt, >> - struct sk_buff *skb, u32 *crc); >> +int rxe_prepare(struct rxe_pkt_info *pkt, struct sk_buff *skb, u32 *crc); >> enum rdma_link_layer rxe_link_layer(struct rxe_dev *rxe, unsigned int port_num); >> const char *rxe_parent_name(struct rxe_dev *rxe, unsigned int port_num); >> struct device *rxe_dma_device(struct rxe_dev *rxe); >> diff --git a/drivers/infiniband/sw/rxe/rxe_net.c b/drivers/infiniband/sw/rxe/rxe_net.c >> index 12981242ff44..08441a23022f 100644 >> --- a/drivers/infiniband/sw/rxe/rxe_net.c >> +++ b/drivers/infiniband/sw/rxe/rxe_net.c >> @@ -368,8 +368,8 @@ 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_dev *rxe, struct rxe_pkt_info *pkt, >> - struct sk_buff *skb, struct rxe_av *av) >> +static int prepare4(struct rxe_pkt_info *pkt, struct sk_buff *skb, >> + struct rxe_av *av) >> { >> struct rxe_qp *qp = pkt->qp; >> struct dst_entry *dst; >> @@ -397,8 +397,8 @@ static int prepare4(struct rxe_dev *rxe, struct rxe_pkt_info *pkt, >> return 0; >> } >> >> -static int prepare6(struct rxe_dev *rxe, struct rxe_pkt_info *pkt, >> - struct sk_buff *skb, struct rxe_av *av) >> +static int prepare6(struct rxe_pkt_info *pkt, struct sk_buff *skb, >> + struct rxe_av *av) >> { >> struct rxe_qp *qp = pkt->qp; >> struct dst_entry *dst; >> @@ -425,16 +425,15 @@ static int prepare6(struct rxe_dev *rxe, struct rxe_pkt_info *pkt, >> return 0; >> } >> >> -int rxe_prepare(struct rxe_dev *rxe, struct rxe_pkt_info *pkt, >> - struct sk_buff *skb, u32 *crc) >> +int rxe_prepare(struct rxe_pkt_info *pkt, struct sk_buff *skb, u32 *crc) >> { >> int err = 0; >> struct rxe_av *av = rxe_get_av(pkt); >> >> if (av->network_type == RDMA_NETWORK_IPV4) >> - err = prepare4(rxe, pkt, skb, av); >> + err = prepare4(pkt, skb, av); >> else if (av->network_type == RDMA_NETWORK_IPV6) >> - err = prepare6(rxe, pkt, skb, av); >> + err = prepare6(pkt, skb, av); >> >> *crc = rxe_icrc_hdr(pkt, skb); >> >> diff --git a/drivers/infiniband/sw/rxe/rxe_req.c b/drivers/infiniband/sw/rxe/rxe_req.c >> index 8be27238a86e..84d35520781c 100644 >> --- a/drivers/infiniband/sw/rxe/rxe_req.c >> +++ b/drivers/infiniband/sw/rxe/rxe_req.c >> @@ -476,7 +476,7 @@ static int fill_packet(struct rxe_qp *qp, struct rxe_send_wqe *wqe, >> u32 *p; >> int err; >> >> - err = rxe_prepare(rxe, pkt, skb, &crc); >> + err = rxe_prepare(pkt, skb, &crc); >> if (err) >> return err; >> >> diff --git a/drivers/infiniband/sw/rxe/rxe_resp.c b/drivers/infiniband/sw/rxe/rxe_resp.c >> index aa5833318372..c1948d406528 100644 >> --- a/drivers/infiniband/sw/rxe/rxe_resp.c >> +++ b/drivers/infiniband/sw/rxe/rxe_resp.c >> @@ -637,7 +637,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(rxe, ack, skb, &crc); >> + err = rxe_prepare(ack, skb, &crc); >> if (err) { >> kfree_skb(skb); >> return NULL; >> -- >> 2.17.1 >>
diff --git a/drivers/infiniband/sw/rxe/rxe_loc.h b/drivers/infiniband/sw/rxe/rxe_loc.h index 87d14f7ef21b..8e305422adbb 100644 --- a/drivers/infiniband/sw/rxe/rxe_loc.h +++ b/drivers/infiniband/sw/rxe/rxe_loc.h @@ -144,8 +144,7 @@ void rxe_loopback(struct sk_buff *skb); int rxe_send(struct rxe_pkt_info *pkt, struct sk_buff *skb); 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_dev *rxe, struct rxe_pkt_info *pkt, - struct sk_buff *skb, u32 *crc); +int rxe_prepare(struct rxe_pkt_info *pkt, struct sk_buff *skb, u32 *crc); enum rdma_link_layer rxe_link_layer(struct rxe_dev *rxe, unsigned int port_num); const char *rxe_parent_name(struct rxe_dev *rxe, unsigned int port_num); struct device *rxe_dma_device(struct rxe_dev *rxe); diff --git a/drivers/infiniband/sw/rxe/rxe_net.c b/drivers/infiniband/sw/rxe/rxe_net.c index 12981242ff44..08441a23022f 100644 --- a/drivers/infiniband/sw/rxe/rxe_net.c +++ b/drivers/infiniband/sw/rxe/rxe_net.c @@ -368,8 +368,8 @@ 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_dev *rxe, struct rxe_pkt_info *pkt, - struct sk_buff *skb, struct rxe_av *av) +static int prepare4(struct rxe_pkt_info *pkt, struct sk_buff *skb, + struct rxe_av *av) { struct rxe_qp *qp = pkt->qp; struct dst_entry *dst; @@ -397,8 +397,8 @@ static int prepare4(struct rxe_dev *rxe, struct rxe_pkt_info *pkt, return 0; } -static int prepare6(struct rxe_dev *rxe, struct rxe_pkt_info *pkt, - struct sk_buff *skb, struct rxe_av *av) +static int prepare6(struct rxe_pkt_info *pkt, struct sk_buff *skb, + struct rxe_av *av) { struct rxe_qp *qp = pkt->qp; struct dst_entry *dst; @@ -425,16 +425,15 @@ static int prepare6(struct rxe_dev *rxe, struct rxe_pkt_info *pkt, return 0; } -int rxe_prepare(struct rxe_dev *rxe, struct rxe_pkt_info *pkt, - struct sk_buff *skb, u32 *crc) +int rxe_prepare(struct rxe_pkt_info *pkt, struct sk_buff *skb, u32 *crc) { int err = 0; struct rxe_av *av = rxe_get_av(pkt); if (av->network_type == RDMA_NETWORK_IPV4) - err = prepare4(rxe, pkt, skb, av); + err = prepare4(pkt, skb, av); else if (av->network_type == RDMA_NETWORK_IPV6) - err = prepare6(rxe, pkt, skb, av); + err = prepare6(pkt, skb, av); *crc = rxe_icrc_hdr(pkt, skb); diff --git a/drivers/infiniband/sw/rxe/rxe_req.c b/drivers/infiniband/sw/rxe/rxe_req.c index 8be27238a86e..84d35520781c 100644 --- a/drivers/infiniband/sw/rxe/rxe_req.c +++ b/drivers/infiniband/sw/rxe/rxe_req.c @@ -476,7 +476,7 @@ static int fill_packet(struct rxe_qp *qp, struct rxe_send_wqe *wqe, u32 *p; int err; - err = rxe_prepare(rxe, pkt, skb, &crc); + err = rxe_prepare(pkt, skb, &crc); if (err) return err; diff --git a/drivers/infiniband/sw/rxe/rxe_resp.c b/drivers/infiniband/sw/rxe/rxe_resp.c index aa5833318372..c1948d406528 100644 --- a/drivers/infiniband/sw/rxe/rxe_resp.c +++ b/drivers/infiniband/sw/rxe/rxe_resp.c @@ -637,7 +637,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(rxe, ack, skb, &crc); + err = rxe_prepare(ack, skb, &crc); if (err) { kfree_skb(skb); return NULL;
After the commit ("IB/rxe: Simplify rxe_find_route() to avoid GID query for netdev"), in the functions rxe_prepare, prepare4 and prepare6, the variable rxe is not needed. Fix: commit ("IB/rxe: Simplify rxe_find_route() to avoid GID query for netdev") Signed-off-by: Zhu Yanjun <yanjun.zhu@oracle.com> --- drivers/infiniband/sw/rxe/rxe_loc.h | 3 +-- drivers/infiniband/sw/rxe/rxe_net.c | 15 +++++++-------- drivers/infiniband/sw/rxe/rxe_req.c | 2 +- drivers/infiniband/sw/rxe/rxe_resp.c | 2 +- 4 files changed, 10 insertions(+), 12 deletions(-)