From nobody Tue Oct 7 02:15:47 2025 Received: from mail-wr1-f74.google.com (mail-wr1-f74.google.com [209.85.221.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 470402F3C36 for ; Wed, 16 Jul 2025 11:07:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752664069; cv=none; b=MtR/hXTZvAoZkl3zTt1JWIzPVgkGa0CisAQ9BZP538c1hhE7vM9UbPxH/jOn7189hTPD0UHHy4i7ycoI4zdzquyQE0KsL4IXManW2Hjk0c8Xt4bDMxcGLfm74YZFZkTjqkOBXb+KXzFcvY/eMgadqGA4b4LINftuALRBR02EeTs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752664069; c=relaxed/simple; bh=7MCXu2XIExm1XsO3hQiAoT4CvnT5CB3Dy282TZ97t3U=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=rADBJ8jh9M2+4zrceNZ+eFAqFYEGoLXx0yYAKsTlO5XpxEW8WKDPly1CH4vl96yxPHwDF0ZH0EHAAkZgTrmIIHTFbcio39OWCpUdjtihybYcV2tGv2IUfChwty0AWOM9nO5oM/LJ4imjzxWvPS296ESgt92G+youdbF22B+PVPE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--keirf.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=KGPB21K/; arc=none smtp.client-ip=209.85.221.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--keirf.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="KGPB21K/" Received: by mail-wr1-f74.google.com with SMTP id ffacd0b85a97d-3a4f858bc5eso4896085f8f.0 for ; Wed, 16 Jul 2025 04:07:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1752664064; x=1753268864; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=lw9Wdz3TAUoCooOMv3X14CEUxWY0AuV/hf0NzcKNFE8=; b=KGPB21K/wFDrm3ArnevTOzbNa0dlmdb8VQFUxn1geeeW9/fwrbhbxjMWWystOnUPOA RShHNYAmZ2Xe8ypB8PPRaeBMe+eSHG1yUgf76MQDC8cOrnwLwNK/rF2ZiQna9lk3HLyS 1CR993ZYB+wyZulszyisgY2S6esPjON/a1LiAPqP2KJv0N/d7nP0C8bT4IZfAlF4H48Q WiGvY1bZ3p82EeMnxgGfo13kifv+HuQB/NMkLwtOUEx2QYqJhMAm4NZ1x2/9EhilkCB0 OGeM/TbPxdAKq6mCaJNAApv461aRMttAIJ+/hJQ9oPn/Gk5f3ohaQsBQv9HUAmqpb9+O LUQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752664064; x=1753268864; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=lw9Wdz3TAUoCooOMv3X14CEUxWY0AuV/hf0NzcKNFE8=; b=jRCfAfLpMQC7OpCMWHGywqZ+ebkPEWw+CNU1w38PDRjMnoN5cjBh2UEsFlph0LfU5j Am7GFUp1crHRTBXNl6lPgE4lg76kAy4IGzzkvNvxYzqRi12Bw5LJ4Mt8qeHCaLnikTQf xVxS2g8Gv8tMoQKPUtV1zyXMMzm94hb4coWs5ZgLjfoLH1UNLVL+IhFAQ81rilNV/wn9 eTYBPoLy167uZp+nu50GamLtUTN0DbgH4Q4zuUbDMfVEGiFDOr/5Ig6T8eZqCpPusUjO 8xUUAUmqsDvdZNygrLNfWLQCjsZfoYdQ08lbYQ2iYwBUqgpba6MxZR3tuFj9AF4pxCZh 9osA== X-Forwarded-Encrypted: i=1; AJvYcCXBlWlM0sOh1T005zP5xv2iiJzfD4TQMV45+q95WvnODXKF3vYsCsKQq+bEqDw0fqUa8bam8rrS7MAx1Tc=@vger.kernel.org X-Gm-Message-State: AOJu0Yyp25s0BtwBbFvEK6eFtpSalTW1e6fY2fC7pHtUxZsFh1GVoJYV 8euAoQness1CfjM7PJJLRAGktZMMlgyLA0oXHzWVwjy91+WP703DIece4inkMmXGgN/Hp53aoa2 QEQ== X-Google-Smtp-Source: AGHT+IHuNxCrx7B1F7XbHUaYm3AAwwPyLKTJsfFZ+D2KSuL1269JyI8e442f/hH+yv6mKmRQSSBPsJCPSA== X-Received: from wmbek10.prod.google.com ([2002:a05:600c:3eca:b0:451:4d6b:5b7e]) (user=keirf job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:3481:b0:43c:fcbc:9680 with SMTP id 5b1f17b1804b1-4562e3c4b8bmr18712195e9.25.1752664064367; Wed, 16 Jul 2025 04:07:44 -0700 (PDT) Date: Wed, 16 Jul 2025 11:07:34 +0000 In-Reply-To: <20250716110737.2513665-1-keirf@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250716110737.2513665-1-keirf@google.com> X-Mailer: git-send-email 2.50.0.727.gbf7dc18ff4-goog Message-ID: <20250716110737.2513665-2-keirf@google.com> Subject: [PATCH v2 1/4] KVM: arm64: vgic-init: Remove vgic_ready() macro From: Keir Fraser To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: Sean Christopherson , Eric Auger , Oliver Upton , Marc Zyngier , Will Deacon , Paolo Bonzini , Keir Fraser Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" It is now used only within kvm_vgic_map_resources(). vgic_dist::ready is already written directly by this function, so it is clearer to bypass the macro for reads as well. Signed-off-by: Keir Fraser --- arch/arm64/kvm/vgic/vgic-init.c | 5 ++--- include/kvm/arm_vgic.h | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/arch/arm64/kvm/vgic/vgic-init.c b/arch/arm64/kvm/vgic/vgic-ini= t.c index eb1205654ac8..502b65049703 100644 --- a/arch/arm64/kvm/vgic/vgic-init.c +++ b/arch/arm64/kvm/vgic/vgic-init.c @@ -559,7 +559,6 @@ int vgic_lazy_init(struct kvm *kvm) * Also map the virtual CPU interface into the VM. * v2 calls vgic_init() if not already done. * v3 and derivatives return an error if the VGIC is not initialized. - * vgic_ready() returns true if this function has succeeded. */ int kvm_vgic_map_resources(struct kvm *kvm) { @@ -568,12 +567,12 @@ int kvm_vgic_map_resources(struct kvm *kvm) gpa_t dist_base; int ret =3D 0; =20 - if (likely(vgic_ready(kvm))) + if (likely(dist->ready)) return 0; =20 mutex_lock(&kvm->slots_lock); mutex_lock(&kvm->arch.config_lock); - if (vgic_ready(kvm)) + if (dist->ready) goto out; =20 if (!irqchip_in_kernel(kvm)) diff --git a/include/kvm/arm_vgic.h b/include/kvm/arm_vgic.h index 4a34f7f0a864..233eaa6d1267 100644 --- a/include/kvm/arm_vgic.h +++ b/include/kvm/arm_vgic.h @@ -399,7 +399,6 @@ u64 vgic_v3_get_misr(struct kvm_vcpu *vcpu); =20 #define irqchip_in_kernel(k) (!!((k)->arch.vgic.in_kernel)) #define vgic_initialized(k) ((k)->arch.vgic.initialized) -#define vgic_ready(k) ((k)->arch.vgic.ready) #define vgic_valid_spi(k, i) (((i) >=3D VGIC_NR_PRIVATE_IRQS) && \ ((i) < (k)->arch.vgic.nr_spis + VGIC_NR_PRIVATE_IRQS)) =20 --=20 2.50.0.727.gbf7dc18ff4-goog