From: Peng Li <lipeng321@huawei.com>
To: <davem@davemloft.net>
Cc: <netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<linuxarm@huawei.com>, <yisen.zhuang@huawei.com>,
<salil.mehta@huawei.com>, <lipeng321@huawei.com>
Subject: [PATCH net-next 05/11] net: hns3: add unlikely for error check
Date: Thu, 28 Jun 2018 12:12:23 +0800 [thread overview]
Message-ID: <1530159149-122284-6-git-send-email-lipeng321@huawei.com> (raw)
In-Reply-To: <1530159149-122284-1-git-send-email-lipeng321@huawei.com>
The first bd of a packet is invalid and invalid ring head for tx
IRQ is not offen, they may occur when there is error,
Add unlikely for error check branch is better for performance.
Signed-off-by: Peng Li <lipeng321@huawei.com>
---
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
index 99bb6a8..1a68952 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
@@ -1917,7 +1917,7 @@ bool hns3_clean_tx_ring(struct hns3_enet_ring *ring, int budget)
if (is_ring_empty(ring) || head == ring->next_to_clean)
return true; /* no data to poll */
- if (!is_valid_clean_head(ring, head)) {
+ if (unlikely(!is_valid_clean_head(ring, head))) {
netdev_err(netdev, "wrong head (%d, %d-%d)\n", head,
ring->next_to_use, ring->next_to_clean);
@@ -2174,7 +2174,7 @@ static int hns3_handle_rx_bd(struct hns3_enet_ring *ring,
bd_base_info = le32_to_cpu(desc->rx.bd_base_info);
/* Check valid BD */
- if (!hnae_get_bit(bd_base_info, HNS3_RXD_VLD_B))
+ if (unlikely(!hnae_get_bit(bd_base_info, HNS3_RXD_VLD_B)))
return -EFAULT;
va = (unsigned char *)desc_cb->buf + desc_cb->page_offset;
--
2.9.3
next prev parent reply other threads:[~2018-06-28 4:12 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-28 4:12 [PATCH net-next 00/11] net: hns3: a few code improvements Peng Li
2018-06-28 4:12 ` [PATCH net-next 01/11] net: hns3: remove hclge_get_vector_index from hclge_bind_ring_with_vector Peng Li
2018-06-28 4:12 ` [PATCH net-next 02/11] net: hns3: rename the interface for init_client_instance and uninit_client_instance Peng Li
2018-06-28 4:12 ` [PATCH net-next 03/11] net: hns3: add vector status check before free vector Peng Li
2018-06-28 4:12 ` [PATCH net-next 04/11] net: hns3: add l4_type check for both ipv4 and ipv6 Peng Li
2018-06-28 4:12 ` Peng Li [this message]
2018-06-28 4:12 ` [PATCH net-next 06/11] net: hns3: remove unused head file in hnae3.c Peng Li
2018-06-28 4:12 ` [PATCH net-next 07/11] net: hns3: extraction an interface for state init|uninit Peng Li
2018-06-28 4:12 ` [PATCH net-next 08/11] net: hns3: print the ret value in error information Peng Li
2018-06-28 4:12 ` [PATCH net-next 09/11] net: hns3: remove the Redundant put_vector in hns3_client_uninit Peng Li
2018-06-28 4:12 ` [PATCH net-next 10/11] net: hns3: remove back in struct hclge_hw Peng Li
2018-06-28 4:12 ` [PATCH net-next 11/11] net: hns3: use lower_32_bits and upper_32_bits Peng Li
2018-06-29 2:07 ` [PATCH net-next 00/11] net: hns3: a few code improvements David Miller
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=1530159149-122284-6-git-send-email-lipeng321@huawei.com \
--to=lipeng321@huawei.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxarm@huawei.com \
--cc=netdev@vger.kernel.org \
--cc=salil.mehta@huawei.com \
--cc=yisen.zhuang@huawei.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