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.6 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 06E57C43381 for ; Thu, 28 Feb 2019 02:20:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C541B218A2 for ; Thu, 28 Feb 2019 02:20:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="tAyK9dDe" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730951AbfB1CUE (ORCPT ); Wed, 27 Feb 2019 21:20:04 -0500 Received: from mail-qt1-f194.google.com ([209.85.160.194]:42314 "EHLO mail-qt1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730649AbfB1CUE (ORCPT ); Wed, 27 Feb 2019 21:20:04 -0500 Received: by mail-qt1-f194.google.com with SMTP id u7so12611903qtg.9 for ; Wed, 27 Feb 2019 18:20:03 -0800 (PST) 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=4cz02TzylqkAXKVACmGz3wU8OF5wYBBjmDGrq65fE6E=; b=tAyK9dDeWx0rN775kjjW7vi/WSy8xF5kNkHFinf9qlz+TVaK61+T7EQ8B5DB5OVPhp 27qzKaBYoEITQIIRP4D1vVouhG6S+XxDoaoRBUXLJPVew9656XnAZ/PeoSnoPt3RpFPL wekx1LyCO6fJR50bR9HgJWLGs3Hywpbvvlw7kd16K2Oyq62WenEiU6G6IPzSzQg+4FK0 DpouTeRXwpcBSvYKr9fHg65T7+iGsd4qQ5V10YMloI+1FwNpySHm7m9a47rprErwo+7w USpLMpRycXUlB3IpbRg6Mj6jN1HpfDZiu3AfWZPSDs6nLt8CJg3liMc8u9gX3Ji81fXc lUEw== 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=4cz02TzylqkAXKVACmGz3wU8OF5wYBBjmDGrq65fE6E=; b=EEBCGXwvRKoHlZ+qoNlQVvxK+ZtQkQgw/E0tW6BkWlV+3mCmjBD5uoB8a3H2OXUmrR 8WZr9ZsUBQWv9V+GIL8BO/fV5nfhuQjuwViiau68RGzS9uUMYabvOR7dPzZyHDlgKUeD 5O3An+Mm2l//YLpB41a/KQDn3f3Pv1hNggYvHNknd2Ts7F1mjEO7SUyBtXa41g/F/5FI 8KCzb2YaykKfBTuAKFve8BGXDeJ2T35AU8zuioWY24b2MJN/1UeJZvK6HlyhViSTDE58 k30gac02DDpa0qGyOIBxkIH5YZUR/+G0fJU2LPhDmsGLZlwy3XjLKxkIzNn0edULXsVz q1YQ== X-Gm-Message-State: APjAAAXBqiSeUGm+eRBtZ/jY//BPAd8WhEGMjQnwjmoTKYxttLBQsRA/ rXSVmH+oGFqDVWDb+UlvE38= X-Google-Smtp-Source: APXvYqzsIubmbGkXGek/1QDxt7vSb1UL79SJA/8TTEAKLJhpZU4q0b2mdyPyNb1q6N4Nsp3etYAMjA== X-Received: by 2002:a0c:bd83:: with SMTP id n3mr4506570qvg.205.1551320402480; Wed, 27 Feb 2019 18:20:02 -0800 (PST) Received: from localhost.localdomain ([177.220.172.100]) by smtp.gmail.com with ESMTPSA id t123sm9028058qkc.6.2019.02.27.18.20.01 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 27 Feb 2019 18:20:01 -0800 (PST) Received: by localhost.localdomain (Postfix, from userid 1000) id CA3F4180CD3; Wed, 27 Feb 2019 23:19:58 -0300 (-03) Date: Wed, 27 Feb 2019 23:19:58 -0300 From: Marcelo Ricardo Leitner To: David Miller Cc: netdev@vger.kernel.org, lucien.xin@gmail.com, nhorman@tuxdriver.com Subject: Re: [PATCH RFC v3 4/5] sctp: Make sctp_enqueue_event tak an skb list. Message-ID: <20190228021958.GA13343@localhost.localdomain> References: <20190227.170024.1735727318522180688.davem@davemloft.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190227.170024.1735727318522180688.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 Wed, Feb 27, 2019 at 05:00:24PM -0800, 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 > --- > net/sctp/stream_interleave.c | 44 +++++++++++++++++++++++++++--------- > 1 file changed, 33 insertions(+), 11 deletions(-) > > diff --git a/net/sctp/stream_interleave.c b/net/sctp/stream_interleave.c > index b6b251b8b3cf..0bc3d9329d9a 100644 > --- a/net/sctp/stream_interleave.c > +++ b/net/sctp/stream_interleave.c ... > @@ -866,11 +867,15 @@ static int sctp_ulpevent_idata(struct sctp_ulpq *ulpq, More context: if (!(event->msg_flags & SCTP_DATA_UNORDERED)) { event = sctp_intl_reasm(ulpq, event); [1] if (event && event->msg_flags & MSG_EOR) { [2] skb_queue_head_init(&temp); __skb_queue_tail(&temp, sctp_event2skb(event)); 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); [1] can return an event without MSG_EOR (a partial delivery), which would skip the condition on [2] and cause temp to not be initialized by here. Same applies to sctp_ulpq_tail_data(). It's the only thing I noticed on the series. Will test it tomorrow. > } > > return event_eor; ...