iommu/amd: Correctly set flags for handle_mm_fault call

Instead of just checking for a write access, calculate the
flags that are passed to handle_mm_fault() more precisly and
use the pre-defined macros.

Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Acked-By: David Woodhouse <David.Woodhouse@intel.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>

diff --git a/drivers/iommu/amd_iommu_v2.c b/drivers/iommu/amd_iommu_v2.c
index 7caf2fa237f22bd7a3b0932c6387ed52e0b26424..a7edbd6851c4b926fe2d55c7a5ebd2916f7c1f6b 100644 (file)
--- a/drivers/iommu/amd_iommu_v2.c
+++ b/drivers/iommu/amd_iommu_v2.c
@@ -513,16 +513,20 @@ static bool access_error(struct vm_area_struct *vma, struct fault *fault)
 static void do_fault(struct work_struct *work)
 {
        struct fault *fault = container_of(work, struct fault, work);
-       struct mm_struct *mm;
        struct vm_area_struct *vma;
+       unsigned int flags = 0;
+       struct mm_struct *mm;
        u64 address;
-       int ret, write;
-
-       write = !!(fault->flags & PPR_FAULT_WRITE);
+       int ret;
 
        mm = fault->state->mm;
        address = fault->address;
 
+       if (fault->flags & PPR_FAULT_USER)
+               flags |= FAULT_FLAG_USER;
+       if (fault->flags & PPR_FAULT_WRITE)
+               flags |= FAULT_FLAG_WRITE;
+
        down_read(&mm->mmap_sem);
        vma = find_extend_vma(mm, address);
        if (!vma || address < vma->vm_start) {
@@ -539,7 +543,7 @@ static void do_fault(struct work_struct *work)
                goto out;
        }
 
-       ret = handle_mm_fault(mm, vma, address, write);
+       ret = handle_mm_fault(mm, vma, address, flags);
        if (ret & VM_FAULT_ERROR) {
                /* failed to service fault */
                up_read(&mm->mmap_sem);