From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 8C7F0C3DA49 for ; Tue, 23 Jul 2024 10:14:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Type: Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID:Date :Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=QS7Q6moReX0ytgpoj7OMDTRK1GZLav9EGBrr2p1MFoI=; b=TrfsyIOyyUbSuNSSu+Vphw7Rx0 E4/5i2qj6EDgRnlh7qRN/nxHN9fJYYwnQueTZP3GwuVGB7/U3yLWsEHruayFgSc6fo6jhVb8Pkruq Xl1muh5jcS59K8coeBjkLPs57n6VL4IEtxrw+S1mdxoaDtGVsfuMu11LxjF9g6f0Mz8Db3Ww781j4 045z3uixGnFqe9tnq4HRFFBvi5Waizz3XjkeyjWw5ovRkS75WSTjzXWc60S0hk9ox8FJIMQVjbabt J2bEI75uBqY7n2pf/m3B+7dBOrf61J9mflNh7GPVUE1M1xxwr7+QExp+TaAROUzXxSatnLg17Gfex drSgKesA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sWCXN-0000000C8H0-2qF7; Tue, 23 Jul 2024 10:14:29 +0000 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sWCWv-0000000C88u-3S3B for linux-arm-kernel@lists.infradead.org; Tue, 23 Jul 2024 10:14:04 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1721729640; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QS7Q6moReX0ytgpoj7OMDTRK1GZLav9EGBrr2p1MFoI=; b=cTaBW3Yr8SvghQtFRnf3hP5/PhtVR5gKKTjqo+Xna0TiC6cPwUusgP9246gCX3rlwZqElK wBuOSlXTiLaWMo6/YNYcHQq/3vIeaacPFMLm43rk/QEkGvBaJ/M2ptdJq5QaXdW9nPXK9X nE0Fh3/Xgi2OHUAN4+TCSoI6IXomIq0= Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-612-kUiBEqbqNHWDhM6vI6Sigw-1; Tue, 23 Jul 2024 06:12:20 -0400 X-MC-Unique: kUiBEqbqNHWDhM6vI6Sigw-1 Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-79efca8478bso549628285a.1 for ; Tue, 23 Jul 2024 03:12:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721729540; x=1722334340; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=QS7Q6moReX0ytgpoj7OMDTRK1GZLav9EGBrr2p1MFoI=; b=J7S4mhcGPP8eaNdsPTB36Fo/R9UWu8HtdvK2itGeyeQOpss7hNvRYbPprwM/OY5XgB IN3PG+joSXcOyFlklhAgmPek3T3pIVbaB9sz9tTg+FIbSjgrEGEGif+trx9q4sYV6hjf 6qOsPtoODEimqcVUb5Qy8rhMmdN9FUOva0S9RE6Ele2alw3KN+ajtaWYIcpW6xjUIbEe uFzc947w2rPgmsqVSepU34f4ik8eoIrLjG9AKCnRP9eRAp1rMvSjqem5EzoFv3pf+qjt MG9HpsV5GXZF+a39c0TjFxydNU+V74vKuKejgX68IeDx86pQPwbxkp8cgn8Pg9uetYJ7 3cYg== X-Gm-Message-State: AOJu0YxtumhwM/abijeNbXU1wiX3p2K6IcmT2SP3irtexCqA7a12pZ1H wZMpVOIh0Nso3GrjkXWqLbTnBTpF4aWZg/BGN09cJIyGib5oOyLmkh/f2r/6i9I2Ue9sBJeQdfi rADUarY8luvgjR2XOfTuStzuJahFO1/H41rFmJ4H/A2ArJa1lUgY+cxYJfF1tKJCtZxw06SUCNr znAe2piHECApda608B50D7PkEKxp8MMEuPKz9zU2+gJdC5Fo5w2TvERw== X-Received: by 2002:a05:620a:244d:b0:79d:569a:699f with SMTP id af79cd13be357-7a1a654db8cmr1283856185a.39.1721729539925; Tue, 23 Jul 2024 03:12:19 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF2wFZtBagU/E46pV0uxTwzvChsAR2Dj7XVxuoFQCCKIFbTAHgkyz2V/BD0RPFoS8SnlRhwYw== X-Received: by 2002:a05:620a:244d:b0:79d:569a:699f with SMTP id af79cd13be357-7a1a654db8cmr1283853185a.39.1721729539500; Tue, 23 Jul 2024 03:12:19 -0700 (PDT) Received: from rh.redhat.com (p200300c93f45e50062e5f8c654844c9a.dip0.t-ipconnect.de. [2003:c9:3f45:e500:62e5:f8c6:5484:4c9a]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7a1990063f2sm463780085a.64.2024.07.23.03.12.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jul 2024 03:12:19 -0700 (PDT) From: Sebastian Ott To: linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, linux-kernel@vger.kernel.org Cc: Marc Zyngier , Oliver Upton , James Morse , Suzuki K Poulose , Catalin Marinas , Will Deacon , Zenghui Yu , Mark Rutland Subject: [PATCH v2 3/3] KVM: arm64: vgic: fix unexpected unlock sparse warnings Date: Tue, 23 Jul 2024 12:12:04 +0200 Message-ID: <20240723101204.7356-4-sebott@redhat.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240723101204.7356-1-sebott@redhat.com> References: <20240723101204.7356-1-sebott@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240723_031402_089952_BEB10ACE X-CRM114-Status: GOOD ( 13.39 ) 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 Get rid of unexpected unlock sparse warnings in vgic code by adding an annotation to vgic_queue_irq_unlock(). arch/arm64/kvm/vgic/vgic.c:334:17: warning: context imbalance in 'vgic_queue_irq_unlock' - unexpected unlock arch/arm64/kvm/vgic/vgic.c:419:5: warning: context imbalance in 'kvm_vgic_inject_irq' - different lock contexts for basic block Signed-off-by: Sebastian Ott --- arch/arm64/kvm/vgic/vgic.c | 2 +- arch/arm64/kvm/vgic/vgic.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/kvm/vgic/vgic.c b/arch/arm64/kvm/vgic/vgic.c index f07b3ddff7d4..974849ea7101 100644 --- a/arch/arm64/kvm/vgic/vgic.c +++ b/arch/arm64/kvm/vgic/vgic.c @@ -313,7 +313,7 @@ static bool vgic_validate_injection(struct vgic_irq *irq, bool level, void *owne * with all locks dropped. */ bool vgic_queue_irq_unlock(struct kvm *kvm, struct vgic_irq *irq, - unsigned long flags) + unsigned long flags) __releases(&irq->irq_lock) { struct kvm_vcpu *vcpu; diff --git a/arch/arm64/kvm/vgic/vgic.h b/arch/arm64/kvm/vgic/vgic.h index 03d356a12377..ba8f790431bd 100644 --- a/arch/arm64/kvm/vgic/vgic.h +++ b/arch/arm64/kvm/vgic/vgic.h @@ -186,7 +186,7 @@ bool vgic_get_phys_line_level(struct vgic_irq *irq); void vgic_irq_set_phys_pending(struct vgic_irq *irq, bool pending); void vgic_irq_set_phys_active(struct vgic_irq *irq, bool active); bool vgic_queue_irq_unlock(struct kvm *kvm, struct vgic_irq *irq, - unsigned long flags); + unsigned long flags) __releases(&irq->irq_lock); void vgic_kick_vcpus(struct kvm *kvm); void vgic_irq_handle_resampling(struct vgic_irq *irq, bool lr_deactivated, bool lr_pending); -- 2.42.0