From owner-dev-commits-src-main@freebsd.org Tue Jan 26 16:15:05 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C9B6F4F4ACA; Tue, 26 Jan 2021 16:15:05 +0000 (UTC) (envelope-from Richard.Scheffenegger@netapp.com) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2073.outbound.protection.outlook.com [40.107.237.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.protection.outlook.com", Issuer "GlobalSign Organization Validation CA - SHA256 - G3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DQBf14QpWz4ccH; Tue, 26 Jan 2021 16:15:05 +0000 (UTC) (envelope-from Richard.Scheffenegger@netapp.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Kv8nEnZS/vPiJrZ+U6tXUuQM6kaPQQmVx81M+i8jVgh9uiqxJz4YPvy5Zvhx/o4HFxRDZGF00SS1EaW785bSiqVyWRBaeFVDWxeyTI2sKZXdA0a7OqHHGaOrVCmDcpzk7QSb8hFYyRXLhWbMdp/K6guyQu36q8RpMd7OlIXcHOpQCDkuks540R3toyI3R4xd61cimH7saUJ1ERW1+0lalKzjOJ0G0uu2NFYgwhP8C2aV8l+aST7vdF8xgu+R6HfwJKufnAjIpIgV1BhbXgrdef0txKngbcoV4Nrqt8m+CRGHvFmr6JU1aU9j7lEC2ZL2j5TMqpCgfN7NRqUGcstdwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ONwFVmwyPgg7PZoCIP5c1i3yCWKcwiv0vhT42XtSXPU=; b=A8/FfXcSa/Qz2pP3C2TfiKtMxfhBXoqeF3EJNWLkm3qob3tqvQZ0Yqm3LtLJS04blymJgg5Rx8JRM/jr++bskSt+EsC4WBzBMmm104sy4HCoCmO9uRuqPTRvn0z8daQLZE4z9JQoKs3X3p4qak4oEYACnRXpkEGgriwhgHtHUU8XmF5tMnZPLizqEq3v3lBDYXJwTaEuCIBy0Qygqe75/D1XHe/KnC3bkrNGKfMlWAC/ZsawnJOhsRfz4omC95i5EhK+WrxmBo5DtPn0UykHbvwu+zGGVQtkTfsNDHsegup25apXCRsWCxWb2P6j1z2CF3qkft8YsFJBZJCeXvTyjw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=netapp.com; dmarc=pass action=none header.from=netapp.com; dkim=pass header.d=netapp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netapp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ONwFVmwyPgg7PZoCIP5c1i3yCWKcwiv0vhT42XtSXPU=; b=M1Ct43xDAC5tN7o/jT7t/uoCiQlkp1PLF69H4vU7UntODsJ28W4c+3QBQfBFJxuD3J4rTsL3XKXfoCqjR5JNMOrUgXbiy4gbMCfbbyfhpYArd8Z9WhzPHUHmtp9uKOrM5udaZSRypjFkfZU/sH2wBzxAPYwTjjPoIOMWkgRy8csY2gJLKbWvUe/kriDZHoiHO3/UKvJQ4A6r8JDHWpxQEWXU/jSiXn9BnKcIP+rqYVgDwLv2sS5SCNjmk2qj5mAy/xw2X/Crgvl9ZDgKCPOCT1gTENDBtIkV1XX9ygOKE2mqG1E+g7TCpChWdQQo5Av5/cSWWHCScdlDHB7EWWtORg== Received: from SN4PR0601MB3728.namprd06.prod.outlook.com (2603:10b6:803:51::24) by SN4PR0601MB3631.namprd06.prod.outlook.com (2603:10b6:803:4f::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.13; Tue, 26 Jan 2021 16:15:02 +0000 Received: from SN4PR0601MB3728.namprd06.prod.outlook.com ([fe80::1551:a759:21c5:fd41]) by SN4PR0601MB3728.namprd06.prod.outlook.com ([fe80::1551:a759:21c5:fd41%7]) with mapi id 15.20.3784.019; Tue, 26 Jan 2021 16:15:02 +0000 From: "Scheffenegger, Richard" To: Michael Tuexen , Richard Scheffenegger CC: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Subject: AW: git: 84761f3df508 - main - Adjust line length in tcp_prr_partialack Thread-Topic: git: 84761f3df508 - main - Adjust line length in tcp_prr_partialack Thread-Index: AQHW8/QmmRVHwLlOY06JeclXCRUhYKo6Ez4AgAAAY8A= Date: Tue, 26 Jan 2021 16:15:02 +0000 Message-ID: References: <202101261501.10QF16hV000586@gitrepo.freebsd.org> <84A0BAE9-0553-4D19-9F48-535A4B9473D3@macmic.franken.de> In-Reply-To: <84A0BAE9-0553-4D19-9F48-535A4B9473D3@macmic.franken.de> Accept-Language: de-AT, en-US Content-Language: de-DE X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [185.236.167.136] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 486b474b-409c-426b-72c9-08d8c2158904 x-ms-traffictypediagnostic: SN4PR0601MB3631: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:6430; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: XxKHTLZGvw0OIl3QqTFxve1cDl01vNHbZbhMSVRvrcc/2WM2dLXxvh00CgrrpP3UjxPeA7gV48Cc4P4ZdJvmVKLs0kaSo+LV/aBP8Guh/uJSeTxg2RxvSEfmMlhtmyLk9UiT9n+EQPLXRsEtxXxkeqf9UpOoxeYEQ3bQ3Vm6yr7zlSHUXX5O8RdZVax1ixw37/eQwSfESsZ/K9SSIFZjPrmvg+JayZ1ChjJCKRsLlx1Z2r0YH7m8bCbX+R24XoHvJWGUAhvWtskZ4sMm5oxCwjT6wblo6Ypy3c2sDnxpTvq71Dh29ux/Bt74u4C7LnIs+XzydNPM/5zEFJFrs0pD3u09juc9OTTMW0kNToGQof5iPEd6eVDRiCWmwazB1Pfzb9SZiVnrYzNkx6i8MThFNJv6j++31szj4kAEYcShXNH8dEuPKib3ElxzZWEnUVRN/A9vZG2fSwm6B2tg86Vqgi3CM4Fp82CrusjzbUdYfLQDf4PaS3+VlGw+Wk+2I0RXBIBMQgiwyZ+TTtLzC58X1ImxUIzGdTJwrdzrlWvN1ituyr3GyKvVFYUCM1Tv5gj6NZcHyBpZZ0PhqedRwEAZVWavlVvrVsBhRjjWX+7wAok= x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SN4PR0601MB3728.namprd06.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(376002)(366004)(39860400002)(346002)(136003)(396003)(83380400001)(66946007)(5660300002)(966005)(4326008)(110136005)(52536014)(8936002)(66556008)(33656002)(66476007)(316002)(86362001)(26005)(478600001)(9686003)(8676002)(76116006)(6506007)(66446008)(54906003)(186003)(7696005)(64756008)(2906002)(55016002)(66574015)(71200400001); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata: =?iso-8859-1?Q?PuLDJuBYIkhD0paiq+njJeDFr3vRMEqI3bH1JG6jgGzKv7J7GhthRldJwW?= =?iso-8859-1?Q?CCuCz2eoDbZjqNQ4KhaenV3daB/MhFM/kcYXAOO8uITXecH5XcPMcwCtes?= =?iso-8859-1?Q?nNLOpMvU+/wX1pgV+7xcX44kmL518qmIdwrSnfnFV0FN6vU2ne+av/y/MX?= =?iso-8859-1?Q?aJ6A9ff09SZhR+R6hQz1CjJpnwEbBUHQFXf0N+x9JLxZDn0UxqpzI/FjVA?= =?iso-8859-1?Q?hvuMsoalTTf8OeR/FAmtr/VqD5BHmz6NAzblAgg93ga/OkL4RS6w4+yWxY?= =?iso-8859-1?Q?qRoD6xQF9xvUxoukkJDbQXlACG+/aprVzGMgrlCoZCeiLLJvUcHA59WFE4?= =?iso-8859-1?Q?Uh7Ovm+fsWn5b6R/yBHY++AVqSrMe2C5dInogCTP8jgbuxtOJMWF9xYw5O?= =?iso-8859-1?Q?oIa2pts4BlsgzkT/Xriuv1A1kATULhkIXjZNcb/7kv6zPA1n6me935pUHt?= =?iso-8859-1?Q?Bh4Jyw/2et78Zjyr3q7Q3tScnwzrVcFz5tM8PDQI3Z3MOVCWyte7hFX6Yu?= =?iso-8859-1?Q?JjuqkuquLJsJvrL5hGG51gObs6Zwxp7Vj7gERRFycr6WAq0MAJnnY+RCfT?= =?iso-8859-1?Q?YhO5/6FBKvBoQUR+JwtrFoIh9NJy0FjsYkswbEkK/mp0LsvxygxqL86qQS?= =?iso-8859-1?Q?Er4VkaxEbUZAPlz1GQvNeLOSGvQgyvEEMr7N87kalVdWndGhgLOoevD3Jq?= =?iso-8859-1?Q?n6RcOYg7kKIrZj4GQHyzXkjMYQb9sue5VbYFGtxv0kX06OM2wKoRBRdjZB?= =?iso-8859-1?Q?iA1gokqRHL4BoVpngOq2WnAxECRlTbcAVmNXDx3XVTRAtQp3KrDp3UwtmR?= =?iso-8859-1?Q?fnNRkVEcUzbI7fHTBAG54QvKTalmTST8T0xYSKWGs/WkVdE4kMDIDNMKKK?= =?iso-8859-1?Q?1dbsqNLszALmzwXJK34KShLdE/8txUbGxqj/rR2gcbO6hhlLzovDN2rXcA?= =?iso-8859-1?Q?tosrGfaqsQ7BTlySZnTl9zDugU44D6jfsBVpqYzT8X8eLE7VJZkznb8PPY?= =?iso-8859-1?Q?d08yba9LDy8U2xnQAVGEudHyVav37KdqRw6EF1xgnQyFfoED47/MDSBgGL?= =?iso-8859-1?Q?jilvJDM9JRAc1P04MowvoK5Y9JfBWfhasQ1zMmmHItp1?= x-ms-exchange-transport-forked: True Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: netapp.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: SN4PR0601MB3728.namprd06.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 486b474b-409c-426b-72c9-08d8c2158904 X-MS-Exchange-CrossTenant-originalarrivaltime: 26 Jan 2021 16:15:02.0887 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 4b0911a0-929b-4715-944b-c03745165b3a X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: smrXLOMPtsDt2Llhhe9Ho9ZBoTNfNxoiISPW4PQkS0TNjW7U9IZ1PyjJRExSqWgnH6IhuoGHb3bVLbBH8shhDw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN4PR0601MB3631 X-Rspamd-Queue-Id: 4DQBf14QpWz4ccH X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Jan 2021 16:15:05 -0000 Let's discuss this during the next @transport call on thursday; I would wan= t to hold off for next weekend at least for the MFC to apply all related pa= tches in close succession. (and quite frankly didn't think about it) Richard Scheffenegger -----Urspr=FCngliche Nachricht----- Von: Michael Tuexen =20 Gesendet: Dienstag, 26. J=E4nner 2021 17:09 An: Richard Scheffenegger Cc: src-committers@freebsd.org; dev-commits-src-all@freebsd.org; dev-commit= s-src-main@freebsd.org Betreff: Re: git: 84761f3df508 - main - Adjust line length in tcp_prr_parti= alack NetApp Security WARNING: This is an external email. Do not click links or o= pen attachments unless you recognize the sender and know the content is saf= e. > On 26. Jan 2021, at 16:01, Richard Scheffenegger wr= ote: > > The branch main has been updated by rscheff: > > URL:=20 > https://cgit.FreeBSD.org/src/commit/?id=3D84761f3df508aed50783b60f028af9 > d98a684b41 > > commit 84761f3df508aed50783b60f028af9d98a684b41 > Author: Richard Scheffenegger > AuthorDate: 2021-01-26 13:47:19 +0000 > Commit: Richard Scheffenegger > CommitDate: 2021-01-26 13:47:19 +0000 > > Adjust line length in tcp_prr_partialack > > Summary: > Wrap lines before column 80 in new prr code checked in recently. > > No functional changes. > > Reviewers: tuexen, rrs, jtl, mm, kbowling, #transport > > Reviewed By: tuexen, mm, #transport > > Subscribers: imp, melifaro > > Differential Revision: https://reviews.freebsd.org/D28329 Any plans to MFC this to stable/13? Best regards Michael > --- > sys/netinet/tcp_input.c | 13 ++++++++----- > 1 file changed, 8 insertions(+), 5 deletions(-) > > diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index=20 > 75718352da00..4b8f91ed9d0b 100644 > --- a/sys/netinet/tcp_input.c > +++ b/sys/netinet/tcp_input.c > @@ -3949,14 +3949,17 @@ tcp_prr_partialack(struct tcpcb *tp, struct tcphd= r *th) > * Proportional Rate Reduction > */ > if (pipe > tp->snd_ssthresh) > - snd_cnt =3D (tp->sackhint.prr_delivered * tp->snd_ssthresh = / tp->sackhint.recover_fs) - > - tp->sackhint.sack_bytes_rexmit; > + snd_cnt =3D (tp->sackhint.prr_delivered * tp->snd_ssthresh = / > + tp->sackhint.recover_fs) -=20 > + tp->sackhint.sack_bytes_rexmit; > else { > if (V_tcp_do_prr_conservative) > - limit =3D tp->sackhint.prr_delivered - tp->sackhint= .sack_bytes_rexmit; > + limit =3D tp->sackhint.prr_delivered - > + tp->sackhint.sack_bytes_rexmit; > else > - if ((tp->sackhint.prr_delivered - tp->sackhint.sack= _bytes_rexmit) > del_data) > - limit =3D tp->sackhint.prr_delivered - tp->= sackhint.sack_bytes_rexmit + maxseg; > + if ((tp->sackhint.prr_delivered - > + tp->sackhint.sack_bytes_rexmit) > del_data) > + limit =3D tp->sackhint.prr_delivered - > + tp->sackhint.sack_bytes_rexmit +=20 > + maxseg; > else > limit =3D del_data + maxseg; > snd_cnt =3D min((tp->snd_ssthresh - pipe), limit);