From patchwork Fri Jul 12 11:03:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Ott X-Patchwork-Id: 13731618 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 0F141C3DA4A for ; Fri, 12 Jul 2024 11:05:03 +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=MsvQ75fAXsh3PNmutFTZ+oUFOtcjE1xAsn2yQswaCk8=; b=eZ50tKxAErycfMiiPT1CFCijra dj3++YrZ1fMNweBoNI1Rnx4T8h2DN5sYAA6reAwB7EIvwMlHhFj8bFe2OGc7xxcakeF0HiHABc0qZ 6tRo/DT2EUjSnCgr7X/e0gZvc7DivAKUOry3LplUfBX1dtYV0yyqHH3eUEby9mb+2XzedUY2pTAtR 7MAHmc4kMFHgr3OB0/wZxJwO3ImRLmKgOixhbtvxQ2Kzarx8RaAtRjtyM4Uw2Nr7/vpH6xwZw0oV3 7ZfUeZl4/Iqwy4y6/YToKnltr3tghVDy4QXr3Fwz/osJjYQF2D4cM4b29whGFQC2GnEBm7wLH85iH h42EoV/A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sSE52-0000000HO0d-3clA; Fri, 12 Jul 2024 11:04:48 +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 1sSE47-0000000HNgh-30Bi for linux-arm-kernel@lists.infradead.org; Fri, 12 Jul 2024 11:03:53 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1720782230; 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=MsvQ75fAXsh3PNmutFTZ+oUFOtcjE1xAsn2yQswaCk8=; b=PIdwtbzXHvZck6Ulg7zT0QGJH4AaO2wR+k5UqG4O+5dTFEo0qpyJBmIgf1wK6t9g2oHTwm i1ztonQlnbEDJypLgCdwuT3sEuRXCJIN3cltEpSjPgXEL3bDKybJOFrJgRHR6YJsFFgBoB ZZRyMiFRhefB+jKQk3NgZiUzrJ3HZ1g= Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-656-kOLnNFfrOvm1Bz6eX6mWDQ-1; Fri, 12 Jul 2024 07:03:49 -0400 X-MC-Unique: kOLnNFfrOvm1Bz6eX6mWDQ-1 Received: by mail-qk1-f197.google.com with SMTP id af79cd13be357-79f0da8e7c7so166824385a.0 for ; Fri, 12 Jul 2024 04:03:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720782228; x=1721387028; 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=MsvQ75fAXsh3PNmutFTZ+oUFOtcjE1xAsn2yQswaCk8=; b=DlftqdY2wqRQS3+Ip1MBhTON0ghOerQsF+jqINt7ym5OdwP+2ZOJKmi1w3ameQIe1D k0XWqqfQF/20GpW1uQPSXFAOv2Ymge+a3cpGFkLJD6ItqXTYjwBiQHabXITTQpk55KJV KH96sf6oglSxbxS1V6qlgqvKYEa8K0UZMe/EqTdvCZMg4+fta+XE/F9ofoAp84ht5c0q C4XPoLSEc4cwfo4p7niZlSTQERO7CkPC9pQlJWFZ6CPDYrsANWKKHDrR4DTOZGfmvXvx TvG+SWLv9Q/xqQsA6IuCz3r5a+wS2WCuFwmtEW8pZFib+8BTaDIzKh/fhec915EWiLwh AP0w== X-Gm-Message-State: AOJu0YzqrCLnDmJYd4MF1tMstV/D39V0n+XThahpUHpfgyfPzOvotmY8 2UxOilXarzrSVeMAj9vjgr4fj2JIokwXklAqgDbqqRVsNc4mVPbuGTKlLg/qoYfSF6/yFBAFCTz NZPiNH+7OVc0gsSyM4/eWfvr8u/C5rTKNlOT4FdcAZDKea5DwKiz69CmFY9caKf4WDGMcxzDTab rvIliI3WNpi7R1FgW/IZnXPisOR+d6EcehHggBEu0pjQflk01x36nyjw== X-Received: by 2002:a05:620a:2186:b0:79c:119e:2b44 with SMTP id af79cd13be357-79f19a51d7fmr1225835385a.3.1720782228730; Fri, 12 Jul 2024 04:03:48 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF/x1W3ipOkWAMomp0zXTQ02Ix+7KNx4A712Y6gcZalpd9XUggvSO3hVJNYViAZWFdOQfl+eg== X-Received: by 2002:a05:620a:2186:b0:79c:119e:2b44 with SMTP id af79cd13be357-79f19a51d7fmr1225831585a.3.1720782228362; Fri, 12 Jul 2024 04:03:48 -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-79f18ff834csm390498685a.5.2024.07.12.04.03.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Jul 2024 04:03:48 -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 Subject: [PATCH 3/3] KVM: arm64: vgic: fix unexpected unlock sparse warnings Date: Fri, 12 Jul 2024 13:03:32 +0200 Message-ID: <20240712110332.10970-4-sebott@redhat.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240712110332.10970-1-sebott@redhat.com> References: <20240712110332.10970-1-sebott@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240712_040351_847271_15DBA4E5 X-CRM114-Status: GOOD ( 12.77 ) 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 6106ebd5ba42..480b5c7e2031 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);