Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Wei Fang <wei.fang@nxp.com>
To:     davem@davemloft.net, edumazet@google.com, kuba@kernel.org,
        pabeni@redhat.com, shenwei.wang@nxp.com, xiaoning.wang@nxp.com,
        netdev@vger.kernel.org
Cc:     linux-imx@nxp.com, linux-kernel@vger.kernel.org
Subject: [PATCH net] net: fec: avoid tx queue timeout when XDP is enabled
Date:   Fri, 21 Jul 2023 16:35:59 +0800
Message-Id: <20230721083559.2857312-1-wei.fang@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ZqXSPP6rU9mxPFwUFTEDaXH8zno5bNq5NYeuExPzr/z9t+jXrYKS9n3I8wve?=
 =?us-ascii?Q?q0+OzU9sH27BoUvG68mTF0LmnooTLtRliQw1G/0bfMGD3t6Y99pqHRcDAqVV?=
 =?us-ascii?Q?oU5kuBEvF9YefFyCwwk0C2AVPjjabmG7ImJwujYpKbcC28Bt5wCyJ+pGc+/S?=
 =?us-ascii?Q?Rl0vL4zF5j3fh4b/HlZAhs5gOFchwfVacF9UUD7fWgRlx7LsAmMLF9cHiWrE?=
 =?us-ascii?Q?dCVnI7oZxcN80rPKq1+Xc500YQBM+ICXrrP7dx6PSIXn5YF+enCTR+eyqwhn?=
 =?us-ascii?Q?M20wzrzfdiNohq1HMf+hjWPy+RM0PDSKUBxPR9Lg70Z2oa0qz75K9RdBovxl?=
 =?us-ascii?Q?sWn90Dj7wrBZ9JwGlKtcnjWgWVVBfIcTj/qCTRNwa6H/etyOuTty9fj5Cqz9?=
 =?us-ascii?Q?SKrhpV6V7iiUr9oaMOVVfcVW5zuLvkRyfzPawIY6/d3G9s8sUtQ24OvLj4TU?=
 =?us-ascii?Q?fAnUCNZtimfJ0D+gZ09c2dtSbPbZ0pDrmJ8YX6YBQm8oumnTe4FLOdGeLZBf?=
 =?us-ascii?Q?RFbj/CoON89eoXsAvikgBFIxA/BdXps/1CvL00B9F/0YbAWzjxr37qQ4kvRY?=
 =?us-ascii?Q?DOQfZN4CSTfHAHyrjPak49rtiKWMSFdHFSQ8Buhmt7dj9VG8JgBAzNTudDPw?=
 =?us-ascii?Q?SIEp/J1c0BHlhojhYik1Q+srid8KZM8gdVqYpPTueZxyPZ0wY9Bn7NqJk7On?=
 =?us-ascii?Q?EnLy7EkmZEFxa/jRJ5VMeOjiioCJTbTWX+yiop0KFz4CCW9+Z1r1YxvXbHXS?=
 =?us-ascii?Q?ZEv7pjLcturm+TuOJ7fk79wU0HdzDrCQx+6EtCXUMyFxgWrSIwJR/rBsi8vT?=
 =?us-ascii?Q?U0M3A/4WT33/P6IFGPLx/hcfWoN2zwj/gQ83X+tdCqa5tSlRZAlalB9ji2bO?=
 =?us-ascii?Q?XlsV5rMwxmKvPt54gW733SiUKjsNFXLYNg4XriVBlwpn/dWiSSxu+p6dWznZ?=
 =?us-ascii?Q?XvGVEUOVwuLvh6us7AzcmOWGbSj975dfCHxxTObbIJvWxs0MpJqGktYYLpiG?=
 =?us-ascii?Q?myq2d1tc/TZpJgjKxD6zgBqdEoELb3u2UGUWH4WYxFM9+OyEO4vTH1XZ+Y6k?=
 =?us-ascii?Q?i2QEdMqpkR5n1UMDrYoI2Lhs6gA/oPw+MQoSheyzGMrtmw8OIVdahPQmx3qu?=
 =?us-ascii?Q?f6oDNWlt1GjW1oj11/x6SI3L5BM68cvpxICw3USnH6ojPFdr+dLAk2XJdHkw?=
 =?us-ascii?Q?GMudAm49c8LLBTNbs1U16DP4Rcf6sEiQf75LODqVV47o0c3WXqjhy1WYefUv?=
 =?us-ascii?Q?FtyhiIHhokmZttbDtmR4ctWaZNkyt7nP7622KKlqUzzL5CWaxaMEjuJJX04Y?=
 =?us-ascii?Q?w/iQwtrx5QYtOxEekMnoaETDQ9Yc4NdL1+OUq4W9Lm3O+/1MX/FQaagDaUp+?=
 =?us-ascii?Q?+HGxls9tRNkPylh+QUfVvkbZDDU7idm0X0RMzP+la2Xzd8nBBD17mdRbYgnp?=
 =?us-ascii?Q?iQIPVbjTSXBuAE9IPZ7sIYcG5rgp+2HYQLhLjZSBsE5CI2DMXKRlfLI8FEZE?=
 =?us-ascii?Q?Ss0vRY1VvMBhQKfCCkUwBdbQ36ITODq9MuhgKdco9Q+h18xvAVTym0REcjTi?=
 =?us-ascii?Q?LAGPSf8XZiVQDdAkaTY7RsDFKZE5CeocIMTkzrnJ?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: b35553fc-0b43-427b-3d01-08db89c66750
X-MS-Exchange-CrossTenant-AuthSource: AM5PR04MB3139.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jul 2023 08:42:24.1375
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: XVhii2nsSnOZK83ic8X9aS6iJNOl8e6xmWMTQxZTcXl9ZCoKV5dKTNcWf64cY0pH2E8tYhl40ceh9YXfoWh88Q==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB8831
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE,
        URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

According to the implementation of XDP of FEC driver, the XDP path
shares the transmit queues with the kernel network stack, so it is
possible to lead to a tx timeout event when XDP uses the tx queue
pretty much exclusively. And this event will cause the reset of the
FEC hardware.
To avoid timeout in this case, we use the txq_trans_cond_update()
interface to update txq->trans_start to jiffies so that watchdog
won't generate a transmit timeout warning.

Fixes: 6d6b39f180b8 ("net: fec: add initial XDP support")
Signed-off-by: Wei Fang <wei.fang@nxp.com>
---
 drivers/net/ethernet/freescale/fec_main.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
index ec9e4bdb0c06..073d61619336 100644
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@ -3916,6 +3916,8 @@ static int fec_enet_xdp_xmit(struct net_device *dev,
 
 	__netif_tx_lock(nq, cpu);
 
+	/* Avoid tx timeout as XDP shares the queue with kernel stack */
+	txq_trans_cond_update(nq);
 	for (i = 0; i < num_frames; i++) {
 		if (fec_enet_txq_xmit_frame(fep, txq, frames[i]) < 0)
 			break;
-- 
2.25.1