From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 27CB0C43381 for ; Sun, 17 Feb 2019 07:19:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CAC9C21A4A for ; Sun, 17 Feb 2019 07:19:50 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=Mellanox.com header.i=@Mellanox.com header.b="G0AQLV8Y" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727482AbfBQHTt (ORCPT ); Sun, 17 Feb 2019 02:19:49 -0500 Received: from mail-eopbgr10071.outbound.protection.outlook.com ([40.107.1.71]:18464 "EHLO EUR02-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726788AbfBQHTt (ORCPT ); Sun, 17 Feb 2019 02:19:49 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Z1nMTTZgkogqR7Su+uhc44kO6v+wfToVPqrafHImfdg=; b=G0AQLV8Yrk/idJSiP8HS8tOhRt/4kwiTL24X4vfDFEr3efR0TiL6nFqr+fap2305c5ydYzoYghVcJlqpMs2Z1n1I5cKEKK3oDbL0Hzlc2FAj7GDVuVwi3F9FCwqOWa1FA+lxIkc0aoVvW/SAdX6luthk8Op8sDe3VVXzg0bquQw= Received: from AM6PR05MB5240.eurprd05.prod.outlook.com (20.177.196.214) by AM6PR05MB4853.eurprd05.prod.outlook.com (20.177.34.217) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1601.21; Sun, 17 Feb 2019 07:19:02 +0000 Received: from AM6PR05MB5240.eurprd05.prod.outlook.com ([fe80::3542:889c:3a85:3866]) by AM6PR05MB5240.eurprd05.prod.outlook.com ([fe80::3542:889c:3a85:3866%5]) with mapi id 15.20.1622.018; Sun, 17 Feb 2019 07:18:41 +0000 From: Ido Schimmel To: "netdev@vger.kernel.org" CC: "davem@davemloft.net" , Jiri Pirko , Petr Machata , mlxsw , Ido Schimmel Subject: [PATCH net] mlxsw: __mlxsw_sp_port_headroom_set(): Fix a use of local variable Thread-Topic: [PATCH net] mlxsw: __mlxsw_sp_port_headroom_set(): Fix a use of local variable Thread-Index: AQHUxpECM8fyEF/wjkiAGoGq3Nm3/w== Date: Sun, 17 Feb 2019 07:18:41 +0000 Message-ID: <20190217071809.19295-1-idosch@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: LO2P265CA0061.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:60::25) To AM6PR05MB5240.eurprd05.prod.outlook.com (2603:10a6:20b:64::22) authentication-results: spf=none (sender IP is ) smtp.mailfrom=idosch@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.20.1 x-originating-ip: [193.47.165.251] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: fbffca7b-01d6-430d-76a7-08d694a824d1 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605104)(4618075)(2017052603328)(7153060)(7193020);SRVR:AM6PR05MB4853; x-ms-traffictypediagnostic: AM6PR05MB4853: x-microsoft-exchange-diagnostics: =?iso-8859-1?Q?1;AM6PR05MB4853;23:i+wg6tehSRLwtGVfHGg3nriYfrwtbWVr5/MBSwZ?= =?iso-8859-1?Q?7FFy3HvUaozxQmnkIplNpCfwSGaw/8rLpolll5nAdN7Ck+UQHeqNgwGMwp?= =?iso-8859-1?Q?eFI+5wnljWxXQU2Lqchf95hgIH+okpdMSEWG8U6ua7eH7lpbD9RA3iJz8U?= =?iso-8859-1?Q?yZCi4yg5PpNo2C17J2Bv6wJKkl4u6Ab6jhe9/9jNbrp+cg9lsCbhrRmvpJ?= =?iso-8859-1?Q?qL68HjT3OSCR4H1X8Zq/nVz8lWvtaHKL6oZdo018AUoCD02Yy1HsmIHYRh?= =?iso-8859-1?Q?AKZC6wO+GTwVzDniMJm8ij9kH7RBKWuaAcFh9wEDr40zzxMue/SFuSEHR7?= =?iso-8859-1?Q?yDfT79sJmZ2tu2iaAjabUFLOy7zSBN08tPEQwGPmDE6LRrOTdAf3HwJ7Nb?= =?iso-8859-1?Q?soZxnOQ+dMGBHOLAdbS+OBqPFH0nAkQu8G62R/cEsnsCwfKgnsyUZVqThk?= =?iso-8859-1?Q?crgOsaD57SqPDQA7puMGWLVoSfXRl7Va2JeJ4GWSdHUl/IH5QrVhxkgbzf?= =?iso-8859-1?Q?TxLGBdloaPmWguy/lZW0dhuXceJunrV5zifdS9HF/ZqgaaDLk9kVehkYw/?= =?iso-8859-1?Q?i1Jo9d8GVN5ltaxSlov09WS2rCizv1YfaIRWYJVpoTsyPbZoX9Cjd2boGA?= =?iso-8859-1?Q?fU5MhkITpIsbEMNXjibau9JBS4TLDzhda+6CL3/TpRPvs0aFAO12FtNejn?= =?iso-8859-1?Q?TIeq7dC2p1pehWdiUTlFRQeTOc1bQh0PS5TQQ1CExaDvNYpj/IMsJ5QRhj?= =?iso-8859-1?Q?EapjZywFHd9ppEq+fTUQ8lfNAN6QMSdz6q0rQ9ewVejfCe1iKqYZ6l9Boj?= =?iso-8859-1?Q?XDy73w1fVkXWuP409Ktj76ns9CdcPOVbxtcwkcP/5sibv5HbxEZJvEmQpC?= =?iso-8859-1?Q?Yq6Zq4fNa6qrLCUx5lGznKA7Vw9ZFjCnY587xoARnY9xcwaInsZufFVe0k?= =?iso-8859-1?Q?QijKQq1+DHfKdD8YkaeI9I32CtszV3dc2YaC1XfwW/WQfmSGdeu5PKSI+1?= =?iso-8859-1?Q?QLHXrIUl3oWZQj90p93VNQ5EQhvxSJD8iPNLcI8VUL966DzcP7ShQNONuH?= =?iso-8859-1?Q?ypwJN09km3AEn+anQ+Ov/Lx6/gjBw4NGmqYys8X5XcDjFQdlWdFsDw7dxv?= =?iso-8859-1?Q?KgVYL2jBJIQFaTYBxhexDWI7XyaDQjNNt5EylWzhREuWU4AD5tMFgJCMQY?= =?iso-8859-1?Q?uyyuCKAN+dYfk3xLnF3qcF7geEfCdIsaYEp2VNSio5dLdUs6tdcUWwDxZc?= =?iso-8859-1?Q?YrczUdFnEKni0jB23wDBwL4e+BGhyViM69MdVfCvCXMQTeHPMkvKbU8bJU?= =?iso-8859-1?Q?yU=3D?= x-microsoft-antispam-prvs: x-forefront-prvs: 0951AB0A30 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(396003)(39860400002)(136003)(366004)(376002)(346002)(199004)(189003)(256004)(476003)(53936002)(6486002)(26005)(6506007)(52116002)(102836004)(81166006)(81156014)(486006)(86362001)(386003)(2616005)(478600001)(1730700003)(8936002)(99286004)(50226002)(107886003)(316002)(36756003)(186003)(71190400001)(71200400001)(25786009)(3846002)(6116002)(2351001)(2501003)(2906002)(305945005)(1076003)(7736002)(68736007)(6512007)(4326008)(14454004)(54906003)(6916009)(105586002)(66066001)(5640700003)(97736004)(8676002)(106356001)(6436002)(5660300002);DIR:OUT;SFP:1101;SCL:1;SRVR:AM6PR05MB4853;H:AM6PR05MB5240.eurprd05.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; received-spf: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: voK5/D2UoQ9y34RMmyfJ56U10JfhK/busAr01+jM53rnexW+fNbvnJNFhTppTPolzqf8mydDKCRMru4Rl3dlMTFsBuVEJeJOU2/RERbJbEucqJ6M+3XOzjBMSU4kwhtoiu69j6ZJsKt/8OAtK1OngLlQfUus3Lev5CC6D0GWf4W6V4ImRkaLczaiq0hha6bAg0nrTbwtSOwDOo2+uDmZ87B01nrqcOQqxvo0ZKg5A+XDUElXJeuzd+It1jvGIwSFqU50VmkKY92/Jh7nkxtXDHNvQq87r1/xyuqJnwekF936RidYfhFcKgsm7kHOU0Jan4HO2pq/whoKDFlcMgfErB0mzc0gRZsiQXrUlPbgAyU/nhGabv0MfKDfhYGUUFEu4UM7n8Wctde6Iw94fbOsPGqOzGiEN4V7nG4+XzwkkfU= Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: fbffca7b-01d6-430d-76a7-08d694a824d1 X-MS-Exchange-CrossTenant-originalarrivaltime: 17 Feb 2019 07:18:40.7003 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR05MB4853 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Petr Machata The function-local variable "delay" enters the loop interpreted as delay in bits. However, inside the loop it gets overwritten by the result of mlxsw_sp_pg_buf_delay_get(), and thus leaves the loop as quantity in cells. Thus on second and further loop iterations, the headroom for a given priority is configured with a wrong size. Fix by introducing a loop-local variable, delay_cells. Rename thres to thres_cells for consistency. Fixes: f417f04da589 ("mlxsw: spectrum: Refactor port buffer configuration") Signed-off-by: Petr Machata Acked-by: Jiri Pirko Signed-off-by: Ido Schimmel --- drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c b/drivers/net/e= thernet/mellanox/mlxsw/spectrum.c index 32519c93df17..b65e274b02e9 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c @@ -862,8 +862,9 @@ int __mlxsw_sp_port_headroom_set(struct mlxsw_sp_port *= mlxsw_sp_port, int mtu, for (i =3D 0; i < IEEE_8021QAZ_MAX_TCS; i++) { bool configure =3D false; bool pfc =3D false; + u16 thres_cells; + u16 delay_cells; bool lossy; - u16 thres; =20 for (j =3D 0; j < IEEE_8021QAZ_MAX_TCS; j++) { if (prio_tc[j] =3D=3D i) { @@ -877,10 +878,11 @@ int __mlxsw_sp_port_headroom_set(struct mlxsw_sp_port= *mlxsw_sp_port, int mtu, continue; =20 lossy =3D !(pfc || pause_en); - thres =3D mlxsw_sp_pg_buf_threshold_get(mlxsw_sp, mtu); - delay =3D mlxsw_sp_pg_buf_delay_get(mlxsw_sp, mtu, delay, pfc, - pause_en); - mlxsw_sp_pg_buf_pack(pbmc_pl, i, thres + delay, thres, lossy); + thres_cells =3D mlxsw_sp_pg_buf_threshold_get(mlxsw_sp, mtu); + delay_cells =3D mlxsw_sp_pg_buf_delay_get(mlxsw_sp, mtu, delay, + pfc, pause_en); + mlxsw_sp_pg_buf_pack(pbmc_pl, i, thres_cells + delay_cells, + thres_cells, lossy); } =20 return mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(pbmc), pbmc_pl); --=20 2.20.1