summaryrefslogtreecommitdiffstats
path: root/virt
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2018-04-16 20:39:10 +0200
committerEric W. Biederman <ebiederm@xmission.com>2018-09-27 21:57:43 +0200
commit795a83714526754a2b8089a0533bfef24287bcb9 (patch)
treeee95552e9468c9aebddaf9aa2ea794f73afdd8a2 /virt
parentsignal/arm: Use send_sig_fault where appropriate (diff)
downloadlinux-795a83714526754a2b8089a0533bfef24287bcb9.tar.xz
linux-795a83714526754a2b8089a0533bfef24287bcb9.zip
signal/arm/kvm: Use send_sig_mceerr
This simplifies the code making it clearer what is going on, and making the siginfo generation easier to maintain. Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Diffstat (limited to 'virt')
-rw-r--r--virt/kvm/arm/mmu.c14
1 files changed, 4 insertions, 10 deletions
diff --git a/virt/kvm/arm/mmu.c b/virt/kvm/arm/mmu.c
index 91aaf73b00df..39c0405f2021 100644
--- a/virt/kvm/arm/mmu.c
+++ b/virt/kvm/arm/mmu.c
@@ -1450,20 +1450,14 @@ static void invalidate_icache_guest_page(kvm_pfn_t pfn, unsigned long size)
static void kvm_send_hwpoison_signal(unsigned long address,
struct vm_area_struct *vma)
{
- siginfo_t info;
-
- clear_siginfo(&info);
- info.si_signo = SIGBUS;
- info.si_errno = 0;
- info.si_code = BUS_MCEERR_AR;
- info.si_addr = (void __user *)address;
+ short lsb;
if (is_vm_hugetlb_page(vma))
- info.si_addr_lsb = huge_page_shift(hstate_vma(vma));
+ lsb = huge_page_shift(hstate_vma(vma));
else
- info.si_addr_lsb = PAGE_SHIFT;
+ lsb = PAGE_SHIFT;
- send_sig_info(SIGBUS, &info, current);
+ send_sig_mceerr(BUS_MCEERR_AR, (void __user *)address, lsb, current);
}
static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa,