From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) by dpdk.org (Postfix) with ESMTP id 5E4AE235 for ; Tue, 21 Nov 2017 14:26:04 +0100 (CET) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 13C1220A5F; Tue, 21 Nov 2017 08:26:04 -0500 (EST) Received: from frontend2 ([10.202.2.161]) by compute1.internal (MEProxy); Tue, 21 Nov 2017 08:26:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fridaylinux.org; h=cc:date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=92FIt02d5P6mvr0wv 9opxnUwpFHXX+Vwiz7/S1vjWBA=; b=kvGBf16HK4Klzy3bKbGHKc9K12aUsCJ1C AU2qPIdSWuNzYjZHEmIZQ2sQHP0mfYcueV3fwykCo0pLw+KJGLGaupTg92KChGRq NkHztf+9WJzDVpAWsoSxeeQh09Y4TKw8/FNmLhVMfzDyQwdSbQQDrxMdubWKAjee tzIo1FYtcsw+/2io+X69jgOpBBmLjmxy3VgS1kNcoG/7RH19pdOadEzVwZ7Gvpz4 pdEq6AupTNnx6I6ENrU9EC1Eq2eo6bmmrYxgkCEkW4ojlcsks3Yu3sUPSz0XjpJE rDKVYJQHRwgKt6pnzqTxhGnzopMoOqcQ6kmS5xF0nCtoCjQBrLdIA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=92FIt02d5P6mvr0wv9opxnUwpFHXX+Vwiz7/S1vjWBA=; b=mu9kSu+1 5A21+sM6KEo795p+zKbtqZxDvrF4kPFtcOOF4UjEqtFp/R2ueh817zwxg4gidNg5 IbkxUtcwxrEIqjNpj4u9aPmGl5kkfIyJnx9gQhOQXhzO5bcmLiUb9YQgAH5bKsuW /Lc2s8sQ1ewIWhiIDrz3ze/olj8Ku9+/N4hL36L+FwwG9tW8kV0gDYp7TYQ831SQ 5YmKMpXpMwzWAFVchtgklF7rxazldqxgvcbYB+UdlvTSVU9MglfoqVHZTUj7a5Dn Zn1oOngDo6ferB+mwE++0XSPF6VZCufyR/f+DvQ/jAJVoEtwhBROrYofAUzzyxBA B0e3S13/bbiy7A== X-ME-Sender: Received: from localhost.localdomain (unknown [180.158.62.0]) by mail.messagingengine.com (Postfix) with ESMTPA id 23CB8247A9; Tue, 21 Nov 2017 08:26:00 -0500 (EST) From: Yuanhan Liu To: Wei Dai Cc: Wenzhuo Lu , Jianwei Ma , dpdk stable Date: Tue, 21 Nov 2017 21:17:28 +0800 Message-Id: <1511270333-31002-106-git-send-email-yliu@fridaylinux.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1511270333-31002-1-git-send-email-yliu@fridaylinux.org> References: <1511270333-31002-1-git-send-email-yliu@fridaylinux.org> Subject: [dpdk-stable] patch 'net/ixgbe: fix VFIO interrupt mapping in VF' has been queued to stable release 17.08.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Nov 2017 13:26:04 -0000 Hi, FYI, your patch has been queued to stable release 17.08.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/24/17. So please shout if anyone has objections. Thanks. --yliu --- >>From 4c23366c3653d0708e4415cbfe0c8266d16740c3 Mon Sep 17 00:00:00 2001 From: Wei Dai Date: Thu, 28 Sep 2017 10:28:33 +0800 Subject: [PATCH] net/ixgbe: fix VFIO interrupt mapping in VF [ upstream commit 06938770186afcfd05a4d6d3addee12645c9c558 ] When a VF port is bound to VFIO-PIC, only miscellaneous interrupt is mapped to VFIO vector 0 in eth_ixgbevf_dev_init( ). In ixgbevf_dev_start(), if previous VFIO interrupt mapping set in eth_ixgbevf_dev_init( ) is not cleard, it will fail when calling rte_intr_enable( ) tries to map Rx queue interrupt to other VFIO vectors. This patch clears the VFIO interrupt mappings before setting both miscellaneous and Rx queue interrupt mappings again to avoid failure. Fixes: 77234603fba0 ("net/ixgbe: support VF mailbox interrupt for link up/down") Signed-off-by: Wei Dai Acked-by: Wenzhuo Lu Tested-by: Jianwei Ma --- drivers/net/ixgbe/ixgbe_ethdev.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c index 0c431fa..7bef6f9 100644 --- a/drivers/net/ixgbe/ixgbe_ethdev.c +++ b/drivers/net/ixgbe/ixgbe_ethdev.c @@ -5019,6 +5019,15 @@ ixgbevf_dev_start(struct rte_eth_dev *dev) } ixgbevf_configure_msix(dev); + /* When a VF port is bound to VFIO-PCI, only miscellaneous interrupt + * is mapped to VFIO vector 0 in eth_ixgbevf_dev_init( ). + * If previous VFIO interrupt mapping setting in eth_ixgbevf_dev_init( ) + * is not cleared, it will fail when following rte_intr_enable( ) tries + * to map Rx queue interrupt to other VFIO vectors. + * So clear uio/vfio intr/evevnfd first to avoid failure. + */ + rte_intr_disable(intr_handle); + rte_intr_enable(intr_handle); /* Re-enable interrupt for VF */ -- 2.7.4