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 D8B81C10F13 for ; Thu, 11 Apr 2019 22:19:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8B7182184B for ; Thu, 11 Apr 2019 22:19:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Cz+cg1Kr" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727052AbfDKWTV (ORCPT ); Thu, 11 Apr 2019 18:19:21 -0400 Received: from mail-wm1-f65.google.com ([209.85.128.65]:35752 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726728AbfDKWTV (ORCPT ); Thu, 11 Apr 2019 18:19:21 -0400 Received: by mail-wm1-f65.google.com with SMTP id y197so8537645wmd.0 for ; Thu, 11 Apr 2019 15:19:19 -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=vmn/nfEc6M6nrjPC647e5+kX1TBK4zWb+UQ6j+E8ucc=; b=Cz+cg1Kr2+EUXnLgAwO2gY7QVo2zdD0NnsdxYvCR4Yv8u2QoyIsxh9N9hFvz0iPboR oyi4A6qHWL+ANtSCYcB/YaP2R2RqmyAo08Pe/mcb/rE0d70x1nfsc6YRXWmvnS3j6+Qq RHzG8TLOXga3dFjkfT4ht7zoNsoIYbGxOu8XJx6uPhFR5l0lfmWavrK8tCjtrfBXXiiz NslfB74RYjkEgupN52yXn8GLzTD7nHhMN0wiBe+WG9JtuSG3xHSFSjaJ/FQHE6S4Ib5d GlcX+N5/Q5DUtB273ae0Qwt6sWWN56tIJLPIneu+vfeLDxb8iiqYPDNiYv1GPovOF1eS HvKA== 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=vmn/nfEc6M6nrjPC647e5+kX1TBK4zWb+UQ6j+E8ucc=; b=lNwUymUplUT+mM06K8AL8E8yPTVa+HZAIyOaiXDM5ln6jVeK+KexPd2zdeLgGKty6k Ac4NEdMM5pjNWIYBHoEq3hWyuGdA3kW6oWryyol4XqfLH33ZzG+UEoxb07Qrz1kxShuN 6iH/jZWnqYDXGt6dUtd6KkuYnkat7+not5c0a12U9Q9n8TbrkM/rvwOeLZvofJZI0AdG gWNVAznWDE1yD3NxBjnOMuoK1619ll8EIgySU73mZfKatv4z56oO70EFi/drH41EUOGV +e37SXgtFyVBXD0ZzngLj8riJEG3W/GqnXwu0wQLuhFp+SPTFm8qeyzMf9SzRtJ+F0w0 ptJg== X-Gm-Message-State: APjAAAXAX/T7ZKXxRqZTVdEXBrJql7DQZrw0OaELPt0rP3muyRXjtN39 v0BwA6CxK8n4kmqxXzMRN+c= X-Google-Smtp-Source: APXvYqwOb9SwkCR3NIz+YjFzQ7pXN7D23tYzi4I/Cva54bu2vHsjN2ZeAqCIsvmVBwmbulUNV5QgeQ== X-Received: by 2002:a1c:9d46:: with SMTP id g67mr7753303wme.99.1555021158322; Thu, 11 Apr 2019 15:19:18 -0700 (PDT) Received: from localhost.localdomain ([194.42.141.29]) by smtp.gmail.com with ESMTPSA id d14sm60413493wro.79.2019.04.11.15.19.17 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 11 Apr 2019 15:19:17 -0700 (PDT) Received: by localhost.localdomain (Postfix, from userid 1000) id AE0CB180B5B; Thu, 11 Apr 2019 19:19:15 -0300 (-03) Date: Thu, 11 Apr 2019 19:19:15 -0300 From: Marcelo Ricardo Leitner To: David Miller Cc: netdev@vger.kernel.org, lucien.xin@gmail.com, nhorman@tuxdriver.com Subject: Re: [PATCH v5 4/5] sctp: Make sctp_enqueue_event tak an skb list. Message-ID: <20190411221915.GP10452@localhost.localdomain> References: <20190411.150204.1769174238614470220.davem@davemloft.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190411.150204.1769174238614470220.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:04PM -0700, David Miller wrote: > > Pass this, instead of an event. Then everything trickles down and we > always have events a non-empty list. > > Then we needs a list creating stub to place into .enqueue_event for sctp_stream_interleave_1. > > Signed-off-by: David S. Miller Typo on summary, s/tak /take / Acked-by: Marcelo Ricardo Leitner > --- > net/sctp/stream_interleave.c | 49 ++++++++++++++++++++++++++---------- > net/sctp/ulpqueue.c | 5 ++-- > 2 files changed, 39 insertions(+), 15 deletions(-) > > diff --git a/net/sctp/stream_interleave.c b/net/sctp/stream_interleave.c > index a6bc42121e35..2c50627bdfdb 100644 > --- a/net/sctp/stream_interleave.c > +++ b/net/sctp/stream_interleave.c > @@ -484,14 +484,15 @@ static struct sctp_ulpevent *sctp_intl_order(struct sctp_ulpq *ulpq, > } > > static int sctp_enqueue_event(struct sctp_ulpq *ulpq, > - struct sctp_ulpevent *event) > + struct sk_buff_head *skb_list) > { > - struct sk_buff *skb = sctp_event2skb(event); > struct sock *sk = ulpq->asoc->base.sk; > struct sctp_sock *sp = sctp_sk(sk); > - struct sk_buff_head *skb_list; > + struct sctp_ulpevent *event; > + struct sk_buff *skb; > > - skb_list = (struct sk_buff_head *)skb->prev; > + skb = __skb_peek(skb_list); > + event = sctp_skb2event(skb); > > if (sk->sk_shutdown & RCV_SHUTDOWN && > (sk->sk_shutdown & SEND_SHUTDOWN || > @@ -858,19 +859,24 @@ static int sctp_ulpevent_idata(struct sctp_ulpq *ulpq, > > if (!(event->msg_flags & SCTP_DATA_UNORDERED)) { > event = sctp_intl_reasm(ulpq, event); > - if (event && event->msg_flags & MSG_EOR) { > + if (event) { > skb_queue_head_init(&temp); > __skb_queue_tail(&temp, sctp_event2skb(event)); > > - event = sctp_intl_order(ulpq, event); > + if (event->msg_flags & MSG_EOR) > + event = sctp_intl_order(ulpq, event); > } > } else { > event = sctp_intl_reasm_uo(ulpq, event); > + if (event) { > + skb_queue_head_init(&temp); > + __skb_queue_tail(&temp, sctp_event2skb(event)); > + } > } > > if (event) { > event_eor = (event->msg_flags & MSG_EOR) ? 1 : 0; > - sctp_enqueue_event(ulpq, event); > + sctp_enqueue_event(ulpq, &temp); > } > > return event_eor; > @@ -944,20 +950,27 @@ static struct sctp_ulpevent *sctp_intl_retrieve_first(struct sctp_ulpq *ulpq) > static void sctp_intl_start_pd(struct sctp_ulpq *ulpq, gfp_t gfp) > { > struct sctp_ulpevent *event; > + struct sk_buff_head temp; > > if (!skb_queue_empty(&ulpq->reasm)) { > do { > event = sctp_intl_retrieve_first(ulpq); > - if (event) > - sctp_enqueue_event(ulpq, event); > + if (event) { > + skb_queue_head_init(&temp); > + __skb_queue_tail(&temp, sctp_event2skb(event)); > + sctp_enqueue_event(ulpq, &temp); > + } > } while (event); > } > > if (!skb_queue_empty(&ulpq->reasm_uo)) { > do { > event = sctp_intl_retrieve_first_uo(ulpq); > - if (event) > - sctp_enqueue_event(ulpq, event); > + if (event) { > + skb_queue_head_init(&temp); > + __skb_queue_tail(&temp, sctp_event2skb(event)); > + sctp_enqueue_event(ulpq, &temp); > + } > } while (event); > } > } > @@ -1059,7 +1072,7 @@ static void sctp_intl_reap_ordered(struct sctp_ulpq *ulpq, __u16 sid) > > if (event) { > sctp_intl_retrieve_ordered(ulpq, event); > - sctp_enqueue_event(ulpq, event); > + sctp_enqueue_event(ulpq, &temp); > } > } > > @@ -1326,6 +1339,16 @@ static struct sctp_stream_interleave sctp_stream_interleave_0 = { > .handle_ftsn = sctp_handle_fwdtsn, > }; > > +static int do_sctp_enqueue_event(struct sctp_ulpq *ulpq, > + struct sctp_ulpevent *event) > +{ > + struct sk_buff_head temp; > + > + skb_queue_head_init(&temp); > + __skb_queue_tail(&temp, sctp_event2skb(event)); > + return sctp_enqueue_event(ulpq, &temp); > +} > + > static struct sctp_stream_interleave sctp_stream_interleave_1 = { > .data_chunk_len = sizeof(struct sctp_idata_chunk), > .ftsn_chunk_len = sizeof(struct sctp_ifwdtsn_chunk), > @@ -1334,7 +1357,7 @@ static struct sctp_stream_interleave sctp_stream_interleave_1 = { > .assign_number = sctp_chunk_assign_mid, > .validate_data = sctp_validate_idata, > .ulpevent_data = sctp_ulpevent_idata, > - .enqueue_event = sctp_enqueue_event, > + .enqueue_event = do_sctp_enqueue_event, > .renege_events = sctp_renege_events, > .start_pd = sctp_intl_start_pd, > .abort_pd = sctp_intl_abort_pd, > diff --git a/net/sctp/ulpqueue.c b/net/sctp/ulpqueue.c > index b22f558adc49..a698f1a509bf 100644 > --- a/net/sctp/ulpqueue.c > +++ b/net/sctp/ulpqueue.c > @@ -116,12 +116,13 @@ int sctp_ulpq_tail_data(struct sctp_ulpq *ulpq, struct sctp_chunk *chunk, > event = sctp_ulpq_reasm(ulpq, event); > > /* Do ordering if needed. */ > - if ((event) && (event->msg_flags & MSG_EOR)) { > + if (event) { > /* Create a temporary list to collect chunks on. */ > skb_queue_head_init(&temp); > __skb_queue_tail(&temp, sctp_event2skb(event)); > > - event = sctp_ulpq_order(ulpq, event); > + if (event->msg_flags & MSG_EOR) > + event = sctp_ulpq_order(ulpq, event); > } > > /* Send event to the ULP. 'event' is the sctp_ulpevent for > -- > 2.20.1 >