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 v3 net-next] net: fec: using the standard return codes when xdp xmit errors
Date:   Thu, 11 May 2023 10:21:15 -0500
Message-Id: <20230511152115.1355010-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?9xbZisAlUNx7LKwdDt8dw38LUbryw5QM7Rx5FA1zK2S5ciRdhbc5YmyUE9HC?=
 =?us-ascii?Q?iImakxiYhBNfyjGxBic6t5oSiBgoyqP0migJu0avs6L+ld9Ldor89e6ZOiP6?=
 =?us-ascii?Q?IkhA2KFcicMrFTUBe9oQp5ISH5Y515uR5EohQ9YsHhAj0VecU4OyE1+FcBrp?=
 =?us-ascii?Q?OyM2ansdZUNJYuH4a+9TwGk+KsmuZWfghhGdduyRwVoMOFACeAhhb+NS51VW?=
 =?us-ascii?Q?TLLYh2gRbd9yrF4VTgeBOKkQHp5PIjO4nike/pk+l4G8i9UbQcc/AMDDbn5j?=
 =?us-ascii?Q?h25iH7KhzsQkqKBi+w79+MWCK791lsrszGm7qlLQKviIrxmZyZYEH6mZMhtB?=
 =?us-ascii?Q?q02bA20cJOyG1PY9mG2+FgNfhpMD5JcNPCsHJz6027iWoGT2ZKPiUOKs3yiN?=
 =?us-ascii?Q?32njtRl8nl8ajHdrNmkP/55KJwru2M3Z/OsVqBT5fbf1Uq81a6uKJptMVUwQ?=
 =?us-ascii?Q?GCpbVnypQZWDbfu4dq1HWiskzZmoCYoRKWH5pjAj0lWp53m1PyCNxspzHa54?=
 =?us-ascii?Q?Mlb5asKmM8AzCppWSEdOs5yQVqKsnsbAZI0/Yf8ZYIf7IHu4aOLC8wDjU/Ov?=
 =?us-ascii?Q?Asm1sT2EOumKy9Pc5yb/gGWAEJ6yku3/2y1T0ins8WrpiF2746/JirvcjVh1?=
 =?us-ascii?Q?HybYQakWaJFqmtWnC+Ml2IijrlfaeMNUHLG5yzmF1MjgeQ9C0aEec2U4y7XW?=
 =?us-ascii?Q?D8jBvCFn2QOrBJyitWfhfbP13vdXsehGbYMbOW3zQLq8NCTTXyqtCAxTVmps?=
 =?us-ascii?Q?y95MCJonF0ilxahAB3bu3/HPb0Gbj4MLijXHVaSThOPZNLzDJ8uXN1oqKdBV?=
 =?us-ascii?Q?ce5fbto7XLRSanGEuDcyyQ23l8ai827ltx1CCisuifS6qRnKNP1WSs05rkkB?=
 =?us-ascii?Q?/4oql72AKJwADlO2I/7oyHqbWZpo12BpXK7zcIORwWVnaBrNeALg4IZWCOSs?=
 =?us-ascii?Q?lnq679eRNUHPafegrpTCv+M6ydkCrRFG1HW+OlxyMUodR8eIu0YDnrCIQ4K0?=
 =?us-ascii?Q?6qQAQp/xNO/x+pYZWctervhG3wuzWJ0N+LwzbsuPbfvlhA0zJd/EZnPgGjrN?=
 =?us-ascii?Q?vPubajLz6GczmWKomM7Fd1fArcGqbt4MKyjzgoPjPAqImiM/P34mZ0sv4IP9?=
 =?us-ascii?Q?vo2A1sm/gFDYsBhAARv7IKqrdFxTTE4XPmg3hVaHNyhLRs3MU1wFYIxIq8tu?=
 =?us-ascii?Q?P/Uk8nDxPTomIbcDymUxhqhCnmPiNnZGwOuTF2zs7hx/Ij0MfpfyruOgoNun?=
 =?us-ascii?Q?9founehXZYQj0eKbOZQNcMIyC8K/E+4eGQ03tC98rWxt/i3Vlxge1C0Dxjh3?=
 =?us-ascii?Q?1qHJY24aUo/Bsn8eDRKQid0V2HBSTDy92rrYjAW6EQoc9pXP2xCSAkndwUlN?=
 =?us-ascii?Q?CSGdJPahaoOxBbLn+wi0Y9TbegogAVuIn+/2Zlegh6tlaSfRAWj19swzOpcI?=
 =?us-ascii?Q?QSST3d7AzML8uJpE8bcGdyBB98QU1pSyfGteHXhgwLCtSG5NOjAHmVPQxDrv?=
 =?us-ascii?Q?7yUgGk+VylE1/4Q+nij3MfKcTrFkRBXpYFKdO60+pKlhdJjld2uPRwHzNSL4?=
 =?us-ascii?Q?TudhhPlJh0n9dZIshG+C/MWWq9B7vDN7LKkubrwb?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 6ec2d9ee-d221-488b-edd3-08db523367ee
X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9185.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 May 2023 15:21:34.6791
 (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: LgdInuFRtNhyNSbJsil0W4B25aLGNpRGn36K7ApIpF56i4ndwvNCvUp0e9K5rdgRkTRHZMpx05nxqlE+RunL6A==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8040
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
        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

This patch standardizes the inconsistent return values for unsuccessful
XDP transmits by using standardized error codes (-EBUSY or -ENOMEM).

Signed-off-by: Shenwei Wang <shenwei.wang@nxp.com>
---
 v3:
  - remove the fix tag.
  - resend to net-next

 v2:
  - focusing on code clean up per Simon's feedback.

 drivers/net/ethernet/freescale/fec_main.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
index 42ec6ca3bf03..6a021fe24dfe 100644
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@ -3798,8 +3798,7 @@ 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;
+		return -EBUSY;
 	}

 	/* Fill in a Tx ring entry */
@@ -3813,7 +3812,7 @@ static int fec_enet_txq_xmit_frame(struct fec_enet_private *fep,
 	dma_addr = dma_map_single(&fep->pdev->dev, frame->data,
 				  frame->len, DMA_TO_DEVICE);
 	if (dma_mapping_error(&fep->pdev->dev, dma_addr))
-		return FEC_ENET_XDP_CONSUMED;
+		return -ENOMEM;

 	status |= (BD_ENET_TX_INTR | BD_ENET_TX_LAST);
 	if (fep->bufdesc_ex)
@@ -3869,7 +3868,7 @@ static int fec_enet_xdp_xmit(struct net_device *dev,
 	__netif_tx_lock(nq, cpu);

 	for (i = 0; i < num_frames; i++) {
-		if (fec_enet_txq_xmit_frame(fep, txq, frames[i]) != 0)
+		if (fec_enet_txq_xmit_frame(fep, txq, frames[i]) < 0)
 			break;
 		sent_frames++;
 	}
--
2.34.1