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>,
        netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
        imx@lists.linux.dev
Subject: [PATCH v2 net 1/1] net: fec: using the standard return codes when xdp xmit errors
Date:   Wed, 10 May 2023 15:05:23 -0500
Message-Id: <20230510200523.1352951-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?ZMwYX53Pcn8EiY2TCx3xuP6wme1/vnQId9uTmufdftsg/KQN3vmjH8UCal0C?=
 =?us-ascii?Q?aAB26G1m0lsKRYFvIJmJJ1fLTfwk+oERqMr0q3987jJc9Yq/w7UQvGPtXMBu?=
 =?us-ascii?Q?g3NhC4+O78cpW4mRaF7ABWCNk4BPZTyh15gdRJBEzSN0eI7YwWsiqxUBaUip?=
 =?us-ascii?Q?z7VDVPYlQy7V8gB8JJX3GGADKsBwpTthq574Bg3aKYt3MZKWMUZqtGMo6uPy?=
 =?us-ascii?Q?aExBOWINigrqclDmoaXcpqvnqLPdoyFPi7gr6IFRUVd/3NGa9HIeRkvcd1m7?=
 =?us-ascii?Q?oO/RjDlx1voltv/6PiEFApBBYVu+mUeIRAxfsIq1kNai16JhmzhnJi0BGIgK?=
 =?us-ascii?Q?cDXFQEf4+KU16Y8aVcCnMt2VIy/DC2ZVKO9lGFfMS8DlhAz8OyR1LwBDT/Jl?=
 =?us-ascii?Q?/taHNodXwx1tDg+eavnSUWPV7qC9u1AWSEBwge3wTjCOZ1Biw3mnhOE/qaon?=
 =?us-ascii?Q?edxqtHZwWRyJuQM4r5UUiUpnCLG9oXia6WibkJJyFLs0o2UC4PjNHDdbAlCG?=
 =?us-ascii?Q?3wb+HMEr4/8eF7g3s/7849zjhE8NbzuUggQw7BXaihRg162746Ei6Pgvg9CN?=
 =?us-ascii?Q?IYUt7gKNde851bop3XROq7EW1mvk3N6xBoXbvbj1+rwCFuzFIOYJLV8zlT5K?=
 =?us-ascii?Q?TWwfc6zF//FokpaRChzyVntTgPOApIlpwEo4cWfcLNPSCqli47HDSd4f1/AV?=
 =?us-ascii?Q?nEAESkCSOdWwYeK5c3TEvbLn97PrjfDt+Xf+o8OrNUpXK7w4qORzkYNWnqTf?=
 =?us-ascii?Q?GOR9ctro1a4tqGKXBS6ruqdhQpd0uTYFVyERI/zePVi5BDiah75y0peGQn+H?=
 =?us-ascii?Q?rpxWvkzRVBq12MwDvXUt3J7k7fqnWJtr06TiTcyLUFLbXRTRt45z+R+iKqCH?=
 =?us-ascii?Q?8KCrBhH7EVh9rgzWGWcMYdgokmuI+LtdpmKgwNr78M4YaLa+NtFT45bVY5PQ?=
 =?us-ascii?Q?+47hQ6NtC/EkkW3Ux5a+m3REV2T/7zFD9mDABXjxjvGf7s+4cxV9PD00rPdI?=
 =?us-ascii?Q?ulgLpk97FbGy9ZBE3BOsSJdsm824+R7XB8CEIWadKNBHpDj5lohC89WCl+rD?=
 =?us-ascii?Q?VHKLbX1vtp8L2BLUl/mSW7N2uwgZIPYte+McrBytxbsKD6mp/ESGKInr2uei?=
 =?us-ascii?Q?K/BZM+uuZsMGlEvV8swjXH43dIpt03v0R6Kn1xLcwdlbZGQVD7aSpkPpNUkh?=
 =?us-ascii?Q?KBpW7qdSlz8+gp46Zt7JJe2EBxyyaCcuIIdNyN1Y9hViClbtX5j84xNhq+Ww?=
 =?us-ascii?Q?P3hE82jvqR8lNdraDskALN699O71ZL1tpddH6A54UzNind7YqF4jzatbRsfO?=
 =?us-ascii?Q?OwkPzbIPfWTDIZiF5zUFUh8bnP5vewf5iiEQelpzIwq/at40dJ5VPsL768Bi?=
 =?us-ascii?Q?WNTGDHAp5zTAq/nQ/N/O3IlGDL3+hS3z3e1sbN1vJoOHnGSZRPbtwcEBZxiS?=
 =?us-ascii?Q?OXkBsCZr9xeUHlDYGmQCaYXeTRG+pKTy7H9tdju7la6bbO7WrFjgskbQ/4u4?=
 =?us-ascii?Q?7JmJWlZg/YEtAx5vt2eRFMgjGbZONpRE53ZlzmYQtYwoMjLV1QZELAhC1btt?=
 =?us-ascii?Q?O5CiPpWmeohwMuFYSNYQUeTKr/rBGDWC+nAG7ReC?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 01dc9724-b7f4-4df2-457a-08db5191ebb2
X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9185.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2023 20:05:37.2663
 (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: uEe/akf1cNWtMhIoe4nc+7uJDP0p1QhlCAxQ3ldjhiG5zVSH7Y67OEzU/pv6Nh2cxDG7RQbms9PiWBwL7Ud0Tg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0PR04MB9419
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).

Fixes: 26312c685ae0 ("net: fec: correct the counting of XDP sent frames")
Signed-off-by: Shenwei Wang <shenwei.wang@nxp.com>
---
 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