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:   Shenwei Wang <shenwei.wang@nxp.com>
To:     Wei Fang <wei.fang@nxp.com>,
        "David S. Miller" <davem@davemloft.net>,
        Eric Dumazet <edumazet@google.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>
Cc:     Shenwei Wang <shenwei.wang@nxp.com>,
        Clark Wang <xiaoning.wang@nxp.com>,
        NXP Linux Team <linux-imx@nxp.com>,
        Alexei Starovoitov <ast@kernel.org>,
        Daniel Borkmann <daniel@iogearbox.net>,
        Jesper Dangaard Brouer <hawk@kernel.org>,
        John Fastabend <john.fastabend@gmail.com>,
        Alexander Lobakin <alexandr.lobakin@intel.com>,
        Horatiu Vultur <horatiu.vultur@microchip.com>,
        Simon Horman <horms@kernel.org>, netdev@vger.kernel.org,
        linux-kernel@vger.kernel.org, imx@lists.linux.dev
Subject: [PATCH net] net: fec: remove the xdp_return_frame when lack of tx BDs
Date:   Fri, 12 May 2023 08:38:43 -0500
Message-Id: <20230512133843.1358661-1-shenwei.wang@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?vgfHDpayGZQFKKr1q7H3kSNKLny/GM9Q4+Of//U7LLuxCwUM7GmHj1FjUC//?=
 =?us-ascii?Q?+82FHJE8/hx37y3ELi4lQqug/BCUPfPsJygQ8PafMjlbd/6eKVrl/gxf7rSo?=
 =?us-ascii?Q?TNXUSx1e0IcMWfYZO7re5ljTRq6Rx1fiHD3xYjIruhqxsCGR2vEH/YxDNnKU?=
 =?us-ascii?Q?MJUWKAG48CoEDTS2Mdtf5gvigQIkI++O9+PYduZ0m9tw3AcoD67ga+rSMi5U?=
 =?us-ascii?Q?mKS5sfrQW8/GyXSHvuOEh4CZddSB1RDY4tgcKxJKYRJxeo6RO1YV1zpDA9cq?=
 =?us-ascii?Q?V+KrQYJn+p7ibFXo/fcICVFKCAuasm6xBox2b0RBDJcbTzc5MGOLiay7IW8x?=
 =?us-ascii?Q?9aVrGV4vHgVcpt0j6Z7VN9M1EB9aVhZyiYx1YwZDXcFZkQbI8VS4Q1+UAnZU?=
 =?us-ascii?Q?QJaArD2uSBh0nM1ZMo7tQYsKf5vhANFJs2i0VzOvuu2McCzJN942rDoqAqXh?=
 =?us-ascii?Q?ou4QwrjDoPIASmpDk0tf1GetrfWuIkRE5tevz7J2WTxRcznnmnThKPBqkhng?=
 =?us-ascii?Q?GCTDtkWMHrcGmSVbdYZ9tz3FtP3uzhfre/hldav3eFmjoQN/tDVIlNSPN4rc?=
 =?us-ascii?Q?FoslTNlfj8a9IQqAjjjshAdipBXYmYT7cgy3IIuojc8l4c8yiAkZWYMzL9gR?=
 =?us-ascii?Q?R4YR5ZwQaxNxTwHniwlT8w9v64CR0V8IdVWTFLunLfFidZIkUIP2NZ5dlqOm?=
 =?us-ascii?Q?LfD2zzXr2qb4litYlV9j5bHun+Xe34N/PzgauHCrLnGNBnhBHlvE2qABL84b?=
 =?us-ascii?Q?3Dph/8Nrd/xp1Ge6dxNBuGTUcB8/Cjp9s2t9pT6ci0A2YpTrEu7APjRRF6gE?=
 =?us-ascii?Q?cmBAQvkQ3tFWIbqjsgeoTXIPNVwzH4YieokxtIjVZzUGrAucnp0HltRI68fj?=
 =?us-ascii?Q?NzOltBOMiAbcCJNTwsQaXKcMHVw8HEvx8JxA/ZhQf6lpIxis6GF6a8k5siKe?=
 =?us-ascii?Q?FFTKznANvKDbHeHDms3IK5lzGZKYcNpn/CN9qlKsz9xJyFndvPGiz4QDXflr?=
 =?us-ascii?Q?PHo58ZHVyyi+zBtHjzc7MhlS9rp2uSh67e53XR9uyKBk6COpVz4U83bbHB24?=
 =?us-ascii?Q?2XXz1CK4CmjasP1F8G/9L+NkGThwzROD0VHioGiGJOuUNe43z9WCo65lKl4L?=
 =?us-ascii?Q?8MsyQp8//Mk1488PH2dDf+02ReW+yBWbpfGaeqtSVj8qmArOYmyzws5r6C69?=
 =?us-ascii?Q?MijmvK+OktZelNY5eNfwGUH9e3fV3kvrNP/8uLSad+8d8+Z83WU8EvXcSqGE?=
 =?us-ascii?Q?eUgLNpoMFN82RteO9zD/yVnCRlARQ2uAZLA8NCjY5RmTidnoR8UeQjbdA+7n?=
 =?us-ascii?Q?C5QVf+z7GiL2xzmtOaQ4fCVXh0NEzAsm2DgByrIQWw/flcSIM57iPfcTWf1E?=
 =?us-ascii?Q?CNjjGJhEBS45yVcw70dC5acBJdor2LMU+Y38qOwGGex85wgiZ2T8Ew13bZHX?=
 =?us-ascii?Q?PHtkc/pkH45V8Sb4sf8FAxZ07ywQj8bI6yeF3MdSYV0pxdYHx/FzEtpA27O5?=
 =?us-ascii?Q?9Oe/tuhOMeBVK/c/uHJ6yq+Y/xTikC8P42mrX/zoq3rj43bM2jBY6ignVoIx?=
 =?us-ascii?Q?NQInbHQralbDRVUY4nV4kQgit9EUgoHTlhhoGzmH?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 4cd2ab4b-ec52-49f5-86d5-08db52ee3e04
X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9185.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 May 2023 13:39:00.2357
 (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: DI801lf9p7pjeC1mLgO8IGM/ei+M9WpuPDH3H+qfiMSHJc1ly0OUb2kwJGM2aaidWpunCEtqy7BNZA8PTY52iw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB6803
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

In the implementation, the sent_frame count does not increment when
transmit errors occur. Therefore, bq_xmit_all() will take care of
returning the XDP frames.

Fixes: 26312c685ae0 ("net: fec: correct the counting of XDP sent frames")
Signed-off-by: Shenwei Wang <shenwei.wang@nxp.com>
---
 drivers/net/ethernet/freescale/fec_main.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
index 42ec6ca3bf03..2a3e8b69b70a 100644
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@ -3798,7 +3798,6 @@ static int fec_enet_txq_xmit_frame(struct fec_enet_private *fep,
 	entries_free = fec_enet_get_free_txdesc_num(txq);
 	if (entries_free < MAX_SKB_FRAGS + 1) {
 		netdev_err(fep->netdev, "NOT enough BD for SG!\n");
-		xdp_return_frame(frame);
 		return NETDEV_TX_BUSY;
 	}

--
2.34.1