From patchwork Fri Jul 24 14:35:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Will Deacon X-Patchwork-Id: 11683443 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 70313138A for ; Fri, 24 Jul 2020 14:37:04 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 496BC2065C for ; Fri, 24 Jul 2020 14:37:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="pIY3C6mO"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="yiXEFGt7" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 496BC2065C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=JULMjK6JgZLJcQMMMsseg92U0I5gHdpW9M7eI8ihixM=; b=pIY3C6mO+hxtd50wvppSYGsK2 GP9WJcomwMhpY0/aNf5/iN30BTzWgZvVz7tHE8FIyv6dbXS7UMIUoRvEzRndZbJoW92jsTDMnDOeJ 4np6CV6OsdD8DCmxfhdq18XAq5tbGPG5mD9P28vXWoZxpVziFfZFzDuXOP/Meo1i+NM3pex7Z/7e3 1i1Vdf6G7NLJmd7LUlxzNvwbx4LByY3bzRk90OmENcNnXG712mwVYnUYjqYsVLm29EO0jLMKjMrm0 LR0Pp6XejxjiGuVtONw1WSl6KIq/pfxMlkxMtplOrfbaEtoN6DnDKz8T3ydG41XG7397buYddyiPh ALL0S8IAw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jyynR-0003Hj-2I; Fri, 24 Jul 2020 14:35:37 +0000 Received: from mail.kernel.org ([198.145.29.99]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jyynA-0003DV-Oy for linux-arm-kernel@lists.infradead.org; Fri, 24 Jul 2020 14:35:21 +0000 Received: from localhost.localdomain (236.31.169.217.in-addr.arpa [217.169.31.236]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D071C20674; Fri, 24 Jul 2020 14:35:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595601320; bh=ijOhZAWxzLhleVKNPuhFyU6KwAfe6z3uD2+snheMDy0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yiXEFGt7N8Cojz24AFxW3Ck5sT84Iy0+U4Uh5quzcZp6eNEg35lqlyEfDLc+j2I7k IKFr5SitXOPBrxiF7SE9OD5pD9eqNk+b8NuLTyHpuExHtqDEYnECiSOw/2G12ZIfdC 5H7DwJzFFyXVRQz2z8+VjsC13MS/P+EN04c1SaFc= From: Will Deacon To: kvmarm@lists.cs.columbia.edu Subject: [PATCH 4/7] KVM: arm64: Remove useless local variable Date: Fri, 24 Jul 2020 15:35:03 +0100 Message-Id: <20200724143506.17772-5-will@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200724143506.17772-1-will@kernel.org> References: <20200724143506.17772-1-will@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200724_103520_925846_6A621B89 X-CRM114-Status: GOOD ( 11.31 ) X-Spam-Score: -5.2 (-----) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-5.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at https://www.dnswl.org/, high trust [198.145.29.99 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.0 DKIMWL_WL_HIGH DKIMwl.org - Whitelisted High sender X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Quentin Perret , kernel-team@android.com, Suzuki Poulose , James Morse , Marc Zyngier , Will Deacon , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org 'is_iabt' is used exactly once in kvm_handle_guest_abort(). Remove it, and inlined its definition instead. Cc: Marc Zyngier Cc: Quentin Perret Signed-off-by: Will Deacon --- arch/arm64/kvm/mmu.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c index ae17a99243e2..73e62d360a36 100644 --- a/arch/arm64/kvm/mmu.c +++ b/arch/arm64/kvm/mmu.c @@ -2064,14 +2064,13 @@ int kvm_handle_guest_abort(struct kvm_vcpu *vcpu, struct kvm_run *run) phys_addr_t fault_ipa; struct kvm_memory_slot *memslot; unsigned long hva; - bool is_iabt, write_fault, writable; + bool write_fault, writable; gfn_t gfn; int ret, idx; fault_status = kvm_vcpu_trap_get_fault_type(vcpu); fault_ipa = kvm_vcpu_get_fault_ipa(vcpu); - is_iabt = kvm_vcpu_trap_is_iabt(vcpu); /* Synchronous External Abort? */ if (kvm_vcpu_abt_is_extabt(vcpu)) { @@ -2105,7 +2104,7 @@ int kvm_handle_guest_abort(struct kvm_vcpu *vcpu, struct kvm_run *run) hva = gfn_to_hva_memslot_prot(memslot, gfn, &writable); write_fault = kvm_is_write_fault(vcpu); if (kvm_is_error_hva(hva) || (write_fault && !writable)) { - if (is_iabt) { + if (kvm_vcpu_trap_is_iabt(vcpu)) { /* Prefetch Abort on I/O address */ ret = -ENOEXEC; goto out;