From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from SA9PR02CU001.outbound.protection.outlook.com (mail-southcentralusazon11013027.outbound.protection.outlook.com [40.93.196.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C24503D525B; Wed, 18 Mar 2026 12:10:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.93.196.27 ARC-Seal:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773835858; cv=fail; b=cgkPxH4XziDeGR5qOTRbTLVOQDkvwAPxQX3qeT7YEA1YD3lqJoly7PWJFhtkrw/hUjYh6l1ka7xLiZCOuhCTpg7U0sArPqxmFT2APvAVRI9PEGQnfphzxOd+p2DFmXtWBqIOTD0zxC6W7/uXLrSznKryJRGmN/+4MAjiTAq4fFU= ARC-Message-Signature:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773835858; c=relaxed/simple; bh=M9eTMh9bBxEDNBPrZLWv7pE5hU4KpkamRkEr+iHm+mg=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=lQYtFsvnweUe0R0sstWNGYNJPKWzPykopXg5d+2btsyVBiAY/vYNfuCh3A9+4PRtL0Oh8IbZ5eW+3GlZHQ4YuvF1XIRm6KYLs3nyLgH89YiMGIIxruGyZoGZPoH5jhbau/zozzn1w0sfvVXxH/9TormEOtIO7aMykncHKWCb3LM= ARC-Authentication-Results:i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=USlUdCoG; arc=fail smtp.client-ip=40.93.196.27 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="USlUdCoG" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=b8TDdWXPruqqGwwYQBoFqvO9gsHE8MxdMQlAdN/gdZmELhBG8ZzMukLCu9+e35kQuxTn+GVjFNZ8NGN3eYRD4rLWXH+FcqMWgb6f49+uS91gg/KEM8n60P4tHEjNff/kqi3RGGsWgiJHCa9PT7+2ja3o43oJBcE9SdSu2WgAyxmUHsSkLwwKVrLuLILuKpSutCbLBa6JHuzv5wRnMnvNN9nJL+Y18hKzOME711BBNlacLnxwJUbOAtC1+bod4ytlaxVmKJqO4xksfdUxFjrxhMx7f+qnIpLFzNr+1Hokj/zGPVrb3mKuMbH6GVLanEM4BrRb2vjK4WYIhavXUUU3og== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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; bh=lHekaD6nQ0z8jKNa1vVFQdR94Q9AEjUmfb2Lr7zlPps=; b=me1qVTWKSvC2sU/zpcwQ7aWKF2zgv3ftCVIFkl9loWQXpKeOBGFEm7CkI+i0hdHiHwis4OTqVZlTUXvA41EsrXuFaUPW3ATHj40kElT7mKKjo2oXple9wMuBKCCWD07s7Sqt29DdaCd4fVRbL4WThwAcLYMT0q9AGzqc7br4Xsnl8rem4HnCChhHfU9Yoz2FBTr7OSTOw0DPXbvXxaczWhVbYXy/voTCfJFziyd/i6FOrcmHcoQ6LIs7bP6gT86+wDLlfPTZHcEh7tq+eCrCD9QU3JHxs0qqFKpUGjkJMZKexrvcIHYWAv46UJVBKlS+5n6u4jhR5Omh7ILEg6H80Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=lHekaD6nQ0z8jKNa1vVFQdR94Q9AEjUmfb2Lr7zlPps=; b=USlUdCoGe25NUXwYmCa17KwAn4kEDQ3S+1LyN+LVvKpnJ43qStDJ/srU1EXSCirngRfi0+XIof9WuYROo1TsTYGDR+7xLO8ui8sMePoxkcDKatwuttcZATYyup+m1tTCKWLUBw/a64bITKI9mqYXZcKiTdbGiGwURyQXhZHxeAA= Received: from DM5PR07CA0069.namprd07.prod.outlook.com (2603:10b6:4:ad::34) by CH3PR12MB8709.namprd12.prod.outlook.com (2603:10b6:610:17c::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9723.19; Wed, 18 Mar 2026 12:10:48 +0000 Received: from DS3PEPF000099E2.namprd04.prod.outlook.com (2603:10b6:4:ad:cafe::e2) by DM5PR07CA0069.outlook.office365.com (2603:10b6:4:ad::34) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9700.27 via Frontend Transport; Wed, 18 Mar 2026 12:10:48 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=satlexmb07.amd.com; pr=C Received: from satlexmb07.amd.com (165.204.84.17) by DS3PEPF000099E2.mail.protection.outlook.com (10.167.17.201) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9723.19 via Frontend Transport; Wed, 18 Mar 2026 12:10:48 +0000 Received: from airavat.amd.com (10.180.168.240) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.17; Wed, 18 Mar 2026 07:10:46 -0500 From: Raju Rangoju To: CC: , , , , , , "Raju Rangoju" Subject: [PATCH v2 net-next 3/3] amd-xgbe: add TX descriptor cleanup for link-down Date: Wed, 18 Mar 2026 17:40:06 +0530 Message-ID: <20260318121006.1565435-4-Raju.Rangoju@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260318121006.1565435-1-Raju.Rangoju@amd.com> References: <20260318121006.1565435-1-Raju.Rangoju@amd.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: satlexmb07.amd.com (10.181.42.216) To satlexmb07.amd.com (10.181.42.216) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS3PEPF000099E2:EE_|CH3PR12MB8709:EE_ X-MS-Office365-Filtering-Correlation-Id: 4f1a34d5-edd8-406c-d585-08de84e7644e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|376014|36860700016|82310400026|22082099003|56012099003|18002099003; X-Microsoft-Antispam-Message-Info: w81mHUqhIRMrskEFU8d0T5EYKg3iIvwMktyamwBXQueQLzFwFOonvKQ90y+d09GMtVvf/76djLO2E4IdYNTBJ+nPh5yzHYlWKMh9h3WSSHXFDghfD21Cpl5bt/V4uCUUZKtvOFahYBBrYjn5K3bc+dUdBZWBHQbjU6PValIKNfalu51lPlREElnyjnKUFcxCuAwvIxdbN1Me72Spiq4cEiYWnOWfgUn4/AYW4BlSLPJ4JU8Xk3te/enwUpJ6YjCHQVsWI/9WoVQ0vdaJtc7XWTysV2ZcGyOijWIRxVfxMRqV5J5P+WS1cU6wQhASoAulbaIAGkiEKcA8XbQaAVEfczbkBendUvTMuVehHhlM2dZ2DR+aOVDY4JFSJA6tXyfA+VNFh8X529eaA/nGvUd9vryzAFnTv15vQEC1MWS5dPEJXwWyjGS55Yvj0MH4lDfRCzobHr29uqH+lu/gVJ5uKIMy7TIzlEpOc3zgbwdyc8W2g+q2klsS33SVa2GHP5A39hQHaHmhYLuJVQiff24OgC+KLMaNcJmORObf3q2xIBLSKW6TlM10rKf23koG9NqASryhNNOjwCPEEOoFSDulfjVWGvUEoGTVnbmvEsj5SQldRpDzgvdR/GryHwLD2cA2Q0bNRfzHJ+wYOZ9uaTGO53aWxZjD/If1PQhrXu/wwH0NickcGKkFkcxnk5Sopnl/pkvJ6uILgkj5XZfUYH20yvOvsE2OnXLhcwi+FNKYulaNb4IMFDPAMEYobSAzaoHxggr+5X51E82A7sCvJEzkRw== X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:satlexmb07.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(1800799024)(376014)(36860700016)(82310400026)(22082099003)(56012099003)(18002099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: x0pVcYXoz8kISQhc6RJievDbKc+Nw92i5v63QVYE/DRCf2t6dX6KNb2CGr0QEoaNO6e59WSqfUINzqg2421qOObM+tOwxciRZWK0tOoCy3vgPJ0+LceGvk/o/1ieOGv73498hVhdqUtfW5esQilduiApkg2iHyf7mD4heSZ1nJqJupLdyVexgyJWEfreO9F+M7dJbKn095b4E1FDQlry4hw30DYQi6SbvoWnpBiUbOrcX3EGTCJ4GLpR0kf00ZiTSn+ovD45Ie4Q4nfd8no9KyKlLSStrfeLvDOav4wUWae2nB9arheJYNI152lmasrofBX3VoxwHKnhVdDR0ZectD6Rx5Z+ZZkQAvfVqjQhoOom3CVMxxJMekkDI4x058eRBu2gGlcARKOMgEeIR7ob/u3R5gEa+Hgj62g22eurf8hK84WggD+lNLYZM51mcrfC X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Mar 2026 12:10:48.7778 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4f1a34d5-edd8-406c-d585-08de84e7644e X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[satlexmb07.amd.com] X-MS-Exchange-CrossTenant-AuthSource: DS3PEPF000099E2.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB8709 Add intelligent TX descriptor cleanup mechanism to reclaim abandoned descriptors when the physical link goes down. When the link goes down while TX packets are in-flight, the hardware stops processing descriptors with the OWN bit still set. The current driver waits indefinitely for these descriptors to complete, which never happens. This causes: - TX ring exhaustion (no descriptors available for new packets) - Memory leaks (skbs never freed) - DMA mapping leaks (mappings never unmapped) - Network stack backpressure buildup Add force-cleanup mechanism in xgbe_tx_poll() that detects link-down state and reclaims abandoned descriptors. The helper functions and DMA optimizations support efficient TX shutdown: - xgbe_wait_for_dma_tx_complete(): Wait for DMA completion with link-down optimization - Restructure xgbe_disable_tx() for proper shutdown sequence Implementation: 1. Check link state at the start of tx_poll 2. If link is down, set force_cleanup flag 3. For descriptors that hardware hasn't completed (!tx_complete): - If force_cleanup: treat as completed and reclaim resources - If link up: break and wait for hardware (normal behavior) The cleanup process: - Frees skbs that will never be transmitted - Unmaps DMA mappings - Resets descriptors for reuse - Does NOT count as successful transmission (correct statistics) Benefits: - Prevents TX ring starvation - Eliminates memory and DMA mapping leaks - Enables fast link recovery when link comes back up - Critical for link aggregation failover scenarios Signed-off-by: Raju Rangoju --- drivers/net/ethernet/amd/xgbe/xgbe-common.h | 4 ++ drivers/net/ethernet/amd/xgbe/xgbe-dev.c | 77 ++++++++++++++++++--- drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 43 ++++++++++-- drivers/net/ethernet/amd/xgbe/xgbe.h | 3 + 4 files changed, 111 insertions(+), 16 deletions(-) diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-common.h b/drivers/net/ethernet/amd/xgbe/xgbe-common.h index c17900a49595..66807d67e984 100644 --- a/drivers/net/ethernet/amd/xgbe/xgbe-common.h +++ b/drivers/net/ethernet/amd/xgbe/xgbe-common.h @@ -330,6 +330,10 @@ #define MAC_ISR_SMI_WIDTH 1 #define MAC_ISR_TSIS_INDEX 12 #define MAC_ISR_TSIS_WIDTH 1 +#define MAC_ISR_LS_INDEX 24 +#define MAC_ISR_LS_WIDTH 2 +#define MAC_ISR_LSI_INDEX 0 +#define MAC_ISR_LSI_WIDTH 1 #define MAC_MACA1HR_AE_INDEX 31 #define MAC_MACA1HR_AE_WIDTH 1 #define MAC_MDIOIER_SNGLCOMPIE_INDEX 12 diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-dev.c b/drivers/net/ethernet/amd/xgbe/xgbe-dev.c index b7bf74c6bb47..2de974213090 100644 --- a/drivers/net/ethernet/amd/xgbe/xgbe-dev.c +++ b/drivers/net/ethernet/amd/xgbe/xgbe-dev.c @@ -3276,28 +3276,83 @@ static void xgbe_enable_tx(struct xgbe_prv_data *pdata) XGMAC_IOWRITE_BITS(pdata, MAC_TCR, TE, 1); } -static void xgbe_disable_tx(struct xgbe_prv_data *pdata) +/** + * xgbe_wait_for_dma_tx_complete - Wait for DMA to complete pending TX + * @pdata: driver private data + * + * Wait for the DMA TX channels to complete all pending descriptors. + * This ensures no frames are in-flight before we disable the transmitter. + * If link is down, return immediately as TX will never complete. + * + * Return: 0 on success, -ETIMEDOUT on timeout + */ +static int xgbe_wait_for_dma_tx_complete(struct xgbe_prv_data *pdata) { + struct xgbe_channel *channel; + struct xgbe_ring *ring; + unsigned long timeout; unsigned int i; + bool complete; - /* Prepare for Tx DMA channel stop */ - for (i = 0; i < pdata->tx_q_count; i++) - xgbe_prepare_tx_stop(pdata, i); + /* If link is down, TX will never complete - skip waiting */ + if (!pdata->phy.link) + return 0; - /* Disable MAC Tx */ - XGMAC_IOWRITE_BITS(pdata, MAC_TCR, TE, 0); + timeout = jiffies + (XGBE_DMA_STOP_TIMEOUT * HZ); - /* Disable each Tx queue */ - for (i = 0; i < pdata->tx_q_count; i++) - XGMAC_MTL_IOWRITE_BITS(pdata, i, MTL_Q_TQOMR, TXQEN, 0); + do { + complete = true; - /* Disable each Tx DMA channel */ + for (i = 0; i < pdata->channel_count; i++) { + channel = pdata->channel[i]; + ring = channel->tx_ring; + if (!ring) + continue; + + /* Check if DMA has processed all descriptors */ + if (ring->dirty != ring->cur) { + complete = false; + break; + } + } + + if (complete) + return 0; + + usleep_range(100, 200); + } while (time_before(jiffies, timeout)); + + netif_warn(pdata, drv, pdata->netdev, + "timeout waiting for DMA TX to complete\n"); + return -ETIMEDOUT; +} + +static void xgbe_disable_tx(struct xgbe_prv_data *pdata) +{ + unsigned int i; + + /* Step 1: Wait for DMA to complete pending descriptors */ + xgbe_wait_for_dma_tx_complete(pdata); + + /* Step 2: Disable each Tx DMA channel to stop + * processing new descriptors + */ for (i = 0; i < pdata->channel_count; i++) { if (!pdata->channel[i]->tx_ring) break; - XGMAC_DMA_IOWRITE_BITS(pdata->channel[i], DMA_CH_TCR, ST, 0); } + + /* Step 3: Wait for MTL TX queues to drain */ + for (i = 0; i < pdata->tx_q_count; i++) + xgbe_prepare_tx_stop(pdata, i); + + /* Step 4: Disable MTL TX queues */ + for (i = 0; i < pdata->tx_q_count; i++) + XGMAC_MTL_IOWRITE_BITS(pdata, i, MTL_Q_TQOMR, TXQEN, 0); + + /* Step 5: Disable MAC TX last */ + XGMAC_IOWRITE_BITS(pdata, MAC_TCR, TE, 0); } static void xgbe_prepare_rx_stop(struct xgbe_prv_data *pdata, diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c index 6886d3b33ffe..2d6d00e3689b 100644 --- a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c +++ b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c @@ -2169,6 +2169,7 @@ static int xgbe_tx_poll(struct xgbe_channel *channel) struct net_device *netdev = pdata->netdev; struct netdev_queue *txq; int processed = 0; + int force_cleanup; unsigned int tx_packets = 0, tx_bytes = 0; unsigned int cur; @@ -2185,13 +2186,41 @@ static int xgbe_tx_poll(struct xgbe_channel *channel) txq = netdev_get_tx_queue(netdev, channel->queue_index); + /* Smart descriptor cleanup during link-down conditions. + * + * When link is down, hardware stops processing TX descriptors (OWN bit + * remains set). Enable intelligent cleanup to reclaim these abandoned + * descriptors and maintain TX queue health. + * + * This cleanup mechanism enables: + * - Continuous TX queue availability for new packets when link recovers + * - Clean resource management (skbs, DMA mappings, descriptors) + * - Fast failover in link aggregation scenarios + */ + force_cleanup = !pdata->phy.link; + while ((processed < XGBE_TX_DESC_MAX_PROC) && (ring->dirty != cur)) { rdata = XGBE_GET_DESC_DATA(ring, ring->dirty); rdesc = rdata->rdesc; - if (!hw_if->tx_complete(rdesc)) - break; + if (!hw_if->tx_complete(rdesc)) { + if (!force_cleanup) + break; + /* Link-down descriptor cleanup: reclaim abandoned + * resources. + * + * Hardware has stopped processing this descriptor, so + * perform intelligent cleanup to free skbs and reclaim + * descriptors for future use when link recovers. + * + * These are not counted as successful transmissions + * since packets never reached the wire. + */ + netif_dbg(pdata, tx_err, netdev, + "force-freeing stuck TX desc %u (link down)\n", + ring->dirty); + } /* Make sure descriptor fields are read after reading the OWN * bit */ @@ -2200,9 +2229,13 @@ static int xgbe_tx_poll(struct xgbe_channel *channel) if (netif_msg_tx_done(pdata)) xgbe_dump_tx_desc(pdata, ring, ring->dirty, 1, 0); - if (hw_if->is_last_desc(rdesc)) { - tx_packets += rdata->tx.packets; - tx_bytes += rdata->tx.bytes; + /* Only count packets actually transmitted (not force-cleaned) + */ + if (!force_cleanup || hw_if->is_last_desc(rdesc)) { + if (hw_if->is_last_desc(rdesc)) { + tx_packets += rdata->tx.packets; + tx_bytes += rdata->tx.bytes; + } } /* Free the SKB and reset the descriptor for re-use */ diff --git a/drivers/net/ethernet/amd/xgbe/xgbe.h b/drivers/net/ethernet/amd/xgbe/xgbe.h index 60b7e53206d1..f6f82f1bd650 100644 --- a/drivers/net/ethernet/amd/xgbe/xgbe.h +++ b/drivers/net/ethernet/amd/xgbe/xgbe.h @@ -1315,6 +1315,9 @@ void xgbe_init_tx_coalesce(struct xgbe_prv_data *); void xgbe_restart_dev(struct xgbe_prv_data *pdata); void xgbe_full_restart_dev(struct xgbe_prv_data *pdata); +/* TX queue reset for link-down cleanup*/ +void xgbe_reset_tx_queues(struct xgbe_prv_data *pdata); + /* For Timestamp config */ void xgbe_config_tstamp(struct xgbe_prv_data *pdata, unsigned int mac_tscr); u64 xgbe_get_tstamp_time(struct xgbe_prv_data *pdata); -- 2.34.1