{"id":1296576,"url":"http://patchwork.ozlabs.org/api/patches/1296576/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20200523004049.34832-12-saeedm@mellanox.com/","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20200523004049.34832-12-saeedm@mellanox.com>","list_archive_url":null,"date":"2020-05-23T00:40:47","name":"[net,11/13] net/mlx5e: Update netdev txq on completions during closure","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"dc485040b94f971994985d1b1deb379f569a0c20","submitter":{"id":65299,"url":"http://patchwork.ozlabs.org/api/people/65299/?format=json","name":"Saeed Mahameed","email":"saeedm@mellanox.com"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/20200523004049.34832-12-saeedm@mellanox.com/mbox/","series":[{"id":178808,"url":"http://patchwork.ozlabs.org/api/series/178808/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=178808","date":"2020-05-23T00:40:36","name":"[net,01/13] net/mlx5: Add command entry handling completion","version":1,"mbox":"http://patchwork.ozlabs.org/series/178808/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/1296576/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/1296576/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"patchwork-incoming-netdev@ozlabs.org","Delivered-To":"patchwork-incoming-netdev@ozlabs.org","Authentication-Results":["ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org\n (client-ip=23.128.96.18; helo=vger.kernel.org;\n envelope-from=netdev-owner@vger.kernel.org; receiver=)","ozlabs.org;\n dmarc=pass (p=none dis=none) header.from=mellanox.com","ozlabs.org;\n\tdkim=pass (1024-bit key;\n unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.a=rsa-sha256\n header.s=selector1 header.b=tltCvERF;\n\tdkim-atps=neutral","davemloft.net; dkim=none (message not signed)\n header.d=none;davemloft.net; dmarc=none action=none header.from=mellanox.com;"],"Received":["from vger.kernel.org (vger.kernel.org [23.128.96.18])\n\tby ozlabs.org (Postfix) with ESMTP id 49TPgg2vPBz9sRY\n\tfor ;\n Sat, 23 May 2020 10:41:51 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n id S2387519AbgEWAlu (ORCPT\n );\n Fri, 22 May 2020 20:41:50 -0400","from mail-eopbgr40071.outbound.protection.outlook.com\n ([40.107.4.71]:51206\n \"EHLO EUR03-DB5-obe.outbound.protection.outlook.com\"\n rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP\n id S2387510AbgEWAls (ORCPT );\n Fri, 22 May 2020 20:41:48 -0400","from VI1PR05MB5102.eurprd05.prod.outlook.com (2603:10a6:803:5e::23)\n by VI1PR05MB5391.eurprd05.prod.outlook.com (2603:10a6:803:95::25) with\n Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3021.24; Sat, 23 May\n 2020 00:41:34 +0000","from VI1PR05MB5102.eurprd05.prod.outlook.com\n ([fe80::2405:4594:97a:13c]) by VI1PR05MB5102.eurprd05.prod.outlook.com\n ([fe80::2405:4594:97a:13c%2]) with mapi id 15.20.3021.026; Sat, 23 May 2020\n 00:41:34 +0000","from smtp.office365.com (73.15.39.150) by\n BYAPR08CA0042.namprd08.prod.outlook.com (2603:10b6:a03:117::19) with\n Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3021.23 via Frontend\n Transport; Sat, 23 May 2020 00:41:33 +0000"],"ARC-Seal":"i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=L/FnG7kVx8Qnts+ig+uycUPzTtLH2wkN30w0YdAk4Tk1MGEdCKN3KnjqaGIXQM2BuDs9Ccsdh72yYIcH4AMITTFIdElEPLO98xKFCQLG+7SEXK0UYlkmr7mFECvNVy5RAkSyTQ+YyFovWRObwxpCb5BvEFqOSZ2j6y5ZQt7n5sNOvb3Sy+gpksOred74EpEtl18SE6eh+zGiNMXHXO1VCBpet8pwtI1uiYPuyRQAqspv5SKag/oh2pmRMqlepjwq8ylV9LIzj38aYShnOuvFED1fmC2S8Oj2SjIftH74cewxnqG+SchqhPLVbxi1ubY+P6Xk+5FKwDia8YtKCKI4Yg==","ARC-Message-Signature":"i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com;\n s=arcselector9901;\n h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;\n bh=fsn2U38XGKrNUE+TcNljhvwVvIYvjLVuiTsmLWNcRfA=;\n b=HxResILnCFG797IvWgS6VPTY9pXDIiXtENbJHwjN3o66Cqkwl14U/OHTwUXv7OACQVVEoYOm+mTnJiKOUz6bVI2DUciBv12YmlM0BBklbtNQReWcBNzLzXzM/Tz/TfwqB8xKloMUbecEHm0aF1B4cBOsnwmG0r2zj+SfpqV/2BSQjs9dEYBFoR/SRddfpVBbMwbhmD45VB74qUSmEWRb8m7fpzl4JGQep1EKx2qogzFjQE0dU4cVYXp4r7tVLtqp3eThU0TOG1QUjewXunN8GkxSFWjLGzf/azaki316FNS6JXSp+s9mNWr9xvid5Ktncb+P3xcn1sYH8rsw7kJfEA==","ARC-Authentication-Results":"i=1; mx.microsoft.com 1; spf=pass\n smtp.mailfrom=mellanox.com; dmarc=pass action=none header.from=mellanox.com;\n dkim=pass header.d=mellanox.com; arc=none","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com;\n s=selector1;\n h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;\n bh=fsn2U38XGKrNUE+TcNljhvwVvIYvjLVuiTsmLWNcRfA=;\n b=tltCvERFwh7vzI8IfhL7rf7gun8+fxvI24If+6srInnZ4wnVd03Q4vFkI3pKFuL5mkAghVA71PvGTz8In3Xfhh6mvKbsIcvnMxdjgiP5MVlFn18TzBV9HoaybkxS54WtVuZp2pXnvythz5xeyobPvtwcLS33Wz0e8m1iym0S4G0=","From":"Saeed Mahameed ","To":"\"David S. Miller\" , kuba@kernel.org","Cc":"netdev@vger.kernel.org, Moshe Shemesh ,\n Tariq Toukan ,\n Saeed Mahameed ","Subject":"[net 11/13] net/mlx5e: Update netdev txq on completions during\n closure","Date":"Fri, 22 May 2020 17:40:47 -0700","Message-Id":"<20200523004049.34832-12-saeedm@mellanox.com>","X-Mailer":["git-send-email 2.25.4","git-send-email 2.25.4"],"In-Reply-To":"<20200523004049.34832-1-saeedm@mellanox.com>","References":"<20200523004049.34832-1-saeedm@mellanox.com>","Content-Transfer-Encoding":"8bit","Content-Type":"text/plain","X-ClientProxiedBy":"BYAPR08CA0042.namprd08.prod.outlook.com\n (2603:10b6:a03:117::19) To VI1PR05MB5102.eurprd05.prod.outlook.com\n (2603:10a6:803:5e::23)","MIME-Version":"1.0","X-MS-Exchange-MessageSentRepresentingType":"1","X-Originating-IP":"[73.15.39.150]","X-MS-PublicTrafficType":"Email","X-MS-Office365-Filtering-HT":"Tenant","X-MS-Office365-Filtering-Correlation-Id":"120c74b0-0c69-4533-2988-08d7feb20b6c","X-MS-TrafficTypeDiagnostic":"VI1PR05MB5391:","X-MS-Exchange-Transport-Forked":"True","X-Microsoft-Antispam-PRVS":"\n ","X-MS-Oob-TLC-OOBClassifiers":"OLM:4303;","X-Forefront-PRVS":"0412A98A59","X-MS-Exchange-SenderADCheck":"1","X-Microsoft-Antispam":"BCL:0;","X-Microsoft-Antispam-Message-Info":"\n oysUrsJZTo4c3sHmsP4kVAgMDz9Kzr5kK+6fAQOm7nVVqtYWuNlrMB4b5nO0QdPhGkIO3RmlgFX2SjCkh2pK9lu3FiO/bUnlRYubaQtql5iS5epYKetVyQ2i2KUZ3ZBFb6k0rwzMqOw5GFu6UnO9py0hvcPExlZS4fiA0174Sjw1hO34uFWKCp1c9YY4wZeYtDzA4ipM9So30wJbv1oMal0HgmI2uXSrxUofjUTiRotZiMtIVEiimZqw8dEXGQQkvG1xsLwA4wAheBrK15rRo77Wb+mAzVNydjXBX+VrTC6n1VwJMfOsFTzXUT00tmBhQA2jAUMWBi9A88Hl1auIrowM86SEJnuNkBmn7dYr9Sjco3MeyNylgBxXInQ1bwJy","X-Forefront-Antispam-Report":"\n CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR05MB5102.eurprd05.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(346002)(376002)(366004)(396003)(39860400002)(136003)(1076003)(8676002)(2616005)(956004)(4326008)(52116002)(186003)(26005)(16526019)(478600001)(6666004)(86362001)(6506007)(6512007)(107886003)(36756003)(15650500001)(316002)(5660300002)(8936002)(6486002)(66946007)(54906003)(66476007)(2906002)(66556008)(54420400002);DIR:OUT;SFP:1101;","X-MS-Exchange-AntiSpam-MessageData":"\n zfjNIRVJzmR9xfo7ulEDiaxao9/9Jlps0JnaZs36ziwiyCFLlof1popTNHy6LbTP0s4dkiDSOppRYIrCf2o+RM9YMhENeonEcboAWbdNWrcZKpAOlmV8rIVFvzIIX1IdlAxuQXpfqcyTIGNMuZySN+MdJRtw8lmEswB0Zuo02IDH2igTd3HhOlCKaYZO8im3dTjT06Pd3vX2wcVXvg+273nzsAnngb7dLseAqG/pma8NULkpZlOFhuXDxTYA7iagvhaOv79ni0kCnLDuubfx0LdByALtjkxLPHvPu7sOJGJ1VG199EeRrT/I/EWakeqINKeoYohyq5o6oC3pvuTiQwwt5hhbuNKYCfQtZfFhzkce4QZx+C6D2NRSwT5eNQkfJpZj2WWRgtFg87vbg0mksMeVsQ2XVRt3dECIPvdfTDDilkjSTTX16oC+qlZnhAKbOUXJJzZI8uaI0BL4CLzzZqGLR2e2CRXLJqSSzeCv0WE=","X-OriginatorOrg":"Mellanox.com","X-MS-Exchange-CrossTenant-Network-Message-Id":"\n 120c74b0-0c69-4533-2988-08d7feb20b6c","X-MS-Exchange-CrossTenant-OriginalArrivalTime":"23 May 2020 00:41:34.7445\n (UTC)","X-MS-Exchange-CrossTenant-FromEntityHeader":"Hosted","X-MS-Exchange-CrossTenant-Id":"a652971c-7d2e-4d9b-a6a4-d149256f461b","X-MS-Exchange-CrossTenant-MailboxType":"HOSTED","X-MS-Exchange-CrossTenant-UserPrincipalName":"\n jQEOJ71U890UwpIKStH/cbOiAfxFrKya5jh7SXXlI9nKidGSP7F9K10m34H6IzX5k0rhIiykXQQxnjMPIQRQrQ==","X-MS-Exchange-Transport-CrossTenantHeadersStamped":"VI1PR05MB5391","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"From: Moshe Shemesh \n\nOn sq closure when we free its descriptors, we should also update netdev\ntxq on completions which would not arrive. Otherwise if we reopen sqs\nand attach them back, for example on fw fatal recovery flow, we may get\ntx timeout.\n\nFixes: 29429f3300a3 (\"net/mlx5e: Timeout if SQ doesn't flush during close\")\nSigned-off-by: Moshe Shemesh \nReviewed-by: Tariq Toukan \nSigned-off-by: Saeed Mahameed \n---\n drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 9 ++++++---\n 1 file changed, 6 insertions(+), 3 deletions(-)","diff":"diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c\nindex fd6b2a1898c5..119a5c6cc167 100644\n--- a/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c\n+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c\n@@ -537,10 +537,9 @@ bool mlx5e_poll_tx_cq(struct mlx5e_cq *cq, int napi_budget)\n void mlx5e_free_txqsq_descs(struct mlx5e_txqsq *sq)\n {\n \tstruct mlx5e_tx_wqe_info *wi;\n+\tu32 dma_fifo_cc, nbytes = 0;\n+\tu16 ci, sqcc, npkts = 0;\n \tstruct sk_buff *skb;\n-\tu32 dma_fifo_cc;\n-\tu16 sqcc;\n-\tu16 ci;\n \tint i;\n \n \tsqcc = sq->cc;\n@@ -565,11 +564,15 @@ void mlx5e_free_txqsq_descs(struct mlx5e_txqsq *sq)\n \t\t}\n \n \t\tdev_kfree_skb_any(skb);\n+\t\tnpkts++;\n+\t\tnbytes += wi->num_bytes;\n \t\tsqcc += wi->num_wqebbs;\n \t}\n \n \tsq->dma_fifo_cc = dma_fifo_cc;\n \tsq->cc = sqcc;\n+\n+\tnetdev_tx_completed_queue(sq->txq, npkts, nbytes);\n }\n \n #ifdef CONFIG_MLX5_CORE_IPOIB\n","prefixes":["net","11/13"]}