From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f73.google.com (mail-pj1-f73.google.com [209.85.216.73]) (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 A0A0E320393 for ; Fri, 29 Aug 2025 14:19:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.73 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756477159; cv=none; b=AoYjXOCJBIHsfxRkzBMz6l1nqlSJAW22BuLzfh0Z8zG9JEQk5ATJzQcNcUZm/lltLuI1B9NGvPw5/aGlNuY5QoVlfilOG+o3PRfVpRHDL6vkeVwsc0g7LlnKZXdmBZ92JPCECutOUa3BrR6m9ISvFoO5AHLDLnunSH0WVZ5rc/c= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756477159; c=relaxed/simple; bh=1Pf4kWGF8Nl6Fz5LD6iSs09KK9VBlttvZCY110akIYY=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=rkgIYhsNL6MOCQ/iYtwJnbeVIoqonT73PqWSqMABICPpMkwGTwvKqG2ZgBuKZglOCY2NmHtFPuTEFezk+chGLXyDQUogDbg/cmgcGzk9TRPyYnLcwg9wYeJC5hQJE3XdLyruL0eFpjIItbE0wN5Y9kAdF/+jNFW4OHQecwdfloI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=ymp+EyqE; arc=none smtp.client-ip=209.85.216.73 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--seanjc.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="ymp+EyqE" Received: by mail-pj1-f73.google.com with SMTP id 98e67ed59e1d1-324e41e946eso3846512a91.0 for ; Fri, 29 Aug 2025 07:19:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1756477156; x=1757081956; darn=vger.kernel.org; h=content-transfer-encoding:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:from:to:cc:subject:date:message-id :reply-to; bh=j21crHF1Yk5JFqIlz5UrZbt7K7r61xcnF+akUnmAGnM=; b=ymp+EyqEmHqIcF7YhOUpYc2IfY207nJEUMzRRyLarixg7mWwWJDQW/2rD2fMkIkIhO 6dlw8KUhHCW2kMBYeXeJgTnyA7wn2ioE3XdLy9i1dGhpy+13N1N7+JdZtfkyV+VcDR1u 2ooZOiRUtK2lmyQW/CH4+w6mINng1mQS/sR09bPBFTx4dVTxP69k+cyKYOpoqxtw53l0 n2Skomv0mfDY24bTA6xI1Vwpnm2G9uvWtymQni/oUbQiu887+xoJJ6Ln+PuUqHoYNqMX lZB6yEGWuvb4KxXPqWeycnojnWSe4ydPltB+askrntsH/QQ2t8VKuHVOksyZTpbf25Ne 6Hqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756477156; x=1757081956; h=content-transfer-encoding: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=j21crHF1Yk5JFqIlz5UrZbt7K7r61xcnF+akUnmAGnM=; b=V6xz/RrtXRMJwal3QIgqFYLREyNIYsm9hL65bh5/WbU+4dFwxjkx7pgZnQYp1n0m44 85L6Q8gQQblkFCpLHy+aJlIMn6y5shgWe5T2bYAxj4IkFmOK/Oh02FZTbuk0GPGuz0WK aRQ4mRcUxZBsllPLccbtsAbcJVIPkSGPKFEAroZV925iL3k4CxCPWEu76eMMMMsy1aOU +Ai+xfip6aEdP0YJIJMAxtpJaCk0CcrTW+02YEd/7URFN1LUZiDE5TTQOpBBNIAkTA1j Xpmzzvh/3j+UCQmCm5FYzi8T2kveYElJs5rr7hKDtNSb3nlTSCMr0P46w6FVyAVpwtGJ wAPQ== X-Forwarded-Encrypted: i=1; AJvYcCW/b1BOws/RzH2S7kvbLeHrppJmQrCGM333SmiYc8275+3/u111qLmrntnk8SFPb1jWImQ=@vger.kernel.org X-Gm-Message-State: AOJu0YyiX1fVFI6amIqT7dLIvRtIdCabs/4/3It0G6Hi/NagTyMFwS6/ YhuhKvCtXxDJPN6kkZ5Tp/uWTS0IG4xrebd0O+M32n6iuH2tTbodLAM0EwM921xF/v4t+tycaqy SyFNihg== X-Google-Smtp-Source: AGHT+IHQCGK1n8ucMTSWAAVaO3wbmZ1keEusOyRlTN9padDWnDkB4uZOVUdZ5WjrRzkzASPAQVQOPvuz1VQ= X-Received: from pjbqx12.prod.google.com ([2002:a17:90b:3e4c:b0:31f:6a10:6ea6]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:4fd0:b0:325:c92:4a89 with SMTP id 98e67ed59e1d1-32515e3cad8mr32112898a91.5.1756477155808; Fri, 29 Aug 2025 07:19:15 -0700 (PDT) Date: Fri, 29 Aug 2025 07:19:13 -0700 In-Reply-To: Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250829000618.351013-1-seanjc@google.com> <20250829000618.351013-16-seanjc@google.com> Message-ID: Subject: Re: [RFC PATCH v2 15/18] KVM: TDX: Combine KVM_BUG_ON + pr_tdx_error() into TDX_BUG_ON() From: Sean Christopherson To: Binbin Wu Cc: Paolo Bonzini , kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Ira Weiny , Kai Huang , Michael Roth , Yan Zhao , Vishal Annapurve , Rick Edgecombe , Ackerley Tng Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable On Fri, Aug 29, 2025, Binbin Wu wrote: > On 8/29/2025 8:06 AM, Sean Christopherson wrote: > > Add TDX_BUG_ON() macros (with varying numbers of arguments) to deduplic= ate > > the myriad flows that do KVM_BUG_ON()/WARN_ON_ONCE() followed by a call= to > > pr_tdx_error(). In addition to reducing boilerplate copy+paste code, t= his > > also helps ensure that KVM provides consistent handling of SEAMCALL err= ors. > >=20 > > Opportunistically convert a handful of bare WARN_ON_ONCE() paths to the > > equivalent of KVM_BUG_ON(), i.e. have them terminate the VM. If a SEAM= CALL > > error is fatal enough to WARN on, it's fatal enough to terminate the TD= . > >=20 > > Signed-off-by: Sean Christopherson > > --- > > arch/x86/kvm/vmx/tdx.c | 114 +++++++++++++++++-----------------------= - > > 1 file changed, 47 insertions(+), 67 deletions(-) > >=20 > > diff --git a/arch/x86/kvm/vmx/tdx.c b/arch/x86/kvm/vmx/tdx.c > > index aa6d88629dae..df9b4496cd01 100644 > > --- a/arch/x86/kvm/vmx/tdx.c > > +++ b/arch/x86/kvm/vmx/tdx.c > > @@ -24,20 +24,32 @@ > > #undef pr_fmt > > #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt > > -#define pr_tdx_error(__fn, __err) \ > > - pr_err_ratelimited("SEAMCALL %s failed: 0x%llx\n", #__fn, __err) > > +#define __TDX_BUG_ON(__err, __f, __kvm, __fmt, __args...) \ > > +({ \ > > + struct kvm *_kvm =3D (__kvm); \ > > + bool __ret =3D !!(__err); \ > > + \ > > + if (WARN_ON_ONCE(__ret && (!_kvm || !_kvm->vm_bugged))) { \ > > + if (_kvm) \ > > + kvm_vm_bugged(_kvm); \ > > + pr_err_ratelimited("SEAMCALL " __f " failed: 0x%llx" __fmt "\n",\ > > + __err, __args); \ > > + } \ > > + unlikely(__ret); \ > > +}) > > -#define __pr_tdx_error_N(__fn_str, __err, __fmt, ...) \ > > - pr_err_ratelimited("SEAMCALL " __fn_str " failed: 0x%llx, " __fmt, _= _err, __VA_ARGS__) > > +#define TDX_BUG_ON(__err, __fn, __kvm) \ > > + __TDX_BUG_ON(__err, #__fn, __kvm, "%s", "") > > -#define pr_tdx_error_1(__fn, __err, __rcx) \ > > - __pr_tdx_error_N(#__fn, __err, "rcx 0x%llx\n", __rcx) > > +#define TDX_BUG_ON_1(__err, __fn, __rcx, __kvm) \ > > + __TDX_BUG_ON(__err, #__fn, __kvm, ", rcx 0x%llx", __rcx) > > -#define pr_tdx_error_2(__fn, __err, __rcx, __rdx) \ > > - __pr_tdx_error_N(#__fn, __err, "rcx 0x%llx, rdx 0x%llx\n", __rcx, __r= dx) > > +#define TDX_BUG_ON_2(__err, __fn, __rcx, __rdx, __kvm) \ > > + __TDX_BUG_ON(__err, #__fn, __kvm, ", rcx 0x%llx, rdx 0x%llx", __rcx, = __rdx) > > + > > +#define TDX_BUG_ON_3(__err, __fn, __rcx, __rdx, __r8, __kvm) \ > > + __TDX_BUG_ON(__err, #__fn, __kvm, ", rcx 0x%llx, rdx 0x%llx, r8 0x%ll= x", __rcx, __rdx, __r8) > > -#define pr_tdx_error_3(__fn, __err, __rcx, __rdx, __r8) \ > > - __pr_tdx_error_N(#__fn, __err, "rcx 0x%llx, rdx 0x%llx, r8 0x%llx\n",= __rcx, __rdx, __r8) >=20 > I thought you would use the format Rick proposed in > https://lore.kernel.org/all/9e55a0e767317d20fc45575c4ed6dafa863e1ca0.came= l@intel.com/ > =C2=A0 =C2=A0 #define TDX_BUG_ON_2(__err, __fn, arg1, arg2, __kvm)=C2=A0 = =C2=A0 =C2=A0 =C2=A0 \ > =C2=A0 =C2=A0 =C2=A0 =C2=A0 __TDX_BUG_ON(__err, #__fn, __kvm, ", " #arg1 = " 0x%llx, " #arg2 " > =C2=A0 =C2=A0 0x%llx", arg1, arg2) >=20 > =C2=A0 =C2=A0 so you get: entry: 0x00 level:0xF00 >=20 > No? Ya, see the next patch :-)