From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 B5F4E1E764C; Tue, 3 Sep 2024 20:46:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725396411; cv=none; b=RHq3xtbJutdpho8wehRW4sqPIOAa9HmmXmVc3cTMDhFC+ni1S3H5sM+SHA6W1+apsHBTM90yAS8NICnvIvMfrdshVj2p4gLbstzlFbigZpT/IbSoxb4BTt8nwK9Ulsibqh7SxYusmBqrEeRuGpMRiKNQZHIB3CL6bCMQ1HmZKkc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725396411; c=relaxed/simple; bh=gNcHIH7zDKtglRJHjdDjSUwKONRbvEy93Ho05OVKvpU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QoY13q3eubX+JjzWie+lmb9/GQ/BCXavWW3m/q6fHrqXJX7pcTXEvzUfZEsz6kIUV3gDMCxb1xslIhIPr75fZi9JGtaMnXiSp+Dy3SLptajEqZj2xJHNhsuvyI2yy6xQZhVSMJTfubnCRACnf2YI/mCb8zCi/FwolhQyGev6CTk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=nZlI5Icw; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="nZlI5Icw" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6B859C4CEC4; Tue, 3 Sep 2024 20:46:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1725396411; bh=gNcHIH7zDKtglRJHjdDjSUwKONRbvEy93Ho05OVKvpU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nZlI5IcwKqVDvu9X1iMa7EajvkFe9pXaHl3o7ZXmqYZCvhc6DhcIVOa0P78weIFZd rEcVOYjX16VgcbjVkTQ02ymB0Rup7Rf2T/curzvuYtzEc5KZe6ZHYSRnwBfmROPLmr BCpq3ZlkdqEoyfXfgu2Dpfwz1I77v4Mw/qm6nQfvg1b0jo9R1ZUpBEgbr4ibGt54VO SYA6mz8RfSv05RnGLjMyW+DAEbxobQiQs68psWZqk2BF6a5AOssDqeskbGEbFtOSAC mlLA61oFijCfuXgMzLqm3gBGbqNR3ktYajOW5XGKOSybYNLbAs3TyGx93BW8J6Th2t AHbVWRSySVNiA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jacky Chou , "David S . Miller" , Sasha Levin , edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, u.kleine-koenig@pengutronix.de, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.15 07/12] net: ftgmac100: Ensure tx descriptor updates are visible Date: Tue, 3 Sep 2024 15:26:51 -0400 Message-ID: <20240903192718.1108456-7-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240903192718.1108456-1-sashal@kernel.org> References: <20240903192718.1108456-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.15.165 Content-Transfer-Encoding: 8bit From: Jacky Chou [ Upstream commit 4186c8d9e6af57bab0687b299df10ebd47534a0a ] The driver must ensure TX descriptor updates are visible before updating TX pointer and TX clear pointer. This resolves TX hangs observed on AST2600 when running iperf3. Signed-off-by: Jacky Chou Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/faraday/ftgmac100.c | 26 ++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c index 11f76e56d0316..9179014e90d11 100644 --- a/drivers/net/ethernet/faraday/ftgmac100.c +++ b/drivers/net/ethernet/faraday/ftgmac100.c @@ -569,7 +569,7 @@ static bool ftgmac100_rx_packet(struct ftgmac100 *priv, int *processed) (*processed)++; return true; - drop: +drop: /* Clean rxdes0 (which resets own bit) */ rxdes->rxdes0 = cpu_to_le32(status & priv->rxdes0_edorr_mask); priv->rx_pointer = ftgmac100_next_rx_pointer(priv, pointer); @@ -653,6 +653,11 @@ static bool ftgmac100_tx_complete_packet(struct ftgmac100 *priv) ftgmac100_free_tx_packet(priv, pointer, skb, txdes, ctl_stat); txdes->txdes0 = cpu_to_le32(ctl_stat & priv->txdes0_edotr_mask); + /* Ensure the descriptor config is visible before setting the tx + * pointer. + */ + smp_wmb(); + priv->tx_clean_pointer = ftgmac100_next_tx_pointer(priv, pointer); return true; @@ -806,6 +811,11 @@ static netdev_tx_t ftgmac100_hard_start_xmit(struct sk_buff *skb, dma_wmb(); first->txdes0 = cpu_to_le32(f_ctl_stat); + /* Ensure the descriptor config is visible before setting the tx + * pointer. + */ + smp_wmb(); + /* Update next TX pointer */ priv->tx_pointer = pointer; @@ -826,7 +836,7 @@ static netdev_tx_t ftgmac100_hard_start_xmit(struct sk_buff *skb, return NETDEV_TX_OK; - dma_err: +dma_err: if (net_ratelimit()) netdev_err(netdev, "map tx fragment failed\n"); @@ -848,7 +858,7 @@ static netdev_tx_t ftgmac100_hard_start_xmit(struct sk_buff *skb, * last fragment, so we know ftgmac100_free_tx_packet() * hasn't freed the skb yet. */ - drop: +drop: /* Drop the packet */ dev_kfree_skb_any(skb); netdev->stats.tx_dropped++; @@ -1448,7 +1458,7 @@ static void ftgmac100_reset_task(struct work_struct *work) ftgmac100_init_all(priv, true); netdev_dbg(netdev, "Reset done !\n"); - bail: +bail: if (priv->mii_bus) mutex_unlock(&priv->mii_bus->mdio_lock); if (netdev->phydev) @@ -1519,15 +1529,15 @@ static int ftgmac100_open(struct net_device *netdev) return 0; - err_ncsi: +err_ncsi: napi_disable(&priv->napi); netif_stop_queue(netdev); - err_alloc: +err_alloc: ftgmac100_free_buffers(priv); free_irq(netdev->irq, netdev); - err_irq: +err_irq: netif_napi_del(&priv->napi); - err_hw: +err_hw: iowrite32(0, priv->base + FTGMAC100_OFFSET_IER); ftgmac100_free_rings(priv); return err; -- 2.43.0