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,
        Simon Horman <simon.horman@corigine.com>
Subject: [PATCH v4] net: fec: using the standard return codes when xdp xmit errors
Date:   Fri, 12 May 2023 08:20:10 -0500
Message-Id: <20230512132010.1358350-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?gM6ZX/Ci+0fywt+itmOQUVvSGF0g+fauwQ5hoisTuTQ4EC25oLoLAM0iBY4J?=
 =?us-ascii?Q?NKnXKhkQAZ3jWvLYVNPwtsMwMYjGqh3J94Ao6bQnsOiMOp3ohp29Z3vbXcGp?=
 =?us-ascii?Q?GlpXZ/dRhE4M92xiVOCb8Fe6hcvq87Qid2hQGspCsHKPR08D+yBbZAIMJ1/m?=
 =?us-ascii?Q?LwYyzZ8rrGaWb+6mrl+BztCzdTV0R7qOxX2EkOGbG79BsCMo86feyJ3JZHZH?=
 =?us-ascii?Q?xzfe5fVxXJmIxuOLkXadEVulIvolVkHjyy4YhloWWHbKQ/8HLbZEeKzifmKw?=
 =?us-ascii?Q?9h8mocpUjXKSQU8jbF9ve8jqxP1zaD8O4/zy+pGGV9hhY3q6LECeRySKI6Xq?=
 =?us-ascii?Q?r3j3KNawvRuI4dLvoMm48D6Fmk7ZD17wm2PLQLMuqRQEXql6QcnBJBD8LWJC?=
 =?us-ascii?Q?JazU1KhxyVe/toSuhhxFxFVniBrErBmGfEqW96oSzpk5+BIt1NGXNf+cmzn0?=
 =?us-ascii?Q?XhZWEzC21Yox1frsN1bk0y7AIx/5egr3n9euFPpWYjwnoTwQ0xkGEXjBuPg7?=
 =?us-ascii?Q?f7Ip4S/E4kCdD7/BG95wNrG76RneSecgawelYMnlW++X3mnel5vthE+AydFO?=
 =?us-ascii?Q?4DXF4WaE+UB7GM19dOs7XExgQaSODO+UzHuzPDbr/8BCIVjKAgwBHkvMXiIs?=
 =?us-ascii?Q?Eea5gAxVQYwj2InmQOzuP5YV00C/0ULeseTrlUVxsPwTzxpxQ6z4v+AV3TXy?=
 =?us-ascii?Q?3fP3ksJIBGyjDcFbEKevLll4cVZ1gO+o+xsvmNzhBUkbWTtoijM1Y8b0PEEs?=
 =?us-ascii?Q?TshPxE6xKJM0KpFggtzTwz2a8hyxW6YlrDGsqf+JSMtBjWP8xgmqnL+GJKjr?=
 =?us-ascii?Q?F7drzd+b9QdCQYp3WEfU1UVvn/V72R9oFg6hj7kcSu5vDl7LgmZ0TeJZJZmT?=
 =?us-ascii?Q?3UVhkMmt/U/2LoH6qM4eOGtOl42KQcrz4omKnjRbUd8pJV0caXCwykuEjEqi?=
 =?us-ascii?Q?TtsQLUQJnBvjhYAXHQL+cDAmAV1BNCp32+s7ZyedN48IXsFwquuYoEtJPqec?=
 =?us-ascii?Q?pUU2FqjDfIvYicLKGPSlzz8CzHxIrMqI+B+rRSUQzqEcycvKHpM8w7E16AI7?=
 =?us-ascii?Q?GYg+EDBYrnfXF35w0+fLbV/y32HkcVYTAv9METJx1BngAr69+8wObD4oMGCA?=
 =?us-ascii?Q?NwvJWeZ68Z64w6Guj9X6a9A5tnVrq1u+VUAEUtVDYVyTSgMklV930woZOVD8?=
 =?us-ascii?Q?L0OWOwHTx/JJpAewfmMntHjuI9nngLAT1OfdI+8+B4rqUtgs8NAvNhRGhOj9?=
 =?us-ascii?Q?qIMyjrRrVmmwUcQKnPc7c7u/nj3EZ98sEEzqwI1pMlH32NY5pB53NuzGtURV?=
 =?us-ascii?Q?wsA2f0fDW0IluOq6de9xYtrzSkiM+w1W4pbXAlJMzWIB9dpMyoz49lAoN5zy?=
 =?us-ascii?Q?VqnaQsgVaeKnIIHBkOZEsi+F+WHdtqXDkzwShSFGcQ7ei1Mq3x/gBrhzAkro?=
 =?us-ascii?Q?PPIV0Hd/kUnNKH6gk1c3BmN4t4827RnKiVbyP/GjN2OhfiBepcERX/Hjvqcv?=
 =?us-ascii?Q?X+ooZctAXviGjQzux/gwkNopHtvmwLngdDB0LHa9cMdahSRgta0o4eysGFCA?=
 =?us-ascii?Q?YACDpCnqrbBQcNi/JByHGD79wKiqaPjP5awxUMYi?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 6d1501a4-de05-4844-3348-08db52ebaa4c
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:20:33.3932
 (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: SFBEG5lt1/N87RcPUVXS6gIrkb11bvjmyEtkRAWaUE+UCs+0y9J7QkDhR3aq8tdZthQZ8QBGbe3aUWdI5vtFbA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB8730
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

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>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
---
 v4:
  - remove the fix of double call of xdp_return_frame in this patch and
    will correct it in another patch for net.

 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 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
index 42ec6ca3bf03..cd215ab20ff9 100644
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@ -3799,7 +3799,7 @@ static int fec_enet_txq_xmit_frame(struct fec_enet_private *fep,
 	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 +3813,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 +3869,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