Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

KVM: MIPS: Add Loongson-3 Virtual IPI interrupt support

This patch add Loongson-3 Virtual IPI interrupt support in the kernel.
The current implementation of IPI emulation in QEMU is based on GIC for
MIPS, but Loongson-3 doesn't use GIC. Furthermore, IPI emulation in QEMU
is too expensive for performance (because of too many context switches
between Host and Guest). With current solution, the IPI delay may even
cause RCU stall warnings in a multi-core Guest. So, we design a faster
solution that emulate IPI interrupt in kernel (only used by Loongson-3
now).

Reviewed-by: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>
Signed-off-by: Huacai Chen <chenhc@lemote.com>
Co-developed-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
Message-Id: <1590220602-3547-11-git-send-email-chenhc@lemote.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

authored by

Huacai Chen and committed by
Paolo Bonzini
f21db309 3f51d8fc

+277 -1
+32
arch/mips/include/asm/kvm_host.h
··· 23 23 #include <asm/inst.h> 24 24 #include <asm/mipsregs.h> 25 25 26 + #include <kvm/iodev.h> 27 + 26 28 /* MIPS KVM register ids */ 27 29 #define MIPS_CP0_32(_R, _S) \ 28 30 (KVM_REG_MIPS_CP0 | KVM_REG_SIZE_U32 | (8 * (_R) + (_S))) ··· 185 183 struct kvm_arch_memory_slot { 186 184 }; 187 185 186 + #ifdef CONFIG_CPU_LOONGSON64 187 + struct ipi_state { 188 + uint32_t status; 189 + uint32_t en; 190 + uint32_t set; 191 + uint32_t clear; 192 + uint64_t buf[4]; 193 + }; 194 + 195 + struct loongson_kvm_ipi; 196 + 197 + struct ipi_io_device { 198 + int node_id; 199 + struct loongson_kvm_ipi *ipi; 200 + struct kvm_io_device device; 201 + }; 202 + 203 + struct loongson_kvm_ipi { 204 + spinlock_t lock; 205 + struct kvm *kvm; 206 + struct ipi_state ipistate[16]; 207 + struct ipi_io_device dev_ipi[4]; 208 + }; 209 + #endif 210 + 188 211 struct kvm_arch { 189 212 /* Guest physical mm */ 190 213 struct mm_struct gpa_mm; 191 214 /* Mask of CPUs needing GPA ASID flush */ 192 215 cpumask_t asid_flush_mask; 216 + #ifdef CONFIG_CPU_LOONGSON64 217 + struct loongson_kvm_ipi ipi; 218 + #endif 193 219 }; 194 220 195 221 #define N_MIPS_COPROC_REGS 32 ··· 1165 1135 /* Misc */ 1166 1136 extern void kvm_mips_dump_stats(struct kvm_vcpu *vcpu); 1167 1137 extern unsigned long kvm_mips_get_ramsize(struct kvm *kvm); 1138 + extern int kvm_vcpu_ioctl_interrupt(struct kvm_vcpu *vcpu, 1139 + struct kvm_mips_interrupt *irq); 1168 1140 1169 1141 static inline void kvm_arch_hardware_unsetup(void) {} 1170 1142 static inline void kvm_arch_sync_events(struct kvm *kvm) {}
+3
arch/mips/kvm/Makefile
··· 13 13 fpu.o 14 14 kvm-objs += hypcall.o 15 15 kvm-objs += mmu.o 16 + ifdef CONFIG_CPU_LOONGSON64 17 + kvm-objs += loongson_ipi.o 18 + endif 16 19 17 20 ifdef CONFIG_KVM_MIPS_VZ 18 21 kvm-objs += vz.o
+22 -1
arch/mips/kvm/emulate.c
··· 1600 1600 struct kvm_run *run, 1601 1601 struct kvm_vcpu *vcpu) 1602 1602 { 1603 + int r; 1603 1604 enum emulation_result er; 1604 1605 u32 rt; 1605 1606 void *data = run->mmio.data; ··· 1667 1666 goto out_fail; 1668 1667 } 1669 1668 1670 - run->mmio.is_write = 1; 1671 1669 vcpu->mmio_needed = 1; 1670 + run->mmio.is_write = 1; 1672 1671 vcpu->mmio_is_write = 1; 1672 + 1673 + r = kvm_io_bus_write(vcpu, KVM_MMIO_BUS, 1674 + run->mmio.phys_addr, run->mmio.len, data); 1675 + 1676 + if (!r) { 1677 + vcpu->mmio_needed = 0; 1678 + return EMULATE_DONE; 1679 + } 1680 + 1673 1681 return EMULATE_DO_MMIO; 1674 1682 1675 1683 out_fail: ··· 1691 1681 u32 cause, struct kvm_run *run, 1692 1682 struct kvm_vcpu *vcpu) 1693 1683 { 1684 + int r; 1694 1685 enum emulation_result er; 1695 1686 unsigned long curr_pc; 1696 1687 u32 op, rt; ··· 1756 1745 1757 1746 run->mmio.is_write = 0; 1758 1747 vcpu->mmio_is_write = 0; 1748 + 1749 + r = kvm_io_bus_read(vcpu, KVM_MMIO_BUS, 1750 + run->mmio.phys_addr, run->mmio.len, run->mmio.data); 1751 + 1752 + if (!r) { 1753 + kvm_mips_complete_mmio_load(vcpu, run); 1754 + vcpu->mmio_needed = 0; 1755 + return EMULATE_DONE; 1756 + } 1757 + 1759 1758 return EMULATE_DO_MMIO; 1760 1759 } 1761 1760
+214
arch/mips/kvm/loongson_ipi.c
··· 1 + // SPDX-License-Identifier: GPL-2.0-or-later 2 + /* 3 + * Loongson-3 Virtual IPI interrupt support. 4 + * 5 + * Copyright (C) 2019 Loongson Technologies, Inc. All rights reserved. 6 + * 7 + * Authors: Chen Zhu <zhuchen@loongson.cn> 8 + * Authors: Huacai Chen <chenhc@lemote.com> 9 + */ 10 + 11 + #include <linux/kvm_host.h> 12 + 13 + #define IPI_BASE 0x3ff01000ULL 14 + 15 + #define CORE0_STATUS_OFF 0x000 16 + #define CORE0_EN_OFF 0x004 17 + #define CORE0_SET_OFF 0x008 18 + #define CORE0_CLEAR_OFF 0x00c 19 + #define CORE0_BUF_20 0x020 20 + #define CORE0_BUF_28 0x028 21 + #define CORE0_BUF_30 0x030 22 + #define CORE0_BUF_38 0x038 23 + 24 + #define CORE1_STATUS_OFF 0x100 25 + #define CORE1_EN_OFF 0x104 26 + #define CORE1_SET_OFF 0x108 27 + #define CORE1_CLEAR_OFF 0x10c 28 + #define CORE1_BUF_20 0x120 29 + #define CORE1_BUF_28 0x128 30 + #define CORE1_BUF_30 0x130 31 + #define CORE1_BUF_38 0x138 32 + 33 + #define CORE2_STATUS_OFF 0x200 34 + #define CORE2_EN_OFF 0x204 35 + #define CORE2_SET_OFF 0x208 36 + #define CORE2_CLEAR_OFF 0x20c 37 + #define CORE2_BUF_20 0x220 38 + #define CORE2_BUF_28 0x228 39 + #define CORE2_BUF_30 0x230 40 + #define CORE2_BUF_38 0x238 41 + 42 + #define CORE3_STATUS_OFF 0x300 43 + #define CORE3_EN_OFF 0x304 44 + #define CORE3_SET_OFF 0x308 45 + #define CORE3_CLEAR_OFF 0x30c 46 + #define CORE3_BUF_20 0x320 47 + #define CORE3_BUF_28 0x328 48 + #define CORE3_BUF_30 0x330 49 + #define CORE3_BUF_38 0x338 50 + 51 + static int loongson_vipi_read(struct loongson_kvm_ipi *ipi, 52 + gpa_t addr, int len, void *val) 53 + { 54 + uint32_t core = (addr >> 8) & 3; 55 + uint32_t node = (addr >> 44) & 3; 56 + uint32_t id = core + node * 4; 57 + uint64_t offset = addr & 0xff; 58 + void *pbuf; 59 + struct ipi_state *s = &(ipi->ipistate[id]); 60 + 61 + BUG_ON(offset & (len - 1)); 62 + 63 + switch (offset) { 64 + case CORE0_STATUS_OFF: 65 + *(uint64_t *)val = s->status; 66 + break; 67 + 68 + case CORE0_EN_OFF: 69 + *(uint64_t *)val = s->en; 70 + break; 71 + 72 + case CORE0_SET_OFF: 73 + *(uint64_t *)val = 0; 74 + break; 75 + 76 + case CORE0_CLEAR_OFF: 77 + *(uint64_t *)val = 0; 78 + break; 79 + 80 + case CORE0_BUF_20 ... CORE0_BUF_38: 81 + pbuf = (void *)s->buf + (offset - 0x20); 82 + if (len == 8) 83 + *(uint64_t *)val = *(uint64_t *)pbuf; 84 + else /* Assume len == 4 */ 85 + *(uint32_t *)val = *(uint32_t *)pbuf; 86 + break; 87 + 88 + default: 89 + pr_notice("%s with unknown addr %llx\n", __func__, addr); 90 + break; 91 + } 92 + 93 + return 0; 94 + } 95 + 96 + static int loongson_vipi_write(struct loongson_kvm_ipi *ipi, 97 + gpa_t addr, int len, const void *val) 98 + { 99 + uint32_t core = (addr >> 8) & 3; 100 + uint32_t node = (addr >> 44) & 3; 101 + uint32_t id = core + node * 4; 102 + uint64_t data, offset = addr & 0xff; 103 + void *pbuf; 104 + struct kvm *kvm = ipi->kvm; 105 + struct kvm_mips_interrupt irq; 106 + struct ipi_state *s = &(ipi->ipistate[id]); 107 + 108 + data = *(uint64_t *)val; 109 + BUG_ON(offset & (len - 1)); 110 + 111 + switch (offset) { 112 + case CORE0_STATUS_OFF: 113 + break; 114 + 115 + case CORE0_EN_OFF: 116 + s->en = data; 117 + break; 118 + 119 + case CORE0_SET_OFF: 120 + s->status |= data; 121 + irq.cpu = id; 122 + irq.irq = 6; 123 + kvm_vcpu_ioctl_interrupt(kvm->vcpus[id], &irq); 124 + break; 125 + 126 + case CORE0_CLEAR_OFF: 127 + s->status &= ~data; 128 + if (!s->status) { 129 + irq.cpu = id; 130 + irq.irq = -6; 131 + kvm_vcpu_ioctl_interrupt(kvm->vcpus[id], &irq); 132 + } 133 + break; 134 + 135 + case CORE0_BUF_20 ... CORE0_BUF_38: 136 + pbuf = (void *)s->buf + (offset - 0x20); 137 + if (len == 8) 138 + *(uint64_t *)pbuf = (uint64_t)data; 139 + else /* Assume len == 4 */ 140 + *(uint32_t *)pbuf = (uint32_t)data; 141 + break; 142 + 143 + default: 144 + pr_notice("%s with unknown addr %llx\n", __func__, addr); 145 + break; 146 + } 147 + 148 + return 0; 149 + } 150 + 151 + static int kvm_ipi_read(struct kvm_vcpu *vcpu, struct kvm_io_device *dev, 152 + gpa_t addr, int len, void *val) 153 + { 154 + unsigned long flags; 155 + struct loongson_kvm_ipi *ipi; 156 + struct ipi_io_device *ipi_device; 157 + 158 + ipi_device = container_of(dev, struct ipi_io_device, device); 159 + ipi = ipi_device->ipi; 160 + 161 + spin_lock_irqsave(&ipi->lock, flags); 162 + loongson_vipi_read(ipi, addr, len, val); 163 + spin_unlock_irqrestore(&ipi->lock, flags); 164 + 165 + return 0; 166 + } 167 + 168 + static int kvm_ipi_write(struct kvm_vcpu *vcpu, struct kvm_io_device *dev, 169 + gpa_t addr, int len, const void *val) 170 + { 171 + unsigned long flags; 172 + struct loongson_kvm_ipi *ipi; 173 + struct ipi_io_device *ipi_device; 174 + 175 + ipi_device = container_of(dev, struct ipi_io_device, device); 176 + ipi = ipi_device->ipi; 177 + 178 + spin_lock_irqsave(&ipi->lock, flags); 179 + loongson_vipi_write(ipi, addr, len, val); 180 + spin_unlock_irqrestore(&ipi->lock, flags); 181 + 182 + return 0; 183 + } 184 + 185 + static const struct kvm_io_device_ops kvm_ipi_ops = { 186 + .read = kvm_ipi_read, 187 + .write = kvm_ipi_write, 188 + }; 189 + 190 + void kvm_init_loongson_ipi(struct kvm *kvm) 191 + { 192 + int i; 193 + unsigned long addr; 194 + struct loongson_kvm_ipi *s; 195 + struct kvm_io_device *device; 196 + 197 + s = &kvm->arch.ipi; 198 + s->kvm = kvm; 199 + spin_lock_init(&s->lock); 200 + 201 + /* 202 + * Initialize IPI device 203 + */ 204 + for (i = 0; i < 4; i++) { 205 + device = &s->dev_ipi[i].device; 206 + kvm_iodevice_init(device, &kvm_ipi_ops); 207 + addr = (((unsigned long)i) << 44) + IPI_BASE; 208 + mutex_lock(&kvm->slots_lock); 209 + kvm_io_bus_register_dev(kvm, KVM_MMIO_BUS, addr, 0x400, device); 210 + mutex_unlock(&kvm->slots_lock); 211 + s->dev_ipi[i].ipi = s; 212 + s->dev_ipi[i].node_id = i; 213 + } 214 + }
+6
arch/mips/kvm/mips.c
··· 129 129 return 0; 130 130 } 131 131 132 + extern void kvm_init_loongson_ipi(struct kvm *kvm); 133 + 132 134 int kvm_arch_init_vm(struct kvm *kvm, unsigned long type) 133 135 { 134 136 switch (type) { ··· 149 147 kvm->arch.gpa_mm.pgd = kvm_pgd_alloc(); 150 148 if (!kvm->arch.gpa_mm.pgd) 151 149 return -ENOMEM; 150 + 151 + #ifdef CONFIG_CPU_LOONGSON64 152 + kvm_init_loongson_ipi(kvm); 153 + #endif 152 154 153 155 return 0; 154 156 }