Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753766AbbKQPLw (ORCPT ); Tue, 17 Nov 2015 10:11:52 -0500 Received: from 8bytes.org ([81.169.241.247]:58329 "EHLO theia.8bytes.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752890AbbKQPLu (ORCPT ); Tue, 17 Nov 2015 10:11:50 -0500 From: Joerg Roedel To: iommu@lists.linux-foundation.org Cc: Oded Gabbay , David Woodhouse , Jesse Barnes , Linus Torvalds , linux-kernel@vger.kernel.org, Joerg Roedel Subject: [PATCH 3/4] iommu/amd: Cleanup error handling in do_fault() Date: Tue, 17 Nov 2015 16:11:38 +0100 Message-Id: <1447773099-2444-4-git-send-email-joro@8bytes.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1447773099-2444-1-git-send-email-joro@8bytes.org> References: <1447773099-2444-1-git-send-email-joro@8bytes.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2009 Lines: 73 From: Joerg Roedel Get rid of the three error paths that look the same and move error handling to a single place. Signed-off-by: Joerg Roedel --- drivers/iommu/amd_iommu_v2.c | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/drivers/iommu/amd_iommu_v2.c b/drivers/iommu/amd_iommu_v2.c index a7edbd6..6a28b74 100644 --- a/drivers/iommu/amd_iommu_v2.c +++ b/drivers/iommu/amd_iommu_v2.c @@ -514,10 +514,10 @@ static void do_fault(struct work_struct *work) { struct fault *fault = container_of(work, struct fault, work); struct vm_area_struct *vma; + int ret = VM_FAULT_ERROR; unsigned int flags = 0; struct mm_struct *mm; u64 address; - int ret; mm = fault->state->mm; address = fault->address; @@ -529,31 +529,23 @@ static void do_fault(struct work_struct *work) down_read(&mm->mmap_sem); vma = find_extend_vma(mm, address); - if (!vma || address < vma->vm_start) { + if (!vma || address < vma->vm_start) /* failed to get a vma in the right range */ - up_read(&mm->mmap_sem); - handle_fault_error(fault); goto out; - } /* Check if we have the right permissions on the vma */ - if (access_error(vma, fault)) { - up_read(&mm->mmap_sem); - handle_fault_error(fault); + if (access_error(vma, fault)) goto out; - } ret = handle_mm_fault(mm, vma, address, flags); - if (ret & VM_FAULT_ERROR) { - /* failed to service fault */ - up_read(&mm->mmap_sem); - handle_fault_error(fault); - goto out; - } +out: up_read(&mm->mmap_sem); -out: + if (ret & VM_FAULT_ERROR) + /* failed to service fault */ + handle_fault_error(fault); + finish_pri_tag(fault->dev_state, fault->state, fault->tag); put_pasid_state(fault->state); -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/