Skip to contentSkip to conversation

net/ixgbe: fix port close in FreeBSD OS

PATCH Superseded Di ChenxuX 3 participants 4 messages Oct 25, 2019 – Nov 4, 2019 Network drivers

lore
Share & tools
lore

Di ChenxuX

author
#0 lore raw

PATCH 1/1 net/ixgbe: fix port close in FreeBSD OS

FreeBSD OS don't support igb_uio interrupt, so it will fail
that unregister intr callback when port close.
Fix by passing -ENOENT when check the return value of unregister intr callback function.

Fixes f2f4990eff94 ("net/ixgbe: release port upon close")
---
 drivers/net/ixgbe/ixgbe_ethdev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ixgbe/ixgbe_ethdev.c +1 -1
index dbce7a80e..0a654accb 100644
@@ -2978,7 +2978,7 @@ ixgbe_dev_close(struct rte_eth_dev *dev)
 	do {
 		ret = rte_intr_callback_unregister(intr_handle,
 				ixgbe_dev_interrupt_handler, dev);
-		if (ret >= 0) {
+		if (ret >= 0 || ret == -ENOENT) {
 			break;
 		} else if (ret != -EAGAIN) {
 			PMD_INIT_LOG(ERR,
Signature · 1 line
2.17.1
#1 lore raw

Hi, Chenxu

Quoted 10 lines

-----Original Message-----
From: Di, ChenxuX
Sent: Friday, October 25, 2019 12:53 PM
To: [email protected]
Cc: Lu, Wenzhuo <[email protected]>; Yang, Qiming <[email protected]>; Di, ChenxuX <[email protected]>
Subject: [PATCH] net/ixgbe: fix port close in FreeBSD OS

FreeBSD OS don't support igb_uio interrupt, so it will fail that unregister intr callback when port close.

it will fail when unregister the interrupt callback in port close.

Quoted 2 lines

Fix by passing -ENOENT when check the return value of unregister intr callback function.

We can fix the issue by ... / please use interrupt not intr in commit message.

Quoted 24 lines
Fixes f2f4990eff94 ("net/ixgbe: release port upon close")
---
 drivers/net/ixgbe/ixgbe_ethdev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ixgbe/ixgbe_ethdev.c +1 -2
index dbce7a80e..0a654accb 100644
@@ -2978,7 +2978,7 @@ ixgbe_dev_close(struct rte_eth_dev *dev)
 	do {
 		ret = rte_intr_callback_unregister(intr_handle,
 				ixgbe_dev_interrupt_handler, dev);
-		if (ret >= 0) {
+		if (ret >= 0 || ret == -ENOENT) {
 			break;
 		} else if (ret != -EAGAIN) {
 			PMD_INIT_LOG(ERR,
--

2.17.1

author
#2 lore raw

PATCH v2 1/1 net/ixgbe: fix port close in FreeBSD OS

In reply to Di ChenxuX

FreeBSD OS don't support igb_uio interrupt, so it will fail
when unregister the interrupt callback in port close.
We can fix the issue by passing -ENOENT when check the
return value of unregister interrupt callback function.

Fixes f2f4990eff94 ("net/ixgbe: release port upon close")

v2:
Modified commit log.

---
 drivers/net/ixgbe/ixgbe_ethdev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ixgbe/ixgbe_ethdev.c +1 -1
index dbce7a80e..0a654accb 100644
@@ -2978,7 +2978,7 @@ ixgbe_dev_close(struct rte_eth_dev *dev)
 	do {
 		ret = rte_intr_callback_unregister(intr_handle,
 				ixgbe_dev_interrupt_handler, dev);
-		if (ret >= 0) {
+		if (ret >= 0 || ret == -ENOENT) {
 			break;
 		} else if (ret != -EAGAIN) {
 			PMD_INIT_LOG(ERR,
Signature · 1 line
2.17.1
Acked-by on v2 1/1 Applied
#3 lore raw

Seems i40e driver has the same issue, could you help to cook another fix patch as well?

Quoted 31 lines · Di ChenxuX

FreeBSD OS don't support igb_uio interrupt, so it will fail when unregister the interrupt callback in port close. We can fix the issue by passing -ENOENT when check the return value of unregister interrupt callback function.

Fixes f2f4990eff94 ("net/ixgbe: release port upon close")

v2:
Modified commit log.
---
drivers/net/ixgbe/ixgbe_ethdev.c | 2 +-

1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ixgbe/ixgbe_ethdev.c +1 -1
index dbce7a80e..0a654accb 100644
@@ -2978,7 +2978,7 @@ ixgbe_dev_close(struct rte_eth_dev *dev)
 	do {
 		ret = rte_intr_callback_unregister(intr_handle,
 				ixgbe_dev_interrupt_handler, dev);
-		if (ret >= 0) {
+		if (ret >= 0 || ret == -ENOENT) {
 			break;
 		} else if (ret != -EAGAIN) {
 			PMD_INIT_LOG(ERR,
Signature · 1 line
2.17.1

Applied to dpdk-next-net-intel. Thanks.