OrgACRN
/
clear-pkgs-linux-iot-lts2018
mirror of https://github.com/clearlinux-pkgs/linux-iot-lts2018.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
clear-pkgs-linux-iot-lts2018/0752-kernel-Revert-x86-acrn...

449 lines
16 KiB
Diff
Raw Permalink Blame History

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "Chen, Zide" <zide.chen@intel.com>
Date: Sun, 28 Oct 2018 23:32:57 -0700
Subject: [PATCH] kernel: Revert "x86:acrn: add write_msi pv ops to intercept
pci msi write with pv method"
this reverts commit ("x86:acrn: add write_msi pv ops to intercept pci
msi write with pv method").
After the acrn-hypervisor traps the access of PCI addr/data port, ACRN
hypervisor also intercepts MSI writes and does MSI remapping. In such case
it is no longer required to do so in Linux kernel.
V1->V2: Don't call hcall_remap_pci_msix() in handling IC_VM_PCI_MSIX_REMAP
and remove the definition of hcall_remap_pci_msix.
Tracked-On: PKT-1592
Tracked-on: projectacrn/acrn-hypervisor#1568
Signed-off-by: dongshen <dongsheng.x.zhang@intel.com>
Signed-off-by: Zide Chen <zide.chen@intel.com>
Reviewed-by: Zhao Yakui <yakui.zhao@intel.com>
Acked-by: Anthony Xu <anthony.xu@intel.com>
---
arch/x86/acrn/acrn.c | 5 -
arch/x86/include/asm/paravirt.h | 10 --
arch/x86/include/asm/paravirt_types.h | 4 -
arch/x86/kernel/paravirt.c | 4 -
drivers/char/vhm/vhm_dev.c | 6 --
drivers/pci/msi.c | 4 +-
drivers/pci/pci.h | 2 -
drivers/vhm/Makefile | 2 +-
drivers/vhm/vhm_hypercall.c | 5 -
drivers/vhm/vhm_msi.c | 135 --------------------------
include/linux/msi.h | 10 +-
include/linux/vhm/vhm_hypercall.h | 1 -
include/linux/vhm/vhm_msi.h | 61 ------------
13 files changed, 4 insertions(+), 245 deletions(-)
delete mode 100644 drivers/vhm/vhm_msi.c
delete mode 100644 include/linux/vhm/vhm_msi.h
diff --git a/arch/x86/acrn/acrn.c b/arch/x86/acrn/acrn.c
index 12ebc4f93611..8283673604f9 100644
--- a/arch/x86/acrn/acrn.c
+++ b/arch/x86/acrn/acrn.c
@@ -33,7 +33,6 @@
*
*/
#include <asm/hypervisor.h>
-#include <linux/vhm/vhm_msi.h>
#include <asm/acrnhyper.h>
#include <asm/irq_vectors.h>
#include <asm/irq_regs.h>
@@ -46,10 +45,6 @@ static uint32_t __init acrn_detect(void)
static void __init acrn_init_platform(void)
{
-#if defined(CONFIG_PCI_MSI) && defined(CONFIG_ACRN_VHM)
- pv_irq_ops.write_msi = acrn_write_msi_msg;
-#endif
-
alloc_intr_gate(HYPERVISOR_CALLBACK_VECTOR,
acrn_hv_callback_vector);
}
diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
index fa6468c0a40b..a04677038872 100644
--- a/arch/x86/include/asm/paravirt.h
+++ b/arch/x86/include/asm/paravirt.h
@@ -808,16 +808,6 @@ static inline notrace unsigned long arch_local_irq_save(void)
return f;
}
-static inline void write_msi_msg_paravirt(struct msi_desc *entry,
- struct msi_msg *msg)
-{
- if ((pv_irq_ops.write_msi == NULL) ||
- (pv_irq_ops.write_msi == paravirt_nop))
- return;
-
- return PVOP_VCALL2(pv_irq_ops.write_msi, entry, msg);
-}
-
/* Make sure as little as possible of this mess escapes. */
#undef PARAVIRT_CALL
diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/paravirt_types.h
index 9929ab59774b..4b75acc23b30 100644
--- a/arch/x86/include/asm/paravirt_types.h
+++ b/arch/x86/include/asm/paravirt_types.h
@@ -56,9 +56,6 @@ struct cpumask;
struct flush_tlb_info;
struct mmu_gather;
-struct msi_desc;
-struct msi_msg;
-
/*
* Wrapper type for pointers to code which uses the non-standard
* calling convention. See PV_CALL_SAVE_REGS_THUNK below.
@@ -199,7 +196,6 @@ struct pv_irq_ops {
void (*safe_halt)(void);
void (*halt)(void);
- void (*write_msi)(struct msi_desc *entry, struct msi_msg *msg);
} __no_randomize_layout;
struct pv_mmu_ops {
diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c
index eaa8917dab73..8dc69d82567e 100644
--- a/arch/x86/kernel/paravirt.c
+++ b/arch/x86/kernel/paravirt.c
@@ -25,7 +25,6 @@
#include <linux/bcd.h>
#include <linux/highmem.h>
#include <linux/kprobes.h>
-#include <linux/msi.h>
#include <asm/bug.h>
#include <asm/paravirt.h>
@@ -337,9 +336,6 @@ __visible struct pv_irq_ops pv_irq_ops = {
.irq_enable = __PV_IS_CALLEE_SAVE(native_irq_enable),
.safe_halt = native_safe_halt,
.halt = native_halt,
-#ifdef CONFIG_PCI_MSI
- .write_msi = native_write_msi_msg,
-#endif
};
__visible struct pv_cpu_ops pv_cpu_ops = {
diff --git a/drivers/char/vhm/vhm_dev.c b/drivers/char/vhm/vhm_dev.c
index a2217949ec74..dbed2dfbde65 100644
--- a/drivers/char/vhm/vhm_dev.c
+++ b/drivers/char/vhm/vhm_dev.c
@@ -522,12 +522,6 @@ static long vhm_dev_ioctl(struct file *filep,
(void *)ioctl_param, sizeof(msix_remap)))
return -EFAULT;
- ret = hcall_remap_pci_msix(vm->vmid, virt_to_phys(&msix_remap));
-
- if (copy_to_user((void *)ioctl_param,
- &msix_remap, sizeof(msix_remap)))
- return -EFAULT;
-
if (msix_remap.msix) {
void __iomem *msix_entry;
struct table_iomems *ptr;
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index 5f0d8827645d..23a363fd4c59 100644
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -190,7 +190,7 @@ static void msi_mask_irq(struct msi_desc *desc, u32 mask, u32 flag)
desc->masked = __pci_msi_desc_mask_irq(desc, mask, flag);
}
-void __iomem *pci_msix_desc_addr(struct msi_desc *desc)
+static void __iomem *pci_msix_desc_addr(struct msi_desc *desc)
{
return desc->mask_base +
desc->msi_attrib.entry_nr * PCI_MSIX_ENTRY_SIZE;
@@ -294,7 +294,7 @@ void __pci_read_msi_msg(struct msi_desc *entry, struct msi_msg *msg)
}
}
-void native_write_msi_msg(struct msi_desc *entry, struct msi_msg *msg)
+void __pci_write_msi_msg(struct msi_desc *entry, struct msi_msg *msg)
{
struct pci_dev *dev = msi_desc_to_pci_dev(entry);
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
index a0a5483a62da..f84758ea427b 100644
--- a/drivers/pci/pci.h
+++ b/drivers/pci/pci.h
@@ -172,8 +172,6 @@ static inline void pci_msix_clear_and_set_ctrl(struct pci_dev *dev, u16 clear, u
pci_write_config_word(dev, dev->msix_cap + PCI_MSIX_FLAGS, ctrl);
}
-void __iomem *pci_msix_desc_addr(struct msi_desc *desc);
-
void pci_realloc_get_opt(char *);
static inline int pci_no_d1d2(struct pci_dev *dev)
diff --git a/drivers/vhm/Makefile b/drivers/vhm/Makefile
index 4abfbfcba4aa..a1520388766a 100644
--- a/drivers/vhm/Makefile
+++ b/drivers/vhm/Makefile
@@ -1,2 +1,2 @@
subdir-ccflags-$(CONFIG_ACRN_VHM) := -Werror
-obj-y += vhm_mm.o vhm_hugetlb.o vhm_ioreq.o vhm_vm_mngt.o vhm_msi.o vhm_hypercall.o vhm_ioeventfd.o vhm_irqfd.o
+obj-y += vhm_mm.o vhm_hugetlb.o vhm_ioreq.o vhm_vm_mngt.o vhm_hypercall.o vhm_ioeventfd.o vhm_irqfd.o
diff --git a/drivers/vhm/vhm_hypercall.c b/drivers/vhm/vhm_hypercall.c
index 55289bd70e16..8390d7f794f9 100644
--- a/drivers/vhm/vhm_hypercall.c
+++ b/drivers/vhm/vhm_hypercall.c
@@ -158,11 +158,6 @@ inline long hcall_reset_ptdev_intr_info(unsigned long vmid,
return acrn_hypercall2(HC_RESET_PTDEV_INTR_INFO, vmid, pt_irq);
}
-inline long hcall_remap_pci_msix(unsigned long vmid, unsigned long msi)
-{
- return acrn_hypercall2(HC_VM_PCI_MSIX_REMAP, vmid, msi);
-}
-
inline long hcall_vm_gpa2hpa(unsigned long vmid, unsigned long addr)
{
return acrn_hypercall2(HC_VM_GPA2HPA, vmid, addr);
diff --git a/drivers/vhm/vhm_msi.c b/drivers/vhm/vhm_msi.c
deleted file mode 100644
index 73affd60fc46..000000000000
--- a/drivers/vhm/vhm_msi.c
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * virtio and hyperviosr service module (VHM): msi paravirt
- *
- * This file is provided under a dual BSD/GPLv2 license. When using or
- * redistributing this file, you may do so under either license.
- *
- * GPL LICENSE SUMMARY
- *
- * Copyright (c) 2017 Intel Corporation. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * BSD LICENSE
- *
- * Copyright (C) 2017 Intel Corporation. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Intel Corporation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Jason Chen CJ <jason.cj.chen@intel.com>
- *
- */
-
-#include <linux/msi.h>
-#include <linux/pci.h>
-#include <linux/vhm/acrn_hv_defs.h>
-#include <linux/vhm/vhm_hypercall.h>
-
-#include "../pci/pci.h"
-
-static struct msi_msg acrn_notify_msix_remap(struct msi_desc *entry,
- struct msi_msg *msg)
-{
- volatile struct acrn_vm_pci_msix_remap notify;
- struct pci_dev *dev = msi_desc_to_pci_dev(entry);
- struct msi_msg remapped_msg = *msg;
- u16 msgctl;
- int ret;
-
- pci_read_config_word(dev, dev->msi_cap + PCI_MSI_FLAGS, &msgctl);
-
- notify.msi_ctl = msgctl;
- notify.virt_bdf = (dev->bus->number << 8) | dev->devfn;
- notify.msi_addr = msg->address_hi;
- notify.msi_addr <<= 32;
- notify.msi_addr |= msg->address_lo;
- notify.msi_data = msg->data;
- notify.msix = !!entry->msi_attrib.is_msix;
-
- if (notify.msix)
- notify.msix_entry_index = entry->msi_attrib.entry_nr;
- else
- notify.msix_entry_index = 0;
-
- ret = hcall_remap_pci_msix(0, virt_to_phys(&notify));
- if (ret < 0)
- dev_err(&dev->dev, "Failed to notify MSI/x change to HV\n");
- else {
- remapped_msg.address_hi = (unsigned int)(notify.msi_addr >> 32);
- remapped_msg.address_lo = (unsigned int)notify.msi_addr;
- remapped_msg.data = notify.msi_data;
- }
- return remapped_msg;
-}
-
-void acrn_write_msi_msg(struct msi_desc *entry, struct msi_msg *msg)
-{
- struct pci_dev *dev = msi_desc_to_pci_dev(entry);
- struct msi_msg fmsg;
-
- if (dev->current_state != PCI_D0 || pci_dev_is_disconnected(dev)) {
- /* Don't touch the hardware now */
- } else if (entry->msi_attrib.is_msix) {
- void __iomem *base = pci_msix_desc_addr(entry);
-
- fmsg = acrn_notify_msix_remap(entry, msg);
-
- writel(fmsg.address_lo, base + PCI_MSIX_ENTRY_LOWER_ADDR);
- writel(fmsg.address_hi, base + PCI_MSIX_ENTRY_UPPER_ADDR);
- writel(fmsg.data, base + PCI_MSIX_ENTRY_DATA);
- } else {
- int pos = dev->msi_cap;
- u16 msgctl;
-
- fmsg = acrn_notify_msix_remap(entry, msg);
-
- pci_read_config_word(dev, pos + PCI_MSI_FLAGS, &msgctl);
- msgctl &= ~PCI_MSI_FLAGS_QSIZE;
- msgctl |= entry->msi_attrib.multiple << 4;
- pci_write_config_word(dev, pos + PCI_MSI_FLAGS, msgctl);
-
- pci_write_config_dword(dev, pos + PCI_MSI_ADDRESS_LO,
- fmsg.address_lo);
- if (entry->msi_attrib.is_64) {
- pci_write_config_dword(dev, pos + PCI_MSI_ADDRESS_HI,
- fmsg.address_hi);
- pci_write_config_word(dev, pos + PCI_MSI_DATA_64,
- fmsg.data);
- } else {
- pci_write_config_word(dev, pos + PCI_MSI_DATA_32,
- fmsg.data);
- }
- }
- entry->msg = *msg;
-}
diff --git a/include/linux/msi.h b/include/linux/msi.h
index 2dd6c83b991c..5dd171849a27 100644
--- a/include/linux/msi.h
+++ b/include/linux/msi.h
@@ -147,15 +147,7 @@ struct msi_desc *alloc_msi_entry(struct device *dev, int nvec,
const struct cpumask *affinity);
void free_msi_entry(struct msi_desc *entry);
void __pci_read_msi_msg(struct msi_desc *entry, struct msi_msg *msg);
-
-void native_write_msi_msg(struct msi_desc *entry, struct msi_msg *msg);
-
-#if defined(CONFIG_PARAVIRT) && defined(CONFIG_X86)
-#include <asm/paravirt.h>
-#define __pci_write_msi_msg write_msi_msg_paravirt
-#else
-#define __pci_write_msi_msg native_write_msi_msg
-#endif
+void __pci_write_msi_msg(struct msi_desc *entry, struct msi_msg *msg);
u32 __pci_msix_desc_mask_irq(struct msi_desc *desc, u32 flag);
u32 __pci_msi_desc_mask_irq(struct msi_desc *desc, u32 mask, u32 flag);
diff --git a/include/linux/vhm/vhm_hypercall.h b/include/linux/vhm/vhm_hypercall.h
index 2c79bf3df6b4..5041f5ace282 100644
--- a/include/linux/vhm/vhm_hypercall.h
+++ b/include/linux/vhm/vhm_hypercall.h
@@ -167,7 +167,6 @@ inline long hcall_set_ptdev_intr_info(unsigned long vmid,
unsigned long pt_irq);
inline long hcall_reset_ptdev_intr_info(unsigned long vmid,
unsigned long pt_irq);
-inline long hcall_remap_pci_msix(unsigned long vmid, unsigned long msi);
inline long hcall_vm_gpa2hpa(unsigned long vmid, unsigned long addr);
inline long hcall_vm_intr_monitor(unsigned long vmid, unsigned long addr);
inline long hcall_profiling_ops(unsigned long cmd, unsigned long msr_nodes);
diff --git a/include/linux/vhm/vhm_msi.h b/include/linux/vhm/vhm_msi.h
deleted file mode 100644
index 059e97a0e543..000000000000
--- a/include/linux/vhm/vhm_msi.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * virtio and hyperviosr service module (VHM): msi paravirt
- *
- * This file is provided under a dual BSD/GPLv2 license. When using or
- * redistributing this file, you may do so under either license.
- *
- * GPL LICENSE SUMMARY
- *
- * Copyright (c) 2017 Intel Corporation. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * BSD LICENSE
- *
- * Copyright (C) 2017 Intel Corporation. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Intel Corporation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Jason Chen CJ <jason.cj.chen@intel.com>
- *
- */
-
-#ifndef __ACRN_VHM_MSI_H__
-#define __ACRN_VHM_MSI_H__
-
-struct msi_desc;
-struct msi_msg;
-void acrn_write_msi_msg(struct msi_desc *entry, struct msi_msg *msg);
-
-#endif
--
https://clearlinux.org
Reference in New Issue View Git Blame Copy Permalink