From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.3 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_MUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C1467C10F13 for ; Thu, 11 Apr 2019 22:19:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 857EB2146F for ; Thu, 11 Apr 2019 22:19:53 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="sRc2aS1X" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727006AbfDKWTw (ORCPT ); Thu, 11 Apr 2019 18:19:52 -0400 Received: from mail-wm1-f65.google.com ([209.85.128.65]:34177 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726636AbfDKWTw (ORCPT ); Thu, 11 Apr 2019 18:19:52 -0400 Received: by mail-wm1-f65.google.com with SMTP id r186so2916837wmf.1 for ; Thu, 11 Apr 2019 15:19:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=NAETw3f3bJWrgraSTvhJhMyiOJiV+DB71Z8gKKcNmHQ=; b=sRc2aS1XLs1S0vwpwlPQ34uyeuQLjhOd8lSKSCek3VbQskfnPdME3KEel0tkMzaFNv lRvRCZmHTy9eXjgMcnNMkEVT6bQGJi3C7LR4i2ALrzCxmdnkF13D+O/GKkBxpq+YEpfD /F3Sgqx0KOJmPNebO1GAR6Nf8Xr0Qd9YNoB5d4VK35E2ubt+NTuhNqCU+gT66l9zR/dz AN7HA7P9lINR0jnIKfbS8TPS85Y9auzTa2fCt5qRx6Bg8NVbyBe+jr2UzFwTANvDJg3I SdJBvjqRMe0IJYs14jI4ZL9Z2HCrVt8MOTmtJxBtNm0KxcdwhnZWMqZH3XTxT/DdnQOS JAPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=NAETw3f3bJWrgraSTvhJhMyiOJiV+DB71Z8gKKcNmHQ=; b=VW0F1+DO31D6UZ+h45clO+yahLGfEtYzLA2+ib9VO3WWw8iq5s+vfT6NcbXXin5kzA 3jsL4MSqAzO3S7tD3z2s/j6t4FtTwjmA/tFly/8KRGt3Cp8Xj56NMnawumSMbFdH33Sy o3SCs5MdsRvhv0CMOQai0Wd3aOQeknT8nc3E3AC5RM3QZwt3VLYm92getGr9yds0DAR1 PH5beXjfW7YQnC9el+U2c7bUs7vlIm2fOx3IUXXnbtGJBp0hAMEhrsxZzxfAq9jbmGPA rmYqpIo8kfzVexfvq0B3j9/lt4dFXBi+qHnBhkaxD+jDq8Lhc2wqEY5cHRwHMXJM6BvS sppg== X-Gm-Message-State: APjAAAV6YsP/YWO9xroRkg7QNWykXIiIuGl+zPiFbQCKCxp+Hbabbqbx biQ3v/FEm6aNk3Zrj5FLuVk= X-Google-Smtp-Source: APXvYqz2jvsuGXlkuvcveQ7WEXlU3+SDgYzLZJEuRXrYOf62EKAF2rRWiKXWqlpAfEWqfO1vbhA7oQ== X-Received: by 2002:a1c:7008:: with SMTP id l8mr8096612wmc.49.1555021189483; Thu, 11 Apr 2019 15:19:49 -0700 (PDT) Received: from localhost.localdomain ([194.42.141.29]) by smtp.gmail.com with ESMTPSA id z63sm11272582wme.30.2019.04.11.15.19.47 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 11 Apr 2019 15:19:48 -0700 (PDT) Received: by localhost.localdomain (Postfix, from userid 1000) id 7F535180B5B; Thu, 11 Apr 2019 19:19:46 -0300 (-03) Date: Thu, 11 Apr 2019 19:19:46 -0300 From: Marcelo Ricardo Leitner To: David Miller Cc: netdev@vger.kernel.org, lucien.xin@gmail.com, nhorman@tuxdriver.com Subject: Re: [PATCH v5 5/5] sctp: Pass sk_buff_head explicitly to sctp_ulpq_tail_event(). Message-ID: <20190411221946.GQ10452@localhost.localdomain> References: <20190411.150207.1202792333614364121.davem@davemloft.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190411.150207.1202792333614364121.davem@davemloft.net> User-Agent: Mutt/1.11.3 (2019-02-01) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Thu, Apr 11, 2019 at 03:02:07PM -0700, David Miller wrote: > > Now the SKB list implementation assumption can be removed. > > And now that we know that the list head is always non-NULL > we can remove the code blocks dealing with that as well. > > Signed-off-by: David S. Miller Acked-by: Marcelo Ricardo Leitner Thanks! > --- > include/net/sctp/ulpqueue.h | 2 +- > net/sctp/stream_interleave.c | 2 +- > net/sctp/ulpqueue.c | 29 +++++++++++------------------ > 3 files changed, 13 insertions(+), 20 deletions(-) > > diff --git a/include/net/sctp/ulpqueue.h b/include/net/sctp/ulpqueue.h > index bb0ecba3db2b..f4ac7117ff29 100644 > --- a/include/net/sctp/ulpqueue.h > +++ b/include/net/sctp/ulpqueue.h > @@ -59,7 +59,7 @@ void sctp_ulpq_free(struct sctp_ulpq *); > int sctp_ulpq_tail_data(struct sctp_ulpq *, struct sctp_chunk *, gfp_t); > > /* Add a new event for propagation to the ULP. */ > -int sctp_ulpq_tail_event(struct sctp_ulpq *, struct sctp_ulpevent *ev); > +int sctp_ulpq_tail_event(struct sctp_ulpq *, struct sk_buff_head *skb_list); > > /* Renege previously received chunks. */ > void sctp_ulpq_renege(struct sctp_ulpq *, struct sctp_chunk *, gfp_t); > diff --git a/net/sctp/stream_interleave.c b/net/sctp/stream_interleave.c > index 2c50627bdfdb..25e0b7e5189c 100644 > --- a/net/sctp/stream_interleave.c > +++ b/net/sctp/stream_interleave.c > @@ -1317,7 +1317,7 @@ static int do_ulpq_tail_event(struct sctp_ulpq *ulpq, struct sctp_ulpevent *even > > skb_queue_head_init(&temp); > __skb_queue_tail(&temp, sctp_event2skb(event)); > - return sctp_ulpq_tail_event(ulpq, event); > + return sctp_ulpq_tail_event(ulpq, &temp); > } > > static struct sctp_stream_interleave sctp_stream_interleave_0 = { > diff --git a/net/sctp/ulpqueue.c b/net/sctp/ulpqueue.c > index a698f1a509bf..7cdc3623fa35 100644 > --- a/net/sctp/ulpqueue.c > +++ b/net/sctp/ulpqueue.c > @@ -130,7 +130,7 @@ int sctp_ulpq_tail_data(struct sctp_ulpq *ulpq, struct sctp_chunk *chunk, > */ > if (event) { > event_eor = (event->msg_flags & MSG_EOR) ? 1 : 0; > - sctp_ulpq_tail_event(ulpq, event); > + sctp_ulpq_tail_event(ulpq, &temp); > } > > return event_eor; > @@ -194,18 +194,17 @@ static int sctp_ulpq_clear_pd(struct sctp_ulpq *ulpq) > return sctp_clear_pd(ulpq->asoc->base.sk, ulpq->asoc); > } > > -/* If the SKB of 'event' is on a list, it is the first such member > - * of that list. > - */ > -int sctp_ulpq_tail_event(struct sctp_ulpq *ulpq, struct sctp_ulpevent *event) > +int sctp_ulpq_tail_event(struct sctp_ulpq *ulpq, struct sk_buff_head *skb_list) > { > struct sock *sk = ulpq->asoc->base.sk; > struct sctp_sock *sp = sctp_sk(sk); > - struct sk_buff_head *queue, *skb_list; > - struct sk_buff *skb = sctp_event2skb(event); > + struct sctp_ulpevent *event; > + struct sk_buff_head *queue; > + struct sk_buff *skb; > int clear_pd = 0; > > - skb_list = (struct sk_buff_head *) skb->prev; > + skb = __skb_peek(skb_list); > + event = sctp_skb2event(skb); > > /* If the socket is just going to throw this away, do not > * even try to deliver it. > @@ -258,13 +257,7 @@ int sctp_ulpq_tail_event(struct sctp_ulpq *ulpq, struct sctp_ulpevent *event) > } > } > > - /* If we are harvesting multiple skbs they will be > - * collected on a list. > - */ > - if (skb_list) > - skb_queue_splice_tail_init(skb_list, queue); > - else > - __skb_queue_tail(queue, skb); > + skb_queue_splice_tail_init(skb_list, queue); > > /* Did we just complete partial delivery and need to get > * rolling again? Move pending data to the receive > @@ -757,7 +750,7 @@ static void sctp_ulpq_reasm_drain(struct sctp_ulpq *ulpq) > * sctp_ulpevent for very first SKB on the temp' list. > */ > if (event) > - sctp_ulpq_tail_event(ulpq, event); > + sctp_ulpq_tail_event(ulpq, &temp); > } > } > > @@ -957,7 +950,7 @@ static void sctp_ulpq_reap_ordered(struct sctp_ulpq *ulpq, __u16 sid) > if (event) { > /* see if we have more ordered that we can deliver */ > sctp_ulpq_retrieve_ordered(ulpq, event); > - sctp_ulpq_tail_event(ulpq, event); > + sctp_ulpq_tail_event(ulpq, &temp); > } > } > > @@ -1087,7 +1080,7 @@ void sctp_ulpq_partial_delivery(struct sctp_ulpq *ulpq, > > skb_queue_head_init(&temp); > __skb_queue_tail(&temp, sctp_event2skb(event)); > - sctp_ulpq_tail_event(ulpq, event); > + sctp_ulpq_tail_event(ulpq, &temp); > sctp_ulpq_set_pd(ulpq); > return; > } > -- > 2.20.1 >