Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/117615/?format=api
{ "id": 117615, "url": "http://patchwork.dpdk.org/api/patches/117615/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20221007174336.54354-36-andrew.boyer@amd.com/", "project": { "id": 1, "url": "http://patchwork.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20221007174336.54354-36-andrew.boyer@amd.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20221007174336.54354-36-andrew.boyer@amd.com", "date": "2022-10-07T17:43:36", "name": "[35/35] net/ionic: add watchdogs to protect each queue type", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "ba46fda82cec12ca515d13977ee8c5b6a16cd47c", "submitter": { "id": 2861, "url": "http://patchwork.dpdk.org/api/people/2861/?format=api", "name": "Andrew Boyer", "email": "Andrew.Boyer@amd.com" }, "delegate": { "id": 319, "url": "http://patchwork.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/20221007174336.54354-36-andrew.boyer@amd.com/mbox/", "series": [ { "id": 25037, "url": "http://patchwork.dpdk.org/api/series/25037/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=25037", "date": "2022-10-07T17:43:01", "name": "net/ionic: updates for 22.11 release", "version": 1, "mbox": "http://patchwork.dpdk.org/series/25037/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/117615/comments/", "check": "success", "checks": "http://patchwork.dpdk.org/api/patches/117615/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id DDABAA04FD;\n\tFri, 7 Oct 2022 19:48:21 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 1E78842C2A;\n\tFri, 7 Oct 2022 19:45:19 +0200 (CEST)", "from NAM11-CO1-obe.outbound.protection.outlook.com\n (mail-co1nam11on2088.outbound.protection.outlook.com [40.107.220.88])\n by mails.dpdk.org (Postfix) with ESMTP id A190A42BFB\n for <dev@dpdk.org>; Fri, 7 Oct 2022 19:45:14 +0200 (CEST)", "from MW4PR03CA0351.namprd03.prod.outlook.com (2603:10b6:303:dc::26)\n by MW4PR12MB6874.namprd12.prod.outlook.com (2603:10b6:303:20b::13)\n with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.23; Fri, 7 Oct\n 2022 17:45:12 +0000", "from CO1NAM11FT068.eop-nam11.prod.protection.outlook.com\n (2603:10b6:303:dc:cafe::f1) by MW4PR03CA0351.outlook.office365.com\n (2603:10b6:303:dc::26) with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.24 via Frontend\n Transport; Fri, 7 Oct 2022 17:45:12 +0000", "from SATLEXMB04.amd.com (165.204.84.17) by\n CO1NAM11FT068.mail.protection.outlook.com (10.13.175.142) with Microsoft SMTP\n Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id\n 15.20.5709.10 via Frontend Transport; Fri, 7 Oct 2022 17:45:12 +0000", "from driver-dev1.pensando.io (10.180.168.240) by SATLEXMB04.amd.com\n (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.28; Fri, 7 Oct\n 2022 12:45:08 -0500" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=SAvN+cbzsjQH5E8xA2leSdFgNohXR1rbCOQt7JpoaNZDNm8t6xublK80lWNKu1i3iKr3x4K5ZI94Gxbcql3XAH2ftFS9gKs+b9RzwfaIclYJDg7Touhn6xID8EIMu3dnXJbaIdn7KLg0QBico4wkin6RWQretxR5Cd91lHynqJWDiVVd2ngEcH2CZ1S8EB2y/yhDGc9UPh+JliNA9p7LIsaz0ge/WKJsljpXGGdos/K6ZRJTBK7A5FeoNZYJ61N4avJHqXsvcInir6Tx1swQxTtpJLgCfiONwIQvZflS1SZPz7Gn90ZxhZI8zEcFswcP31YSKfb7YGC/fSJxs5mTPw==", "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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1;\n bh=XiJ6/gwJfBLlCrv9Rad56GMl0fjjaOZS05ubpFq0/NU=;\n b=QLQTEIZKansVgBLq4YYJUzvPRG7Zl/TyM/melFR47lQQXCVB3Kc81YR0ywh77IoU6AN0ku48Dd9T+/DEAELgo74GaATPc1IZa6TG3KlneRGRfnxFWTW9VebJIhdmdkVF9CLGIc/0Y8RT5EH/rQjH/OYO0UUjyFXh6cu4psXD9E6FZmY+KMmNou7Pwqkv7EQeU+9Txe7mLsaENto+ikd0lZT2vymhdnSTGygW5gNOzCrdVpJ6ZcldvzS1C7fn94mt5Fn0k4Gg7v2dsUB+/7YT+MISWpHB352neITC9kJ8mSRJ+Ntx1pxmHwna3HapI3d6yojzzxuxlKgtj2NZLggzBw==", "ARC-Authentication-Results": "i=1; mx.microsoft.com 1; spf=pass (sender ip is\n 165.204.84.17) smtp.rcpttodomain=dpdk.org smtp.mailfrom=amd.com; dmarc=pass\n (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com;\n dkim=none (message not signed); arc=none", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1;\n h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;\n bh=XiJ6/gwJfBLlCrv9Rad56GMl0fjjaOZS05ubpFq0/NU=;\n b=aO57mQVB/T0MNNC0Xl+b2etm+brI8sb09Y8D7x5FSPx7NFtMdD3xO8VMhXXX8/DqcIN8y9hLOt4c0dfL4TVnYRMjjBAMOnr4hZYm066MokY8vkylkA3FiIpQqPlQzn7oS6sWBzXJjZWJE9zTUPxrNxRWM2sak3OXVIQRNIOqG3o=", "X-MS-Exchange-Authentication-Results": "spf=pass (sender IP is 165.204.84.17)\n smtp.mailfrom=amd.com; dkim=none (message not signed)\n header.d=none;dmarc=pass action=none header.from=amd.com;", "Received-SPF": "Pass (protection.outlook.com: domain of amd.com designates\n 165.204.84.17 as permitted sender) receiver=protection.outlook.com;\n client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C", "From": "Andrew Boyer <andrew.boyer@amd.com>", "To": "<dev@dpdk.org>", "CC": "Andrew Boyer <andrew.boyer@amd.com>", "Subject": "[PATCH 35/35] net/ionic: add watchdogs to protect each queue type", "Date": "Fri, 7 Oct 2022 10:43:36 -0700", "Message-ID": "<20221007174336.54354-36-andrew.boyer@amd.com>", "X-Mailer": "git-send-email 2.17.1", "In-Reply-To": "<20221007174336.54354-1-andrew.boyer@amd.com>", "References": "<20221007174336.54354-1-andrew.boyer@amd.com>", "MIME-Version": "1.0", "Content-Type": "text/plain", "X-Originating-IP": "[10.180.168.240]", "X-ClientProxiedBy": "SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com\n (10.181.40.145)", "X-EOPAttributedMessage": "0", "X-MS-PublicTrafficType": "Email", "X-MS-TrafficTypeDiagnostic": "CO1NAM11FT068:EE_|MW4PR12MB6874:EE_", "X-MS-Office365-Filtering-Correlation-Id": "cb2f2fad-3694-4e2a-4432-08daa88baf75", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n HPwB29EViBhoaOlOVCyRdtma4LS6zKDpzVm4/88E9g0GSmxvsSGC+kl87cAEMLCFIzSm7sJ9iCAc/F2R5h0ESzV00Ja8/SMExi+blPMsk5XXp5P+MS5et0NlPh/Sni4Om8e/SVqKxd13ZJCeNu2bufBkMiXzZwe3RHgtVl173RwbKYQTH/3IBeOzzjHvpbyCfdTXnc79JGgBQ8nei5rxFhmtWqlH3UG149trVLehPjCv7nMAKA/Z9jM+ehpo7XGN7ahAWO7wQug5m0WoH0r9InEHWgUa/gssBe4jMOijvwzFHAfC8FXYWzYQXE0u5bt7BiaYC3lOpmOSRfMPt9l0HW6q+S1ueZwdtbumDTdX3YB/WS5+LWStB7BQpM9JA0tJvZkHqWLdM+XRoEOlYscE5QxaWtJ91N8UJaJFpPcNtyh+9P7BDEPzuCrx4neGjz5kTkfkgxNEMOwII1VnbCmRMZeVXudjck2MN/3ZnDKcQhRgu6L909INWYAHSwjktNSPaujuvwOBkAdCT6TmJkUvJAmnhJC9hLpiGyZOgl6PY6lVgfMjltl8YVXaYU6J5sOCE9w9WOK7NU8VDzQrirqeWfk/hF5tGyqVHh/XB99lnZqQD+7YrXuiZtIadA5ERu9EPePPju1YB8A06kdf6bS9u/uto30g1GskM/F86UtBkFmNmbNsl5pnQ2Bvvf90JueHdvEnLrlDWtN3bO39tf9nDgOzfAezy9lblyADpVh2CwsKpj1dr9F/FyxmdE46gmy18ZMkDtmaMEctfrwz8h8qyi3qC+gngmy6iqQFkRA4pFTjqY+nbybF8Y21E3jVS+nm", "X-Forefront-Antispam-Report": "CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:;\n IPV:CAL; SFV:NSPM; H:SATLEXMB04.amd.com; PTR:InfoDomainNonexistent; CAT:NONE;\n SFS:(13230022)(4636009)(376002)(39860400002)(346002)(136003)(396003)(451199015)(40470700004)(46966006)(36840700001)(8936002)(36860700001)(40480700001)(8676002)(16526019)(6666004)(2616005)(44832011)(336012)(186003)(426003)(1076003)(26005)(40460700003)(36756003)(5660300002)(2906002)(41300700001)(70586007)(83380400001)(47076005)(4326008)(356005)(81166007)(70206006)(6916009)(82310400005)(86362001)(82740400003)(316002)(478600001)(36900700001);\n DIR:OUT; SFP:1101;", "X-OriginatorOrg": "amd.com", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "07 Oct 2022 17:45:12.2246 (UTC)", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n cb2f2fad-3694-4e2a-4432-08daa88baf75", "X-MS-Exchange-CrossTenant-Id": "3dd8961f-e488-4e60-8e11-a82d994e183d", "X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp": "\n TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17];\n Helo=[SATLEXMB04.amd.com]", "X-MS-Exchange-CrossTenant-AuthSource": "\n CO1NAM11FT068.eop-nam11.prod.protection.outlook.com", "X-MS-Exchange-CrossTenant-AuthAs": "Anonymous", "X-MS-Exchange-CrossTenant-FromEntityHeader": "HybridOnPrem", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "MW4PR12MB6874", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org" }, "content": "Ring the doorbell again for the following scenarios:\n * No receives posted but Rx queue not empty after deadline\n * No transmits posted but Tx work still pending after deadline\n * Admin queue work still pending after deadline\n\nThis will help the queues recover in the extremely rare case that\na doorbell is missed by the FW.\n\nSigned-off-by: Andrew Boyer <andrew.boyer@amd.com>\n---\n drivers/net/ionic/ionic_dev.h | 4 +++\n drivers/net/ionic/ionic_lif.h | 3 ++\n drivers/net/ionic/ionic_main.c | 22 ++++++++++++\n drivers/net/ionic/ionic_rxtx.c | 1 +\n drivers/net/ionic/ionic_rxtx_sg.c | 50 ++++++++++++++++++++++++++-\n drivers/net/ionic/ionic_rxtx_simple.c | 50 ++++++++++++++++++++++++++-\n 6 files changed, 128 insertions(+), 2 deletions(-)", "diff": "diff --git a/drivers/net/ionic/ionic_dev.h b/drivers/net/ionic/ionic_dev.h\nindex 4d07d9206e..d5d56b778d 100644\n--- a/drivers/net/ionic/ionic_dev.h\n+++ b/drivers/net/ionic/ionic_dev.h\n@@ -26,6 +26,10 @@\n #define IONIC_DEVCMD_CHECK_PERIOD_US\t10\t/* devcmd status chk period */\n #define IONIC_DEVCMD_RETRY_WAIT_US\t20000\n \n+#define IONIC_Q_WDOG_MS\t\t\t10\t/* 10ms */\n+#define IONIC_Q_WDOG_MAX_MS\t\t5000\t/* 5s */\n+#define IONIC_ADMINQ_WDOG_MS\t\t500\t/* 500ms */\n+\n #define IONIC_ALIGN\t\t\t4096\n \n struct ionic_adapter;\ndiff --git a/drivers/net/ionic/ionic_lif.h b/drivers/net/ionic/ionic_lif.h\nindex 2aa9f774ff..1f4686f340 100644\n--- a/drivers/net/ionic/ionic_lif.h\n+++ b/drivers/net/ionic/ionic_lif.h\n@@ -85,6 +85,8 @@ struct ionic_rx_qcq {\n \tstruct rte_mempool *mb_pool;\n \tuint64_t rearm_data;\n \tuint64_t rearm_seg_data;\n+\tuint64_t last_wdog_cycles;\n+\tuint64_t wdog_ms;\n \tuint16_t frame_size;\t/* Based on configured MTU */\n \tuint16_t hdr_seg_size;\t/* Length of first segment of RX chain */\n \tuint16_t seg_size;\t/* Length of all subsequent segments */\n@@ -103,6 +105,7 @@ struct ionic_tx_qcq {\n \tstruct ionic_qcq qcq;\n \n \t/* cacheline2 */\n+\tuint64_t last_wdog_cycles;\n \tuint16_t num_segs_fw;\t/* # segs supported by current FW */\n \tuint16_t free_thresh;\n \tuint16_t flags;\ndiff --git a/drivers/net/ionic/ionic_main.c b/drivers/net/ionic/ionic_main.c\nindex 3d8157dac3..8330d8dfc1 100644\n--- a/drivers/net/ionic/ionic_main.c\n+++ b/drivers/net/ionic/ionic_main.c\n@@ -230,10 +230,16 @@ static int\n ionic_adminq_wait_for_completion(struct ionic_lif *lif,\n \t\tstruct ionic_admin_ctx *ctx, unsigned long max_wait)\n {\n+\tstruct ionic_queue *q = &lif->adminqcq->qcq.q;\n \tunsigned long step_usec = IONIC_DEVCMD_CHECK_PERIOD_US;\n+\tunsigned long step_deadline;\n \tunsigned long max_wait_usec = max_wait * 1000000L;\n \tunsigned long elapsed_usec = 0;\n \tint budget = 8;\n+\tuint16_t idx;\n+\tvoid **info;\n+\n+\tstep_deadline = IONIC_ADMINQ_WDOG_MS * 1000 / step_usec;\n \n \twhile (ctx->pending_work && elapsed_usec < max_wait_usec) {\n \t\t/*\n@@ -245,10 +251,26 @@ ionic_adminq_wait_for_completion(struct ionic_lif *lif,\n \t\tionic_qcq_service(&lif->adminqcq->qcq, budget,\n \t\t\t\tionic_adminq_service, NULL);\n \n+\t\t/*\n+\t\t * Ring the doorbell again if work is pending after deadline.\n+\t\t */\n+\t\tif (ctx->pending_work && !step_deadline) {\n+\t\t\tstep_deadline = IONIC_ADMINQ_WDOG_MS *\n+\t\t\t\t1000 / step_usec;\n+\n+\t\t\trte_spinlock_lock(&lif->adminq_lock);\n+\t\t\tidx = Q_NEXT_TO_POST(q, -1);\n+\t\t\tinfo = IONIC_INFO_PTR(q, idx);\n+\t\t\tif (info[0] == ctx)\n+\t\t\t\tionic_q_flush(q);\n+\t\t\trte_spinlock_unlock(&lif->adminq_lock);\n+\t\t}\n+\n \t\trte_spinlock_unlock(&lif->adminq_service_lock);\n \n \t\trte_delay_us_block(step_usec);\n \t\telapsed_usec += step_usec;\n+\t\tstep_deadline--;\n \t}\n \n \treturn (!ctx->pending_work);\ndiff --git a/drivers/net/ionic/ionic_rxtx.c b/drivers/net/ionic/ionic_rxtx.c\nindex 64733da535..967cc7dc9a 100644\n--- a/drivers/net/ionic/ionic_rxtx.c\n+++ b/drivers/net/ionic/ionic_rxtx.c\n@@ -551,6 +551,7 @@ ionic_dev_rx_queue_setup(struct rte_eth_dev *eth_dev,\n \t}\n \n \trxq->mb_pool = mp;\n+\trxq->wdog_ms = IONIC_Q_WDOG_MS;\n \n \t/*\n \t * Note: the interface does not currently support\ndiff --git a/drivers/net/ionic/ionic_rxtx_sg.c b/drivers/net/ionic/ionic_rxtx_sg.c\nindex bdca3fa4b4..73e3114bea 100644\n--- a/drivers/net/ionic/ionic_rxtx_sg.c\n+++ b/drivers/net/ionic/ionic_rxtx_sg.c\n@@ -167,6 +167,7 @@ ionic_xmit_pkts_sg(void *tx_queue, struct rte_mbuf **tx_pkts,\n \tstruct rte_mbuf *mbuf;\n \tuint32_t bytes_tx = 0;\n \tuint16_t nb_avail, nb_tx = 0;\n+\tuint64_t then, now, hz, delta;\n \tint err;\n \n \tstruct ionic_txq_desc *desc_base = q->base;\n@@ -220,8 +221,26 @@ ionic_xmit_pkts_sg(void *tx_queue, struct rte_mbuf **tx_pkts,\n \t\trte_wmb();\n \t\tionic_q_flush(q);\n \n+\t\ttxq->last_wdog_cycles = rte_get_timer_cycles();\n+\n \t\tstats->packets += nb_tx;\n \t\tstats->bytes += bytes_tx;\n+\t} else {\n+\t\t/*\n+\t\t * Ring the doorbell again if no work could be posted and work\n+\t\t * is still pending after the deadline.\n+\t\t */\n+\t\tif (q->head_idx != q->tail_idx) {\n+\t\t\tthen = txq->last_wdog_cycles;\n+\t\t\tnow = rte_get_timer_cycles();\n+\t\t\thz = rte_get_timer_hz();\n+\t\t\tdelta = (now - then) * 1000;\n+\n+\t\t\tif (delta >= hz * IONIC_Q_WDOG_MS) {\n+\t\t\t\tionic_q_flush(q);\n+\t\t\t\ttxq->last_wdog_cycles = now;\n+\t\t\t}\n+\t\t}\n \t}\n \n \treturn nb_tx;\n@@ -421,6 +440,7 @@ ionic_rxq_service_sg(struct ionic_rx_qcq *rxq, uint32_t work_to_do,\n \tstruct ionic_rxq_desc *q_desc_base = q->base;\n \tstruct ionic_rxq_comp *cq_desc, *cq_desc_base = cq->base;\n \tuint32_t work_done = 0;\n+\tuint64_t then, now, hz, delta;\n \n \tcq_desc = &cq_desc_base[cq->tail_idx];\n \n@@ -453,8 +473,36 @@ ionic_rxq_service_sg(struct ionic_rx_qcq *rxq, uint32_t work_to_do,\n \t}\n \n \t/* Update the queue indices and ring the doorbell */\n-\tif (work_done)\n+\tif (work_done) {\n \t\tionic_q_flush(q);\n+\t\trxq->last_wdog_cycles = rte_get_timer_cycles();\n+\t\trxq->wdog_ms = IONIC_Q_WDOG_MS;\n+\t} else {\n+\t\t/*\n+\t\t * Ring the doorbell again if no recvs were posted and the\n+\t\t * recv queue is not empty after the deadline.\n+\t\t *\n+\t\t * Exponentially back off the deadline to avoid excessive\n+\t\t * doorbells when the recv queue is idle.\n+\t\t */\n+\t\tif (q->head_idx != q->tail_idx) {\n+\t\t\tthen = rxq->last_wdog_cycles;\n+\t\t\tnow = rte_get_timer_cycles();\n+\t\t\thz = rte_get_timer_hz();\n+\t\t\tdelta = (now - then) * 1000;\n+\n+\t\t\tif (delta >= hz * rxq->wdog_ms) {\n+\t\t\t\tionic_q_flush(q);\n+\t\t\t\trxq->last_wdog_cycles = now;\n+\n+\t\t\t\tdelta = 2 * rxq->wdog_ms;\n+\t\t\t\tif (delta > IONIC_Q_WDOG_MAX_MS)\n+\t\t\t\t\tdelta = IONIC_Q_WDOG_MAX_MS;\n+\n+\t\t\t\trxq->wdog_ms = delta;\n+\t\t\t}\n+\t\t}\n+\t}\n }\n \n uint16_t\ndiff --git a/drivers/net/ionic/ionic_rxtx_simple.c b/drivers/net/ionic/ionic_rxtx_simple.c\nindex fe10e2624e..74b9ee65c3 100644\n--- a/drivers/net/ionic/ionic_rxtx_simple.c\n+++ b/drivers/net/ionic/ionic_rxtx_simple.c\n@@ -140,6 +140,7 @@ ionic_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,\n \tstruct rte_mbuf *mbuf;\n \tuint32_t bytes_tx = 0;\n \tuint16_t nb_avail, nb_tx = 0;\n+\tuint64_t then, now, hz, delta;\n \tint err;\n \n \tstruct ionic_txq_desc *desc_base = q->base;\n@@ -193,8 +194,26 @@ ionic_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,\n \t\trte_wmb();\n \t\tionic_q_flush(q);\n \n+\t\ttxq->last_wdog_cycles = rte_get_timer_cycles();\n+\n \t\tstats->packets += nb_tx;\n \t\tstats->bytes += bytes_tx;\n+\t} else {\n+\t\t/*\n+\t\t * Ring the doorbell again if no work could be posted and work\n+\t\t * is still pending after the deadline.\n+\t\t */\n+\t\tif (q->head_idx != q->tail_idx) {\n+\t\t\tthen = txq->last_wdog_cycles;\n+\t\t\tnow = rte_get_timer_cycles();\n+\t\t\thz = rte_get_timer_hz();\n+\t\t\tdelta = (now - then) * 1000;\n+\n+\t\t\tif (delta >= hz * IONIC_Q_WDOG_MS) {\n+\t\t\t\tionic_q_flush(q);\n+\t\t\t\ttxq->last_wdog_cycles = now;\n+\t\t\t}\n+\t\t}\n \t}\n \n \treturn nb_tx;\n@@ -342,6 +361,7 @@ ionic_rxq_service(struct ionic_rx_qcq *rxq, uint32_t work_to_do,\n \tstruct ionic_rxq_desc *q_desc_base = q->base;\n \tstruct ionic_rxq_comp *cq_desc, *cq_desc_base = cq->base;\n \tuint32_t work_done = 0;\n+\tuint64_t then, now, hz, delta;\n \n \tcq_desc = &cq_desc_base[cq->tail_idx];\n \n@@ -374,8 +394,36 @@ ionic_rxq_service(struct ionic_rx_qcq *rxq, uint32_t work_to_do,\n \t}\n \n \t/* Update the queue indices and ring the doorbell */\n-\tif (work_done)\n+\tif (work_done) {\n \t\tionic_q_flush(q);\n+\t\trxq->last_wdog_cycles = rte_get_timer_cycles();\n+\t\trxq->wdog_ms = IONIC_Q_WDOG_MS;\n+\t} else {\n+\t\t/*\n+\t\t * Ring the doorbell again if no recvs were posted and the\n+\t\t * recv queue is not empty after the deadline.\n+\t\t *\n+\t\t * Exponentially back off the deadline to avoid excessive\n+\t\t * doorbells when the recv queue is idle.\n+\t\t */\n+\t\tif (q->head_idx != q->tail_idx) {\n+\t\t\tthen = rxq->last_wdog_cycles;\n+\t\t\tnow = rte_get_timer_cycles();\n+\t\t\thz = rte_get_timer_hz();\n+\t\t\tdelta = (now - then) * 1000;\n+\n+\t\t\tif (delta >= hz * rxq->wdog_ms) {\n+\t\t\t\tionic_q_flush(q);\n+\t\t\t\trxq->last_wdog_cycles = now;\n+\n+\t\t\t\tdelta = 2 * rxq->wdog_ms;\n+\t\t\t\tif (delta > IONIC_Q_WDOG_MAX_MS)\n+\t\t\t\t\tdelta = IONIC_Q_WDOG_MAX_MS;\n+\n+\t\t\t\trxq->wdog_ms = delta;\n+\t\t\t}\n+\t\t}\n+\t}\n }\n \n uint16_t\n", "prefixes": [ "35/35" ] }