From patchwork Fri Jul 21 08:35:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Fang X-Patchwork-Id: 123732 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp100016vqg; Fri, 21 Jul 2023 03:14:12 -0700 (PDT) X-Google-Smtp-Source: APBJJlEonF7aErAUDPDqDDwbbSFE1SIQEM5q365TcsJjar1+8O4aeCH/59rTYXS2R2NATuSBKcCp X-Received: by 2002:a17:906:59:b0:99b:4525:e06c with SMTP id 25-20020a170906005900b0099b4525e06cmr1508862ejg.55.1689934452068; Fri, 21 Jul 2023 03:14:12 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1689934452; cv=pass; d=google.com; s=arc-20160816; b=ZPZOxo+9I1IjQfjjTWOtKWjyHgh2dOMG0J+AF8U86W2QzYw4IHYBluEdQfLEzzp1j4 dE2ev1y3RCZpAnL7euwhmJx58iuL93ELHHCf5H/TyDLPQ1i80kk6TrQ0ZjszmddII9TD 37YOkIslwM0ADsz7t4Hq/Wyhy/ubXQbF1TY97vF/OkHNCGFt0HZWA1tcU3w3ZpWW1fNI 52rpfO/rcT2t1u2OulnJGJypzpir68AR9rveB2NqaL+M7lYXWrbkDy3feim5DWTzseAT Nf03Rjbq7Zh/JU5X1mSSbc1vtwr3r6giB5ufGpKQUpJ6c1B/IED5OZoh66jZAwkwA38L zN+g== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:content-transfer-encoding :message-id:date:subject:cc:to:from:dkim-signature; bh=/GcnfV2oz4KKVcHPmS8LiJ1uOBSQU21D0/b47/naXyw=; fh=3by0lIWfIqFsqLaGQ3O8NZxoqxEEeurZdjUoiW4rXIc=; b=q4mCahCXlgmuHyu3RpggyeJ9dBFIz/haEnf9jgHaU1UQDhdpXHUcVm1DKQ2y50l7YL yAA97rlzm0dq95kfNxtoqATyQVZctK4Iit68rA/4OiQLPyd1SI+tc+C8zJFIMKVRoTTr e51sXgjbFxJAShRu6ltX4Ci7KVNt6XumvmJ6xdQFA1rdsGz5czlUwSlQw86V8x0skwcW hbKbAwiXrmAtommhxq+xMQ+bkC4+5VYhxOclCp9IGRWvEz7bgqqd5tVj3XTVJlPZe2Js 3kJKJy9w2ToiZAEl/u2nvRoHjGmeESDPz9ao1i9Cgu806rb7veYq4UIlS7RqDGw0bCmG ngzg== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@nxp.com header.s=selector2 header.b=iZtYkzv8; arc=pass (i=1 spf=pass spfdomain=nxp.com dkim=pass dkdomain=nxp.com dmarc=pass fromdomain=nxp.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=nxp.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id kg3-20020a17090776e300b0098e0739531dsi1984592ejc.751.2023.07.21.03.13.47; Fri, 21 Jul 2023 03:14:12 -0700 (PDT) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@nxp.com header.s=selector2 header.b=iZtYkzv8; arc=pass (i=1 spf=pass spfdomain=nxp.com dkim=pass dkdomain=nxp.com dmarc=pass fromdomain=nxp.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=nxp.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230286AbjGUIme (ORCPT + 99 others); Fri, 21 Jul 2023 04:42:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48644 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230393AbjGUImc (ORCPT ); Fri, 21 Jul 2023 04:42:32 -0400 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2081.outbound.protection.outlook.com [40.107.22.81]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DC00F2D53; Fri, 21 Jul 2023 01:42:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZqKYuhTP9I/bkvxjQ+dNN4np1FZJxk+xsia8XyrxmPmUC+PM+icaLi5o1oU9E8RMSM2z+xUA9ppcBtDkYqCVS2hQQHla0tEv5+BR1scNjPqQjGLkkaRX0UKrVyd+f2QGEAv8O+8Sf/bYOCBzrizl6FGbMroqpHaNpt7x8+PU1ZMflyfVKSH3vdir3oH+3+sSz6ulJdX9cKu2Hp6BtASWtaipv182pAeEAcO3Q7y+zNzSOYan7Sr1ye9yQxVdrNVEvUpVbBqu1JeNSIitPg/Vfj5mn7hqd6ckaLgX88F4D4A+CsOsgxyTim8VNv0Q4EaKDMkyj45BrXgrUyPj5+R5uA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=/GcnfV2oz4KKVcHPmS8LiJ1uOBSQU21D0/b47/naXyw=; b=KZ1kBeaqi6AI0WX9vt8JCtCbhpt+LKxnZH5x+cnzQMBAl9ZF7Vk6b1a/g/d8yYf8mBv57A2gXuhLwiKMn5/uMBN14F+oPhEI5Ho2onQR3E1EZDCJ2UQleqc4p8VuwYgzzS97KmrzcbcVDU66RfVH05D39zYEXsEfWqwXiL+nr5ifZdrBDyOGqfK2hgkr2B271J0UTM/2CyS7RlcekwKNZ+9vLyyKo1BJtwPOL8yq37V6dMMTBKFYdcjF2oTeH2WKwBH2XOvUpI1un3LyOz3iz5gFhDtfTgtuMgKEIol7nWnhWwuFCWgv9RIokiub1odsISYGBH/4W09TE77/+tuoPQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=/GcnfV2oz4KKVcHPmS8LiJ1uOBSQU21D0/b47/naXyw=; b=iZtYkzv8rslDIIsZEYljIZuPGydMn7AGQlwGOZrfhuj52ua7aTAOgGcPJV8ccTy0nihjfqwnyQwHMEJKTV5+qcZmvUOlw08rNNmIK8AMboPUAv2iOQNhx5kArsfArCRT5OZLEMzrteS7UpAu7GiwoOk0sEfwVu7mAp702xoaY/0= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AM5PR04MB3139.eurprd04.prod.outlook.com (2603:10a6:206:8::20) by PAXPR04MB8831.eurprd04.prod.outlook.com (2603:10a6:102:20e::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6609.28; Fri, 21 Jul 2023 08:42:24 +0000 Received: from AM5PR04MB3139.eurprd04.prod.outlook.com ([fe80::2468:a15e:aa9b:7f8e]) by AM5PR04MB3139.eurprd04.prod.outlook.com ([fe80::2468:a15e:aa9b:7f8e%4]) with mapi id 15.20.6588.031; Fri, 21 Jul 2023 08:42:24 +0000 From: Wei Fang 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> X-Mailer: git-send-email 2.25.1 X-ClientProxiedBy: SI1PR02CA0022.apcprd02.prod.outlook.com (2603:1096:4:1f4::16) To AM5PR04MB3139.eurprd04.prod.outlook.com (2603:10a6:206:8::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM5PR04MB3139:EE_|PAXPR04MB8831:EE_ X-MS-Office365-Filtering-Correlation-Id: b35553fc-0b43-427b-3d01-08db89c66750 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: edL8ImwN12enSrnm/l0Nfl0+yoyXGfpDb+U5XoHqSYjkAOUbU9uofvfE6qjkukJVYdngWCpOtWQlJwvAbgBxjDNt8jNEzYUQDCHu15ZUGHVetFaPRXRaz556tEJ2lzmD0Wm37+S6Ava3nehGN7edY4xQ1jhzSWFvAFPGLB8OtqMnC8cXvMXAVXUvLOna774w/qqLd9I0Yo+fAKfLroeOzCUdMWdznUR2ea36dRse4Ba4HZadPGC4sDh3OzoXdMHgtPEnju4KlCGwY06xvwB30ZN+A93T/Q6cARuJpRYXj08yIFKaLh9wdA7TQnPeSQjYs97VbFPUkki6vSbLRLwwRQzX5ww5peY0tpHd/0QNyhfTeVDy8pmQmYR8AwAFnP+uk0vtg2vNQjUGI+H0JG/h0dKrEo4p4rApfDLjnyKht1NeX1tvg1bGU6njjqUOy7q9XvFor+GhQ1eU6yznSRnAJEOsbewZuwutDpV4Qjc92tAJc2Pt10JNLKj1opBGt7f1cSu7yA1nxEistt9VsDTwQGeKnSHNmtdl0VZezbTsTS8dCWi3IklL1B4ZMvEZHghMAlqPl1oGtd0LO24Xva1t/IrnMJJmEynOgyKHHNRSG75hZp7H0xInU4yifX6mGd22 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM5PR04MB3139.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(4636009)(136003)(366004)(376002)(396003)(346002)(39860400002)(451199021)(38350700002)(38100700002)(478600001)(26005)(6486002)(52116002)(6666004)(6512007)(86362001)(1076003)(36756003)(186003)(6506007)(2906002)(44832011)(83380400001)(41300700001)(316002)(4326008)(8676002)(8936002)(5660300002)(66476007)(66556008)(66946007)(2616005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ZqXSPP6rU9mxPFwUFTEDaXH8zno5bNq5NYeuExPzr/z9t+jXrYKS9n3I8wveq0+OzU9sH27BoUvG68mTF0LmnooTLtRliQw1G/0bfMGD3t6Y99pqHRcDAqVVoU5kuBEvF9YefFyCwwk0C2AVPjjabmG7ImJwujYpKbcC28Bt5wCyJ+pGc+/SRl0vL4zF5j3fh4b/HlZAhs5gOFchwfVacF9UUD7fWgRlx7LsAmMLF9cHiWrEdCVnI7oZxcN80rPKq1+Xc500YQBM+ICXrrP7dx6PSIXn5YF+enCTR+eyqwhnM20wzrzfdiNohq1HMf+hjWPy+RM0PDSKUBxPR9Lg70Z2oa0qz75K9RdBovxlsWn90Dj7wrBZ9JwGlKtcnjWgWVVBfIcTj/qCTRNwa6H/etyOuTty9fj5Cqz9SKrhpV6V7iiUr9oaMOVVfcVW5zuLvkRyfzPawIY6/d3G9s8sUtQ24OvLj4TUfAnUCNZtimfJ0D+gZ09c2dtSbPbZ0pDrmJ8YX6YBQm8oumnTe4FLOdGeLZBfRFbj/CoON89eoXsAvikgBFIxA/BdXps/1CvL00B9F/0YbAWzjxr37qQ4kvRYDOQfZN4CSTfHAHyrjPak49rtiKWMSFdHFSQ8Buhmt7dj9VG8JgBAzNTudDPwSIEp/J1c0BHlhojhYik1Q+srid8KZM8gdVqYpPTueZxyPZ0wY9Bn7NqJk7OnEnLy7EkmZEFxa/jRJ5VMeOjiioCJTbTWX+yiop0KFz4CCW9+Z1r1YxvXbHXSZEv7pjLcturm+TuOJ7fk79wU0HdzDrCQx+6EtCXUMyFxgWrSIwJR/rBsi8vTU0M3A/4WT33/P6IFGPLx/hcfWoN2zwj/gQ83X+tdCqa5tSlRZAlalB9ji2bOXlsV5rMwxmKvPt54gW733SiUKjsNFXLYNg4XriVBlwpn/dWiSSxu+p6dWznZXvGVEUOVwuLvh6us7AzcmOWGbSj975dfCHxxTObbIJvWxs0MpJqGktYYLpiGmyq2d1tc/TZpJgjKxD6zgBqdEoELb3u2UGUWH4WYxFM9+OyEO4vTH1XZ+Y6ki2QEdMqpkR5n1UMDrYoI2Lhs6gA/oPw+MQoSheyzGMrtmw8OIVdahPQmx3quf6oDNWlt1GjW1oj11/x6SI3L5BM68cvpxICw3USnH6ojPFdr+dLAk2XJdHkwGMudAm49c8LLBTNbs1U16DP4Rcf6sEiQf75LODqVV47o0c3WXqjhy1WYefUvFtyhiIHhokmZttbDtmR4ctWaZNkyt7nP7622KKlqUzzL5CWaxaMEjuJJX04Yw/iQwtrx5QYtOxEekMnoaETDQ9Yc4NdL1+OUq4W9Lm3O+/1MX/FQaagDaUp++HGxls9tRNkPylh+QUfVvkbZDDU7idm0X0RMzP+la2Xzd8nBBD17mdRbYgnpiQIPVbjTSXBuAE9IPZ7sIYcG5rgp+2HYQLhLjZSBsE5CI2DMXKRlfLI8FEZESs0vRY1VvMBhQKfCCkUwBdbQ36ITODq9MuhgKdco9Q+h18xvAVTym0REcjTiLAGPSf8XZiVQDdAkaTY7RsDFKZE5CeocIMTkzrnJ 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772024707755389827 X-GMAIL-MSGID: 1772024707755389827 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 --- 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;