From patchwork Sat Jun 12 11:00:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Austin Kim X-Patchwork-Id: 12316959 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.2 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EE835C48BE5 for ; Sat, 12 Jun 2021 11:02:13 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 A09D861376 for ; Sat, 12 Jun 2021 11:02:13 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A09D861376 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Subject:Cc:To: From:Date:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=bgu7XohJcLOcX4CgVBefJsTKJ7/CpchATvEKDmy6uz0=; b=1YOruOjetyqw0G LwzCxTjyKwj4DBaZcdYgkNew/3BPKlv9XOU2bFKViTE1g3HBGqwOfLYR4Evp1wFAKdLnVgV/lsGYg CdupDfaS3Npsu2EWZxmMokCaTTpBFkkRz0Gg95x7abo2gjS4yWXcINyPBO+mx/dzmYxTZ8FP78PF0 RwJZS5UluH2RHH77KEY0EZ7dZr6RXFdJ0iUvifNx7+Q33k8kWz0au02vC80kZqtmD5ilvrXkeEo4l MQuMTwiwBeR29zCrAKHFpqelLQqTbv0DgGyt03YW0cXT9wPEexcH9LFLLY8sgF6+FpfcQP/jWli86 EsfFT/L5m1ooUtNkkjWg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ls1NO-008LAi-Aw; Sat, 12 Jun 2021 11:00:30 +0000 Received: from mail-pf1-x42f.google.com ([2607:f8b0:4864:20::42f]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ls1NK-008LAH-62 for linux-arm-kernel@lists.infradead.org; Sat, 12 Jun 2021 11:00:27 +0000 Received: by mail-pf1-x42f.google.com with SMTP id c12so6584442pfl.3 for ; Sat, 12 Jun 2021 04:00:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:mime-version:content-disposition :user-agent; bh=8iFz8MxPZLy39szDaTinyyt9MSbr8V1d4abH/6Oyi34=; b=dsAZPKVtBd9FNW3PfmVk3BX6RVgYyNpg0Raa2+UAkDpXioHz+z76oMr8eGi8viVXKL LiNViHV8bVXfGjz0w4vn5sST0m+1oEkawdQVH6VFf3HTzWn9mgM8simVoLWywHcmAjtQ Z5oDevv6bonmRxRv8y3Qfal5SfB/GcuD4YJ10Dy3ZuM/P1CR/PAsmHRit8p9LNXwuzmt 96fq9jE3x5LClunwOps24irJn4iE69mURhQPk9sMhixglFpgcmI6JMUnDtFcCVSWfkUr bM+PHdzbUsRyDk8Oj5BS4EVg53CAaiJBGtekU/CtFElLbP/5IYTNvijdZPAefdDb70V8 tRmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition:user-agent; bh=8iFz8MxPZLy39szDaTinyyt9MSbr8V1d4abH/6Oyi34=; b=mv14s/HFtx3q8v6HZFtAJb7qcjdReqQT6y7bRGa/c+FNZoWa7XJ7Hpexgnxy2up9Yx w2zkM4E9lV4CBoWpPaRW/T5zq9nX0RH3SpVUkMI9ZlyXc63whFTHmgYZGLznSbAGAsG1 xpWiZWbCyYJAVhMjBIqdxMJxtr3OtVxwV1Y/Ghzt/BF6Ktf+kjX5HOkE8yzU8Jd92sp1 5x+sPIFU2u5LwmxuUcy4qTxoiNj6pCBomG1N/RmG3FeL8hgk3ocvWIarr3eXWZAoiSdA OcijOgVJpYOYSZ646Vf2KwQTqeyDg+mC5TMQZUqV1KOG16YTNqE9/t63QIdE3ZHmu6b2 fe2g== X-Gm-Message-State: AOAM532PgFNGHiR18ot4sC31W1F7qMqJPVNkEXZ/9atrLQF5Aq/GKtJI WhxKNzN/EbeSKWnPu40row4= X-Google-Smtp-Source: ABdhPJxX8jxHPklTMEHdOxhkDMwNRN9obBLTCd8K9iuKwSlL5men33m5itr/QfiIZGiD/H4CqQ9vhA== X-Received: by 2002:a62:7e05:0:b029:2ea:57f:ec86 with SMTP id z5-20020a627e050000b02902ea057fec86mr12613918pfc.37.1623495621051; Sat, 12 Jun 2021 04:00:21 -0700 (PDT) Received: from raspberrypi ([125.141.84.155]) by smtp.gmail.com with ESMTPSA id v15sm8060992pgf.26.2021.06.12.04.00.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Jun 2021 04:00:20 -0700 (PDT) Date: Sat, 12 Jun 2021 12:00:14 +0100 From: Austin Kim To: maz@kernel.org, james.morse@arm.com, alexandru.elisei@arm.com, suzuki.poulose@arm.com, catalin.marinas@arm.com, will@kernel.org Cc: linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, linux-kernel@vger.kernel.org, austin.kim@lge.com, austindh.kim@gmail.com Subject: [PATCH] KVM: arm64: vgic: declear local variable 'flags' before for loop starts Message-ID: <20210612110014.GA1211@raspberrypi> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210612_040026_255499_348FFFB5 X-CRM114-Status: GOOD ( 14.33 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Austin Kim Normally local variable 'flags' is defined out of for loop, when 'flags' is used as the second parameter in a call to spinlock_irq[save/restore] function. So it had better declear local variable 'flags' ahead of for loop. Signed-off-by: Austin Kim --- arch/arm64/kvm/vgic/vgic-mmio.c | 2 +- arch/arm64/kvm/vgic/vgic-v4.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/arch/arm64/kvm/vgic/vgic-mmio.c b/arch/arm64/kvm/vgic/vgic-mmio.c index 48c6067fc5ec..ae32428d9f87 100644 --- a/arch/arm64/kvm/vgic/vgic-mmio.c +++ b/arch/arm64/kvm/vgic/vgic-mmio.c @@ -232,11 +232,11 @@ unsigned long vgic_mmio_read_pending(struct kvm_vcpu *vcpu, u32 intid = VGIC_ADDR_TO_INTID(addr, 1); u32 value = 0; int i; + unsigned long flags; /* Loop over all IRQs affected by this read */ for (i = 0; i < len * 8; i++) { struct vgic_irq *irq = vgic_get_irq(vcpu->kvm, vcpu, intid + i); - unsigned long flags; bool val; raw_spin_lock_irqsave(&irq->irq_lock, flags); diff --git a/arch/arm64/kvm/vgic/vgic-v4.c b/arch/arm64/kvm/vgic/vgic-v4.c index c1845d8f5f7e..a0c743f83bbe 100644 --- a/arch/arm64/kvm/vgic/vgic-v4.c +++ b/arch/arm64/kvm/vgic/vgic-v4.c @@ -116,7 +116,7 @@ static void vgic_v4_enable_vsgis(struct kvm_vcpu *vcpu) { struct its_vpe *vpe = &vcpu->arch.vgic_cpu.vgic_v3.its_vpe; int i; - + unsigned long flags; /* * With GICv4.1, every virtual SGI can be directly injected. So * let's pretend that they are HW interrupts, tied to a host @@ -125,7 +125,6 @@ static void vgic_v4_enable_vsgis(struct kvm_vcpu *vcpu) for (i = 0; i < VGIC_NR_SGIS; i++) { struct vgic_irq *irq = vgic_get_irq(vcpu->kvm, vcpu, i); struct irq_desc *desc; - unsigned long flags; int ret; raw_spin_lock_irqsave(&irq->irq_lock, flags); @@ -158,11 +157,11 @@ static void vgic_v4_enable_vsgis(struct kvm_vcpu *vcpu) static void vgic_v4_disable_vsgis(struct kvm_vcpu *vcpu) { int i; + unsigned long flags; for (i = 0; i < VGIC_NR_SGIS; i++) { struct vgic_irq *irq = vgic_get_irq(vcpu->kvm, vcpu, i); struct irq_desc *desc; - unsigned long flags; int ret; raw_spin_lock_irqsave(&irq->irq_lock, flags);