[dpdk-dev,2/2] net/e1000: fix mailbox interrupt handler

Message ID 1514406150-17517-2-git-send-email-qi.z.zhang@intel.com (mailing list archive)
State Accepted, archived
Delegated to: Helin Zhang
Headers

Checks

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

Commit Message

Qi Zhang Dec. 27, 2017, 8:22 p.m. UTC
  Mailbox interrupt handler only take care of the PF reset notification,
for other message mbx->ops.read should not be called since it get chance
to break the foreground VF to PF communication.

Fixes: 316f4f1adc2e ("net/igb: support VF mailbox interrupt for link up/down")
Cc: stable@dpdk.org

Signed-off-by: Qi Zhang <qi.z.zhang@intel.com>
---
 drivers/net/e1000/igb_ethdev.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
  

Comments

Wei Dai Jan. 12, 2018, 2:32 a.m. UTC | #1
> -----Original Message-----
> From: Zhang, Qi Z
> Sent: Thursday, December 28, 2017 4:23 AM
> To: Lu, Wenzhuo <wenzhuo.lu@intel.com>
> Cc: dev@dpdk.org; Dai, Wei <wei.dai@intel.com>; Wang, Liang-min
> <liang-min.wang@intel.com>; Zhang, Qi Z <qi.z.zhang@intel.com>;
> stable@dpdk.org
> Subject: [PATCH 2/2] net/e1000: fix mailbox interrupt handler
> 
> Mailbox interrupt handler only take care of the PF reset notification, for
> other message mbx->ops.read should not be called since it get chance to
> break the foreground VF to PF communication.
> 
> Fixes: 316f4f1adc2e ("net/igb: support VF mailbox interrupt for link
> up/down")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Qi Zhang <qi.z.zhang@intel.com>
Acked-by: Wei Dai <wei.dai@intel.com>

> ---
>  drivers/net/e1000/igb_ethdev.c | 10 +++++++---
>  1 file changed, 7 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/net/e1000/igb_ethdev.c
> b/drivers/net/e1000/igb_ethdev.c index fdc139f..0d8bc49 100644
> --- a/drivers/net/e1000/igb_ethdev.c
> +++ b/drivers/net/e1000/igb_ethdev.c
> @@ -2970,13 +2970,17 @@ void igbvf_mbx_process(struct rte_eth_dev
> *dev)
>  	struct e1000_mbx_info *mbx = &hw->mbx;
>  	u32 in_msg = 0;
> 
> -	if (mbx->ops.read(hw, &in_msg, 1, 0))
> -		return;
> +	/* peek the message first */
> +	in_msg = E1000_READ_REG(hw, E1000_VMBMEM(0));
> 
>  	/* PF reset VF event */
> -	if (in_msg == E1000_PF_CONTROL_MSG)
> +	if (in_msg == E1000_PF_CONTROL_MSG) {
> +		/* dummy mbx read to ack pf */
> +		if (mbx->ops.read(hw, &in_msg, 1, 0))
> +			return;
>  		_rte_eth_dev_callback_process(dev,
> RTE_ETH_EVENT_INTR_RESET,
>  					      NULL, NULL);
> +	}
>  }
> 
>  static int
> --
> 2.7.4
  
Zhang, Helin Jan. 13, 2018, 4:14 p.m. UTC | #2
> -----Original Message-----
> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Qi Zhang
> Sent: Thursday, December 28, 2017 4:23 AM
> To: Lu, Wenzhuo
> Cc: dev@dpdk.org; Dai, Wei; Wang, Liang-min; Zhang, Qi Z; stable@dpdk.org
> Subject: [dpdk-dev] [PATCH 2/2] net/e1000: fix mailbox interrupt handler
> 
> Mailbox interrupt handler only take care of the PF reset notification, for other
> message mbx->ops.read should not be called since it get chance to break the
> foreground VF to PF communication.
> 
> Fixes: 316f4f1adc2e ("net/igb: support VF mailbox interrupt for link up/down")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Qi Zhang <qi.z.zhang@intel.com>
Applied to dpdk-next-net-intel, with minor commit log changes. Thanks!

/Helin
  

Patch

diff --git a/drivers/net/e1000/igb_ethdev.c b/drivers/net/e1000/igb_ethdev.c
index fdc139f..0d8bc49 100644
--- a/drivers/net/e1000/igb_ethdev.c
+++ b/drivers/net/e1000/igb_ethdev.c
@@ -2970,13 +2970,17 @@  void igbvf_mbx_process(struct rte_eth_dev *dev)
 	struct e1000_mbx_info *mbx = &hw->mbx;
 	u32 in_msg = 0;
 
-	if (mbx->ops.read(hw, &in_msg, 1, 0))
-		return;
+	/* peek the message first */
+	in_msg = E1000_READ_REG(hw, E1000_VMBMEM(0));
 
 	/* PF reset VF event */
-	if (in_msg == E1000_PF_CONTROL_MSG)
+	if (in_msg == E1000_PF_CONTROL_MSG) {
+		/* dummy mbx read to ack pf */
+		if (mbx->ops.read(hw, &in_msg, 1, 0))
+			return;
 		_rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_RESET,
 					      NULL, NULL);
+	}
 }
 
 static int