From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-1369136-1517180057-2-1854546073122061269 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=1517180057; b=QbChTOtHJIVRASK9V4uWLfPQEDuIHGxnIz1HuhzDdcIRush BOYGwhuiYuh4YNg5x50tO06EAJopUwSpNjDnaCeRZI7nrZRuaYNY79NA/9D8SusG 1JxMv1aInivujsW3kbqvDyyGO/tXlc7Q7hOPXfLkYCAqHyvqQJKn6bJJLIUrZNvX yXr9jyojF6OkyOrokBfDOUU0qmvs2+ujoOST/YL/GzA6EpCmvi/EW6Hgsz440M3/ R2o2eRIC4xIgdeVOlwc6CwPzRf+eFg1EtMY2I7zm9TLkrYpgWnODynQEldnESgb3 4ULQtQdHAI1cBIbUUP+WVH0A7DGkyRWf892PwtA== 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=1517180057; bh=+TjTqy dk+HyAxtV3whUn48FpHarzc/+nu0chWROq8Tc=; b=h7eGnYI3hb/j3mcocmz67z kkrdpK00cnTjFV6UGhQIIfCGKW8yKaBNM/u0wz/IxSUKeo41m53K+XQ9qqa01u1g y73RGCWqhw4kk3I3AdgmM97s9yGJn4dQt6dS7TwYcQis22BpVQyat9RmjCxPEzih gnmcgrz21JzaO7cZ5Xo2Ngt/YZMM7Pn2cyy0yqRleg+BW57OHnk+OJuCQ1LqRaoJ QJpYWqqARLU9aKtx92mNffiOgAkQTe8Y0+GBd2xqDkSUb4oUKLHMU6/PaDOEffQU nlgVVlTZyvcHXszoZrTLpfQf2gb4Fzf6YSy+RIZ5HoY1oKXstgxhbnsIKBNgSqfg == 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=Z9Jc8eLn 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=Z9Jc8eLn 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 S933028AbeA1Wxt (ORCPT ); Sun, 28 Jan 2018 17:53:49 -0500 Received: from mail-dm3nam03on0095.outbound.protection.outlook.com ([104.47.41.95]:55532 "EHLO NAM03-DM3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753685AbeA1W2b (ORCPT ); Sun, 28 Jan 2018 17:28:31 -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.9 16/49] sctp: only update outstanding_bytes for transmitted queue when doing prsctp_prune Thread-Topic: [PATCH AUTOSEL for 4.9 16/49] sctp: only update outstanding_bytes for transmitted queue when doing prsctp_prune Thread-Index: AQHTmIc4f+ZxbtSDV0G3hGQuut1c7A== Date: Sun, 28 Jan 2018 22:27:46 +0000 Message-ID: <20180128222727.22404-16-alexander.levin@microsoft.com> References: <20180128222727.22404-1-alexander.levin@microsoft.com> In-Reply-To: <20180128222727.22404-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;MW2PR2101MB1097;7:7QrVsEEJG1aYHTqMSifTa8VZEpf47j5vw7kLVjzOoDz+oSurY6joKHXHsriFp0jnEaMKI6GylOztroHpBZElslp0qN1AYupmMlaeSOU6yLXa20M6FuSmPvr9G4bIT4xpF45UjCDJZJvVivaQEZrxe8wdYPffF+ddMbE4pdDc9jbI0y/Nch4Zhscg5qxwbAIux6wmbwJzb1irP6UP0n341duqdTI75TB6AIoFU0NnzsI4daWNKuFqNOQdlRkf87WF x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 7b036d79-3838-41ad-385e-08d5669e7367 x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(3008032)(2017052603307)(7193020);SRVR:MW2PR2101MB1097; x-ms-traffictypediagnostic: MW2PR2101MB1097: 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)(20161123564045)(20161123558120)(20161123562045)(20161123560045)(6072148)(201708071742011);SRVR:MW2PR2101MB1097;BCL:0;PCL:0;RULEID:;SRVR:MW2PR2101MB1097; x-forefront-prvs: 05669A7924 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(346002)(366004)(39380400002)(39860400002)(396003)(376002)(199004)(189003)(72206003)(14454004)(3280700002)(106356001)(4326008)(478600001)(10290500003)(76176011)(102836004)(3660700001)(25786009)(6506007)(105586002)(316002)(6486002)(97736004)(22452003)(186003)(575784001)(99286004)(110136005)(54906003)(107886003)(39060400002)(26005)(86362001)(8676002)(81156014)(2906002)(1076002)(81166006)(68736007)(3846002)(6116002)(305945005)(7736002)(36756003)(86612001)(10090500001)(6512007)(2950100002)(66066001)(5660300001)(53936002)(6666003)(8936002)(6436002)(2501003)(2900100001)(5250100002)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:MW2PR2101MB1097;H:MW2PR2101MB1034.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; x-microsoft-antispam-message-info: 4ulBg2GjjU2M09pPaI73FGCbFPNP4LPzHEhYpKGLmKDQdU9VeT8t43TRCwq510G+N8ujpyf4ZkktE4796wdSLw== 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: 7b036d79-3838-41ad-385e-08d5669e7367 X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Jan 2018 22:27:46.2494 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR2101MB1097 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 0994ce491e7c..0188d9e8272d 100644 --- a/net/sctp/outqueue.c +++ b/net/sctp/outqueue.c @@ -364,7 +364,8 @@ static int sctp_prsctp_prune_sent(struct sctp_associati= on *asoc, asoc->sent_cnt_removable--; asoc->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); @@ -1409,7 +1410,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