From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) (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 0EA5E3D333E for ; Tue, 24 Mar 2026 14:18:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.41 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774361892; cv=none; b=HvqICTcz7SPJnnje35QOOBs1oJv5F4qKhIJ0hy7baLgM5RvKKmhB1HnAN1iKWZ3pF7POBKK7AbZv6+FcfL1/xuI+pFHJBO8USY3Bkrl/49+FgqTmx4e2+HOEpoic3rDxbgpNXbUH2nD2lJe9G94PiEoiQu3eJTeb3P5kvPnABF0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774361892; c=relaxed/simple; bh=wNg7nMM9lHxXeMq3N2T05s5+CgbX4+5G19QUI8C6PFU=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=Wwi6w+/eeE7guEUp2KOnGsdyWDuq4zITqFU8RFIUc6AdVI+FwLjT6OQ9CH1tSzUSyHQMd8vNL3zY/GY2Sk+rWMkPvxXCjQZ9S3TeCWGiTAvDVppU4IzpYEQedRLoI8YtGUAT6Rh6ZhsDX9Kb7CsbJD/Uc3WK01Sp4nRh+puOnWE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=HqNs97QA; arc=none smtp.client-ip=209.85.128.41 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=google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="HqNs97QA" Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-48541edecf9so11838365e9.1 for ; Tue, 24 Mar 2026 07:18:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1774361889; x=1774966689; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=YLMmL9VmQywy+Up0QoM5xuLhWibdytnU56bbqoy1KIg=; b=HqNs97QAinb4g9XrsC2fyYJglZzgVd8HDAK8OHYEmmzGcdY7vVZ+wN9eM0CevTlmID l1ddW4V3zkh/IiBb8t3pkS/2JlcPC+xZ3cIpNxhpkR7AGy9LNvvj22OUAd1NvqupVyua vcRdZ6MSUTmwPVW2Ex7fV6/ephMWEQPASEJODT1lgNOEjdo9WRDYtEUWBsch6JSMWVW3 9rvsRjhVcSpvHmX/ovO5zbQc/3zJCd+LkdoYe2oT6ELKSToqLKYtVSbEdAEpeQLVYV56 cEwLWpZeajXUvNt3/7bW1pssWNHCb8xy6g5qemioahnHGCm0E8Ph5f87b+k8TRVudyfY 3bYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774361889; x=1774966689; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-gg:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YLMmL9VmQywy+Up0QoM5xuLhWibdytnU56bbqoy1KIg=; b=Z2ekMJxo4xIK+nyqT0HsfqDzZasFWJ3rXEUGIvKBiKxjX5i19V9dcXy8NBjhQtsR2x O73JovLG5vhjXadsw6mff/jI9A3w+aF+6LU9+zWK0u9/GV709z2Z2PvC0Mt8C7JX9OnF wuUU6PHSjNAFIY+OOWC9BHTMJVb3geGXxtlZnwWc8XQiBlSN6PsOO7hRAyqMqRAbsKcY x4A9QWhrPLP3g9WMGNzhIdjNaG2LlD3Ig3RiWDC3LzRwUldWsHfaS6+5xq8Ye3eVagYh QTZED9c4KjuUCf0Al0xnDdFPcFv70avLwOKvKy/K0JQWq8ZpO+fqbddBVgfWD87n52Ya aPEg== X-Forwarded-Encrypted: i=1; AJvYcCU1+ilNP0bbh/SsEm8ulu1fYh6QEsrlo8+CX8LN+0tSnMg0mZgy/D9MdPpDn/vYI+lOs4+oj3GC0IzE/aY=@vger.kernel.org X-Gm-Message-State: AOJu0YzOEOC9JlRgnTVWxNdYOnZGlVKc0MftxwJpio0+bg9Op5aqg0VH h/VCpkH2zTgA33JJvPECzwYDdQwPV5G46RpoYsM/CNVckyw1w6iWBej8AGcJSqkXXw== X-Gm-Gg: ATEYQzyHoZWIRuxkZfvA7UL8opyadQCsBCNqz/gLEdNXVaR6Ag4UV4erOUd8y4q7ZVy 9B3j/t6UKXkIpsqswBLzaz350uYAN1PFqm91JK03OkIS3JjdPERS0qiTgnb372gBk+kf2PAaxIv 82l4yzWw0Sy0HO+cgBQ3NZQFlw3ihmUX5vSlF8J4ErHrFP36avpwi/2GNSKaRVaDTZJRszPYiZI to8IJno3TvsqmGvAapv27y/HjQzv9aey5FLLwrYy+Ebg21dDqObNjNDBUxScb+gwv0ymc2fPXjE EmMZglFUBQs7hunHXkJnYGbngNLh2O99XN49Wb624HrpMDxiNYlwjG2OsgMZlWQRcx/bqA2jy5V N4Tzq0kue8tXQ9BS10DroTqNNNpk0Ut7/Wg2SAX6Ym+33z9pY6GhWTa6rNttWTV2TUVmk2wsdkt hMMISAmvX2orPnXbUzvUzire5fcXdqwCf9SfSVL4Srol6bqfTmce+tJiQmbBYbnfpcJR6m7yc0U LKG9g== X-Received: by 2002:a05:600c:c167:b0:486:fab9:a578 with SMTP id 5b1f17b1804b1-486fedc3843mr249633765e9.11.1774361888913; Tue, 24 Mar 2026 07:18:08 -0700 (PDT) Received: from google.com (198.115.140.34.bc.googleusercontent.com. [34.140.115.198]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-487117732a1sm48548215e9.15.2026.03.24.07.18.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Mar 2026 07:18:08 -0700 (PDT) Date: Tue, 24 Mar 2026 14:18:04 +0000 From: Vincent Donnefort To: Sebastian Ene Cc: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, android-kvm@google.com, catalin.marinas@arm.com, joey.gouly@arm.com, mark.rutland@arm.com, maz@kernel.org, oupton@kernel.org, suzuki.poulose@arm.com, tabba@google.com, will@kernel.org, yuzenghui@huawei.com Subject: Re: [PATCH] KVM: arm64: Inject UNDEF when host is executing an smc with imm16 != 0 Message-ID: References: <20260324135728.3532400-1-sebastianene@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: On Tue, Mar 24, 2026 at 02:09:50PM +0000, Vincent Donnefort wrote: > On Tue, Mar 24, 2026 at 02:06:40PM +0000, Vincent Donnefort wrote: > > On Tue, Mar 24, 2026 at 01:57:28PM +0000, Sebastian Ene wrote: > > > The ARM Service Calling Convention (SMCCC) specifies that the function > > > identifier and parameters should be passed in registers, leaving the > > > 16-bit immediate field of the SMC instruction un-handled. > > > Currently, our pKVM handler ignores the immediate value, which could lead > > > to non-compliant software relying on implementation-defined behavior. > > > Enforce the host kernel running under pKVM to use an immediate value > > > of 0 by decoding the ISS from the ESR_EL2 and inject an undefined > > > instruction exception back to the caller. > > > > > > Signed-off-by: Sebastian Ene > > > --- > > > arch/arm64/kvm/hyp/nvhe/hyp-main.c | 7 ++++++- > > > 1 file changed, 6 insertions(+), 1 deletion(-) > > > > > > diff --git a/arch/arm64/kvm/hyp/nvhe/hyp-main.c b/arch/arm64/kvm/hyp/nvhe/hyp-main.c > > > index e7790097db93..ff6a90a4a4c7 100644 > > > --- a/arch/arm64/kvm/hyp/nvhe/hyp-main.c > > > +++ b/arch/arm64/kvm/hyp/nvhe/hyp-main.c > > > @@ -756,13 +756,18 @@ static bool handle_host_mte(u64 esr) > > > void handle_trap(struct kvm_cpu_context *host_ctxt) > > > { > > > u64 esr = read_sysreg_el2(SYS_ESR); > > > + u16 imm16; > > > > > > switch (ESR_ELx_EC(esr)) { > > > case ESR_ELx_EC_HVC64: > > > handle_host_hcall(host_ctxt); > > > break; > > > case ESR_ELx_EC_SMC64: > > > - handle_host_smc(host_ctxt); > > > + imm16 = esr & U16_MAX; > > > + if (!imm16) > > > > if (ESR_ELx_xVC_IMM_MASK(esr)) ? > > > > Also, I can't find void inject_undef64(void); I think you need a vcpu for that? > > Ah my bad, handle_host_mte() introduced it! > > > > > > + handle_host_smc(host_ctxt); > > > + else > > > + inject_undef64(); Could it be better to return SMCCC_RET_NOT_SUPPORTED? > > > break; > > > case ESR_ELx_EC_IABT_LOW: > > > case ESR_ELx_EC_DABT_LOW: > > > -- > > > 2.53.0.983.g0bb29b3bc5-goog > > >