From patchwork Thu Mar 15 12:49:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ido Schimmel X-Patchwork-Id: 886211 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@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=mellanox.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.b="c57WOqQl"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 4027kM01xBz9sVd for ; Thu, 15 Mar 2018 23:51:07 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751700AbeCOMvE (ORCPT ); Thu, 15 Mar 2018 08:51:04 -0400 Received: from mail-eopbgr00045.outbound.protection.outlook.com ([40.107.0.45]:9017 "EHLO EUR02-AM5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751466AbeCOMvC (ORCPT ); Thu, 15 Mar 2018 08:51:02 -0400 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; bh=I+OEWXWYEI5uy7Do+og5EmcmtFyl/vqz7YvMB+yqNjw=; b=c57WOqQlV4BbQe4jlFb++EXu7PSU4ZTWrU/VqbZVL0kCcRB98NbcWaBGyUYZkA+Wk+tjW4sualSdcl6i4Efqi5nRn50zGgkUHwM/fsLn420fAgUSiwbs0AdsWP4O1fgzQTHqdC6tJXLCe6XTSOkESMWynrKnxJb9jgNDx8hawpU= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=idosch@mellanox.com; Received: from splinter.mtl.com (193.47.165.251) by DB6PR0501MB2008.eurprd05.prod.outlook.com (2603:10a6:4:6::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.588.14; Thu, 15 Mar 2018 12:50:58 +0000 From: Ido Schimmel To: netdev@vger.kernel.org Cc: davem@davemloft.net, jiri@mellanox.com, eddies@mellanox.com, alexpe@mellanox.com, mlxsw@mellanox.com, Ido Schimmel Subject: [PATCH net] mlxsw: spectrum_buffers: Set a minimum quota for CPU port traffic Date: Thu, 15 Mar 2018 14:49:56 +0200 Message-Id: <20180315124956.32719-1-idosch@mellanox.com> X-Mailer: git-send-email 2.14.3 MIME-Version: 1.0 X-Originating-IP: [193.47.165.251] X-ClientProxiedBy: VI1PR08CA0226.eurprd08.prod.outlook.com (2603:10a6:802:15::35) To DB6PR0501MB2008.eurprd05.prod.outlook.com (2603:10a6:4:6::14) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 7e165824-97fc-4298-8418-08d58a736726 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:DB6PR0501MB2008; X-Microsoft-Exchange-Diagnostics: 1; DB6PR0501MB2008; 3:okZkfurNDKhsD8EhYUm3EnVhSKM685Kp+ND4rkhXwSWirzjXh0Ce6h07iS7Wpmii3ALib/4UxsaoVIf8+Zw6+/ZwlX1HbUbzEHvQcfxUidsG+KMpE6Wj4brk2L+N82NMWt8dJfImu1BEPxpPymB1t9Xg+4m/pr0OHvcqq0/TEJ8XFj5u6OqoDPAsFKlz4ii+SHcPg7qVzwYfuh7iUevUEPewjaW/T3uOEsaopdbjY9gE2uwoExqpHVFhvhfEBzGL; 25:khx+9hPneublqGMiyjl1FWRlANK7hf5bDrpbWXUgNI//r99Xi2wKeFvRrkYilGlPGFHy0mICayjr2bjlM5khUfcHZaZiC962o73cbgYlW/acovlU9UdgSmg/s5NHZ2YOK5hCwvz0CS2TLgrO5QnhqxjlRph56vlg79FE8mmN69W2Bx2U32LIZ0JAKt+DNChTP2j18SxHWW/m3lzZiMKk/bbUq8sMSodgSgMk81XOHf/y8myg1w46ZMkqf/KYf6yxC/SoyJzHK2oMf7Rr5sobhF708NacDGHYvv5dEQhg3+1EaSdd0vD5BAVvlFaun/mZjo+6XyzI2CiIDrnyJiPthQ==; 31:VBBc3P8VK9jdbUE+vP86+0nMIex4TLZK6/n14J2yAagrsn3zCuW8ghFN4VF8/nXHV813zfXe+9wz4n/jvMNAYc/6xEbHDkzZh1JtpGlRle2jPOu9dJ1jCoBtT8Z+YLuR3+El+GTsM3sscIDjYMQeUxW/tFAO8WyoZJQyhGxPEE7Rc6i7qIeHt/agmjoCUjH3MxUHL+Hm5h4qvkwkeU4Qu1Bb0srWx2E//ofhqJiImlo= X-MS-TrafficTypeDiagnostic: DB6PR0501MB2008: X-Microsoft-Exchange-Diagnostics: 1; DB6PR0501MB2008; 20:FczXbZ/HldW1P/fJbM2rRBmJmcuLFNtNpoSTH7CDu0YM37qXabTniJhkzWFiINdI/cdIFfqUL3PJ3UULuYATRogH0To5adrsGmx558FQWCg3KTduIA6Jo4iYglk8QYlydikHCjHs8eweCJQoPOrklRsJMmQ3GhqSFeUZyOXvKgulRRHlxn3Jijd2Glk0YkmmQdAA7QrVMPlV1RudmZ52QvZIKyxkRh0/cG/r+sGsIc80aK/Z9RutCmYidr4f02oWe6bbp8zqCSNqxJsHFETUFhUcjTQhgYkCt4vAUC7yzoeemn4MYKPRKKEiII9X3uMMNysfay1Fp5UdU+PhvxEuq/kR7XfvCsR1UyAECq251vjY6M2r0RLMlqR6rzfUWgPMNcoAD3pZ7ttDH7eG258iKMUXHuElHoqXDbXtIZIMaMt2KyIzN+cUWngBjFRdcn+a2do8lazybZ1Hwl/XMKwnLmjip13s1bQ7WtgaITpTSZBx8wKTgBFDJqRFLhOl3kqR; 4:pYQjCCMFaXBwVjNqYTfDtisqSSjpiUrgLgnFEq4/7fjTIlVOUnfs0X6K1th7Rsh3vodVsRAoDG4yW5GndxyL1D47JeGq14/MOvSoDfI6vIaDLCETTdYpxdbDMdXgLF66OMFW0WlTMTi8LnjaZo3smb1lLQaPTsNP0VVKtkWYD3CMh/9PHkyBlxPkWUXCsVcpczq6g99UAJaMcSthmTo5kvpniHUUOCOEotjZoiOs3Z4kRLS8ZSSBmFm7kvUMCzFpzmpQeG/hxP9vOiQIfqZyQA== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(93006095)(93001095)(3231221)(944501244)(52105095)(3002001)(10201501046)(6055026)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123564045)(20161123560045)(20161123562045)(6072148)(201708071742011); SRVR:DB6PR0501MB2008; BCL:0; PCL:0; RULEID:; SRVR:DB6PR0501MB2008; X-Forefront-PRVS: 0612E553B4 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(376002)(396003)(39860400002)(366004)(346002)(39380400002)(189003)(199004)(575784001)(86362001)(478600001)(186003)(16526019)(6506007)(386003)(105586002)(68736007)(6512007)(53416004)(15650500001)(52116002)(51416003)(5660300001)(59450400001)(6116002)(7736002)(2361001)(26005)(50466002)(48376002)(316002)(2351001)(36756003)(3846002)(1076002)(305945005)(107886003)(6486002)(8936002)(50226002)(2906002)(16586007)(8676002)(81166006)(106356001)(81156014)(53936002)(25786009)(66066001)(47776003)(4326008)(6916009)(97736004); DIR:OUT; SFP:1101; SCL:1; SRVR:DB6PR0501MB2008; H:splinter.mtl.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; DB6PR0501MB2008; 23:sEq3YUJCBeOR+5tohCdBYD4k6kouHy+nB0uiqQmJuMV/rTJMNHtzd4+ek8PWFyIrVAjzE/2ncwr05mUJv5uSGHJD1fRZrfC2JagUp3lTY9HTRGztZ7GkchSex0tbmePuIV7QgVTkA3c3Fmh7UAw30O/04co5t+LbHP7nej7MdcFM8FCtbQjaeGx7jNPeooqk2qF7wiTIa4MACqSly+aS+h6MkAXITjbxZYfWcflbdBDSSBZAlZ/7gF2NIM9YGJaKg4c7xWz56nJsLkujpBCChRyYGa8nTy9JQM+1OpXgabVGGrpe4aCDolO3wblgXh7vRoZCirS9WXziZkfQUfEB62fkhmGbvlomtGy9xVr6KUFG172TJ1auvTUyivzRgg0D4p/+UKyBFgyhZ+717NyIjW0+2r4saxI0yuOoksT2TL1GOw1j2A/I3VFL0/4i5oO6FeiU2nxkcX6wEh3DgCiurQ10NDXAIEV+FUZWwp1Vr58lEAAVag7+IYJUmPNrp/6PjbMp3KRkD0Iefo3sFLq1v9Vg7LjlzZSMe+3KKhUFq7YR1EevHweiZLXiOAdPdf5RAFIYoxck4mmmZ+itpf/jvYfT52Vnr1q99bUvg/j4C8YqSKCe+yg8hbuvThvFHyByOclN7iksrOKzwmkGmmGFbtKJrwgjc/3SiAC1+7rtwOJsIJJwWfNpJv+iv5LG6J8/5H4GiEq7lV7QyNkQ3fY1oCv3xLKPAIu7d4zwfP58VJhb0Zr614HPMuhzd5qhlGNcv0K3fpofePoEjrmTaPn1tOODF1kaoQyZXD4lZ0CDCfE5wN/h/HbuIRzuBMo3Zkl2yuBQ18ojZf7DHnX731UmeqySenqDJmpxpG8EI1yQG45e7JjzuBdOWWc0b+ccbJiChuRX0cZkRn9Us2wHSag/7zt8fY4CmUuekmlTSxrMgiyFsf1bG/h3VV5knKb1AV7n/rtuQNwP4l9ospF+s/TqKm9CvUX7wtIZaY+MZvMjqHJ5SPG3j2jQpJ4ZMeVx5NbysvazWaZzKxgeQSGYOE3C08jDhlMeFhjz2PV217LiRDJdqvWjipKy4GTtDfDVCzT2ufHImx8KGfS5qmxTaeIaXwH3mkDmwN5h6qi3pUMfilWZvoZ0F8oSdk22B8oKwfoDh33g0B2SNDH0o+4rRbvYG8RCJ0qbVjZ0UTRJXAA9Z1b9yt8PFexwNb9fUc1FMkBp X-Microsoft-Antispam-Message-Info: z/84Vl8Bs+G4xlObLup+eF9fQKTqElCaFeAcqBcTHhduP+b4M0I3rgqwO3eMhykGcMrgr/s92xytDVmsdh7NvCJnbzdWdS0GDr3AUCiCJ/KcqcRytDh27wysVAb+6TZV0J6YvG23y/cdxEuRA654/bntyBl3M8fiTgPSTYTVwZbkRfyozX6mH20kkdl1SjuC X-Microsoft-Exchange-Diagnostics: 1; DB6PR0501MB2008; 6:0Mod58BUygHapM/zbZa/RN0vRHKAo2Kln+odeyBj0HTlV5p5PSMWckpHN4JtDd6uXYaI1cPPxPnFIUkso0DXWK+bec25ijqKgGmmXNXlkkKjd+Pgc2d9IpeVBLD/j22RbUeDB3y54yBqajaCIA9TQwOseivHHYIYBa6YLiPv1ngTA+NQHRV/GgafsW9AT7ct+X7WVYaPASPaDJcoeRJbCwT3e7Qj+cU76B9JIYvCllWQ50h6Drbgm2KJ5q/aSKNN1hD0N1Xx1x+cZJ89RdhK1wsm9dsARQMkyw5BrWE409Qb77emY0XMNbnyfEV0amjQPXODmqLwtprn4DOZkQ1sfqNwHaW45dsvOLdg3NcNTbI=; 5:4guo210k7X8KbiiXKy21twKJkCPLboYBxOhnqYtPjaesU86MzjECh1ZemScFJGF7+Yq8V+n/I35IJcxOcVVyZiiW+Mi0N47dbpxNF3Jnfs04/pZqeW82jDl/czIdnu96R3ck2IhLNiEI8K/VXKv/52piE3EZMs/SYFMitRiH1y8=; 24:+47C7psNkxtL0abKZQfkjMYaCdlMe6Ge4EKXD8AOrA+si6bAKPLmjHDp7bb1vsWSI4rY3HUSpJEGDzozkfHBjFyc5Q3YuDNHF2ZMfd9xmGs=; 7:HMW3Cm7g5J72Q4wK0nhQds112gZnx2mC4TQh/UvdUpAYFiDUAgaU8WqQusO3RcXaJy7y11u5WeBIFJo7PTB/JjeF4sDU8b5GR1C1gTLQsQr8/f574boACWkfl/oF4NLtZ48Tz5GmJKQvDPqlVKLZrw5/3DYFh33ZrF/w6c4z7Brn40SaQ6m4ly+v4mLjPb3bFJ9MS68zKB2fyMZnBqEl5FtS3yDZSoK7GsqjKcHhVP7bRGBiHVkGYUu+geW3dC4p SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Mar 2018 12:50:58.8929 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7e165824-97fc-4298-8418-08d58a736726 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0501MB2008 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org In commit 9ffcc3725f09 ("mlxsw: spectrum: Allow packets to be trapped from any PG") I fixed a problem where packets could not be trapped to the CPU due to exceeded shared buffer quotas. The mentioned commit explains the problem in detail. The problem was fixed by assigning a minimum quota for the CPU port and the traffic class used for scheduling traffic to the CPU. However, commit 117b0dad2d54 ("mlxsw: Create a different trap group list for each device") assigned different traffic classes to different packet types and rendered the fix useless. Fix the problem by assigning a minimum quota for the CPU port and all the traffic classes that are currently in use. Fixes: 117b0dad2d54 ("mlxsw: Create a different trap group list for each device") Signed-off-by: Ido Schimmel Reported-by: Eddie Shklaer Tested-by: Eddie Shklaer Acked-by: Jiri Pirko --- Please consider the patch for -stable. Thanks! --- drivers/net/ethernet/mellanox/mlxsw/spectrum_buffers.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_buffers.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_buffers.c index 93728c694e6d..0a9adc5962fb 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_buffers.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_buffers.c @@ -385,13 +385,13 @@ static const struct mlxsw_sp_sb_cm mlxsw_sp_sb_cms_egress[] = { static const struct mlxsw_sp_sb_cm mlxsw_sp_cpu_port_sb_cms[] = { MLXSW_SP_CPU_PORT_SB_CM, + MLXSW_SP_SB_CM(MLXSW_PORT_MAX_MTU, 0, 0), + MLXSW_SP_SB_CM(MLXSW_PORT_MAX_MTU, 0, 0), + MLXSW_SP_SB_CM(MLXSW_PORT_MAX_MTU, 0, 0), + MLXSW_SP_SB_CM(MLXSW_PORT_MAX_MTU, 0, 0), + MLXSW_SP_SB_CM(MLXSW_PORT_MAX_MTU, 0, 0), MLXSW_SP_CPU_PORT_SB_CM, - MLXSW_SP_CPU_PORT_SB_CM, - MLXSW_SP_CPU_PORT_SB_CM, - MLXSW_SP_CPU_PORT_SB_CM, - MLXSW_SP_CPU_PORT_SB_CM, - MLXSW_SP_CPU_PORT_SB_CM, - MLXSW_SP_SB_CM(10000, 0, 0), + MLXSW_SP_SB_CM(MLXSW_PORT_MAX_MTU, 0, 0), MLXSW_SP_CPU_PORT_SB_CM, MLXSW_SP_CPU_PORT_SB_CM, MLXSW_SP_CPU_PORT_SB_CM,