From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.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 221063F210F for ; Tue, 24 Mar 2026 14:06:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.41 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774361208; cv=none; b=KiWaGjLDV0TqSm5nZ0qYm1k82j3qu1IqGqgVg/mK2CpJ2b/Fv5INIiotMQEh+s53WEHXWaBL6xtLJiSPLCvJ6X6Nh2++Ngta5Ig+WsB9XhOcaOJ8uwCHXWPB65eOi4xSGjUR9cVkgbFOCDOK5bNL5s8fvfumIUSiwh117z4b2G0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774361208; c=relaxed/simple; bh=gGYNd38Qv86SUn+18xnjHcYSHOfC/E/g8AWXLty8jiE=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=gyUXXNral6m4Ra1zB2NUcME0YtZFt+Fl6FkmorYBTVHAz55bvNWogNtMTxWFFYGPuM+XjkRIFhzKC45llIZdPZ+T353cyDXBS10CHwstvd9qTD0aOlEbt7ehBDQ6XcpVqCaf8+aC4lLdoE4jv7L0K/n2Qomc/OHoLpn3wZDEjSA= 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=OJ+1dtJs; arc=none smtp.client-ip=209.85.221.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="OJ+1dtJs" Received: by mail-wr1-f41.google.com with SMTP id ffacd0b85a97d-43b41b545d9so1340655f8f.2 for ; Tue, 24 Mar 2026 07:06:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1774361204; x=1774966004; 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=3Cv1GxwGjsnJyKeumjJielENFU1WPaGfL15dJDHDpzM=; b=OJ+1dtJs/aJWX5eMhvRSM4wwm2Z2cxgTxaYB7fE47LXu53l0bwA+i2aOgAEM8oPZil TNbOx/jQWmDhzOn6FGwjksnZIzW0F6nljDrYEMxBE1RPkjSIcYVtdqcHyK1O+pOMe0fF x9GErSgPFG9uaSq07m2YOjT8r9Xmb9/yMQPKkZywBqLZMMpblmCnCCw7FB2zvVr4Zepb i1WCb44qy85EAV1CSSnqpps0YUNcT9f6Mg/0I/GWOFZWl8Ko2qk4WIPfm0AJcb3N7vrh VdRPYN0b5tKJsl3tCZpUntDwXvBgWMWcRV5e/Z2TsnhFjwR0sVXxjeLBTLG5XLPtZdH5 2Rtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774361204; x=1774966004; 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=3Cv1GxwGjsnJyKeumjJielENFU1WPaGfL15dJDHDpzM=; b=OTicc9ODh99kagVfcR5CY0FTeu5HX97h24sr/+ePU60bf0bo9Mu6OWwMGd4T7qcph3 nu1p/RfndAb7XNxyU3wDj5BDqqNH4GwCWFRaMsJqeBeK9uOY4m4WXTIIKymKGLzDLbQl D3xf5D1nKV7BvOG2es/TzXANOdv0gwFwN3P8QLJuldbnwlwR5FAyhCJ2iymX69Nw7n4O 0G7D1COl+adqx55EcsE82eSsrkeCDw3ZnRt4pDjuZz6Eg3MFADYzUeiY7x1osMcIygXu 5C7DGtGNxt5vso43oVVMZXdfhyIZUDcxuVK8KVA/ZLENlQeBrxqkwQDg0T8q8RBxDJkt IRsg== X-Forwarded-Encrypted: i=1; AJvYcCVrd14Dn35UkwpeLRaun7Ac6MWhOWVPiiFCtQDSUYBiK0pjjafpidbrfAEpEmoV0RlA0/IFQX4jym02BCk=@vger.kernel.org X-Gm-Message-State: AOJu0Yzy1OPFjxSu9Pbq2nLn1w2y3RRDVslAPBGVqbuNEVUC3OmJ3LMs /gqRPWQDMn+yuXe63aOoUXXzAdyoR1bsExvbIgNgyzk1ONUwl93YsCw2LVe911Oj+Q== X-Gm-Gg: ATEYQzwm4snC+4ojnVBScJx7y8EboBUeJFlFZgGGrzqAiELmdxFJDnSJ8y66zcICWDo g1o8CCeSikMKJfo50fpQJlbqa/tQCvxrwizDMupKQNYglDiXblOA3xA+ky07TPbO5a0sZ/hMVVH qa/pH2QXQk8tsvz/V7ri6uud1Jt0VqKfA/5jmPxWEcoSbJG4phjpU69KJ5nCt4UfmwcDBcJ/pW/ VDrN2Xlv6BKgS96QbwcRPJL95HWWNKu7+qCsL0xSHRGXe8rD4gvjVP6XnvTSpoqxiVyQafW5sn8 8uutDn7VQo5unkdW5iTgJQabHLHQ9ZCpX/mScasBD9qKLDAD7rR2EHr2Vu6YwPpAoeA5rLxHIHd EZC7ioDzUH5JvRZ8+5Z78UsjzEoJa3LKlkCF9dATbM80nn22WlsNS7OoJrhRdjZJAczB2HVBfgl AUn4F5hED0TPhN2goYOLdQJta49TW8m8oNLYFQ+a+aaLHnInBHD7XbIpDsfWWLHiDteiYhm+rsW oGNgw== X-Received: by 2002:a05:6000:240d:b0:439:b7c9:2ef1 with SMTP id ffacd0b85a97d-43b6423bc2dmr25256797f8f.20.1774361204032; Tue, 24 Mar 2026 07:06:44 -0700 (PDT) Received: from google.com (198.115.140.34.bc.googleusercontent.com. [34.140.115.198]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43b64703c27sm38308646f8f.18.2026.03.24.07.06.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Mar 2026 07:06:43 -0700 (PDT) Date: Tue, 24 Mar 2026 14:06:40 +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: <20260324135728.3532400-1-sebastianene@google.com> 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? > + handle_host_smc(host_ctxt); > + else > + inject_undef64(); > break; > case ESR_ELx_EC_IABT_LOW: > case ESR_ELx_EC_DABT_LOW: > -- > 2.53.0.983.g0bb29b3bc5-goog >