[dpdk-dev,branch-16.11] net/i40e: return errno when interrupt setup fails
diff mbox

Message ID f7tvajbz2zt.fsf@dhcp-25-97.bos.redhat.com
State Not Applicable, archived
Headers show

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK

Commit Message

Aaron Conole Oct. 19, 2017, 1:22 p.m. UTC
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(-)

Comments

Yuanhan Liu Oct. 19, 2017, 2:03 p.m. UTC | #1
On Thu, Oct 19, 2017 at 09:22:30AM -0400, Aaron Conole wrote:
> 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.

Thanks for the backport! A minor note is that for backport commits, we'd
like to add something like following in the commit log, for back-tracking
where the backport commit comes from:

[ backported from upstream commit d75547718c873899b7f26616c50df7936a8f45e8 ]

But no worry, I think Luca could handle that while apply. Luca will start
maintain 16.11 LTS since now (v16.11.4).

	--yliu
> 
>  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
Aaron Conole Oct. 19, 2017, 2:37 p.m. UTC | #2
Yuanhan Liu <yliu@fridaylinux.org> writes:

> On Thu, Oct 19, 2017 at 09:22:30AM -0400, Aaron Conole wrote:
>> 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.
>
> Thanks for the backport! A minor note is that for backport commits, we'd
> like to add something like following in the commit log, for back-tracking
> where the backport commit comes from:
>
> [ backported from upstream commit d75547718c873899b7f26616c50df7936a8f45e8 ]

Will do.  Since this is just a git cherry-pick, feel free to ignore the
actual patch submitted, and "do the right thing" if it's easier.

I'll follow that form in the future.

> But no worry, I think Luca could handle that while apply. Luca will start
> maintain 16.11 LTS since now (v16.11.4).

Luca++

> 	--yliu
>>

Patch
diff mbox

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;
 		}