From patchwork Mon May 14 17:34:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Ricardo Leitner X-Patchwork-Id: 913152 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="qAjH2CYA"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40l7BV4Lt0z9s0W for ; Tue, 15 May 2018 03:35:14 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753150AbeENRfG (ORCPT ); Mon, 14 May 2018 13:35:06 -0400 Received: from mail-qk0-f196.google.com ([209.85.220.196]:38802 "EHLO mail-qk0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753125AbeENRfD (ORCPT ); Mon, 14 May 2018 13:35:03 -0400 Received: by mail-qk0-f196.google.com with SMTP id b39-v6so10670772qkb.5; Mon, 14 May 2018 10:35:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=iBwTW5wNJeHmdNp2f2XMlJoZmjgLfE1yug17NbODGXE=; b=qAjH2CYAQkSSRWhgygamfhNTSN43lj5JFQBa5irNsgf7X+1bJt5Dxkp1V9osBu6hlE NslfTcab59RRITOxlKIVLx+cbb+C2Kk4Jhb+JAzuPlF0iMymA5erC9vR+MOyFrA33dto tOVgupURrpZqHP8k72Xp7fZmwLRG3mYv/vq/hC0gU/UPl0+AlTk/Rmo/TWqR5kxKtx/+ 3mLm31fRoudsB0EipE6u+l9fD31DknfGtuSbeR5+xWhQjoN5ztC79FdA64IimqrNkG2E KC/WJlTVD770wqKRSqSBQri/HCNccl2+DOo/NiVcoOry70PO+TkTPJi75gIuj1IpGHGQ uIaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=iBwTW5wNJeHmdNp2f2XMlJoZmjgLfE1yug17NbODGXE=; b=L9NVKcGwB2T3QC3yd7FUvNDoylrao2PR1wTFePMYjIsgzpiVIIHaAEN7TwVzfpWXVT Ba3BkyjByWYRuHQfbHDk8qA6QG2xLRKnSNWUC5JYCe6tHbteBBnuHjd5cVvEPBURafvL 4/qzCK31bW2hYoY2BVZR0w/gbXm1TVSm9IPV1eTYNMTCA8M4NBLZN44Xx+9H6gBS3HVg v3TLuySMMOaJLud6aUTuK5vxIeJ649U3ao3UaVlVe77iWGXwB9NvwoYekTvnLVyl73Mo w6PslLDIq46K3g1o3sIZfKstQf7w+6ScCAlqccCLRG2aHZnRfgyYMGjztAxvB6j2M3EZ XZfQ== X-Gm-Message-State: ALKqPwf4ZrQJooRF5I51BKoDchMZdlAVSlrlV4EC1SknMhkH59Ba3lmR lEWjJFZQ0ge431IGIl7xAs0= X-Google-Smtp-Source: AB8JxZr4Fo/H7Bm0DsY7RHlOMwlG0JF1d35qYEq3PWTg493X7+rm0sUoCedXzXHQIufsZ+DAn/QBNA== X-Received: by 2002:a37:c0c5:: with SMTP id v66-v6mr9302778qkv.343.1526319302706; Mon, 14 May 2018 10:35:02 -0700 (PDT) Received: from localhost.localdomain ([45.4.239.227]) by smtp.gmail.com with ESMTPSA id b52-v6sm8277053qta.58.2018.05.14.10.35.01 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 14 May 2018 10:35:01 -0700 (PDT) Received: by localhost.localdomain (Postfix, from userid 1000) id A9D111814CC; Mon, 14 May 2018 14:34:53 -0300 (-03) From: Marcelo Ricardo Leitner To: netdev@vger.kernel.org Cc: linux-sctp@vger.kernel.org, Neil Horman , Xin Long , Vlad Yasevich Subject: [PATCH net-next v3 6/8] sctp: move transport flush code out of sctp_outq_flush Date: Mon, 14 May 2018 14:34:41 -0300 Message-Id: <875fc90196a94e4353966cd3e1d3afd91b81e151.1526318522.git.marcelo.leitner@gmail.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: References: Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org To the new sctp_outq_flush_transports. Comment on Nagle is outdated and removed. Nagle is performed earlier, while checking if the chunk fits the packet: if the outq length is not enough to fill the packet, it returns SCTP_XMIT_DELAY. So by when it gets to sctp_outq_flush_transports, it has to go through all enlisted transports. Signed-off-by: Marcelo Ricardo Leitner --- net/sctp/outqueue.c | 56 +++++++++++++++++++++++++---------------------------- 1 file changed, 26 insertions(+), 30 deletions(-) diff --git a/net/sctp/outqueue.c b/net/sctp/outqueue.c index bfa2e43dfd31d115862b65d1650858fcaa6f203b..44465e64857b79636a78917a12776402ccb8f990 100644 --- a/net/sctp/outqueue.c +++ b/net/sctp/outqueue.c @@ -1176,6 +1176,29 @@ static void sctp_outq_flush_data(struct sctp_outq *q, } } +static void sctp_outq_flush_transports(struct sctp_outq *q, + struct list_head *transport_list, + gfp_t gfp) +{ + struct list_head *ltransport; + struct sctp_packet *packet; + struct sctp_transport *t; + int error = 0; + + while ((ltransport = sctp_list_dequeue(transport_list)) != NULL) { + t = list_entry(ltransport, struct sctp_transport, send_ready); + packet = &t->packet; + if (!sctp_packet_empty(packet)) { + error = sctp_packet_transmit(packet, gfp); + if (error < 0) + q->asoc->base.sk->sk_err = -error; + } + + /* Clear the burst limited state, if any */ + sctp_transport_burst_reset(t); + } +} + /* * Try to flush an outqueue. * @@ -1187,17 +1210,10 @@ static void sctp_outq_flush_data(struct sctp_outq *q, */ static void sctp_outq_flush(struct sctp_outq *q, int rtx_timeout, gfp_t gfp) { - struct sctp_packet *packet; - struct sctp_association *asoc = q->asoc; + /* Current transport being used. It's NOT the same as curr active one */ struct sctp_transport *transport = NULL; - int error = 0; - /* These transports have chunks to send. */ - struct list_head transport_list; - struct list_head *ltransport; - - INIT_LIST_HEAD(&transport_list); - packet = NULL; + LIST_HEAD(transport_list); /* * 6.10 Bundling @@ -1218,27 +1234,7 @@ static void sctp_outq_flush(struct sctp_outq *q, int rtx_timeout, gfp_t gfp) sctp_flush_out: - /* Before returning, examine all the transports touched in - * this call. Right now, we bluntly force clear all the - * transports. Things might change after we implement Nagle. - * But such an examination is still required. - * - * --xguo - */ - while ((ltransport = sctp_list_dequeue(&transport_list)) != NULL) { - struct sctp_transport *t = list_entry(ltransport, - struct sctp_transport, - send_ready); - packet = &t->packet; - if (!sctp_packet_empty(packet)) { - error = sctp_packet_transmit(packet, gfp); - if (error < 0) - asoc->base.sk->sk_err = -error; - } - - /* Clear the burst limited state, if any */ - sctp_transport_burst_reset(t); - } + sctp_outq_flush_transports(q, &transport_list, gfp); } /* Update unack_data based on the incoming SACK chunk */