From: Aaron Conole <aconole@redhat.com>
To: dev@dpdk.org, stable@dpdk.org
Cc: "Michał Mirosław" <michal.miroslaw@atendesoftware.pl>,
"Jingjing Wu" <jingjing.wu@intel.com>,
"Luca Boccassi" <bluca@debian.org>,
"Yuanhan Liu" <yliu@fridaylinux.org>
Subject: [dpdk-stable] [PATCH branch-16.11] net/i40e: return errno when interrupt setup fails
Date: Thu, 19 Oct 2017 09:22:30 -0400 [thread overview]
Message-ID: <f7tvajbz2zt.fsf@dhcp-25-97.bos.redhat.com> (raw)
From: Michał Mirosław <michal.miroslaw@atendesoftware.pl>
Signed-off-by: Michał Mirosław <michal.miroslaw@atendesoftware.pl>
Reviewed-by: Jingjing Wu <jingjing.wu@intel.com>
---
This is cherry picked from commit d75547718c87 ("net/i40e: return errno
when interrupt setup fails") and applies cleanly. This is just a
backport request.
drivers/net/i40e/i40e_ethdev.c | 5 +++--
lib/librte_eal/linuxapp/eal/eal_interrupts.c | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index 65e10f3..191e858 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -1704,8 +1704,9 @@ i40e_dev_start(struct rte_eth_dev *dev)
!RTE_ETH_DEV_SRIOV(dev).active) &&
dev->data->dev_conf.intr_conf.rxq != 0) {
intr_vector = dev->data->nb_rx_queues;
- if (rte_intr_efd_enable(intr_handle, intr_vector))
- return -1;
+ ret = rte_intr_efd_enable(intr_handle, intr_vector);
+ if (ret)
+ return ret;
}
if (rte_intr_dp_is_en(intr_handle) && !intr_handle->intr_vec) {
diff --git a/lib/librte_eal/linuxapp/eal/eal_interrupts.c b/lib/librte_eal/linuxapp/eal/eal_interrupts.c
index 368863f..25797e4 100644
--- a/lib/librte_eal/linuxapp/eal/eal_interrupts.c
+++ b/lib/librte_eal/linuxapp/eal/eal_interrupts.c
@@ -1157,7 +1157,7 @@ rte_intr_efd_enable(struct rte_intr_handle *intr_handle, uint32_t nb_efd)
RTE_LOG(ERR, EAL,
"can't setup eventfd, error %i (%s)\n",
errno, strerror(errno));
- return -1;
+ return -errno;
}
intr_handle->efds[i] = fd;
}
--
2.9.5
next reply other threads:[~2017-10-19 13:22 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-19 13:22 Aaron Conole [this message]
2017-10-19 14:03 ` Yuanhan Liu
2017-10-19 14:37 ` Aaron Conole
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=f7tvajbz2zt.fsf@dhcp-25-97.bos.redhat.com \
--to=aconole@redhat.com \
--cc=bluca@debian.org \
--cc=dev@dpdk.org \
--cc=jingjing.wu@intel.com \
--cc=michal.miroslaw@atendesoftware.pl \
--cc=stable@dpdk.org \
--cc=yliu@fridaylinux.org \
/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).