On Sun, Feb 28, 2021 at 11:04:08AM -0600, Bob Pearson wrote: > On 2/27/21 2:43 AM, Leon Romanovsky wrote: > > On Fri, Feb 26, 2021 at 06:02:39PM -0600, Bob Pearson wrote: > >> On 2/26/21 5:33 PM, Jason Gunthorpe wrote: > >>> On Fri, Feb 26, 2021 at 05:28:41PM -0600, Bob Pearson wrote: > >>>> Just a reminder. rxe in for-next is broken until this gets done. > >>>> thanks > >>> > >>> I was expecting you to resend it? There seemed to be some changes > >>> needed > >>> > >>> https://patchwork.kernel.org/project/linux-rdma/patch/20210214222630.3901-1-rpearson@xxxxxxx/ > >>> > >>> Jason > >>> > >> OK. I see. I agreed to that complaint when the kfree was the only thing in the if {} but now I have to call ib_device_put() *only* in the error case not if there wasn't an error. So no reason to not put the kfree_skb() in there too and avoid passing a NULL pointer. It should stay the way it is. > > > > First, I posted a diff which makes this if() redundant. > > Second, the if () before kfree() is checked by coccinelle and your > > "should stay the way it is" will be marked as failure in many CIs, > > including ours. > > > > Thanks > > > >> > >> bob > > Leon, > > I am not sure we are talking about the same if statement. You wrote > > ... > diff --git a/drivers/infiniband/sw/rxe/rxe_recv.c b/drivers/infiniband/sw/rxe/rxe_recv.c > index 8a48a33d587b..29cb0125e76f 100644 > --- a/drivers/infiniband/sw/rxe/rxe_recv.c > +++ b/drivers/infiniband/sw/rxe/rxe_recv.c > @@ -247,6 +247,11 @@ static void rxe_rcv_mcast_pkt(struct rxe_dev *rxe, struct sk_buff *skb) > else if (skb->protocol == htons(ETH_P_IPV6)) > memcpy(&dgid, &ipv6_hdr(skb)->daddr, sizeof(dgid)); > > + if (!ib_device_try_get(&rxe->ib_dev)) { > + kfree_skb(skb); > + return; > + } > + > /* lookup mcast group corresponding to mgid, takes a ref */ > mcg = rxe_pool_get_key(&rxe->mc_grp_pool, &dgid); > if (!mcg) > @@ -274,10 +279,6 @@ static void rxe_rcv_mcast_pkt(struct rxe_dev *rxe, struct sk_buff *skb) > */ > if (mce->qp_list.next != &mcg->qp_list) { > per_qp_skb = skb_clone(skb, GFP_ATOMIC); > - if (WARN_ON(!ib_device_try_get(&rxe->ib_dev))) { > - kfree_skb(per_qp_skb); > - continue; > - } > } else { > per_qp_skb = skb; > /* show we have consumed the skb */ > ... > > which I don't understand. > > When a received packet is delivered to the rxe driver in rxe_net.c in rxe_udp_encap_recv() rxe_get_dev_from_net() is called which gets a pointer to the ib_device (contained in rxe_dev) and also takes a reference on the ib_device. This pointer is stored in skb->cb[] so the reference needs to be held until the skb is freed. If the skb has a multicast address and there are more than one QPs belonging to the multicast group then new skbs are cloned in rxe_rcv_mcast_pkt() and each has a pointer to the ib_device. Since each skb can have quite different lifetimes they each need to carry a reference to ib_device to protect against having it deleted out from under them. You suggest adding one more reference outside of the loop regardless of how many QPs, if any, belong to the multicast group. I don't see how this can be correct. > > In any case this is *not* the if statement that is under discussion in the patch. That one has to do with an error which can occur if the last QP in the list (which gets the original skb in the non-error case) doesn't match or isn't ready to receive the packet and it fails either check_type_state() or check_keys() and falls out of the loop. Now the reference to the ib_device needs to be let go and the skb needs to be freed but only if this error occurs. In the normal case that all happens when the skb if done being processed after calling rxe_rcv_pkt(). > > So the discussion boils down to whether to type > > ... > err1: > kfree_skb(skb); > if (unlikely(skb)) > ib_device_put(&rxe->ib_dev); > > or > > err1: > if (unlikely(skb)) { > kfree_skb(skb); > ib_device_put(&rxe->ib_dev); > } > > Here the normal non-error path has skb == NULL and the error path has skb set to the originally delivered packet. The second choice is much clearer as it shows the intent and saves the wasted trip to kfree_skb() for every packet. Can you please configure your mail client so your replies won't be one long unreadable lines? It will help us to read your replies and we will be able to answer them separately. Once the rxe_rcv_mcast_pkt() is called, the device and SKB are already "connected" each one to another, so I don't understand the claims about different lifetimes. It is not the "if ()", but the whole idea that every SKB increments reference counter sounds very strange. All QPs, mcast groups and SKB points to the same ib_dev and even one refcount is enough to ensure that it won't vanish. This is why it is enough to call ib_device_try_get() at the beginning of this function. Also the combination of ib_device_get() together with unlikely() to save kfree call can't be right either. Thanks > > bob
