From patchwork Fri Sep 29 00:03:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavlo Shcherbyna X-Patchwork-Id: 29402 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 3D425276C; Fri, 29 Sep 2017 02:04:57 +0200 (CEST) Received: from NAM03-CO1-obe.outbound.protection.outlook.com (mail-co1nam03on0055.outbound.protection.outlook.com [104.47.40.55]) by dpdk.org (Postfix) with ESMTP id 4BA88FFA for ; Fri, 29 Sep 2017 02:04:54 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=harmonicinc.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=mvu45j1TBVlUQwCUQlva3hEOM16BijmWKnu8uypYPus=; b=HaattonzG0Rkb1IMyfNqMcBbj/pQRLmE+WQjca/6XIT1mkidNOjolr2YYR/n6CEW0cxu1+gNDBv0xHzx2WF89lW0Sgtp7cwglLO163xUOg6QRyxW0MQyPJ2NGv6sBLTLVKiUKPvoTxQZI3d+AkiHcUU5gPKASbK6kd5aCNfrguE= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Pavlo.Shcherbyna@harmonicinc.com; Received: from kms.harmonicinc.com (50.206.120.10) by MWHPR11MB1998.namprd11.prod.outlook.com (10.169.231.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.77.7; Fri, 29 Sep 2017 00:04:50 +0000 From: Pavlo Shcherbyna To: adrien.mazarguil@6wind.com, nelio.laranjeiro@6wind.com Cc: dev@dpdk.org, Pavlo Shcherbyna , shahafs@mellanox.com Date: Fri, 29 Sep 2017 03:03:56 +0300 Message-Id: <1506643436-15561-1-git-send-email-pavlo.shcherbyna@harmonicinc.com> X-Mailer: git-send-email 1.7.10.4 MIME-Version: 1.0 X-Originating-IP: [50.206.120.10] X-ClientProxiedBy: MWHPR2201CA0020.namprd22.prod.outlook.com (10.174.164.33) To MWHPR11MB1998.namprd11.prod.outlook.com (10.169.231.23) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2298ee58-db33-4120-1d75-08d506cdb495 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254152)(48565401081)(2017052603199)(201703131423075)(201703031133081)(201702281549075); SRVR:MWHPR11MB1998; X-Microsoft-Exchange-Diagnostics: 1; MWHPR11MB1998; 3:VF4rxP5pV0DBaXS7DXM5wif3GdGCVSUpekFjUUUNkHFupwmzdWPQZuuToXASjSOYj+VZvAKfPcLxWMGzDsgg6Nz3auAHH69tfsiJky6WLNJi+tpN3Ajw8x3DP0kwHGEmfE3XpgW/j2plcqhhkDwAHbtVTDHYddl4e5CUsvGdK+FfpagmgIDKYX6nPrZ0RsQnvuWzUkXBrRThT6r51lVgXfTfOoulwIBfBecrMosszbRbzXSlH2+dtHwcvmVh66UF; 25:CpvuHYY4LTnF2R8PR+Ib3sCJtaORMINF9tvCA/KlodjZHUUnG2m8cBnxYUfroS50jpN/FDFvtZS/MedaHBBYdnHLRb3gIOi5KzA54Dk9yUfAobRVFw/UmvotH0Bpm2D8YAjUW6sLOxwizOUtxHoUtqUJMJHYEIsozrT48QnUncP0D3x6CfDnmmuGcCVq8sIqm/qT8USb/OR2WLkk+PcrLaeyceCpsP8xlT+W+LVHNrlpIfLeaW+uC2Syn259ouL7yhYj8Sz2C8dJRdqUKlaV+oUkhNsehd/GgdUi05ZaAd4lC+amb+MIIMY6JFQo36YfW+mHNgLwmwtwIweKuameGQ==; 31:8EDhJBnNe1vRbRrN5qSXTox/zEuhKInANWvbFzqXZCdzOehL208Vgf15xQgJhB1ObaZ1/DZcKphhA9/NWM3gqV2J4bUvKAwC2rCJTCQWdtZ7VoCu0/uPW2j3PyFYKtcXKfrjrsid5YgqdK3PjmgGQ9csWPKLEGX5lLGSpFEt0uM5EUA0z7zx4KQgXVkJ4SdopOWvOLKHRx/Zzl/upuMLLaiTfAVQpE9+YHkpVySU3vc= X-MS-TrafficTypeDiagnostic: MWHPR11MB1998: X-Microsoft-Exchange-Diagnostics: 1; MWHPR11MB1998; 20:L3MisQmTFoBdfCY1vzM3CqmogRaqMTadeJ/gZ065WAMjj7GQrAfXin7msn8AucOYG6/4C8/wcGVwMZ0QqTQIG6ckGJgFgAxdT3YPG/RwaRGGKfwUoGwWWajNDm3cz+PIJPHv3p3XukzNId0mUOBnnTv0VugjFH2b/pIWrIWDWY4012rky0TW5sEFq2PvZJu1A48TztGH6GxrPfV95cq0Z0qJYf73cMw7Hz35E8kI0WG9QSrnrxWDqIhIMV/oDWqQiYfanhimm91dU5orEaJCsb1/z12DNv7As6i890A0IDpzsxkL0piaaFgmkTkEEq10sFXg4b6L8osmV3bB0tu3auvllKJTxAsR/2ejGJrq4RS1UZW8Xeawu4qI/8B2UzucJiIJspOJyh0VXD3EEx8V48NEzuMvNk790qX50UzSBQE6a0rZtHZ6Rq870ABiWqhdWQ30Z3tQkUVWrR0NW6GN/VJhdfWcWHDUc96lV759eZ454YtsUqBSd1iackL/nXpI; 4:/oLiQu5z5aRUbYdp3Ni/BKGxJWJNBgD9dQvJXOLH9zL8fQFoDmcmEihTRHMNhFp7xN6ZQa50R3YhwvL0USAhMdOFlfTa5WD5yvw5bdWJEd6z0+xQSWHfnqLvNqXO8KW256HQj998Ei3UfF84IJspZZ7pawNxSxD0GDYbk9ywEYqSERvafUvSeDoC9BGK2AkjofzVJHSiL70IuMA7lbXNMc8ZVBF0DkctrcO/SgTXD7NjwyooDcY3wKInnXfiPmHe X-Exchange-Antispam-Report-Test: UriScan:; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(8121501046)(5005006)(100000703101)(100105400095)(10201501046)(3002001)(93006095)(93001095)(6055026)(6041248)(20161123564025)(20161123562025)(20161123558100)(20161123555025)(20161123560025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:MWHPR11MB1998; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:MWHPR11MB1998; X-Forefront-PRVS: 0445A82F82 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6009001)(376002)(346002)(199003)(189002)(16586007)(189998001)(97736004)(72206003)(316002)(16526017)(36756003)(6486002)(305945005)(33646002)(50986999)(3846002)(106356001)(478600001)(5660300001)(101416001)(53416004)(105586002)(6116002)(7736002)(69596002)(25786009)(4326008)(47776003)(50226002)(2906002)(66066001)(68736007)(86362001)(48376002)(53936002)(8936002)(50466002)(81156014)(4720700003)(81166006)(8676002)(5003940100001); DIR:OUT; SFP:1101; SCL:1; SRVR:MWHPR11MB1998; H:kms.harmonicinc.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: harmonicinc.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; MWHPR11MB1998; 23:8jf89tBSIfXrGAaLmAA+XOfFFigMm0uW4FOx9tG8o?= VB/zfovYvMQw0Hs6ZI4Oe48KCEi7o+dQAdNdMDgcxdbaB5ghlCBj+OHWzPqgGjV2C56nwqZ7EEXzL5bdk9I4gQ+xBW94xJIw3XzJSEHrMHb4EO93I25aHZhXN63nax6U1VzkzgxVNdaaovFDiswxS4628eG1wc9XOaLRoGbhN6nT9WJnn3dNM/SeVF6xL9DwVPo+/kPQzaYAWaI+Q1tOQFYXYuBm004jYzqWaPcfkSxbdcS9H8sqPqejDoOQJFT2z5U5OPEUL6b8/vE/Nu8/rNApEpKw5YlZNxz1DLUNgVsEfXB1ufVpHFyP4kfm9pLLOMkjmCOkAv6hxvK7W+vKYcFrgCVE6+H/Zw72gngQqojZddGS8/0Sj1L5WTeUUAmdD5NEObSeHI6zsUwODZSrKPC9G4B4vjaCHf77p9fn2StUmCZDJvjESLpRjSj3D36tcOuDRxYEj2Gxk9/DGEJvTXVjAQ9HjzqLyfZMIGOr7sSL6GXsmN6bABs9giNigVgqPhG4FqdAA7e3K0TTcCmIMz8SPahRZ6K2USwTz25BPbu/zocPNJ2fbkPUcTKKxcJJbyCcGdyuNmMSFOG0sBhpFH9//WN6LrkH3tHoXeyEnuCm/Gn+z311pxUpbi3jvaQvK1k/WaYS9EMJhbWPtBbDRqS3O8n2FXr5XT2tJ4D8+jurEcDFiHciAFY2qgKikl1daRuDmMeoL9Mw5x+Tp0T2sugFL4ERnGFMC9XdfSmbkOfHSgzyst+dHWkkY90DbK+xxp5O107+6jxRZI3j72ay3KkliHIMclemEn1YULf3nzyUwYv9KOUSCVadpJ0v6VDj4NvtOq0ShGA9BCBPfwXHRk/lLUgcR8HS3wVR7eSF+Tqmi7Z60SuWavHmS6Zms0ICJg9jvZyB0Jp1kc8aNtu4CrfyTn8miAU7HCmMJK9uYTKqIlA0+Nw+ZYnA6Pyr1On8dlqYdCHkoOJUTqTm5d3kLtzmpTU9I+ZTgOYm0DvA2NxoA== X-Microsoft-Exchange-Diagnostics: 1; MWHPR11MB1998; 6:fUx5rbOH2PGPX2sJivhly//z8fTSLIFvZu+W6jeq5HdBkKqfj2BuQupJLtTYelN8pCPYem36tEq/DCvWDgVYAx/hD02KVO0soo20hYRhkpsHg+fcmPWiuLgINbcMwZhCVpGniQtXiBWnarM1lofZaQICqB5UBQozaRJAaG4usztPYhFz6Kt5P3jF2l9ommRIwOAo4PJRtK/ptj33kS8gNaZ5LpDdikr9+whoKfPyZ/EioOCCAdW7flka1ijUCkfcOAlaZ8hwsMw84BFcW/Yr5HdCnWKYAdgvjpnS/e8CvoqaZ7cWXssPnUtgBJ3y8HVahNfFMcAX8wsWk8DOB//USQ==; 5:YXtM1UR37VnQUupCCupI8ZDWCwLFW0jCtbHwj/wNXq6zOJhu2hTZUOM2x1enx4hOzT9fdqIOFA21zahg43W8ER53pUqqbC8eDzd+P6woxOwVgsVVz5ltt5xbx8bQ8AXkbh9DNzv0qEQbVcD5mshP0Q==; 24:hr5GeaAMvGMQPF4sKIzB9FLlQyv7yLc9x6/alDgVW5COP4lofZxHUgaa37vKEZnl1cJvzIIpZkxNkdX4AVH1Mnm+dpKPdR70olivxdiYfcE=; 7:v8Pi+6NkIqmUap1yY/BequrUwAs10xCs+u9oUtQ1J14YwOnny4rSKrn3F5Ih1VvrsAtzPq7CvPM2qs8khx+eeW47I6zDzZW+3cgI4B/Q0NZEnsTa0MT6Jn6jy0G4tyLt0sSxlWMMftL7RIWQS3n5sS+AJdsC3f8XfYWcr6+OExKQSDvp/0zx19LAmUuQc8xo0byKW0mjQ554B6+M6Ah97oH6FNF7PTph7fQSfeCR4Pg= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; MWHPR11MB1998; 20:KMsn5Ag6A/Uausyh8qlFEscn+sWV+4Wlap1ver7icSqP8iPmJH1GPsaGMfpl5oBRDISyl0LtC4FMovJ6PkCJ2r8GqqaDnLk+q/JqHIP5xE70RLeH3yuNZk4NYKlt1aLco/2k6IN3vyRDx9nMp7uts9LWO4fU2KlmmUNc+g7oneY= X-OriginatorOrg: harmonicinc.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Sep 2017 00:04:50.7714 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 19294cf8-3352-4dde-be9e-7f47b9b6b73d X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR11MB1998 Subject: [dpdk-dev] [PATCH] net/mlx5: release spinlock before return from function X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" If priv_ethtool_get_stats_n fails to retrieve statistics, lock is not released. Next call of function, which uses the same spinlock, will stuck trying to obtain it. This patch addresses the issue. Fixes: 4b2e6df26168 ("net/mlx5: fix extended statistics counters identification") Cc: shahafs@mellanox.com Signed-off-by: Pavlo Shcherbyna --- drivers/net/mlx5/mlx5_stats.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) -- 1.7.10.4 diff --git a/drivers/net/mlx5/mlx5_stats.c b/drivers/net/mlx5/mlx5_stats.c index 703f48c..8764829 100644 --- a/drivers/net/mlx5/mlx5_stats.c +++ b/drivers/net/mlx5/mlx5_stats.c @@ -442,8 +442,10 @@ struct mlx5_counter_ctrl { priv_lock(priv); stats_n = priv_ethtool_get_stats_n(priv); - if (stats_n < 0) + if (stats_n < 0) { + priv_unlock(priv); return -1; + } if (xstats_ctrl->stats_n != stats_n) priv_xstats_init(priv); ret = priv_xstats_get(priv, stats); @@ -467,8 +469,10 @@ struct mlx5_counter_ctrl { priv_lock(priv); stats_n = priv_ethtool_get_stats_n(priv); - if (stats_n < 0) + if (stats_n < 0) { + priv_unlock(priv); return; + } if (xstats_ctrl->stats_n != stats_n) priv_xstats_init(priv); priv_xstats_reset(priv);