January 2020 - Kernel - mailweb.openeuler.org

[PATCH 0/3] Some fixes for SVM
by Yang Yingliang 16 Jan '20

16 Jan '20

Lijun Fang (3): svm: Fix unpin_memory calculate nr_pages error svm: Delete svm_unbind_cores() in svm_notifier_release call svm: Delete ifdef CONFIG_ACPI in svm drivers/char/svm.c | 234 ++++++++++++++++++++++++++--------------------------- 1 file changed, 113 insertions(+), 121 deletions(-) -- 1.8.3

1 3

[all] We should provider more concrete spec files for projects
by Liyongle (Fred) 16 Jan '20

16 Jan '20

Hi all, Please read [1] to get the request that all the PR should detail the changes so that users/developers can understand the context. [1] https://gitee.com/open_euler/dashboard/issues?sort=updated_at%20desc&id=I18… Fred 李永乐

1 0

[PATCH] vrf: Do not attempt to create IPv6 mcast rule if IPv6 is disabled
by Yang Yingliang 16 Jan '20

16 Jan '20

From: David Ahern <dsahern(a)gmail.com> mainline inclusion from mainline-v5.4-rc1 commit dac91170f8e9c73784af5fad6225e954b795601c category: bugfix bugzilla: 23512 CVE: NA ------------------------------------- A user reported that vrf create fails when IPv6 is disabled at boot using 'ipv6.disable=1': https://bugzilla.kernel.org/show_bug.cgi?id=204903 The failure is adding fib rules at create time. Add RTNL_FAMILY_IP6MR to the check in vrf_fib_rule if ipv6_mod_enabled is disabled. Fixes: e4a38c0c4b27 ("ipv6: add vrf table handling code for ipv6 mcast") Signed-off-by: David Ahern <dsahern(a)gmail.com> Cc: Patrick Ruddy <pruddy(a)vyatta.att-mail.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> Signed-off-by: guodeqing <geffrey.guo(a)huawei.com> Reviewed-by: Wenan Mao <maowenan(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- drivers/net/vrf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/vrf.c b/drivers/net/vrf.c index af7b809..f94b4f4 100644 --- a/drivers/net/vrf.c +++ b/drivers/net/vrf.c @@ -1158,7 +1158,8 @@ static int vrf_fib_rule(const struct net_device *dev, __u8 family, bool add_it) struct sk_buff *skb; int err; - if (family == AF_INET6 && !ipv6_mod_enabled()) + if ((family == AF_INET6 || family == RTNL_FAMILY_IP6MR) && + !ipv6_mod_enabled()) return 0; skb = nlmsg_new(vrf_fib_rule_nl_size(), GFP_KERNEL); -- 1.8.3

1 0

[PATCH] iommu: Add missing new line for dma type
by Yang Yingliang 16 Jan '20

16 Jan '20

From: Lu Baolu <baolu.lu(a)linux.intel.com> mainline inclusion from mainline-5.2-rc5 commit 24f307d8abf7 category: bugfix bugzilla: 16865 CVE: NA ------------------------------------------------- So that all types are printed in the same format. Fixes: c52c72d3dee81 ("iommu: Add sysfs attribyte for domain type") Signed-off-by: Lu Baolu <baolu.lu(a)linux.intel.com> Signed-off-by: Joerg Roedel <jroedel(a)suse.de> Signed-off-by: Zhen Lei <thunder.leizhen(a)huawei.com> Reviewed-by: Hanjun Guo <guohanjun(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- drivers/iommu/iommu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c index c558fda..b7b0105 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -327,7 +327,7 @@ static ssize_t iommu_group_show_type(struct iommu_group *group, type = "unmanaged\n"; break; case IOMMU_DOMAIN_DMA: - type = "DMA"; + type = "DMA\n"; break; } } -- 1.8.3

1 0

[PATCH 00/45] Backport patches from Linux-4.19.91
by Yang Yingliang 16 Jan '20

16 Jan '20

Merge 45 patches from 4.19.91 stable branch (48 total) beside 3 already merged patches: 248e65f PCI: pciehp: Avoid returning prematurely from sysfs requests 6970c15 dm btree: increase rebalance threshold in __rebalance2() 5dc3f40 scsi: qla2xxx: Change discovery state before PLOGI Aaron Conole (1): openvswitch: support asymmetric conntrack Alex Deucher (1): drm/radeon: fix r1xx/r2xx register checker for POT textures Alexander Lobakin (1): net: dsa: fix flow dissection on Tx path Arun Kumar Neelakantam (2): rpmsg: glink: Fix reuse intents memory leak issue rpmsg: glink: Fix use after free in open_ack TIMEOUT case Bart Van Assche (1): scsi: iscsi: Fix a potential deadlock in the timeout handler Bjorn Andersson (2): rpmsg: glink: Don't send pending rx_done during remove rpmsg: glink: Free pending deferred work on remove Chaotian Jing (2): mmc: block: Make card_busy_detect() a bit more generic mmc: block: Add CMD13 polling for MMC IOCTLS with R1B response Chris Lew (3): rpmsg: glink: Set tail pointer to 0 at end of FIFO rpmsg: glink: Put an extra reference during cleanup rpmsg: glink: Fix rpmsg_register_device err handling Dexuan Cui (1): PCI/PM: Always return devices to D0 when thawing Dmitry Osipenko (1): ARM: tegra: Fix FLOW_CTLR_HALT register clobbering by tegra_resume() Dust Li (1): net: sched: fix dump qlen for sch_mq/sch_mqprio with NOLOCK subqueues Eric Dumazet (2): inet: protect against too small mtu values. tcp: md5: fix potential overestimation of TCP option space George Cherian (1): PCI: Apply Cavium ACS quirk to ThunderX2 and ThunderX3 Greg Kroah-Hartman (2): Revert "arm64: preempt: Fix big-endian when checking preempt count in assembly" Linux 4.19.91 Grygorii Strashko (1): net: ethernet: ti: cpsw: fix extra rx interrupt Guillaume Nault (3): tcp: fix rejected syncookies due to stale timestamps tcp: tighten acceptance of ACKs not matching a child socket tcp: Protect accesses to .ts_recent_stamp with {READ, WRITE}_ONCE() Huy Nguyen (1): net/mlx5e: Query global pause state before setting prio2buffer Jian-Hong Pan (1): PCI/MSI: Fix incorrect MSI-X masking on resume Jiang Yi (1): vfio/pci: call irq_bypass_unregister_producer() before freeing irq Lihua Yao (1): ARM: dts: s3c64xx: Fix init order of clock providers Long Li (4): cifs: smbd: Return -EAGAIN when transport is reconnecting cifs: smbd: Add messages on RDMA session destroy and reconnection cifs: smbd: Return -EINVAL when the number of iovs exceeds SMBDIRECT_MAX_SGE cifs: Don't display RDMA transport on reconnect Martin Blumenstingl (1): drm: meson: venc: cvbs: fix CVBS mode matching Mathias Nyman (1): xhci: fix USB3 device initiated resume race with roothub autosuspend Max Filippov (1): xtensa: fix TLB sanity checker Mian Yousaf Kaukab (1): net: thunderx: start phy before starting autonegotiation Mike Snitzer (1): dm mpath: remove harmful bio-based optimization Navid Emamdoost (1): dma-buf: Fix memory leak in sync_file_merge() Nikolay Aleksandrov (1): net: bridge: deny dev_set_mac_address() when unregistering Pavel Shilovsky (2): CIFS: Respect O_SYNC and O_DIRECT flags during reconnect CIFS: Close open handle after interrupted close Steffen Liebergeld (1): PCI: Fix Intel ACS quirk UPDCR register address Taehee Yoo (1): tipc: fix ordering of tipc module init and exit routine Vladyslav Tarasiuk (1): mqprio: Fix out-of-bounds access in mqprio_dump Makefile | 2 +- arch/arm/boot/dts/s3c6410-mini6410.dts | 4 + arch/arm/boot/dts/s3c6410-smdk6410.dts | 4 + arch/arm/mach-tegra/reset-handler.S | 6 +- arch/arm64/include/asm/assembler.h | 8 +- arch/arm64/kernel/entry.S | 8 +- arch/xtensa/mm/tlb.c | 4 +- drivers/dma-buf/sync_file.c | 2 +- drivers/gpu/drm/meson/meson_venc_cvbs.c | 48 ++++--- drivers/gpu/drm/radeon/r100.c | 4 +- drivers/gpu/drm/radeon/r200.c | 4 +- drivers/md/dm-mpath.c | 37 +---- drivers/mmc/core/block.c | 151 ++++++++------------- drivers/net/ethernet/cavium/thunder/thunder_bgx.c | 2 +- .../ethernet/mellanox/mlx5/core/en/port_buffer.c | 27 +++- drivers/net/ethernet/ti/cpsw.c | 2 +- drivers/pci/msi.c | 2 +- drivers/pci/pci-driver.c | 17 ++- drivers/pci/quirks.c | 22 +-- drivers/rpmsg/qcom_glink_native.c | 53 ++++++-- drivers/rpmsg/qcom_glink_smem.c | 2 +- drivers/scsi/libiscsi.c | 4 +- drivers/usb/host/xhci-hub.c | 8 ++ drivers/usb/host/xhci-ring.c | 3 +- drivers/vfio/pci/vfio_pci_intrs.c | 2 +- fs/cifs/cifs_debug.c | 5 + fs/cifs/file.c | 7 + fs/cifs/smb2misc.c | 59 ++++++-- fs/cifs/smb2pdu.c | 16 ++- fs/cifs/smb2proto.h | 3 + fs/cifs/smbdirect.c | 8 +- fs/cifs/transport.c | 7 +- include/linux/netdevice.h | 5 + include/linux/time.h | 13 ++ include/net/ip.h | 5 + include/net/tcp.h | 27 ++-- net/bridge/br_device.c | 6 + net/core/dev.c | 3 +- net/core/flow_dissector.c | 5 +- net/ipv4/devinet.c | 5 - net/ipv4/ip_output.c | 13 +- net/ipv4/tcp_output.c | 5 +- net/openvswitch/conntrack.c | 11 ++ net/sched/sch_mq.c | 1 + net/sched/sch_mqprio.c | 3 +- net/tipc/core.c | 29 ++-- 46 files changed, 400 insertions(+), 262 deletions(-) -- 1.8.3

1 45

[PATCH] ext4: check for directory entries too close to block end
by Yang Yingliang 16 Jan '20

16 Jan '20

From: Jan Kara <jack(a)suse.cz> commit 109ba779d6cca2d519c5dd624a3276d03e21948e upstream. ext4_check_dir_entry() currently does not catch a case when a directory entry ends so close to the block end that the header of the next directory entry would not fit in the remaining space. This can lead to directory iteration code trying to access address beyond end of current buffer head leading to oops. CC: stable(a)vger.kernel.org Signed-off-by: Jan Kara <jack(a)suse.cz> Link: https://lore.kernel.org/r/20191202170213.4761-3-jack@suse.cz Signed-off-by: Theodore Ts'o <tytso(a)mit.edu> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- fs/ext4/dir.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/fs/ext4/dir.c b/fs/ext4/dir.c index 46d5c40..d947c5e 100644 --- a/fs/ext4/dir.c +++ b/fs/ext4/dir.c @@ -77,6 +77,11 @@ int __ext4_check_dir_entry(const char *function, unsigned int line, error_msg = "rec_len is too small for name_len"; else if (unlikely(((char *) de - buf) + rlen > size)) error_msg = "directory entry overrun"; + else if (unlikely(((char *) de - buf) + rlen > + size - EXT4_DIR_REC_LEN(1) && + ((char *) de - buf) + rlen != size)) { + error_msg = "directory entry too close to block end"; + } else if (unlikely(le32_to_cpu(de->inode) > le32_to_cpu(EXT4_SB(dir->i_sb)->s_es->s_inodes_count))) error_msg = "inode out of bounds"; -- 1.8.3

1 0

[PATCH] ext4: fix ext4_empty_dir() for directories with holes
by Yang Yingliang 16 Jan '20

16 Jan '20

From: Jan Kara <jack(a)suse.cz> commit 64d4ce892383b2ad6d782e080d25502f91bf2a38 upstream. Function ext4_empty_dir() doesn't correctly handle directories with holes and crashes on bh->b_data dereference when bh is NULL. Reorganize the loop to use 'offset' variable all the times instead of comparing pointers to current direntry with bh->b_data pointer. Also add more strict checking of '.' and '..' directory entries to avoid entering loop in possibly invalid state on corrupted filesystems. References: CVE-2019-19037 CC: stable(a)vger.kernel.org Fixes: 4e19d6b65fb4 ("ext4: allow directory holes") Signed-off-by: Jan Kara <jack(a)suse.cz> Link: https://lore.kernel.org/r/20191202170213.4761-2-jack@suse.cz Signed-off-by: Theodore Ts'o <tytso(a)mit.edu> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- fs/ext4/namei.c | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c index f56d6f1..43dcb91 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c @@ -2693,7 +2693,7 @@ bool ext4_empty_dir(struct inode *inode) { unsigned int offset; struct buffer_head *bh; - struct ext4_dir_entry_2 *de, *de1; + struct ext4_dir_entry_2 *de; struct super_block *sb; if (ext4_has_inline_data(inode)) { @@ -2718,19 +2718,25 @@ bool ext4_empty_dir(struct inode *inode) return true; de = (struct ext4_dir_entry_2 *) bh->b_data; - de1 = ext4_next_entry(de, sb->s_blocksize); - if (le32_to_cpu(de->inode) != inode->i_ino || - le32_to_cpu(de1->inode) == 0 || - strcmp(".", de->name) || strcmp("..", de1->name)) { - ext4_warning_inode(inode, "directory missing '.' and/or '..'"); + if (ext4_check_dir_entry(inode, NULL, de, bh, bh->b_data, bh->b_size, + 0) || + le32_to_cpu(de->inode) != inode->i_ino || strcmp(".", de->name)) { + ext4_warning_inode(inode, "directory missing '.'"); + brelse(bh); + return true; + } + offset = ext4_rec_len_from_disk(de->rec_len, sb->s_blocksize); + de = ext4_next_entry(de, sb->s_blocksize); + if (ext4_check_dir_entry(inode, NULL, de, bh, bh->b_data, bh->b_size, + offset) || + le32_to_cpu(de->inode) == 0 || strcmp("..", de->name)) { + ext4_warning_inode(inode, "directory missing '..'"); brelse(bh); return true; } - offset = ext4_rec_len_from_disk(de->rec_len, sb->s_blocksize) + - ext4_rec_len_from_disk(de1->rec_len, sb->s_blocksize); - de = ext4_next_entry(de1, sb->s_blocksize); + offset += ext4_rec_len_from_disk(de->rec_len, sb->s_blocksize); while (offset < inode->i_size) { - if ((void *) de >= (void *) (bh->b_data+sb->s_blocksize)) { + if (!(offset & (sb->s_blocksize - 1))) { unsigned int lblock; brelse(bh); lblock = offset >> EXT4_BLOCK_SIZE_BITS(sb); @@ -2741,12 +2747,11 @@ bool ext4_empty_dir(struct inode *inode) } if (IS_ERR(bh)) return true; - de = (struct ext4_dir_entry_2 *) bh->b_data; } + de = (struct ext4_dir_entry_2 *) (bh->b_data + + (offset & (sb->s_blocksize - 1))); if (ext4_check_dir_entry(inode, NULL, de, bh, bh->b_data, bh->b_size, offset)) { - de = (struct ext4_dir_entry_2 *)(bh->b_data + - sb->s_blocksize); offset = (offset | (sb->s_blocksize - 1)) + 1; continue; } @@ -2755,7 +2760,6 @@ bool ext4_empty_dir(struct inode *inode) return false; } offset += ext4_rec_len_from_disk(de->rec_len, sb->s_blocksize); - de = ext4_next_entry(de, sb->s_blocksize); } brelse(bh); return true; -- 1.8.3

1 0

[PATCH] KVM: arm/arm64: vgic: Replace spin_is_locked() with lockdep
by Yang Yingliang 14 Jan '20

14 Jan '20

From: Lance Roy <ldr709(a)gmail.com> mainline inclusion from mainline-v5.0-rc1 commit d4d592a6eeda1e381f38f398e7a0474a599c11ed category: feature feature: convert assertions of spin_is_locked() into lockdep_assert_held() ------------------------------------------------- lockdep_assert_held() is better suited to checking locking requirements, since it only checks if the current thread holds the lock regardless of whether someone else does. This is also a step towards possibly removing spin_is_locked(). Signed-off-by: Lance Roy <ldr709(a)gmail.com> Cc: Marc Zyngier <marc.zyngier(a)arm.com> Cc: Eric Auger <eric.auger(a)redhat.com> Cc: linux-arm-kernel(a)lists.infradead.org Cc: <kvmarm(a)lists.cs.columbia.edu> Signed-off-by: Paul E. McKenney <paulmck(a)linux.ibm.com> Acked-by: Christoffer Dall <christoffer.dall(a)arm.com> Signed-off-by: Zenghui Yu <yuzenghui(a)huawei.com> Reviewed-by: Hailiang Zhang <zhang.zhanghailiang(a)huawei.com> Signed-off-by: Lance Roy <ldr709(a)gmail.com> Signed-off-by: Paul E. McKenney <paulmck(a)linux.ibm.com> Acked-by: Christoffer Dall <christoffer.dall(a)arm.com> Signed-off-by: Zenghui Yu <yuzenghui(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- virt/kvm/arm/vgic/vgic.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/virt/kvm/arm/vgic/vgic.c b/virt/kvm/arm/vgic/vgic.c index 4040a33..d3ce29f 100644 --- a/virt/kvm/arm/vgic/vgic.c +++ b/virt/kvm/arm/vgic/vgic.c @@ -196,7 +196,7 @@ void vgic_irq_set_phys_active(struct vgic_irq *irq, bool active) */ static struct kvm_vcpu *vgic_target_oracle(struct vgic_irq *irq) { - DEBUG_SPINLOCK_BUG_ON(!spin_is_locked(&irq->irq_lock)); + lockdep_assert_held(&irq->irq_lock); /* If the interrupt is active, it must stay on the current vcpu */ if (irq->active) @@ -280,7 +280,7 @@ static void vgic_sort_ap_list(struct kvm_vcpu *vcpu) { struct vgic_cpu *vgic_cpu = &vcpu->arch.vgic_cpu; - DEBUG_SPINLOCK_BUG_ON(!spin_is_locked(&vgic_cpu->ap_list_lock)); + lockdep_assert_held(&vgic_cpu->ap_list_lock); list_sort(NULL, &vgic_cpu->ap_list_head, vgic_irq_cmp); } @@ -318,7 +318,7 @@ bool vgic_queue_irq_unlock(struct kvm *kvm, struct vgic_irq *irq, { struct kvm_vcpu *vcpu; - DEBUG_SPINLOCK_BUG_ON(!spin_is_locked(&irq->irq_lock)); + lockdep_assert_held(&irq->irq_lock); retry: vcpu = vgic_target_oracle(irq); @@ -709,7 +709,7 @@ static inline void vgic_fold_lr_state(struct kvm_vcpu *vcpu) static inline void vgic_populate_lr(struct kvm_vcpu *vcpu, struct vgic_irq *irq, int lr) { - DEBUG_SPINLOCK_BUG_ON(!spin_is_locked(&irq->irq_lock)); + lockdep_assert_held(&irq->irq_lock); if (kvm_vgic_global_state.type == VGIC_V2) vgic_v2_populate_lr(vcpu, irq, lr); @@ -743,7 +743,7 @@ static int compute_ap_list_depth(struct kvm_vcpu *vcpu, *multi_sgi = false; - DEBUG_SPINLOCK_BUG_ON(!spin_is_locked(&vgic_cpu->ap_list_lock)); + lockdep_assert_held(&vgic_cpu->ap_list_lock); list_for_each_entry(irq, &vgic_cpu->ap_list_head, ap_list) { int w; @@ -768,7 +768,7 @@ static void vgic_flush_lr_state(struct kvm_vcpu *vcpu) bool multi_sgi; u8 prio = 0xff; - DEBUG_SPINLOCK_BUG_ON(!spin_is_locked(&vgic_cpu->ap_list_lock)); + lockdep_assert_held(&vgic_cpu->ap_list_lock); count = compute_ap_list_depth(vcpu, &multi_sgi); if (count > kvm_vgic_global_state.nr_lr || multi_sgi) -- 1.8.3

1 0

[PATCH 0/2] iommu: smmu-v3 support Virtualization feature when 3408iMR/3416iMRraid card exist
by Yang Yingliang 13 Jan '20

13 Jan '20

luochunsheng (2): iommu: smmu-v3 support Virtualization feature when 3408iMR/3416iMRraid card exist openeuler_defconfig: CONFIG_SMMU_BYPASS_DEV=y arch/arm64/configs/openeuler_defconfig | 1 + drivers/iommu/Kconfig | 6 ++ drivers/iommu/arm-smmu-v3.c | 123 +++++++++++++++++++++++++++++++++ drivers/iommu/iommu.c | 15 +++- include/linux/iommu.h | 6 ++ 5 files changed, 150 insertions(+), 1 deletion(-) -- 1.8.3

1 2

[PATCH 00/87] KVM/arm updates for openEuler
by Yang Yingliang 13 Jan '20

13 Jan '20

KVM/arm updates for openEuler. Andrew Murray (10): arm64: arm_pmu: Remove unnecessary isb instruction arm64: KVM: Encapsulate kvm_cpu_context in kvm_host_data arm64: KVM: Add accessors to track guest/host only counters arm64: arm_pmu: Add !VHE support for exclude_host/exclude_guest attributes arm64: KVM: Enable !VHE support for :G/:H perf event modifiers arm64: KVM: Enable VHE support for :G/:H perf event modifiers arm64: KVM: Avoid isb's by using direct pmxevtyper sysreg arm64: docs: Document perf event attributes arm64: KVM: Fix perf cycle counter support for VHE KVM: arm/arm64: Re-create event when setting counter value Christoffer Dall (8): KVM: arm64: Safety check PSTATE when entering guest and handle IL KVM: arm64: Clarify explanation of STAGE2_PGTABLE_LEVELS KVM: arm/arm64: vgic: Consider priority and active state for pending irq KVM: arm/arm64: Fixup the kvm_exit tracepoint KVM: arm/arm64: Remove arch timer workqueue KVM: arm64: Make vcpu const in vcpu_read_sys_reg KVM: arm/arm64: Fix unintended stage 2 PMD mappings KVM: arm/arm64: Simplify bg_timer programming Eric Auger (1): KVM: arm/arm64: vgic: Use a single IO device per redistributor Feng Tiantian (1): fbcon: fix ypos over boundary issue Heyi Guo (2): irqchip/gic-v3-its: Set VPENDING table as inner-shareable kvm/vgic-its: flush pending LPIs when nuking DT James Morse (1): KVM: arm64: Move pmu hyp code under hyp's Makefile to avoid instrumentation Julien Thierry (2): KVM: arm/arm64: vgic: Make vgic_irq->irq_lock a raw_spinlock KVM: arm/arm64: vgic: Make vgic_cpu->ap_list_lock a raw_spinlock Kristina Martsenko (1): vgic: Add support for 52bit guest physical address Marc Zyngier (21): arm64: KVM: Add trapped system register access tracepoint arm/arm64: KVM: Add ARM_EXCEPTION_IS_TRAP macro arm: KVM: Add S2_PMD_{MASK, SIZE} constants arm: KVM: Add missing kvm_stage2_has_pmd() helper arm/arm64: KVM: Statically configure the host's view of MPIDR arm64: KVM: Always set ICH_HCR_EL2.EN if GICv4 is enabled KVM: arm/arm64: vgic-v3: Retire pending interrupts on disabling LPIs KVM: arm/arm64: Initialise host's MPIDRs by reading the actual register KVM: arm/arm64: vgic: Add LPI translation cache definition KVM: arm/arm64: vgic: Add __vgic_put_lpi_locked primitive KVM: arm/arm64: vgic-its: Add MSI-LPI translation cache invalidation KVM: arm/arm64: vgic-its: Invalidate MSI-LPI translation cache on specific commands KVM: arm/arm64: vgic-its: Invalidate MSI-LPI translation cache on disabling LPIs KVM: arm/arm64: vgic-its: Invalidate MSI-LPI translation cache on ITS disable KVM: arm/arm64: vgic-its: Invalidate MSI-LPI translation cache on vgic teardown KVM: arm/arm64: vgic-its: Cache successful MSI->LPI translation KVM: arm/arm64: vgic-its: Check the LPI translation cache on MSI injection KVM: arm/arm64: vgic-irqfd: Implement kvm_arch_set_irq_inatomic KVM: Call kvm_arch_vcpu_blocking early into the blocking sequence irqchip/gic-v3-its: Make vlpi_lock a spinlock KVM: arm/arm64: vgic: Allow more than 256 vcpus for KVM_IRQ_LINE Mark Rutland (1): KVM: arm/arm64: Log PSTATE for unhandled sysregs Punit Agrawal (8): KVM: arm/arm64: Share common code in user_mem_abort() KVM: arm/arm64: Re-factor setting the Stage 2 entry to exec on fault KVM: arm/arm64: Introduce helpers to manipulate page table entries KVM: arm64: Support dirty page tracking for PUD hugepages KVM: arm64: Support PUD hugepage in stage2_is_exec() KVM: arm64: Support handling access faults for PUD hugepages KVM: arm64: Update age handlers to support PUD hugepages KVM: arm64: Add support for creating PUD hugepages at stage 2 Suzuki K Poulose (20): kvm: arm/arm64: Remove spurious WARN_ON kvm: arm64: Add helper for loading the stage2 setting for a VM arm64: Add a helper for PARange to physical shift conversion kvm: arm64: Clean up VTCR_EL2 initialisation kvm: arm/arm64: Allow arch specific configurations for VM kvm: arm64: Configure VTCR_EL2 per VM kvm: arm/arm64: Prepare for VM specific stage2 translations kvm: arm64: Prepare for dynamic stage2 page table layout kvm: arm64: Make stage2 page table layout dynamic kvm: arm64: Dynamic configuration of VTTBR mask kvm: arm64: Configure VTCR_EL2.SL0 per VM kvm: arm64: Switch to per VM IPA limit kvm: arm64: Add 52bit support for PAR to HPFAR conversoin kvm: arm64: Set a limit on the IPA size kvm: arm64: Limit the minimum number of page table levels kvm: arm64: Allow tuning the physical address size for VM KVM: arm64: Relax the restriction on using stage2 PUD huge mapping KVM: arm/arm64: Enforce PTE mappings at stage2 when needed KVM: arm/arm64: Fix handling of stage2 huge mappings kvm: arm: Skip stage2 huge mappings for unaligned ipa backed by THP Xiangyou Xie (2): KVM: arm/arm64: vgic-its: Introduce multiple LPI translation caches KVM: arm/arm64: vgic-its: Do not execute invalidate MSI-LPI translation cache on movi command Yiwen Jiang (1): kvm: arm/arm64: add irqsave for lpi_cache_lock Zenghui Yu (7): KVM: arm/arm64: Add support for probing Hisi ncsnp capability KVM: arm/arm64: Adjust entry/exit and trap related tracepoints perf tools arm64: Add support for get_cpuid() function perf, kvm/arm64: Add stat support on arm64 perf, kvm/arm64: perf-kvm-stat to report VM TRAP KVM: arm/arm64: Avoid the unnecessary stage 2 translation faults KVM: arm/arm64: Only probe CPU type and ncsnp info in hypervisor honghao (1): KVM: arm/arm64: Probe Hisi CPU TYPE from ACPI/DTB Documentation/arm64/perf.txt | 85 ++++ Documentation/virtual/kvm/api.txt | 43 +- arch/arm/include/asm/hisi_cpu_model.h | 18 + arch/arm/include/asm/kvm_arm.h | 4 +- arch/arm/include/asm/kvm_asm.h | 4 + arch/arm/include/asm/kvm_host.h | 25 +- arch/arm/include/asm/kvm_mmu.h | 76 ++- arch/arm/include/asm/stage2_pgtable.h | 69 ++- arch/arm/include/uapi/asm/kvm.h | 4 +- arch/arm/kvm/coproc.c | 4 +- arch/arm/kvm/hyp/cp15-sr.c | 1 - arch/arm64/include/asm/cpufeature.h | 21 + arch/arm64/include/asm/hisi_cpu_model.h | 21 + arch/arm64/include/asm/kvm_arm.h | 160 ++++-- arch/arm64/include/asm/kvm_asm.h | 13 +- arch/arm64/include/asm/kvm_host.h | 61 ++- arch/arm64/include/asm/kvm_hyp.h | 10 + arch/arm64/include/asm/kvm_mmu.h | 84 +++- arch/arm64/include/asm/pgtable-hwdef.h | 4 + arch/arm64/include/asm/pgtable.h | 9 + arch/arm64/include/asm/ptrace.h | 3 + arch/arm64/include/asm/stage2_pgtable-nopmd.h | 42 -- arch/arm64/include/asm/stage2_pgtable-nopud.h | 39 -- arch/arm64/include/asm/stage2_pgtable.h | 242 ++++++--- arch/arm64/include/uapi/asm/kvm.h | 4 +- arch/arm64/kernel/asm-offsets.c | 1 + arch/arm64/kernel/perf_event.c | 50 +- arch/arm64/kvm/Makefile | 3 +- arch/arm64/kvm/handle_exit.c | 10 + arch/arm64/kvm/hyp/Makefile | 1 - arch/arm64/kvm/hyp/hyp-entry.S | 16 +- arch/arm64/kvm/hyp/s2-setup.c | 90 ---- arch/arm64/kvm/hyp/switch.c | 49 +- arch/arm64/kvm/hyp/sysreg-sr.c | 20 +- arch/arm64/kvm/hyp/tlb.c | 4 +- arch/arm64/kvm/pmu.c | 201 ++++++++ arch/arm64/kvm/reset.c | 103 ++++ arch/arm64/kvm/sys_regs.c | 15 +- arch/arm64/kvm/sys_regs.h | 4 + arch/arm64/kvm/trace.h | 70 +++ drivers/irqchip/irq-gic-v3-its.c | 20 +- drivers/video/fbdev/core/fbcon.h | 5 +- include/kvm/arm_arch_timer.h | 7 - include/kvm/arm_vgic.h | 17 +- include/linux/irqchip/arm-gic-v3.h | 8 + include/uapi/linux/kvm.h | 11 + tools/perf/arch/arm64/Makefile | 2 + tools/perf/arch/arm64/util/Build | 1 + tools/perf/arch/arm64/util/aarch64_guest_exits.h | 95 ++++ tools/perf/arch/arm64/util/header.c | 74 +-- tools/perf/arch/arm64/util/kvm-stat.c | 112 +++++ virt/kvm/arm/arch_timer.c | 67 +-- virt/kvm/arm/arm.c | 41 +- virt/kvm/arm/hisi_cpu_model.c | 116 +++++ virt/kvm/arm/hyp/vgic-v3-sr.c | 4 +- virt/kvm/arm/mmu.c | 592 ++++++++++++++++------- virt/kvm/arm/pmu.c | 42 +- virt/kvm/arm/trace.h | 27 +- virt/kvm/arm/vgic/vgic-debug.c | 4 +- virt/kvm/arm/vgic/vgic-init.c | 18 +- virt/kvm/arm/vgic/vgic-irqfd.c | 36 +- virt/kvm/arm/vgic/vgic-its.c | 356 ++++++++++++-- virt/kvm/arm/vgic/vgic-kvm-device.c | 2 +- virt/kvm/arm/vgic/vgic-mmio-v2.c | 14 +- virt/kvm/arm/vgic/vgic-mmio-v3.c | 100 ++-- virt/kvm/arm/vgic/vgic-mmio.c | 34 +- virt/kvm/arm/vgic/vgic-v2.c | 4 +- virt/kvm/arm/vgic/vgic-v3.c | 8 +- virt/kvm/arm/vgic/vgic.c | 170 ++++--- virt/kvm/arm/vgic/vgic.h | 6 + virt/kvm/kvm_main.c | 6 +- 71 files changed, 2807 insertions(+), 875 deletions(-) create mode 100644 Documentation/arm64/perf.txt create mode 100644 arch/arm/include/asm/hisi_cpu_model.h create mode 100644 arch/arm64/include/asm/hisi_cpu_model.h delete mode 100644 arch/arm64/include/asm/stage2_pgtable-nopmd.h delete mode 100644 arch/arm64/include/asm/stage2_pgtable-nopud.h delete mode 100644 arch/arm64/kvm/hyp/s2-setup.c create mode 100644 arch/arm64/kvm/pmu.c create mode 100644 tools/perf/arch/arm64/util/aarch64_guest_exits.h create mode 100644 tools/perf/arch/arm64/util/kvm-stat.c create mode 100644 virt/kvm/arm/hisi_cpu_model.c -- 1.8.3

1 87