From patchwork Fri Aug 3 12:57:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ido Schimmel X-Patchwork-Id: 953221 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@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="XP5olUmD"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41hnCy0mkvz9s0n for ; Fri, 3 Aug 2018 22:58:38 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731938AbeHCOyt (ORCPT ); Fri, 3 Aug 2018 10:54:49 -0400 Received: from mail-eopbgr00045.outbound.protection.outlook.com ([40.107.0.45]:10720 "EHLO EUR02-AM5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729639AbeHCOyt (ORCPT ); Fri, 3 Aug 2018 10:54:49 -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:X-MS-Exchange-SenderADCheck; bh=D4BmcTuJMssw5R/hc0xRXLEEKanD/Wvt/JzUdpt/15c=; b=XP5olUmDGJUguH2D4ZI0IfhiVXut5nvXBaVTWWZ7yWiUVq5JlumRggM4mCXEkdIK5bmx1V47dnBfWPfFawMkyX0P2xXm/t+pBDGN4j7DhcxcIyeMk15DiySM5o89sZgGezr98o3KgXsvrxS2sTS/NTIXoDHqhjeKac0CmQihDBc= Received: from splinter.mtl.com (79.177.4.144) by AM0PR05MB4977.eurprd05.prod.outlook.com (2603:10a6:208:d0::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.995.19; Fri, 3 Aug 2018 12:58:29 +0000 From: Ido Schimmel To: netdev@vger.kernel.org Cc: davem@davemloft.net, jiri@mellanox.com, petrm@mellanox.com, nird@mellanox.com, mlxsw@mellanox.com, Ido Schimmel Subject: [PATCH net 3/4] mlxsw: core_acl_flex_actions: Remove redundant counter destruction Date: Fri, 3 Aug 2018 15:57:43 +0300 Message-Id: <20180803125744.16200-4-idosch@mellanox.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180803125744.16200-1-idosch@mellanox.com> References: <20180803125744.16200-1-idosch@mellanox.com> MIME-Version: 1.0 X-Originating-IP: [79.177.4.144] X-ClientProxiedBy: DB6PR0202CA0017.eurprd02.prod.outlook.com (2603:10a6:4:29::27) To AM0PR05MB4977.eurprd05.prod.outlook.com (2603:10a6:208:d0::30) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c5dbf4bb-b67b-4ef8-df63-08d5f940cf98 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989117)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM0PR05MB4977; X-Microsoft-Exchange-Diagnostics: 1; AM0PR05MB4977; 3:YcbIP8ibnXydozg+bvOn9m48fCFrmL+WcbdtY0+8o9oNxZDJLe4XzgmFLtg9FypGxoAueg8dN60Sd4MPV0pwUztm/o5N7uA+NBuku4HJIKu6CqLqZEj7t7jU+sEv1kYNhQVm3Nyt7f24UGxDKKuXljt/GTbdhp0CCd1ko1flL0UW2lDOgXbeDnGQwCP0fAohjksAm8WJFzf4T0hrNW55Jl1WxKDjxpOc+DcavkiPBMwSiZgO1Im4qyeIAUllULAt; 25:h/2HBZTT5aYgrUjg0cmnaU9QIWKscEfohmuReZoco2+/06irIz4MgMarvfhaxjX+7fyq2cs50gR5xV5QvQlGqNpEMfFuPVH2EJa7lt5M7Wz+tWIJncFhQQ2wkNnUOdIKJQDa3x/a64YjrF5O/ifrtO+KUVW0IFg28hBt/7Xfw9XGFC10xmBHbjF3+NQdhJaq0vvNWPy119gkPjoL/PTDcrjdqhlJ0Goa2zVihrUI5OQVGpwpQAe3lHHhvMY5o/Vwwc6cAHi6ZhyTgY+cnuSoaikli0OzvqhXve/bo0xvbCCjsRCBJ1r677vvUhjFPvTah2BcoiR7UBpJ0EkXvh+mSw==; 31:jq5Dm+Jnxemo6XnZ1tBL2xONGOSVN19Xj+UfF5xQyF/hH0rQfo4rHIUMntRWAyoo38stFf5kLaAzJgdmyk+SETGJeIAcQXc3bg+zv3KC/bQ0l3o0aI5NbYohBnaAA6KmnOXt8m4Nn91u1wDnmwwhno0CHN8Y8rsDM8c4xUVKpJzOIfgiG0SieNnhrr5IiJEl00a+rG/fapt2tdADzgoIs+TKJBQu3qi7jyL0fQX5QfE= X-MS-TrafficTypeDiagnostic: AM0PR05MB4977: Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=idosch@mellanox.com; X-Microsoft-Exchange-Diagnostics: 1; AM0PR05MB4977; 20:2rxnYtCRWFU8bzler5pMLH++qRtN6KNgic79diX71BXR3WwMYem8rWZ0sCgkzPI1kC5KUehRR50gmHRX4bCYV5wZKL56vXbdn7hU+Bx+sLJo5n6ouOtIg99UDNDCsqLe6uL3qR6cVt++hdm91hQr6+A/rSES61VP63qh1C6VIDuqXyUG6hT6KYKiO9VGlQIThuDFbH2sl6YoeENB1zRJg4M9+rVX46kG1Kge/V71NDcfjyao7XssKjkD0I6NFfOGr02WJjwQrAo1lnG0sEbzfNXlNCcmZ/W5wr0ADQP1mNhdjv37Lxrd4owu0+mpNu7hRAb0+0AeC4AIb1PLrSWVfgypGSNaSPPjokDQmXmGggeAaRrCGYVv1gIw5txsLMRkz/nafXUbm4F2HkOrBiO4ALQQ5yvCFsmyGRT1qkAlmxPM4tnpWecJV8u03lQ/SuRS7l4qw4R/uqFYWACe/5Y3ZfpibQ6lS7VxsmnycEkvRRs0J5rD2+EeEHFlihp86qgs; 4:Zl2FtbWbrkNK4NtNz261b4bn6d3Kgmm75FHFbfTe0QWz8QWPK2t5QKnLlr/6QSNEG/huiwEhkkXKZM1a1jpVlOTJLEzeaKzQ1x5IHnfDFW+dF9cTUFc5fghPoJn7nmK98A9FjJJ49Puwd5/6r26qzFtEqaYlGvWV9m8Eo9cmlxuchk0K+6Wh3vkZdfeVcLQRWcXlSkGBI01fLxZT8kD2IDeCu5y8SYfoUNQ9bUuSqRJrBRfnHzlUSqf19SREq3VoLlne2yaC6ZeS09nnKNeAY0gLaVwc012TDm/nZTUq6PijUBxMUDRB5i+/STdF79NW X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(17755550239193); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(93006095)(93001095)(3231311)(944501410)(52105095)(3002001)(10201501046)(6055026)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123564045)(20161123560045)(20161123562045)(6072148)(201708071742011)(7699016); SRVR:AM0PR05MB4977; BCL:0; PCL:0; RULEID:; SRVR:AM0PR05MB4977; X-Forefront-PRVS: 0753EA505A X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(376002)(366004)(39860400002)(346002)(396003)(136003)(189003)(199004)(386003)(50466002)(68736007)(50226002)(16586007)(6512007)(6506007)(53936002)(36756003)(51416003)(316002)(52116002)(6486002)(4326008)(107886003)(5660300001)(25786009)(76176011)(2351001)(478600001)(6666003)(97736004)(476003)(81156014)(53416004)(66066001)(6916009)(1076002)(48376002)(47776003)(8936002)(86362001)(2616005)(7736002)(8676002)(105586002)(446003)(305945005)(486006)(2361001)(11346002)(186003)(81166006)(956004)(14444005)(6116002)(16526019)(106356001)(3846002)(26005)(2906002); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR05MB4977; H:splinter.mtl.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; AM0PR05MB4977; 23:ij/haQiCeDlZR0/9norNNqgAYk66zcYeenZL0zVi82+/c1SdGuHiWmDsOrP6uEGoc8ex4zfZfwp4g5S7LH6g3pS5JsDhwmu0tukEFelQJgbFYp8dC9j2Lk0TSR1eQl374eJ6NzcFKge4ZTYQHnCGkX9Z00TaX1avkBMLnwftfnQgZrUprKduabB7cqD7iftSNHKl8xbeDayfoiiugZb9FeIqXbNcxWA+cXP421Xg939SESh+Qnt8xhfWhE06MkeWzlayn31xC1czX8/6BYshX2zVsSx8ceTFKalsFARccPn1IYGSIcvW31OXufErCuoHWpYaTsW3lq5NGUCDDhlMigHujVrW204d9y1jglkw1eqCYbSn2G99pmHQgicGvxBL/Nlriz8ikEM4GJzPpxorLyVgp2joSoEGhgStn0BZEHiuyhLuZ+Yc8v1rSgCCWhvFv/xd7+eDpIXSZejDUv6PfoduMWj5gI2Rs0PkHKldU9b5EDvUIN/9OSO6UucllCONvprHkW37Sn86MtGLODqBz7Nubv+eI1AhmoDCxSpHhsuDkI7qtgQ3EK08XXxq4bk+GLhY+I2YdqJHDRqpjPBMqsS0xxaZWwGRoW2+V9nFz97vASA3c3D/0jS4vL462cVFeqo/cXMpblDIP+NINABNMCn8jfhcERXdpgYqnIGPoATgpIRNdANVRcy46NjtEwSybXw8tGDWUODrDPagoHnfft7RBiCBWsldEWFiP3qdcOol50dACgL3ZRP0XlfKwBjMMX+3WlVeNOf+wuffzcMWpRav5SIRqkcy0XcWT/rXvravVdJm8UEEbexDBKSBoLppaixllzA70dNPVE4V+kXyIp39vmeeFyn4w951U+4TswayzNYC3lGMLVZUJCO8yOjOZg7FszwXauuBoYiUImOU9FgmB/rHPvIc1W5Jbfd+oS+Lc/T0eAfrRy5ifo1cfWU3gZ1c337Js3UNqPFUYU6E20p8xE5kabkDXTdQ/f5riyrJ4pXA1DsE3t7hwoZV5pzw9SZ9s7q9bIh1uE1i1b3OW+CdXBCxrYyULgrh93rbp9nAzuS/E0BJA8H0vVCeRh8ONhp1gFq02YAW2Yo5gGWaLNJv3jdXOJzN6GBwhwQM7AvnPhr+LSAtgoCLXxfl336yu29VMm2QI4ZLrm1JdyP9tCJLfXrxfdMWzIg4WC9XMY31rZTA718IYsgX+UhiDD8/8CUha8TeBQ7JWY014BkrCT7VO81V7vUYo2WkA2dqHl1B+zTPIk1iZQ+apBcW+n4q8mevSqA6rHAeNrfQ28HtqA== X-Microsoft-Antispam-Message-Info: WimdhD3AGNQiqndMFqj3UNR2BldluZ5FO/EE7maBXKCsA0ZJg4ujFNQDKIqRcqSEeaDwBpgizPFE+HbUk88v6pWt5uJVbrHF8/M1uS+HRseH6D2ErQ5yhcAFmdOtM9nMEZ2WFfgEpJn77yL4erlOlJ/abUfWH5NzQcF1XmNsWCXF0WlSwKeyLtwsBOsl8NwudZ79ManqJnv7rfqqo1lT9oYrarxeMJAretoo0sqmvJqcEu5tCU2aXB4qACLyGy9y2slZuzpyrto+fPE4R0pAK8ho7IDdPRmCx/NuYPCIpEwL4g07JnmuuzdaZZ/tUrhkM1dIRXFCN10iw6Jt4aL3NesNFZfyydoO2+BalXMSlhI= X-Microsoft-Exchange-Diagnostics: 1; AM0PR05MB4977; 6:Ck7lg93lWSn7riQ7ZItk0wf8/Y4BqjSGM+fGVh6Ku7RbPsX+HOUTBOoUrC4wHfR25R2Hwbj2pxkWePhi+uvM3jLoZIxeaRe82RTziWZbRVg8JKjGpg0euQ4/H2IIoVbsvr6oILWS+d5rGDUFYDQ5ytYV13H0mMO+KtcXWFVejZ4VBu0svm4RL2/pNRy+qHtprpIh2fc+uv7iaZ8f9xw0yfuEBzsRkuW/ylBvW06AceSmUSVWO2WcW65LO3OE390IrW1djfXsXn6E+C94m5aeuQ0dp5X78h5Zys6SEVYzbKGefhGv6Xp4FuuBSwJ8VrdwL11SBPHW08bXDhATdnAn/I0qZK2Cu9HvPXEG8gReXwZpHMtt5jK4a8yxPSow2glRI2Dbk1x+ph2Ysym1y4J4wOF6jLaDmkwqCr/1vsv645pcsLmDrwzylpnJdLEjdFcdCmKqEps/1t8CUtBcRsx1Tw==; 5:4oyp+GmIYaX11Gz00OfWgj2YvvtOyQVM/TokTaTezlb3/zdHe6mAafXkstKyDDuD2sMzFMTnP9SWuB4Wo9cUETxil8g6tAzM27Gq+2+kRb+/U+vlF2IeNMuFeC+xlaM99DsBd6KFO/yeQByBf+6EcVdInwnQhtF7QiigDDuaNAQ=; 7:25m8Jmudp5LoqHbOFXga7ENDUKdgPQDHjGvu5zhYxMeaIhQBKk6eeQpEGT9TRuAdm+zwgTxEbLGp0e14ZNqlJnPFje1NEEc0anXjAb94v4KBzNQthoW+bgZGDRDcQItEAhlxfKm8iPd9p2TUOpWhrIiJ6ONPAFdEGuA63Pd7xwbo3bdDaKBvTUTX74fzrp2mhms5Vgg1mfPwU4CpS1IXJ5nc+aeqef4dY7oQZiNY4488Ys+OdckZsOlpp6+zKz6L SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Aug 2018 12:58:29.0222 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c5dbf4bb-b67b-4ef8-df63-08d5f940cf98 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR05MB4977 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Nir Dotan Each tc flower rule uses a hidden count action. As counter resource may not be available due to limited HW resources, update _counter_create() and _counter_destroy() pair to follow previously introduced symmetric error condition handling, add a call to mlxsw_afa_resource_del() as part of the counter resource destruction. Fixes: c18c1e186ba8 ("mlxsw: core: Make counter index allocated inside the action append") Signed-off-by: Nir Dotan Reviewed-by: Petr Machata Reviewed-by: Jiri Pirko Signed-off-by: Ido Schimmel --- drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_actions.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_actions.c b/drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_actions.c index d664cc0289c2..a54f23f00a5f 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_actions.c +++ b/drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_actions.c @@ -584,6 +584,7 @@ static void mlxsw_afa_counter_destroy(struct mlxsw_afa_block *block, struct mlxsw_afa_counter *counter) { + mlxsw_afa_resource_del(&counter->resource); block->afa->ops->counter_index_put(block->afa->ops_priv, counter->counter_index); kfree(counter);