From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by dpdk.org (Postfix) with ESMTP id 3AE2F1B249 for ; Mon, 30 Oct 2017 16:38:12 +0100 (CET) Received: by mail-wm0-f65.google.com with SMTP id y83so17206471wmc.4 for ; Mon, 30 Oct 2017 08:38:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=GKc4NWEXEOYw/os534Ptx9eGUvK67YieCwCMZjWbq18=; b=iusvZ+l2tw1FQbiAQlwTExqP9E5PHA7M8Z3TopNcng1inC4WVyE/Orw3r4r5KCF0pF z19gB8psCKdQTU0SkTXRjuG37WW5wnDf5mZVQRfwkFI7peFiy3+xnQRf8zstDhfjQ6Wj h7kctWZvggQPH8SNnG47OA1WS6qhThILmYrxdiKrFM2m0PB1CIeTUY/s+eq6cPcEJYvk evze3YiP4dTCeUm3vAgjU1Ez9703Yo0W+ts5aX6a0pUzrQ25Vdwx+tjeHI0Bik0ZJ6U+ y9qz+R2fVy0aesRS9fHdMqlqvXKt8uPhQre1gygEhx5i41bZFyLndtXq0SSajp4VWN+G zwbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=GKc4NWEXEOYw/os534Ptx9eGUvK67YieCwCMZjWbq18=; b=MpKrVLMsjBhmHTsG30ogQAt9LHqbqJjsyB/iGarOJIDILBp5dyhpD9QZJTCFH6S8x2 nDKRpVDPeD457B/+S6ZYwOby8HuC4ssetyEcm3Ygv9W403uz4Qh9lZQ4chubPZRp8jgY 0IeIYrOOrjbcgt9+ChWa6wDTk5Ca5/YkWtd8DwSwYB80+F3MAGc/WE7pWlPM6clL2dX4 BUAFc59r7ubLbL09Qz9YkKAu+bbMtV/RGfK39rBXk6ruxZSbIrhROXufmAE7iSGPjk/y 3/QAl6JOHUEOkiUzmQcdjoqnbGOEl7h++Idv3KVUTL8ILnwYmx8yRxIOsRXwzDPvAH6j P69Q== X-Gm-Message-State: AMCzsaVHTe1Ok+GY9q8Rh4vJFUsqp4ZRlQAc5h8Im/sIv04D8IqQrCsI u7Lr0IWNOmqaAGH1zbfKeW8= X-Google-Smtp-Source: ABhQp+SaVZvVo6bbyPRgcQ0Z8uBpoZiVCKjyXt3Wld55OtDE1duVpCX66hEYgdCtr3R9JZJDVsSDDg== X-Received: by 10.28.55.71 with SMTP id e68mr4295953wma.139.1509377891962; Mon, 30 Oct 2017 08:38:11 -0700 (PDT) Received: from localhost ([2a00:23c5:bef3:400:4a51:b7ff:fe0b:4749]) by smtp.gmail.com with ESMTPSA id b11sm13543311wrd.91.2017.10.30.08.38.11 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 30 Oct 2017 08:38:11 -0700 (PDT) From: luca.boccassi@gmail.com To: Wei Dai Cc: Wenzhuo Lu , Jianwei Ma , dpdk stable Date: Mon, 30 Oct 2017 15:34:57 +0000 Message-Id: <20171030153511.13322-54-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171030153511.13322-1-luca.boccassi@gmail.com> References: <20171030153511.13322-1-luca.boccassi@gmail.com> Subject: [dpdk-stable] patch 'net/ixgbe: fix VFIO interrupt mapping in VF' has been queued to LTS release 16.11.4 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: Mon, 30 Oct 2017 15:38:12 -0000 Hi, FYI, your patch has been queued to LTS release 16.11.4 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/01/17. So please shout if anyone has objections. Thanks. Kind regards, Luca Boccassi --- >>From 50f47bf258bf043b917ac1e8cead95fdcc217b43 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 3b51bcc3d..d471488cb 100644 --- a/drivers/net/ixgbe/ixgbe_ethdev.c +++ b/drivers/net/ixgbe/ixgbe_ethdev.c @@ -4250,6 +4250,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.11.0