From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-1372483-1517181078-2-1775034562499287587 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.001, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES en, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='com', MailFrom='org', XOriginatingCountry='US' X-Spam-charsets: plain='iso-8859-1' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=arctest; t=1517181077; b=HlBerPPh/HQ8v0jgLM2vhaQHM+vc3wZYOs3lG0VyVPJD7jk jKVMOwH42+/jjexqGja2RkYyr2ofwi6P/mHy4ju46ZUUBt0LyLXPQeQDphIvmjRu oG50qO9dkSurez/6Wk4t2MQhh5gVk1hi7eYCy6PBWPdku9LBmGjMr+qPulQLjiOv FD8WzZLvWsBGp2SPInV52QYD4+f1qtAmZ1qYISMeUUIZKsQqVIzegT6o0gIl8sxx R/ES7RAsVItHENdUH6YiG2F/GTwk9cSXCWygooaZd+sbphOyuaZ6AILi+IzSHoh1 0DfXThCGnahoUMLiOeEoCJyJ6gi5Qs+ROGR0Zrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :references:in-reply-to:content-type:content-transfer-encoding :mime-version:sender:list-id; s=arctest; t=1517181077; bh=robrd+ TVv0xrO7hqqekuCJnQbPCbK/S9zmLYg1Paq/o=; b=dQJkc+Xgy5uUxiBvJcKdLP Oz42h1B7pfU6CSY81i7IL2JY5JbKJ35nceTZIlwT/6qydCAkDAc2ftWc8dMNPsNb uBpGXpAumqlAsFKhAqBQdbUE7+bh3s696wnOw7ersEWmZIjOJMHA3TaRh2z640Rg 40v/3TyLi+WoxgfdaTqDw2l9XAd+jWEiMOwIzXMyDB5KrexqZl8rawrvWdyIyECX BY6mLWyXJUOkgiOUZPAf+Y/36aRjmX3IzoedjKD5cP/jJ136GkcdN07QPVohJK01 a2EYdSGD2c3kBBlr35ZRL3o5z8LnqHwh9w4Hr0eFVN0dlL3baDAtipyGXtgADPRA == ARC-Authentication-Results: i=1; mx2.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=IPRTEi+4 x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Authentication-Results: mx2.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=IPRTEi+4 x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753410AbeA1XLH (ORCPT ); Sun, 28 Jan 2018 18:11:07 -0500 Received: from mail-by2nam03on0099.outbound.protection.outlook.com ([104.47.42.99]:57621 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753285AbeA1W05 (ORCPT ); Sun, 28 Jan 2018 17:26:57 -0500 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Xin Long , "David S . Miller" , Sasha Levin Subject: [PATCH AUTOSEL for 4.14 037/100] sctp: only update outstanding_bytes for transmitted queue when doing prsctp_prune Thread-Topic: [PATCH AUTOSEL for 4.14 037/100] sctp: only update outstanding_bytes for transmitted queue when doing prsctp_prune Thread-Index: AQHTmIcG+idu4y1eB02U/rY5NHvZyw== Date: Sun, 28 Jan 2018 22:26:22 +0000 Message-ID: <20180128222547.7398-37-alexander.levin@microsoft.com> References: <20180128222547.7398-1-alexander.levin@microsoft.com> In-Reply-To: <20180128222547.7398-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;MWHSPR01MB344;7:LzI/EyH1275ELflDtNtjaQQeFedW2rHGGpQRbTPy3R03XNykTo5nrMlznde3ksaw89/ECQx+35WGhLapOkQU0zyR8rRsMQUm26PS5I+gHZDraovF7siXju4Qgq2i/g4QWFWMI3oWFAoAXQmwQ/STEBXQXn9OLfBl0+nnRTd0LVRh9WTrWsPNh7/sEZ8Eo+xtFGDrRvJwvqErM0YGmEqOcsaVqJ2MasNfXSbo7tsqVwAMHZ0TXyubO5ek1IZIvT7J x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: f0494727-dedd-4916-d25a-08d5669e3b75 x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(3008032)(2017052603307)(7193020);SRVR:MWHSPR01MB344; x-ms-traffictypediagnostic: MWHSPR01MB344: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(85827821059158); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(61425038)(6040501)(2401047)(8121501046)(5005006)(93006095)(93001095)(3002001)(10201501046)(3231101)(944501161)(6055026)(61426038)(61427038)(6041288)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123564045)(20161123558120)(20161123560045)(6072148)(201708071742011);SRVR:MWHSPR01MB344;BCL:0;PCL:0;RULEID:;SRVR:MWHSPR01MB344; x-forefront-prvs: 05669A7924 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(346002)(39860400002)(366004)(396003)(376002)(39380400002)(189003)(199004)(10090500001)(86362001)(39060400002)(36756003)(99286004)(2900100001)(6486002)(6512007)(7736002)(1076002)(6436002)(3846002)(76176011)(575784001)(2906002)(8676002)(86612001)(81156014)(105586002)(316002)(5250100002)(81166006)(66066001)(102836004)(478600001)(3280700002)(6116002)(14454004)(2501003)(4326008)(110136005)(10290500003)(26005)(54906003)(107886003)(53936002)(6666003)(186003)(25786009)(68736007)(6506007)(305945005)(5660300001)(106356001)(22452003)(2950100002)(8936002)(97736004)(3660700001)(72206003)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:MWHSPR01MB344;H:MW2PR2101MB1034.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; x-microsoft-antispam-message-info: n26UzeHJxC6HIuCq5U5dK+B1y2Ny3epiVTaLCaULnYv9cnKj+brsBP997xAfgIUmizWpU4ttpWU4ZOgYI/3nfQ== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: f0494727-dedd-4916-d25a-08d5669e3b75 X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Jan 2018 22:26:22.4766 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHSPR01MB344 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: From: Xin Long [ Upstream commit d30fc5126efb0c33b7adf5966d3051db2c3d7721 ] Now outstanding_bytes is only increased when appending chunks into one packet and sending it at 1st time, while decreased when it is about to move into retransmit queue. It means outstanding_bytes value is already decreased for all chunks in retransmit queue. However sctp_prsctp_prune_sent is a common function to check the chunks in both transmitted and retransmit queue, it decrease outstanding_bytes when moving a chunk into abandoned queue from either of them. It could cause outstanding_bytes underflow, as it also decreases it's value for the chunks in retransmit queue. This patch fixes it by only updating outstanding_bytes for transmitted queue when pruning queues for prsctp prio policy, the same fix is also needed in sctp_check_transmitted. Fixes: 8dbdf1f5b09c ("sctp: implement prsctp PRIO policy") Signed-off-by: Xin Long Acked-by: Marcelo Ricardo Leitner Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- net/sctp/outqueue.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/net/sctp/outqueue.c b/net/sctp/outqueue.c index 2966ff400755..39ac91060bc2 100644 --- a/net/sctp/outqueue.c +++ b/net/sctp/outqueue.c @@ -368,7 +368,8 @@ static int sctp_prsctp_prune_sent(struct sctp_associati= on *asoc, asoc->abandoned_sent[SCTP_PR_INDEX(PRIO)]++; streamout->abandoned_sent[SCTP_PR_INDEX(PRIO)]++; =20 - if (!chk->tsn_gap_acked) { + if (queue !=3D &asoc->outqueue.retransmit && + !chk->tsn_gap_acked) { if (chk->transport) chk->transport->flight_size -=3D sctp_data_size(chk); @@ -1429,7 +1430,8 @@ static void sctp_check_transmitted(struct sctp_outq *= q, /* If this chunk has not been acked, stop * considering it as 'outstanding'. */ - if (!tchunk->tsn_gap_acked) { + if (transmitted_queue !=3D &q->retransmit && + !tchunk->tsn_gap_acked) { if (tchunk->transport) tchunk->transport->flight_size -=3D sctp_data_size(tchunk); --=20 2.11.0