deleted file mode 100644

@@ -1,47 +0,0 @@

-NVME driver allocates admin and IO vector using pci_alloc_irq_vectors(). 

-

-In v4.9, if IO vector allocated using PCI_IRQ_AFFINITY, 

-then assignment of IO vector in vector_irq mismatches with actual assignment. 

-Due to which some IO INT fails to handle.

-

-If IO vector allocated without using PCI_IRQ_AFFINITY, 

-then all IO INT scheduled on CPU 0 and no IO INT fails.

-

-This problem only observed with Azure HyperV NVME,

-so skipping PCI_IRQ_AFFINITY only in this case.

-

-diff -Nurp linux-4.9.140_modified/drivers/nvme/host/pci.c linux-4.9.140/drivers/nvme/host/pci.c

-+++ linux-4.9.140/drivers/nvme/host/pci.c	2019-01-17 01:27:30.002509017 +0530

-@@ -1450,8 +1450,18 @@ static int nvme_setup_io_queues(struct n

- 	 * setting up the full range we need.

- 	 */

- 	pci_free_irq_vectors(pdev);

--	nr_io_queues = pci_alloc_irq_vectors(pdev, 1, nr_io_queues,

--			PCI_IRQ_ALL_TYPES | PCI_IRQ_AFFINITY);

-+

-+	if (pdev->vendor == PCI_VENDOR_ID_MICROSOFT &&

-+			pdev->device == PCI_DEVICE_ID_MICROSOFT_NVME) {

-+		nr_io_queues = pci_alloc_irq_vectors(pdev, 1, nr_io_queues,

-+				PCI_IRQ_ALL_TYPES);

-+		dev_warn(dev->ctrl.device, "detected MicroSoft NVMe controller, "

-+			"skipping PCI_IRQ_AFFINITY from pci_alloc_irq_vectors\n");

-+	} else {

-+		nr_io_queues = pci_alloc_irq_vectors(pdev, 1, nr_io_queues,

-+				PCI_IRQ_ALL_TYPES | PCI_IRQ_AFFINITY);

-+	}

-+

- 	if (nr_io_queues <= 0)

- 		return -EIO;

- 	dev->max_qid = nr_io_queues;

-diff -Nurp linux-4.9.140_modified/include/linux/pci_ids.h linux-4.9.140/include/linux/pci_ids.h

-+++ linux-4.9.140/include/linux/pci_ids.h	2019-01-17 01:10:34.606536165 +0530

-@@ -3056,4 +3056,7 @@

- 

- #define PCI_VENDOR_ID_NCUBE		0x10ff

- 

-+#define PCI_VENDOR_ID_MICROSOFT		0x1414

-+#define PCI_DEVICE_ID_MICROSOFT_NVME		0xb111

-+

- #endif /* _LINUX_PCI_IDS_H */

new file mode 100644

@@ -0,0 +1,72 @@

+From ad8b5f060aef55a55156253d93c6ac0071c6019d Mon Sep 17 00:00:00 2001

+From: Dexuan Cui <decui@microsoft.com>

+Date: Wed, 1 Nov 2017 20:30:53 +0000

+Subject: [PATCH 137/156] PCI: hv: Use effective affinity mask

+

+The effective_affinity_mask is always set when an interrupt is assigned in

+__assign_irq_vector() -> apic->cpu_mask_to_apicid(), e.g. for struct apic

+apic_physflat: -> default_cpu_mask_to_apicid() ->

+irq_data_update_effective_affinity(), but it looks d->common->affinity

+remains all-1's before the user space or the kernel changes it later.

+

+In the early allocation/initialization phase of an IRQ, we should use the

+effective_affinity_mask, otherwise Hyper-V may not deliver the interrupt to

+the expected CPU.  Without the patch, if we assign 7 Mellanox ConnectX-3

+VFs to a 32-vCPU VM, one of the VFs may fail to receive interrupts.

+

+Signed-off-by: Dexuan Cui <decui@microsoft.com>

+Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

+Reviewed-by: Jake Oshins <jakeo@microsoft.com>

+Cc: stable@vger.kernel.org

+Cc: Jork Loeser <jloeser@microsoft.com>

+Cc: Stephen Hemminger <sthemmin@microsoft.com>

+Cc: K. Y. Srinivasan <kys@microsoft.com>

+Signed-off-by: Ajay Kaher <akaher@vmware.com>

+---

+ drivers/pci/host/pci-hyperv.c | 8 +++++---

+ 1 file changed, 5 insertions(+), 3 deletions(-)

+

+--- a/drivers/pci/host/pci-hyperv.c	2017-12-05 16:55:53.278586020 -0800

+@@ -878,7 +878,7 @@ static void hv_irq_unmask(struct irq_dat

+ 	int cpu;

+ 	u64 res;

+ 

+-	dest = irq_data_get_affinity_mask(data);

++	dest = irq_data_get_effective_affinity_mask(data);

+ 	pdev = msi_desc_to_pci_dev(msi_desc);

+ 	pbus = pdev->bus;

+ 	hbus = container_of(pbus->sysdata, struct hv_pcibus_device, sysdata);

+@@ -1041,6 +1041,7 @@ static void hv_compose_msi_msg(struct ir

+ 	struct hv_pci_dev *hpdev;

+ 	struct pci_bus *pbus;

+ 	struct pci_dev *pdev;

++	struct cpumask *dest;

+ 	struct compose_comp_ctxt comp;

+ 	struct tran_int_desc *int_desc;

+ 	struct {

+@@ -1055,6 +1056,7 @@ static void hv_compose_msi_msg(struct ir

+ 	int ret;

+ 

+ 	pdev = msi_desc_to_pci_dev(irq_data_get_msi_desc(data));

++	dest = irq_data_get_effective_affinity_mask(data);

+ 	pbus = pdev->bus;

+ 	hbus = container_of(pbus->sysdata, struct hv_pcibus_device, sysdata);

+ 	hpdev = get_pcichild_wslot(hbus, devfn_to_wslot(pdev->devfn));

+@@ -1080,14 +1082,14 @@ static void hv_compose_msi_msg(struct ir

+ 	switch (pci_protocol_version) {

+ 	case PCI_PROTOCOL_VERSION_1_1:

+ 		size = hv_compose_msi_req_v1(&ctxt.int_pkts.v1,

+-					irq_data_get_affinity_mask(data),

++					dest,

+ 					hpdev->desc.win_slot.slot,

+ 					cfg->vector);

+ 		break;

+ 

+ 	case PCI_PROTOCOL_VERSION_1_2:

+ 		size = hv_compose_msi_req_v2(&ctxt.int_pkts.v2,

+-					irq_data_get_affinity_mask(data),

++					dest,

+ 					hpdev->desc.win_slot.slot,

+ 					cfg->vector);

+ 		break;

new file mode 100644

@@ -0,0 +1,54 @@

+From eba61d21b1ad88f9d4f63b5844f17da1dc8d8930 Mon Sep 17 00:00:00 2001

+From: Dexuan Cui <decui@microsoft.com>

+Date: Mon, 29 Oct 2018 23:18:48 -0700

+Subject: [PATCH] x86/irq: implement irq_data_get_effective_affinity_mask() for

+ v4.12.14

+

+See __assign_irq_vector():

+	cpumask_copy(d->domain, vector_cpumask);

+

+The function is required by Hyper-V pci-hyperv driver. See

+79aa801e8994 ("PCI: hv: Use effective affinity mask")

+

+Signed-off-by: Dexuan Cui <decui@microsoft.com>

+Signed-off-by: Ajay Kaher <akaher@vmware.com>

+---

+ arch/x86/kernel/apic/vector.c | 8 ++++++++

+ include/linux/irq.h           | 2 ++

+ 2 files changed, 10 insertions(+)

+

+diff --git a/arch/x86/kernel/apic/vector.c b/arch/x86/kernel/apic/vector.c

+index 26c3769..627985a 100644

+--- a/arch/x86/kernel/apic/vector.c

+@@ -69,6 +69,14 @@ struct irq_cfg *irqd_cfg(struct irq_data *irq_data)

+ }

+ EXPORT_SYMBOL_GPL(irqd_cfg);

+ 

++struct cpumask *irq_data_get_effective_affinity_mask(struct irq_data *d)

++{

++	struct apic_chip_data *data = apic_chip_data(d);

++

++	return data ? data->domain : NULL;

++}

++EXPORT_SYMBOL_GPL(irq_data_get_effective_affinity_mask);

++

+ struct irq_cfg *irq_cfg(unsigned int irq)

+ {

+ 	return irqd_cfg(irq_get_irq_data(irq));

+diff --git a/include/linux/irq.h b/include/linux/irq.h

+index 45b037e..a3c8c0d 100644

+--- a/include/linux/irq.h

+@@ -695,6 +695,8 @@ static inline struct cpumask *irq_data_get_affinity_mask(struct irq_data *d)

+ 	return d->common->affinity;

+ }

+ 

++struct cpumask *irq_data_get_effective_affinity_mask(struct irq_data *d);

++

+ unsigned int arch_dynirq_lower_bound(unsigned int from);

+ 

+ int __irq_alloc_descs(int irq, unsigned int from, unsigned int cnt, int node,

+-- 

+2.7.4

+

@@ -2,7 +2,7 @@

 Summary:        Kernel

 Name:           linux

 Version:        4.9.140

-Release:        5%{?kat_build:.%kat_build}%{?dist}

+Release:        6%{?kat_build:.%kat_build}%{?dist}

 License:    	GPLv2

 URL:        	http://www.kernel.org/

 Group:        	System Environment/Kernel

@@ -71,13 +71,13 @@ Patch46:        0001-xfs-move-inode-fork-verifiers-to-xfs-dinode-verify.patch

 Patch47:        0002-xfs-verify-dinode-header-first.patch

 Patch48:        0003-xfs-enhance-dinode-verifier.patch

-#HyperV PCI patches

+# HyperV PCI patches to Use vPCI_protocol_version_1.2

 Patch51:        0001_PCI_hv_Allocate_physically_contiguous_hypercall_params_buffer.patch

 Patch52:        0002_PCI_hv_Add_vPCI_version_protocol_negotiation.patch

 Patch53:        0003_PCI_hv_Use_vPCI_protocol_version_1.2_v4.9.patch

-

-# NVME PCI patch

-Patch61:        0001_nvme_io_irq_without_affinity.patch

+# HyperV PCI patches to solve IRQ no handler problem

+Patch54:        0004-PCI-hv-Use-effective-affinity-mask.patch

+Patch55:        0005-x86-irq-implement-irq_data_get_effective_affinity.patch

 # Out-of-tree patches from AppArmor:

 Patch71: 0001-UBUNTU-SAUCE-AppArmor-basic-networking-rules.patch

@@ -201,7 +201,8 @@ This package contains the 'perf' performance analysis tools for Linux kernel.

 %patch51 -p1

 %patch52 -p1

 %patch53 -p1

-%patch61 -p1

+%patch54 -p1

+%patch55 -p1

 %patch71 -p1

 %patch72 -p1

@@ -376,6 +377,9 @@ ln -sf %{name}-%{uname_r}.cfg /boot/photon.cfg

 /usr/share/doc/*

 %changelog

+*   Wed Jan 23 2019 Ajay Kaher <akaher@vmware.com> 4.9.140-6

+-   Fix IRQ issue by using effective_affinity

+-   Remove nvme_io_irq_without_affinity.patch

 *   Thu Jan 17 2019 Ajay Kaher <akaher@vmware.com> 4.9.140-5

 -   Fix IRQ issues with NVMe on Azure.

 *   Tue Jan 15 2019 Alexey Makhalov <amakhalov@vmware.com> 4.9.140-4