From patchwork Fri May 11 23:29:00 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: 912264 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="YuV6bSKi"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40jRBM1Kzzz9s28 for ; Sat, 12 May 2018 09:29:15 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751934AbeEKX3L (ORCPT ); Fri, 11 May 2018 19:29:11 -0400 Received: from mail-qt0-f196.google.com ([209.85.216.196]:41276 "EHLO mail-qt0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751217AbeEKX3H (ORCPT ); Fri, 11 May 2018 19:29:07 -0400 Received: by mail-qt0-f196.google.com with SMTP id g13-v6so9212376qth.8; Fri, 11 May 2018 16:29:06 -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=0/XDajZmSqnFkjfwUvOsxj+w+PIbnj/kG1MmjkGY6d0=; b=YuV6bSKi+TpC7zjqe3StDMg1SPdXlB+WFIqwZYlQpAFJCLYiHVkzlbCBYTekE5RWLS G/dRCXaOeTTv5BcL2BxV2H/sGy1vIxv4mOMy8/Ez/JnbtQPptf2hx0SbGEjWisbz0L1N +IzJhAZv1PjGQfUvU8RX7Gg4/JwkbLJIVo7bt+CKQEBTyLqvyc2uj9uEjyGVa03p8ABX z38dRprL85/PGOFfgQL9wE6zpdTJCTxNw1q97GRNSi1hDl84kjND+IiuX/8mMhgOdDSf +3eXArTB1lkGQAQrelQhMq20Z7LkNFYI0t2XLNWtBzPc2tj+3L+5qGBeg9X2/rqhK0rL uJsA== 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=0/XDajZmSqnFkjfwUvOsxj+w+PIbnj/kG1MmjkGY6d0=; b=lA/4/5LsMhSgPxVj2NLHHvr/Y08DeC+J55EJ0QCQjSzh9PDdrmR5sHtGHMkVdEViTd NUTHUn6INUozcSo+4pQmcJX/deo+1JEZM09FG0b463aLKtyXuFvwjPaMhqPnslkBZF5o M57kaUKistLFDJ8ORaPvegHNcAX/g/ieJuC7olQ7pRpeYntxQW7QCLBb5vs5OZ71lsVA yXzbkySW7mHqPuB0Kwt9g5sY86W7E7NZw3EhPAlQT6oZjZXT8SurqTJzZo9ce7LFuOGI Vb10pxaxhY0Z3+yWnctM9M8FHFXpnvn8qDRqnkUyfuZRZczZemFlh1TDDxRfX3AqlBsp 9GBw== X-Gm-Message-State: ALKqPwd3MYrrK0S9kmLH/FkODjD0bJ7vs7w47+QF2iPXRUpgBFGN2+Fn Xej8xA7bWFBJGF3VYu/5G0I= X-Google-Smtp-Source: AB8JxZpg7JJAh49nw9f/L6nux83VDusET9Q/KAmxgms9/96oebkYXnerEL/er4pXk8yj9PjRHguGRQ== X-Received: by 2002:a0c:9557:: with SMTP id m23-v6mr426485qvm.142.1526081346407; Fri, 11 May 2018 16:29:06 -0700 (PDT) Received: from localhost.localdomain ([45.4.239.227]) by smtp.gmail.com with ESMTPSA id t22-v6sm3526418qtj.63.2018.05.11.16.29.05 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 11 May 2018 16:29:05 -0700 (PDT) Received: by localhost.localdomain (Postfix, from userid 1000) id E7037180C3B; Fri, 11 May 2018 20:29:03 -0300 (-03) From: Marcelo Ricardo Leitner To: netdev@vger.kernel.org Cc: linux-sctp@vger.kernel.org, Neil Horman , Vlad Yasevich , Xin Long Subject: [PATCH net-next 6/8] sctp: move transport flush code out of sctp_outq_flush Date: Fri, 11 May 2018 20:29:00 -0300 Message-Id: <0b335685619527018d1209580a8ac25d3d610d12.1526077476.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 e445a59db26004553984088d50e458a93b03dcb8..e867bde0b2d93f730f0cb89ad2f54a2094f47833 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 */