From: Netanel Belgazal <netanel@annapurnalabs.com>
To: linux-kernel@vger.kernel.org, davem@davemloft.net,
netdev@vger.kernel.org
Cc: Netanel Belgazal <netanel@annapurnalabs.com>,
dwmw@amazon.com, zorik@annapurnalabs.com, alex@annapurnalabs.com,
saeed@annapurnalabs.com, msw@amazon.com, aliguori@amazon.com,
nafea@annapurnalabs.com
Subject: [PATCH V2 net 19/20] net/ena: restructure skb allocation
Date: Sun, 4 Dec 2016 15:19:37 +0200 [thread overview]
Message-ID: <1480857578-5065-20-git-send-email-netanel@annapurnalabs.com> (raw)
In-Reply-To: <1480857578-5065-1-git-send-email-netanel@annapurnalabs.com>
To increase readability, refactor skb allocation to dedicated function
This change does not impact the performance since the compiler optimize
the code and elimitate the if condition.
Signed-off-by: Netanel Belgazal <netanel@annapurnalabs.com>
---
drivers/net/ethernet/amazon/ena/ena_netdev.c | 46 ++++++++++++++++------------
1 file changed, 27 insertions(+), 19 deletions(-)
diff --git a/drivers/net/ethernet/amazon/ena/ena_netdev.c b/drivers/net/ethernet/amazon/ena/ena_netdev.c
index ee80472..8d42960 100644
--- a/drivers/net/ethernet/amazon/ena/ena_netdev.c
+++ b/drivers/net/ethernet/amazon/ena/ena_netdev.c
@@ -787,6 +787,28 @@ static int ena_clean_tx_irq(struct ena_ring *tx_ring, u32 budget)
return tx_pkts;
}
+static struct sk_buff *ena_alloc_skb(struct ena_ring *rx_ring, bool frags)
+{
+ struct sk_buff *skb;
+
+ if (frags)
+ skb = napi_get_frags(rx_ring->napi);
+ else
+ skb = netdev_alloc_skb_ip_align(rx_ring->netdev,
+ rx_ring->rx_copybreak);
+
+ if (unlikely(!skb)) {
+ u64_stats_update_begin(&rx_ring->syncp);
+ rx_ring->rx_stats.skb_alloc_fail++;
+ u64_stats_update_end(&rx_ring->syncp);
+ netif_err(rx_ring->adapter, rx_err, rx_ring->netdev,
+ "Failed to allocate skb. frags: %d\n", frags);
+ return NULL;
+ }
+
+ return skb;
+}
+
static struct sk_buff *ena_rx_skb(struct ena_ring *rx_ring,
struct ena_com_rx_buf_info *ena_bufs,
u32 descs,
@@ -795,8 +817,7 @@ static struct sk_buff *ena_rx_skb(struct ena_ring *rx_ring,
struct sk_buff *skb;
struct ena_rx_buffer *rx_info =
&rx_ring->rx_buffer_info[*next_to_clean];
- u32 len;
- u32 buf = 0;
+ u32 len, buf = 0;
void *va;
len = ena_bufs[0].len;
@@ -815,16 +836,9 @@ static struct sk_buff *ena_rx_skb(struct ena_ring *rx_ring,
prefetch(va + NET_IP_ALIGN);
if (len <= rx_ring->rx_copybreak) {
- skb = netdev_alloc_skb_ip_align(rx_ring->netdev,
- rx_ring->rx_copybreak);
- if (unlikely(!skb)) {
- u64_stats_update_begin(&rx_ring->syncp);
- rx_ring->rx_stats.skb_alloc_fail++;
- u64_stats_update_end(&rx_ring->syncp);
- netif_err(rx_ring->adapter, rx_err, rx_ring->netdev,
- "Failed to allocate skb\n");
+ skb = ena_alloc_skb(rx_ring, false);
+ if (unlikely(!skb))
return NULL;
- }
netif_dbg(rx_ring->adapter, rx_status, rx_ring->netdev,
"rx allocated small packet. len %d. data_len %d\n",
@@ -848,15 +862,9 @@ static struct sk_buff *ena_rx_skb(struct ena_ring *rx_ring,
return skb;
}
- skb = napi_get_frags(rx_ring->napi);
- if (unlikely(!skb)) {
- netif_dbg(rx_ring->adapter, rx_status, rx_ring->netdev,
- "Failed allocating skb\n");
- u64_stats_update_begin(&rx_ring->syncp);
- rx_ring->rx_stats.skb_alloc_fail++;
- u64_stats_update_end(&rx_ring->syncp);
+ skb = ena_alloc_skb(rx_ring, true);
+ if (unlikely(!skb))
return NULL;
- }
do {
dma_unmap_page(rx_ring->dev,
--
2.7.4
next prev parent reply other threads:[~2016-12-04 13:21 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-04 13:19 [PATCH V2 net 00/20] Increase ENA driver version to 1.1.2 Netanel Belgazal
2016-12-04 13:19 ` [PATCH V2 net 01/20] net/ena: remove ntuple filter support from device feature list Netanel Belgazal
2016-12-05 4:08 ` Matt Wilson
2016-12-04 13:19 ` [PATCH V2 net 02/20] net/ena: fix error handling when probe fails Netanel Belgazal
2016-12-05 4:09 ` Matt Wilson
2016-12-05 18:23 ` Netanel Belgazal
2016-12-04 13:19 ` [PATCH V2 net 03/20] net/ena: fix queues number calculation Netanel Belgazal
2016-12-05 4:11 ` Matt Wilson
2016-12-05 18:25 ` Netanel Belgazal
2016-12-04 13:19 ` [PATCH V2 net 04/20] net/ena: fix ethtool RSS flow configuration Netanel Belgazal
2016-12-05 4:18 ` Matt Wilson
2016-12-05 18:26 ` Netanel Belgazal
2016-12-04 13:19 ` [PATCH V2 net 05/20] net/ena: fix RSS default hash configuration Netanel Belgazal
2016-12-05 4:20 ` Matt Wilson
2016-12-05 18:32 ` Netanel Belgazal
2016-12-04 13:19 ` [PATCH V2 net 06/20] net/ena: fix NULL dereference when removing the driver after device reset faild Netanel Belgazal
2016-12-05 4:29 ` Matt Wilson
2016-12-05 18:30 ` Netanel Belgazal
2016-12-04 13:19 ` [PATCH V2 net 07/20] net/ena: refactor ena_get_stats64 to be atomic context safe Netanel Belgazal
2016-12-05 4:24 ` Matt Wilson
2016-12-05 18:29 ` Netanel Belgazal
2016-12-04 13:19 ` [PATCH V2 net 08/20] net/ena: add hardware hints capability to the driver Netanel Belgazal
2016-12-05 4:31 ` Matt Wilson
2016-12-05 18:31 ` Netanel Belgazal
2016-12-04 13:19 ` [PATCH V2 net 09/20] net/ena: fix potential access to freed memory during device reset Netanel Belgazal
2016-12-04 13:19 ` [PATCH V2 net 10/20] net/ena: remove redundant logic in napi callback for busy poll mode Netanel Belgazal
2016-12-05 5:45 ` Eric Dumazet
2016-12-05 18:29 ` Netanel Belgazal
2016-12-05 18:51 ` Eric Dumazet
2016-12-04 13:19 ` [PATCH V2 net 11/20] net/ena: use READ_ONCE to access completion descriptors Netanel Belgazal
2016-12-04 13:19 ` [PATCH V2 net 12/20] net/ena: reduce the severity of ena printouts Netanel Belgazal
2016-12-04 13:19 ` [PATCH V2 net 13/20] net/ena: change driver's default timeouts Netanel Belgazal
2016-12-05 4:35 ` Matt Wilson
2016-12-05 18:28 ` Netanel Belgazal
2016-12-04 13:19 ` [PATCH V2 net 14/20] net/ena: change condition for host attribute configuration Netanel Belgazal
2016-12-04 13:19 ` [PATCH V2 net 15/20] net/ena: change sizeof() argument to be the type pointer Netanel Belgazal
2016-12-04 13:19 ` [PATCH V2 net 16/20] net/ena: use napi_schedule_irqoff when possible Netanel Belgazal
2016-12-04 13:19 ` [PATCH V2 net 17/20] net/ena: add IPv6 extended protocols to ena_admin_flow_hash_proto Netanel Belgazal
2016-12-04 13:19 ` [PATCH V2 net 18/20] net/ena: remove affinity hint from the driver Netanel Belgazal
2016-12-04 13:19 ` Netanel Belgazal [this message]
2016-12-04 13:19 ` [PATCH V2 net 20/20] net/ena: increase driver version to 1.1.2 Netanel Belgazal
2016-12-05 2:37 ` [PATCH V2 net 00/20] Increase ENA " David Miller
2016-12-05 3:30 ` Matt Wilson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1480857578-5065-20-git-send-email-netanel@annapurnalabs.com \
--to=netanel@annapurnalabs.com \
--cc=alex@annapurnalabs.com \
--cc=aliguori@amazon.com \
--cc=davem@davemloft.net \
--cc=dwmw@amazon.com \
--cc=linux-kernel@vger.kernel.org \
--cc=msw@amazon.com \
--cc=nafea@annapurnalabs.com \
--cc=netdev@vger.kernel.org \
--cc=saeed@annapurnalabs.com \
--cc=zorik@annapurnalabs.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).