From patchwork Wed Nov 18 21:59:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shay Agroskin X-Patchwork-Id: 11916055 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 75C4FC63697 for ; Wed, 18 Nov 2020 22:12:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 19C71246DD for ; Wed, 18 Nov 2020 22:12:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=amazon.com header.i=@amazon.com header.b="JmNG95yi" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726738AbgKRWMT (ORCPT ); Wed, 18 Nov 2020 17:12:19 -0500 Received: from smtp-fw-6001.amazon.com ([52.95.48.154]:37801 "EHLO smtp-fw-6001.amazon.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726574AbgKRWMT (ORCPT ); Wed, 18 Nov 2020 17:12:19 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1605737538; x=1637273538; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=XvuPmLbaCcOHek2poH/r9vUi2z9bjLF/JeVfJhA45Ws=; b=JmNG95yipalsPZH7uuTz6ieS3xcuKfkKmTwTHLeTEtCh0HvKJ8xvIB/t Z8HA+/y8Y9V82vru5aWPnkEmSL+xqIe3pD1SYJRsnYtWPIcD4Ok9eqXLx 7SBFYf72DhIwESqIrzGZS6aFZ7O/khFXzCDTKVujhsxqjKPpddzHbvzx8 g=; X-IronPort-AV: E=Sophos;i="5.77,488,1596499200"; d="scan'208";a="67294718" Received: from iad12-co-svc-p1-lb1-vlan2.amazon.com (HELO email-inbound-relay-1e-c7c08562.us-east-1.amazon.com) ([10.43.8.2]) by smtp-border-fw-out-6001.iad6.amazon.com with ESMTP; 18 Nov 2020 22:01:28 +0000 Received: from EX13D28EUC001.ant.amazon.com (iad12-ws-svc-p26-lb9-vlan2.iad.amazon.com [10.40.163.34]) by email-inbound-relay-1e-c7c08562.us-east-1.amazon.com (Postfix) with ESMTPS id CE7BE242624; Wed, 18 Nov 2020 22:01:26 +0000 (UTC) Received: from u68c7b5b1d2d758.ant.amazon.com (10.43.162.53) by EX13D28EUC001.ant.amazon.com (10.43.164.4) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Wed, 18 Nov 2020 22:01:18 +0000 From: Shay Agroskin To: , CC: Shay Agroskin , , , , , , , , , , , , , , Subject: [PATCH V1 net 4/4] net: ena: return error code from ena_xdp_xmit_buff Date: Wed, 18 Nov 2020 23:59:47 +0200 Message-ID: <20201118215947.8970-5-shayagr@amazon.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201118215947.8970-1-shayagr@amazon.com> References: <20201118215947.8970-1-shayagr@amazon.com> MIME-Version: 1.0 X-Originating-IP: [10.43.162.53] X-ClientProxiedBy: EX13D30UWC001.ant.amazon.com (10.43.162.128) To EX13D28EUC001.ant.amazon.com (10.43.164.4) Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org The function mistakenly returns NETDEV_TX_OK regardless of the transmission success. This patch fixes this behavior by returning the error code from the function. Fixes: 548c4940b9f1 ("net: ena: Implement XDP_TX action") Signed-off-by: Shay Agroskin --- drivers/net/ethernet/amazon/ena/ena_netdev.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/amazon/ena/ena_netdev.c b/drivers/net/ethernet/amazon/ena/ena_netdev.c index f63ecc5bca3b..4f1b109ac1fc 100644 --- a/drivers/net/ethernet/amazon/ena/ena_netdev.c +++ b/drivers/net/ethernet/amazon/ena/ena_netdev.c @@ -284,9 +284,9 @@ static int ena_xdp_xmit_buff(struct net_device *dev, struct ena_tx_buffer *tx_info; struct ena_ring *xdp_ring; u16 next_to_use, req_id; - int rc; void *push_hdr; u32 push_len; + int rc; xdp_ring = &adapter->tx_ring[qid]; next_to_use = xdp_ring->next_to_use; @@ -322,14 +322,14 @@ static int ena_xdp_xmit_buff(struct net_device *dev, xdp_ring->tx_stats.doorbells++; u64_stats_update_end(&xdp_ring->syncp); - return NETDEV_TX_OK; + return rc; error_unmap_dma: ena_unmap_tx_buff(xdp_ring, tx_info); tx_info->xdpf = NULL; error_drop_packet: __free_page(tx_info->xdp_rx_page); - return NETDEV_TX_OK; + return rc; } static int ena_xdp_execute(struct ena_ring *rx_ring,