From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ed1-f74.google.com (mail-ed1-f74.google.com [209.85.208.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 2935138B12D for ; Fri, 12 Jun 2026 06:59:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.74 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781247570; cv=none; b=rOFyWsIQ9aezdPGxmgNDVPTEbJx9NZBQ53dtyRukiEs4cYkHqqS6XHcHyyZjHnzY5SMAj9j4Wd8c0Wd79k47wBmK3T6AW8E7foYXNY5sV45xg4XlVsYf1lbk7pNP8QSvT74dp0Jar1AlE/x1so/njtrAwUEIQ8hMKBVZ9bColx4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781247570; c=relaxed/simple; bh=m6OXBGJMXeZbXknwwxjueTeThKmplVgR0U3uoZlrVd0=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=E3KS2j63diUbakz/UsvO+J7yyQdAkUPfyfoBXKuFvuk1FnEKTTgI0DFR6Cl6mN8bHjCXeH9bAt1j2Zj/jSHaGBzYNiJ5QHH1Huuf/+SLYrL2Hk6gH0UIcYxSj2wnISjlz6aodskANZEy0AXWd1JrTkF7Ab30FpRtNIT3AvA8ymM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--tabba.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=D12rvNIm; arc=none smtp.client-ip=209.85.208.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--tabba.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="D12rvNIm" Received: by mail-ed1-f74.google.com with SMTP id 4fb4d7f45d1cf-68d234118f2so514640a12.2 for ; Thu, 11 Jun 2026 23:59:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1781247567; x=1781852367; 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=Wz1k2GgxstbvUGr74v2KjphysWOu90GWRraqbzm662g=; b=D12rvNImD+vPUvIECv/KdaVm3JP+4SOAH2DQDzW5yCYrSwkaG+sioL6Vsc3c0KmTD4 TkSFYT/M0tSdlq0dCXb0s1v6yY4QT3bBTOJ889m+f4063AC3nQeXeTr6KH3aZnE0F8NZ 36Od0lSo7AvGvvkYABbsfYX7oGmdUEDAUANUWtzzv3jUH/fL/w5TrZ5bgOjhlpHlSXlH LsV951K8ZK0iDwR04NaynMc2gsFQTea7NdGHMjMlEO3++NetQvBwSTFAhDsphaLnSHy9 b3FjU+i77BDgSSStNsVc5MFralLZyN1lmbQ+1ARKkG2LW9TsF6xOTQr1peRSQkgOW8f2 8IxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781247567; x=1781852367; 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=Wz1k2GgxstbvUGr74v2KjphysWOu90GWRraqbzm662g=; b=S6VmcgsdxEtMxLXjtD1Rcw6KNRkOLs5SIcZINb9akTJWmYZ8v0Je4LDhjl0g9+x1lL NHUTuovfmcZaAHowt+vDV/LfrO3ZDiCkg5o8OCfrfWswciQkU5rtFsndn04Nd0Qc22b2 +bxjhhJMoHr5dNq2dDk4867HW2KaqGcDdyzsp0MwoThAM0EVNGY6pBArGghE0hTVSXi4 rclOI6Dn+HSwGu956/cvPGajqA/HGL7HMqtj7HbZIhU6HTPkTQQum6v8w3fE/mS+QqH8 Cd/1IMPar7VfONRMjmq7KxDH4E45t7QlCMJWYMFubRwIjhaHC0VqL/H6w1GolCqWakzI UoRg== X-Forwarded-Encrypted: i=1; AFNElJ+0oDEgahpQmx7tqpoqS7XBCsfMmeL/uivh5IN/n7I2uUhW92WZ5rBMIzjNALC4l6TQiqz8/e3quTIb5b0=@vger.kernel.org X-Gm-Message-State: AOJu0YzPRo6I6ZsLHbARvz/vKAnN2fL6j2opwE9Ocb0DlFrQKD2MdsyD P/VsHv/kn2Xoh0611/cSn2TT26UiPZoDNz+8d1O5mWkGRiAba9spvxAJvOyDL5brnLdtrl7+3bB nqg== X-Received: from edb8.prod.google.com ([2002:a05:6402:2388:b0:691:ad32:f754]) (user=tabba job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6402:3901:b0:68d:abcf:9593 with SMTP id 4fb4d7f45d1cf-69378a104a3mr557406a12.17.1781247567338; Thu, 11 Jun 2026 23:59:27 -0700 (PDT) Date: Fri, 12 Jun 2026 07:59:15 +0100 In-Reply-To: <20260612065925.755562-1-tabba@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260612065925.755562-1-tabba@google.com> X-Mailer: git-send-email 2.54.0.1136.gdb2ca164c4-goog Message-ID: <20260612065925.755562-2-tabba@google.com> Subject: [PATCH v1 01/11] KVM: arm64: Add scoped resource management (guard) for hyp_spinlock From: tabba@google.com To: Marc Zyngier , Oliver Upton Cc: Fuad Tabba , Will Deacon , Catalin Marinas , Quentin Perret , Vincent Donnefort , Sebastian Ene , Per Larsen , Suzuki K Poulose , Zenghui Yu , Joey Gouly , Steffen Eiden , Mark Rutland , Jonathan Cameron , Hyunwoo Kim , linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" The nVHE hypervisor manages hyp_spinlock_t locks by hand across error paths, where a missed unlock deadlocks the next CPU to take the lock. Wire hyp_spinlock_t into via DEFINE_LOCK_GUARD_1 so callers can use guard(hyp_spinlock) and scoped_guard(hyp_spinlock), letting later patches replace the manual lock/unlock pairs. Signed-off-by: Fuad Tabba --- arch/arm64/kvm/hyp/include/nvhe/spinlock.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/arch/arm64/kvm/hyp/include/nvhe/spinlock.h b/arch/arm64/kvm/hyp/include/nvhe/spinlock.h index 7c7ea8c55405..63ba826d8e3d 100644 --- a/arch/arm64/kvm/hyp/include/nvhe/spinlock.h +++ b/arch/arm64/kvm/hyp/include/nvhe/spinlock.h @@ -13,6 +13,8 @@ #ifndef __ARM64_KVM_NVHE_SPINLOCK_H__ #define __ARM64_KVM_NVHE_SPINLOCK_H__ +#include + #include #include #include @@ -98,6 +100,10 @@ static inline void hyp_spin_unlock(hyp_spinlock_t *lock) : "memory"); } +DEFINE_LOCK_GUARD_1(hyp_spinlock, hyp_spinlock_t, + hyp_spin_lock(_T->lock), + hyp_spin_unlock(_T->lock)) + static inline bool hyp_spin_is_locked(hyp_spinlock_t *lock) { hyp_spinlock_t lockval = READ_ONCE(*lock); -- 2.54.0.1136.gdb2ca164c4-goog