From nobody Mon Jun 8 17:38:30 2026 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 36A4D40F8F4; Wed, 27 May 2026 14:44:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.158.5 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779893053; cv=none; b=ZwNImy0ixooIYyy7M2v3pooTRGNylbC1cJMvwYLKKOQlu6dIAzAysipnW2v2QgRfqLq5z7syy5wZlIcBflBDJNsW/PNWWJAcQ459S1unGXAG2sdkhWYSySJZMeaG3RbHevf5QNahRQxPQu9grbDJU942uTvK7Ys9XqSp9VyI19c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779893053; c=relaxed/simple; bh=TmRlg5ggWNGM9hQSdzZR4wEFox2Ebrdl5upRcPic/+o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=atJHC/qdXafFJycjm0ftw3RknCyeSRUKAjviCuK87nUY8nbhARy+dDm8iVDLbZO0DhZbR0QlOvw++3hujqRErT3nO1nNfLkdfA8KMFWQBCTyVd9Bpe8hCATCs11C2bEAod69+wa3OhG6nj1jcuqVZgvX+rRfqw5P71xKcUBszD8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=D/p8t9VF; arc=none smtp.client-ip=148.163.158.5 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="D/p8t9VF" Received: from pps.filterd (m0356516.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 64RCLwsE272378; Wed, 27 May 2026 14:44:06 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=RTvo4RELu7tBJZ6LF s9zQkxawwrOJGUz+MPYavYWaXs=; b=D/p8t9VFPminFN3a76JBjBq0EPnFg9S6h kyca1x0+S2YmM6BQFXYZCC6WYU5xRnLvxolO4/D4HxFlXGksm4HVFfulsHdS512d BYtUef9iYGcIIGuu7eolh7XeXWLMOmXjS6Oe51wkNR3pcic1ddI3nkWExqjQi5Iu TajqoVr2QmwMyb5s32ZRKKAEANW1po9DvaqUylXTXoJYyy74EPXsNT6hkEDimR93 0Om/vOIqr54NAEeD5X0qo0SfgVyNS8fg2TXnfkl9arTHpQbeNEcVzfn3XGadyHYR 0O9qvkvfn1AOfPFWnlhpdf+iuqERfxljNfJ4SVGy/Du5kmxHoF3cQ== Received: from ppma21.wdc07v.mail.ibm.com (5b.69.3da9.ip4.static.sl-reverse.com [169.61.105.91]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4eb4nq8mk7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 27 May 2026 14:44:05 +0000 (GMT) Received: from pps.filterd (ppma21.wdc07v.mail.ibm.com [127.0.0.1]) by ppma21.wdc07v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 64REd5P8003170; Wed, 27 May 2026 14:44:05 GMT Received: from smtprelay06.fra02v.mail.ibm.com ([9.218.2.230]) by ppma21.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4edjrb3fu1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 27 May 2026 14:44:04 +0000 (GMT) Received: from smtpav04.fra02v.mail.ibm.com (smtpav04.fra02v.mail.ibm.com [10.20.54.103]) by smtprelay06.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 64REhxjN30998874 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 27 May 2026 14:43:59 GMT Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id ECC9520040; Wed, 27 May 2026 14:43:58 +0000 (GMT) Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id B79C12004B; Wed, 27 May 2026 14:43:58 +0000 (GMT) Received: from p-imbrenda.aag-de.ibm.com (unknown [9.52.223.175]) by smtpav04.fra02v.mail.ibm.com (Postfix) with ESMTP; Wed, 27 May 2026 14:43:58 +0000 (GMT) From: Claudio Imbrenda To: linux-kernel@vger.kernel.org Cc: kvm@vger.kernel.org, linux-s390@vger.kernel.org, borntraeger@de.ibm.com, frankja@linux.ibm.com, david@kernel.org, seiden@linux.ibm.com, nrb@linux.ibm.com, schlameuss@linux.ibm.com, gra@linux.ibm.com, pbonzini@redhat.com, seanjc@google.com, yan.y.zhao@intel.com, isaku.yamahata@intel.com Subject: [PATCH v3 1/5] KVM: s390: Track page size in struct guest_fault Date: Wed, 27 May 2026 16:43:54 +0200 Message-ID: <20260527144358.186359-2-imbrenda@linux.ibm.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260527144358.186359-1-imbrenda@linux.ibm.com> References: <20260527144358.186359-1-imbrenda@linux.ibm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-GUID: 4DD418tJ7BX5LFOfMFXuWrPMinh9m5F6 X-Proofpoint-ORIG-GUID: BuquLLJG9s1Csld4C0BOQE_ropDUDSCC X-Authority-Analysis: v=2.4 cv=QIJYgALL c=1 sm=1 tr=0 ts=6a170336 cx=c_pps a=GFwsV6G8L6GxiO2Y/PsHdQ==:117 a=GFwsV6G8L6GxiO2Y/PsHdQ==:17 a=NGcC8JguVDcA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=Y2IxJ9c9Rs8Kov3niI8_:22 a=VnNF1IyMAAAA:8 a=HydwJh4hHmF5zmZ3e14A:9 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTI3MDE0NCBTYWx0ZWRfXyevpikL+FthY IpnqVyPtNqFPzo/VyXhni1womwVPFD5zaOCbu/uHlfj23dqI7SJLlMQKuaxwMyLfthLiMJ7NIRC FVYrvHPm9r/TDahGjUEkeP2vdXeVobHUnesDURvcFYK370lb8uIQ744oT60F8isTnRxOU1hfX23 g1UhaJLr98h1jFU3ywznINkT9loGv+HfiRzdt4jr5cpdyVknf4ptvrIP1IRi5PDQvMKwiQgZLfD Z0jFHtQg1qaxgDSJViLRpxZdLIAt4I3nTcee/CaLbELZJ/2ZPfNBqbxskOWhTPRRpp8u7TrLnvQ uCA6eIM93IbbqrKmdOqCoV82T4EsJ5Uc872WpgZN5TC4pGDmYixFtAErVf/GdFgEh8y5Cden5Fq ssBLNXlvoP/EBecDDh5PAwHWBhDdKmtajOfYWx3XRKYamLtXJoiIoXZ955Q1QufxONenUcAUyel /TokZzFjNyTQGOZ/UZA== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.125,FMLib:17.12.100.49 definitions=2026-05-27_02,2026-05-26_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 priorityscore=1501 impostorscore=0 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 adultscore=0 spamscore=0 lowpriorityscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605130000 definitions=main-2605270144 Content-Type: text/plain; charset="utf-8" Until now, the members of struct guest_fault are always accessed while holding the required locks, and thus the ptep and crstep pointers can be dereferenced safely. There will be some new cases where callers of kvm_s390_faultin_gfn() need to know the size of the page used to solve the fault, at which point no locks are held anymore, and dereferencing the crstep field is not possible. Introduce a new crste_region3 flag for struct guest_fault to indicate whether the crstep used to solve the fault was a region 3 entry with FC=3D1 (large pud). This allows to disambiguate all three possible scenarios: * If ptep is not NULL, the fault was solved with a pte. * If ptep is NULL and crste_region3 is 0, a segment entry with FC=3D1 (large pmd) was used. * If ptep is NULL and crste_region3 is 1, a region 3 entry with FC=3D1 (large pud) was used. Signed-off-by: Claudio Imbrenda Reviewed-by: Steffen Eiden --- arch/s390/kvm/dat.h | 1 + arch/s390/kvm/gmap.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/arch/s390/kvm/dat.h b/arch/s390/kvm/dat.h index 8f8278c44879..5d848e74e382 100644 --- a/arch/s390/kvm/dat.h +++ b/arch/s390/kvm/dat.h @@ -500,6 +500,7 @@ struct guest_fault { bool write_attempt; /* Write access attempted */ bool attempt_pfault; /* Attempt a pfault first */ bool valid; /* This entry contains valid data */ + bool crste_region3; /* Whether crstep refers to a region3 entry */ void (*callback)(struct guest_fault *f); void *priv; }; diff --git a/arch/s390/kvm/gmap.c b/arch/s390/kvm/gmap.c index 3c26e35af0ef..fe138d17caaf 100644 --- a/arch/s390/kvm/gmap.c +++ b/arch/s390/kvm/gmap.c @@ -531,6 +531,7 @@ static int gmap_handle_minor_crste_fault(struct gmap *g= map, struct guest_fault * f->pfn =3D PHYS_PFN(large_crste_to_phys(oldcrste, f->gfn)); f->writable =3D oldcrste.s.fc1.w; =20 + f->crste_region3 =3D is_pud(oldcrste); /* Appropriate permissions already (race with another handler), nothing t= o do. */ if (!oldcrste.h.i && !(f->write_attempt && oldcrste.h.p)) return 0; @@ -690,6 +691,7 @@ static int _gmap_link(struct kvm_s390_mmu_cache *mc, st= ruct gmap *gmap, int leve if (oldval.val !=3D _CRSTE_EMPTY(oldval.h.tt).val && crste_origin_large(oldval) !=3D crste_origin_large(newval)) return -EAGAIN; + f->crste_region3 =3D is_pud(newval); } while (!gmap_crstep_xchg_atomic(gmap, f->crstep, oldval, newval, f->gf= n)); if (f->callback) f->callback(f); --=20 2.54.0 From nobody Mon Jun 8 17:38:30 2026 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0CD273F8893; Wed, 27 May 2026 14:44:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.158.5 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779893052; cv=none; b=YMK6/E+7wQIPphtFrGRBzuf59RNFDAiAXYrhsk6Ufddh2sMDs8LF7hlWuJXgyOZPrjDRmEph7SqNa9Sc+wqZDJjBAvPUQ5PdruZuwV6OZJP1bG7oL1tJWFfJJ386Uy9oicoBnTbmqPmUe2e0mQWjh/sl//TmknOz3GhfNFcIJk8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779893052; c=relaxed/simple; bh=NGd74zXTr7yVCdgLJpcJp5urQnD7AFzDHnGuvIlxen8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RaSrAw6V/iHcPLVMWrTyIpURnE4TV29whHK22hBjdLIoO5Eshq+RNAQHrtu8AxEwhQ3r1UXAAIVsV60091ufQpqNxnrmxMn7M46x3nrD8JCZN/ozydJ/tGOWRHnBDTsu3zVmgwTmRLrAaG3KB/Rzaei414bfpvZ00mn95WUgji0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=sWftOgLM; arc=none smtp.client-ip=148.163.158.5 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="sWftOgLM" Received: from pps.filterd (m0353725.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 64RCmekp735911; Wed, 27 May 2026 14:44:06 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=feImQcvzuEXnqHVBD h2+oQtVuWm//l/SVpfSkCqifjk=; b=sWftOgLMwEXRkB0p8J8+ZOP2uflm3MYCW NfHLw5VCN02TCT1VpQ3y5pBOdQmqfS7DV4fvsIyONa8MwGoeatwV6r3e1YeGhimb QYdk0t0QNj7OMcmF2On0EnAV8dLmYFvABPBJ/PJ6C1pJW344Tc0/BJ07X8XQTQwP ZUWHcHK4qc4ObY18xLA0AWED46lNqBQUUB2i+UItEuowhAqWSM7FbM5moMF8d37E 1QYrKonT5lIacT/+us4jciovUYRdAaTmoNfuY6iTxpf3hx0doFRPmCGJ5fF9JxGu K0Bc/A0iV7rZbnvDuktVxqzzNncP1VSCyG0SIHkafej4b+AKkokDA== Received: from ppma22.wdc07v.mail.ibm.com (5c.69.3da9.ip4.static.sl-reverse.com [169.61.105.92]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4eb4nc8k12-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 27 May 2026 14:44:05 +0000 (GMT) Received: from pps.filterd (ppma22.wdc07v.mail.ibm.com [127.0.0.1]) by ppma22.wdc07v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 64REd6XU021402; Wed, 27 May 2026 14:44:05 GMT Received: from smtprelay06.fra02v.mail.ibm.com ([9.218.2.230]) by ppma22.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4edjrbkfgf-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 27 May 2026 14:44:05 +0000 (GMT) Received: from smtpav04.fra02v.mail.ibm.com (smtpav04.fra02v.mail.ibm.com [10.20.54.103]) by smtprelay06.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 64REhx0L30998876 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 27 May 2026 14:43:59 GMT Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 3575620040; Wed, 27 May 2026 14:43:59 +0000 (GMT) Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id F35EC20043; Wed, 27 May 2026 14:43:58 +0000 (GMT) Received: from p-imbrenda.aag-de.ibm.com (unknown [9.52.223.175]) by smtpav04.fra02v.mail.ibm.com (Postfix) with ESMTP; Wed, 27 May 2026 14:43:58 +0000 (GMT) From: Claudio Imbrenda To: linux-kernel@vger.kernel.org Cc: kvm@vger.kernel.org, linux-s390@vger.kernel.org, borntraeger@de.ibm.com, frankja@linux.ibm.com, david@kernel.org, seiden@linux.ibm.com, nrb@linux.ibm.com, schlameuss@linux.ibm.com, gra@linux.ibm.com, pbonzini@redhat.com, seanjc@google.com, yan.y.zhao@intel.com, isaku.yamahata@intel.com Subject: [PATCH v3 2/5] KVM: s390: Implement KVM_PRE_FAULT_MEMORY Date: Wed, 27 May 2026 16:43:55 +0200 Message-ID: <20260527144358.186359-3-imbrenda@linux.ibm.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260527144358.186359-1-imbrenda@linux.ibm.com> References: <20260527144358.186359-1-imbrenda@linux.ibm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Authority-Analysis: v=2.4 cv=VvYTxe2n c=1 sm=1 tr=0 ts=6a170336 cx=c_pps a=5BHTudwdYE3Te8bg5FgnPg==:117 a=5BHTudwdYE3Te8bg5FgnPg==:17 a=NGcC8JguVDcA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=V8glGbnc2Ofi9Qvn3v5h:22 a=VnNF1IyMAAAA:8 a=xyOPYXbJwbhnVPa3_EUA:9 X-Proofpoint-ORIG-GUID: 5GeyOIDo7hVGdDAOXGLV9vSFunxrMBVU X-Proofpoint-GUID: aC75_mlYPUfBt8mr06lEZ5ywk_qLrTyg X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTI3MDE0NCBTYWx0ZWRfX/+lFNowh0vsg vh5xS1vOfdQBb0VvkxWOdSy5rN9VRQnxA/UqWUG7rhrzxsSjyOX17FJxH4mTyiFY5mbvQ4iDUz9 lPbML+nAvuzStxbAtlLS9UYr6SDtovhV/OTgodpiuhp7os3A94jbesIx7rlMSRsPzQKHXAwDEHB /5Y9xjxDxSq7JGCJg3134IxXhgY0IwVLyD+24I58YuG93hkJzf8VAGUfs9v9IQ1TYup6dw+MDGL N3E2hhWdkYaxCMKaVqVtZHx19DrNVLkOn7giWP3Rx3UTWTjgBV0g7nKk0jh0RQdprYkV/cJjFuc stZMQBqEXR4aWxBtnQloS18pr9wOs+ZeXakUtglyuiY6/RQdvplZxd0+6TXjW9ZX6dxyz8rfWPj sjmgxRuKohp2Y/Kj0Buke5jzXHKpktQ3rCM1rrqdyDff3k4wJUQtPxowyY6UNBEjvqPp+GA/A8t Xptuw2WmSZE68iSiIXw== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.125,FMLib:17.12.100.49 definitions=2026-05-27_02,2026-05-26_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 phishscore=0 priorityscore=1501 spamscore=0 adultscore=0 lowpriorityscore=0 malwarescore=0 impostorscore=0 clxscore=1015 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605130000 definitions=main-2605270144 Content-Type: text/plain; charset="utf-8" Implement and enable the KVM_PRE_FAULT_MEMORY ioctl for s390. Faulted-in pages will be marked as accessed, unlike x86, otherwise they will trigger a minor fault when accessed. Avoiding such faults is one of the points of KVM_PRE_FAULT_MEMORY. Signed-off-by: Claudio Imbrenda Reviewed-by: Steffen Eiden --- arch/s390/kvm/Kconfig | 1 + arch/s390/kvm/kvm-s390.c | 45 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+) diff --git a/arch/s390/kvm/Kconfig b/arch/s390/kvm/Kconfig index 5b835bc6a194..8d3ee17a1bcb 100644 --- a/arch/s390/kvm/Kconfig +++ b/arch/s390/kvm/Kconfig @@ -30,6 +30,7 @@ config KVM select KVM_VFIO select VIRT_XFER_TO_GUEST_WORK select KVM_MMU_LOCKLESS_AGING + select KVM_GENERIC_PRE_FAULT_MEMORY help Support hosting paravirtualized guest machines using the SIE virtualization capability on the mainframe. This should work diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c index e09960c2e6ed..f6521f16532a 100644 --- a/arch/s390/kvm/kvm-s390.c +++ b/arch/s390/kvm/kvm-s390.c @@ -630,6 +630,7 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long = ext) case KVM_CAP_S390_USER_OPEREXEC: case KVM_CAP_S390_KEYOP: case KVM_CAP_S390_VSIE_ESAMODE: + case KVM_CAP_PRE_FAULT_MEMORY: r =3D 1; break; case KVM_CAP_SET_GUEST_DEBUG2: @@ -5736,6 +5737,50 @@ void kvm_arch_commit_memory_region(struct kvm *kvm, return; } =20 +/** + * kvm_arch_vcpu_pre_fault_memory() -- pre-fault and link gmap dat tables + * @vcpu: the vcpu that shall appear to have generated the fault-in. + * @range: the range that needs to be faulted in. + * + * The first page of the given range is faulted in and the corresponding g= map + * page tables are created, as if the given vCPU had performed a read + * operation. + * If the range starts outside any memslots, an error is returned. An erro= r is + * also returned for UCONTROL VMs, which should instead use the + * KVM_S390_VCPU_FAULT ioctl. + * + * Return: + * * %-ENOENT if the range lies outside of a memslot. + * * %-EINVAL in case of invalid state (for example if the VM is UCONTROL). + * * %-EIO if errors happen while faulting-in the page (will trigger a war= ning + * in the caller). + * * other error codes < 0 in case of other errors. + * * otherwise a number > 0 of bytes that have been faulted in successfull= y. + */ +long kvm_arch_vcpu_pre_fault_memory(struct kvm_vcpu *vcpu, struct kvm_pre_= fault_memory *range) +{ + struct guest_fault f =3D { .gfn =3D gpa_to_gfn(range->gpa), }; + gpa_t end; + int rc; + + if (kvm_is_ucontrol(vcpu->kvm)) + return -EINVAL; + + rc =3D kvm_s390_faultin_gfn(vcpu, NULL, &f); + if (rc =3D=3D PGM_ADDRESSING) + return -ENOENT; + if (rc > 0) + return -EIO; + if (rc < 0) + return rc; + + if (f.ptep) + return PAGE_SIZE; + + end =3D ALIGN(range->gpa + PAGE_SIZE, f.crste_region3 ? _REGION3_SIZE : H= PAGE_SIZE); + return min(range->size, end - range->gpa); +} + /** * kvm_test_age_gfn() - test young * @kvm: the kvm instance --=20 2.54.0 From nobody Mon Jun 8 17:38:30 2026 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 00FEF3C9895; Wed, 27 May 2026 14:44:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.156.1 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779893052; cv=none; b=mf0qBrIuOeTqi66jh1ecHll7nRyXchLjU8S7+pKrlLOcV+HnHAET2dpMZJDlCpkgnaEyM0LutS3aXiuWHYU1kPQda39Htk6dZS6fKqxLyKjaGPhRKWW9/GNpkQ92GOhso2pF6GCHoACcCUPqLDvIFiv46Zafl89mbNy/3zKe0+U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779893052; c=relaxed/simple; bh=FjQeccB0HfpFZYyuynKTH5RgFHk9XbIVNvs05kM9s+E=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bF7F2tF9bQFglrxGOefV26nKNTaNNam7piXnpDyhf7K1lKf4SEfSx2AGV02NrReIwG2XKf+nLVJo42rD4yvlYNCE4GrAJuAzkepjNsa+5yGLj71o+LI0e0GfXq1y86t5rv85eKlo4u7nDyzMPLxuu5Ha65bkO+flsFr+vJmcz7U= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=nRQ7fqdr; arc=none smtp.client-ip=148.163.156.1 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="nRQ7fqdr" Received: from pps.filterd (m0356517.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 64RCnZtf3594654; Wed, 27 May 2026 14:44:06 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=nbd3iHoUzlIuxdqJ4 GyJKHMfXggrDxgF67BeU0h1BoM=; b=nRQ7fqdrF42AuOtv84BStRNo3sNmoH4gh KZsucrGZYX/3Po1YppxxdjSqwiVK68c6UwhuXrapbld3tYuB5vIeTO68uTNAkTlU 7ENM+6gZUkAErDOUcV6xLv46wkBbdXueYya19LNWW2FHpapW2OlENobvgUvQn/O/ AHb3QZB2hWJjkvVmPvZD4gyp92BmAf1AHFIeZaw3VOPtaiP8kuwMUjKN2yMX0rXQ 8EASas6dcQSimNzT7H9BoUdeQGXGK7pBGtcrxYkpA3tKObyzWr20QmGvJWCNKWgm h2jDAqTVrI8nxZkKcL6tQ2iapGoBShbKLs6KD4c37Gu613+ykiWOg== Received: from ppma12.dal12v.mail.ibm.com (dc.9e.1632.ip4.static.sl-reverse.com [50.22.158.220]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4eb4s2huy0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 27 May 2026 14:44:05 +0000 (GMT) Received: from pps.filterd (ppma12.dal12v.mail.ibm.com [127.0.0.1]) by ppma12.dal12v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 64REd4lc000618; Wed, 27 May 2026 14:44:05 GMT Received: from smtprelay06.fra02v.mail.ibm.com ([9.218.2.230]) by ppma12.dal12v.mail.ibm.com (PPS) with ESMTPS id 4edjrb3f4g-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 27 May 2026 14:44:04 +0000 (GMT) Received: from smtpav04.fra02v.mail.ibm.com (smtpav04.fra02v.mail.ibm.com [10.20.54.103]) by smtprelay06.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 64REhxs930998878 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 27 May 2026 14:43:59 GMT Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 6E8B420040; Wed, 27 May 2026 14:43:59 +0000 (GMT) Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 39E2A2004B; Wed, 27 May 2026 14:43:59 +0000 (GMT) Received: from p-imbrenda.aag-de.ibm.com (unknown [9.52.223.175]) by smtpav04.fra02v.mail.ibm.com (Postfix) with ESMTP; Wed, 27 May 2026 14:43:59 +0000 (GMT) From: Claudio Imbrenda To: linux-kernel@vger.kernel.org Cc: kvm@vger.kernel.org, linux-s390@vger.kernel.org, borntraeger@de.ibm.com, frankja@linux.ibm.com, david@kernel.org, seiden@linux.ibm.com, nrb@linux.ibm.com, schlameuss@linux.ibm.com, gra@linux.ibm.com, pbonzini@redhat.com, seanjc@google.com, yan.y.zhao@intel.com, isaku.yamahata@intel.com Subject: [PATCH v3 3/5] KVM: s390: Update KVM_PRE_FAULT_MEMORY API documentation Date: Wed, 27 May 2026 16:43:56 +0200 Message-ID: <20260527144358.186359-4-imbrenda@linux.ibm.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260527144358.186359-1-imbrenda@linux.ibm.com> References: <20260527144358.186359-1-imbrenda@linux.ibm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-GUID: NCVg82Jk9nAQtoutbhZAX1I_bhDM2z2Y X-Authority-Analysis: v=2.4 cv=Sq2gLvO0 c=1 sm=1 tr=0 ts=6a170336 cx=c_pps a=bLidbwmWQ0KltjZqbj+ezA==:117 a=bLidbwmWQ0KltjZqbj+ezA==:17 a=NGcC8JguVDcA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=U7nrCbtTmkRpXpFmAIza:22 a=VnNF1IyMAAAA:8 a=p5bRbc-Dsex6zWGIe5sA:9 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTI3MDE0NCBTYWx0ZWRfX1dh4CkdlEJ0J je4W3opcIqb6SJSEhx6Yerf6PI0Yc0do49pik7bsB5lhg7weW4xEkC6p0v9M65XtG/+V23Tsmqd j4k//I29WpbHWep5SpD33Jp1AKbtGCUVmavwwG6dgVZOmR9jjR2OBcKuxPXV2RTSXkbL42Az6qF Sfuj4EGb404XMPShZiFBiqrMzcBh+gRDUlJukdPyCEb6xTog7qqtM8+n42hmZDozqsENG5rFkXH 0fYFSKBxoq27va1qu/n+mKG4Y0+N6U9nAwuCAf4cenYCad4oNTpK7+5qhT789ynfd5wLrTkrVcU cIgMCiLsMgif0ngeIJKObGLYgPnPA3/EWIxSiEa07q6G7G/72RLlLBR/2WRNj+AcuBm4iSfjU9O jWTB0KXYXdwPjgy6BsCvHjB1F7Gnw6tfOMWwaonCDwQBdxIpQTMtjgw+x3rHUen86elxKnveJBg EQZI8z5HWRNk+jMMVcQ== X-Proofpoint-ORIG-GUID: 5WOffRqmJlE3cHcCVOk_6Wm3DJlAJili X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.125,FMLib:17.12.100.49 definitions=2026-05-27_02,2026-05-26_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 priorityscore=1501 phishscore=0 impostorscore=0 malwarescore=0 lowpriorityscore=0 adultscore=0 clxscore=1015 suspectscore=0 spamscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605130000 definitions=main-2605270144 Content-Type: text/plain; charset="utf-8" Update the API documentation for KVM_PRE_FAULT_MEMORY to account for its s390 implementation. Signed-off-by: Claudio Imbrenda Reviewed-by: Steffen Eiden --- Documentation/virt/kvm/api.rst | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Documentation/virt/kvm/api.rst b/Documentation/virt/kvm/api.rst index 52bbbb553ce1..e7998feaa940 100644 --- a/Documentation/virt/kvm/api.rst +++ b/Documentation/virt/kvm/api.rst @@ -6471,7 +6471,8 @@ Errors: =20 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D EINVAL The specified `gpa` and `size` were invalid (e.g. not - page aligned, causes an overflow, or size is zero). + page aligned, causes an overflow, or size is zero), or the VM + is UCONTROL (s390). ENOENT The specified `gpa` is outside defined memslots. EINTR An unmasked signal is pending and no page was processed. EFAULT The parameter address was invalid. @@ -6494,7 +6495,7 @@ Errors: KVM_PRE_FAULT_MEMORY populates KVM's stage-2 page tables used to map memory for the current vCPU state. KVM maps memory as if the vCPU generated a stage-2 read page fault, e.g. faults in memory as needed, but doesn't break -CoW. However, KVM does not mark any newly created stage-2 PTE as Accessed. +CoW. On x86, KVM does not mark any newly created stage-2 PTE as Accessed. =20 In the case of confidential VM types where there is an initial set up of private guest memory before the guest is 'finalized'/measured, this ioctl --=20 2.54.0 From nobody Mon Jun 8 17:38:30 2026 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 28DBC3FF88A; Wed, 27 May 2026 14:44:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.158.5 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779893053; cv=none; b=t10z6+o/3b4osYqdhxDJeI5QweExufIvJyYWdJKrBnw2ej/hKqqDjbu0X02I2KqawrkTfWxsJ/Twbnq3Btm9t8Iwt/Rt3IfshRAzHJ2GlZIMa4WaYG/WdRO+7uL7hRgz2LjZwJzi0y1MYu/eiFxIfY8ScvHucDBtyrCNDO8wqe4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779893053; c=relaxed/simple; bh=S7GGhHTOuo+dByIWG9WF9ru2vJYFFQOHqb0uTxx2X8w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YE3W0AHlQ2DyTdTUG/aaB85YnbfTQWNVK8BJi1IBQafcurxs8mOZLpRQDHgaSDsnL8yhm/zqgk6/rygSGhfqnz3L5Udf9hjfypDkSEbmi1KOb3gWVG/73MgCtCIs/NMyCA0pa/KZ4pSLKsHq6eIuy+u+v4NVX8N7pPKB+t1w5UA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=XuGlEwpH; arc=none smtp.client-ip=148.163.158.5 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="XuGlEwpH" Received: from pps.filterd (m0353725.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 64RCQoGu736243; Wed, 27 May 2026 14:44:06 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=rNQL8SpV/n85OJA2N 7zCuZzIiLAo6gT2p0S/zS5qvBw=; b=XuGlEwpHN0njRt3NxdauzL8XtwTe2huJP 5+wNCzaa4rz3Y1iuXMN0p7AWSwC2pnFWKOZKHZvuRF+ehY5NeW9tRMB4ETW2g2fS eEtl7LbX8AzGmY6g2fuRyKG1AgL5gWbt+JuHmwfUVXwAVHfuwdOh/ZaBRFZbGNiz l3SpAt7xSA7dw7VSMUqIvCYDMExcPA7W17aYtfEUPb0gdQHR77X4whGDoRoPSO1t 9oYeptWaJCgzBWuXcRELHp6XGWbuPNMjTpQI6fXdN6sjn5eCxpnemF8nE2gkAR03 5VYGXVdsXpw/h+zUHNYNu71LaUsDI0HObbrH561b9RDvzB7eJ54CQ== Received: from ppma13.dal12v.mail.ibm.com (dd.9e.1632.ip4.static.sl-reverse.com [50.22.158.221]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4eb4nc8k13-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 27 May 2026 14:44:05 +0000 (GMT) Received: from pps.filterd (ppma13.dal12v.mail.ibm.com [127.0.0.1]) by ppma13.dal12v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 64REd5LM019625; Wed, 27 May 2026 14:44:05 GMT Received: from smtprelay06.fra02v.mail.ibm.com ([9.218.2.230]) by ppma13.dal12v.mail.ibm.com (PPS) with ESMTPS id 4edjrb3f4k-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 27 May 2026 14:44:05 +0000 (GMT) Received: from smtpav04.fra02v.mail.ibm.com (smtpav04.fra02v.mail.ibm.com [10.20.54.103]) by smtprelay06.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 64REhxSG30998880 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 27 May 2026 14:43:59 GMT Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id A737720040; Wed, 27 May 2026 14:43:59 +0000 (GMT) Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 747AC20043; Wed, 27 May 2026 14:43:59 +0000 (GMT) Received: from p-imbrenda.aag-de.ibm.com (unknown [9.52.223.175]) by smtpav04.fra02v.mail.ibm.com (Postfix) with ESMTP; Wed, 27 May 2026 14:43:59 +0000 (GMT) From: Claudio Imbrenda To: linux-kernel@vger.kernel.org Cc: kvm@vger.kernel.org, linux-s390@vger.kernel.org, borntraeger@de.ibm.com, frankja@linux.ibm.com, david@kernel.org, seiden@linux.ibm.com, nrb@linux.ibm.com, schlameuss@linux.ibm.com, gra@linux.ibm.com, pbonzini@redhat.com, seanjc@google.com, yan.y.zhao@intel.com, isaku.yamahata@intel.com Subject: [PATCH v3 4/5] KVM: selftests: Fix pre_fault_memory_test to run on s390 Date: Wed, 27 May 2026 16:43:57 +0200 Message-ID: <20260527144358.186359-5-imbrenda@linux.ibm.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260527144358.186359-1-imbrenda@linux.ibm.com> References: <20260527144358.186359-1-imbrenda@linux.ibm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Authority-Analysis: v=2.4 cv=VvYTxe2n c=1 sm=1 tr=0 ts=6a170336 cx=c_pps a=AfN7/Ok6k8XGzOShvHwTGQ==:117 a=AfN7/Ok6k8XGzOShvHwTGQ==:17 a=NGcC8JguVDcA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=V8glGbnc2Ofi9Qvn3v5h:22 a=VnNF1IyMAAAA:8 a=1XWaLZrsAAAA:8 a=LqbLTa_TKMQyRjCc8hQA:9 X-Proofpoint-ORIG-GUID: sy2F1_qvd-oCMy-zEC4VREJdt-7lvui0 X-Proofpoint-GUID: nyz6MRrimiOFRnFXSK-94gsLtRaXJo1R X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTI3MDE0NCBTYWx0ZWRfX+j7cy0nh9W/i CzsMpaKKZewwxaVNSQppIU6mVbWXa9d7TeIQIKDQybUf5bJPEhi9hxeb4LsqdKLdaNlAxkbU/Gx jd5X1cPhzR9qJ1E+oaNRNRIeqsnex8gb5p4pZRdzHkOuiW9T92nWwEhoQxZQaSE29ZSpr6U8hwP ZYadlcIAJKrFk6OrpI0vDbThgJy4PtBmYPJV/T2R7dgEDwY/CDopo8ZGHmIiRK115tfrrZN9Dx9 MfzCPqjW6moLxL2HMoj7Lzp+1QVaOHK0FGR7ISzzXXq1vU/5+ItsI2C76zfG5fHj6bHSKqc2fJ9 FYd9yWeQEuOSix72kci4NVuuVn/3BVwen7COWJPa4+v1CIpWwckohdtI/rXJn+e4g9/V2zO8WJ0 SDrqGZBsw3Fr91ZBX4gX2tNHbeg7GEiU5MK7XKwR6UuzlGglz0i1olL8674CRY9QqWFe/suV9bJ 3bzJR6dIcKNVAw/rW9g== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.125,FMLib:17.12.100.49 definitions=2026-05-27_02,2026-05-26_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 phishscore=0 priorityscore=1501 spamscore=0 adultscore=0 lowpriorityscore=0 malwarescore=0 impostorscore=0 clxscore=1015 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605130000 definitions=main-2605270144 Content-Type: text/plain; charset="utf-8" Add a missing #include which is needed and otherwise not included on s390. Remove the assertion vcpu->run->exit_reason =3D=3D KVM_EXIT_IO since it is x86-specific and redundant anyway. Signed-off-by: Claudio Imbrenda Acked-by: Sean Christopherson Reviewed-by: Steffen Eiden --- tools/testing/selftests/kvm/pre_fault_memory_test.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/tools/testing/selftests/kvm/pre_fault_memory_test.c b/tools/te= sting/selftests/kvm/pre_fault_memory_test.c index fcb57fd034e6..a0fcae3cb7a8 100644 --- a/tools/testing/selftests/kvm/pre_fault_memory_test.c +++ b/tools/testing/selftests/kvm/pre_fault_memory_test.c @@ -11,6 +11,7 @@ #include #include #include +#include =20 /* Arbitrarily chosen values */ #define TEST_SIZE (SZ_2M + PAGE_SIZE) @@ -167,7 +168,6 @@ static void __test_pre_fault_memory(unsigned long vm_ty= pe, bool private) .type =3D vm_type, }; struct kvm_vcpu *vcpu; - struct kvm_run *run; struct kvm_vm *vm; struct ucall uc; =20 @@ -193,11 +193,6 @@ static void __test_pre_fault_memory(unsigned long vm_t= ype, bool private) vcpu_args_set(vcpu, 1, gva); vcpu_run(vcpu); =20 - run =3D vcpu->run; - TEST_ASSERT(run->exit_reason =3D=3D KVM_EXIT_IO, - "Wanted KVM_EXIT_IO, got exit reason: %u (%s)", - run->exit_reason, exit_reason_str(run->exit_reason)); - switch (get_ucall(vcpu, &uc)) { case UCALL_ABORT: REPORT_GUEST_ASSERT(uc); --=20 2.54.0 From nobody Mon Jun 8 17:38:30 2026 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2ED0B400E19; Wed, 27 May 2026 14:44:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.158.5 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779893054; cv=none; b=UTq+qEMRhk7+xIC+q2M7ogvxM/bVTM9oP6r8wCA6Jj9lw94r0xbgYQYG72FnlX5FoqbBbGRkHuOOlS6E7h/WngIWrirW+G1WmhBMUNOSI80/Hbn8hMm9EW38sgBi7yn4KGDaWOFWy6kr55Wgs1LfHcO+ApeE+UiEVilurHWzUj0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779893054; c=relaxed/simple; bh=cU0xorK2ua1kep2b1OWcJuac0RINbn0aDFuJbUaNTYY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=j+q0EUUwvK9NNprASuQ70xR8Z2xaolvyGI4njGhXy9VNt64a/Km/pkY3R81FmzMqOHIILFqPzczZBYxncK5mcJn4akrl3LqhL6C52t2zt/AmUV2Tjwm1fbs2Eo+LNFsBdM6lfK9LpGR5G/6dY/Q6q0VoM49VHm8602mRTQOJRFk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=fOV3vSEp; arc=none smtp.client-ip=148.163.158.5 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="fOV3vSEp" Received: from pps.filterd (m0360072.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 64RCaIbv3850935; Wed, 27 May 2026 14:44:06 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=AJYMLGH/fWC7uqxjk aiAtJCxKimPjCHxKmmQv86PRQw=; b=fOV3vSEpxCerwnFbwM2I6GJF4lgVeETRO chg7sWAcTxFeFVre0He0rU5VRlvvGLmUJPR0M4UbKA7Y4oiAMWRJ99WOCHoPVFj0 7hcgYNNI2Rt9c0WxAypYHfWpIX58bpztcoA+blzYOefsoaTAkUiEyA5/D1jh+we7 bAPcy0si9QNA2PuucuznXcMLOWcH53EQBXF0Qv/6Ipk8MkGB5O1prtzNZBnmHXk4 Q2rebDUDGSEAXrhwZ+VptFO/itBzydfbqWI/EUuiLIHWCg8wF5wKBdZeNAzWQdFL hjy5JB59/dvGIwHc4wprjqhp23Mg+U5zj1a/SlyqAM+PogZvbvBQA== Received: from ppma12.dal12v.mail.ibm.com (dc.9e.1632.ip4.static.sl-reverse.com [50.22.158.220]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4eb4pdgndv-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 27 May 2026 14:44:06 +0000 (GMT) Received: from pps.filterd (ppma12.dal12v.mail.ibm.com [127.0.0.1]) by ppma12.dal12v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 64REd4ld000618; Wed, 27 May 2026 14:44:05 GMT Received: from smtprelay07.fra02v.mail.ibm.com ([9.218.2.229]) by ppma12.dal12v.mail.ibm.com (PPS) with ESMTPS id 4edjrb3f4m-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 27 May 2026 14:44:05 +0000 (GMT) Received: from smtpav04.fra02v.mail.ibm.com (smtpav04.fra02v.mail.ibm.com [10.20.54.103]) by smtprelay07.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 64REi06c50594278 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 27 May 2026 14:44:00 GMT Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id E89F620040; Wed, 27 May 2026 14:43:59 +0000 (GMT) Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id AD2202004B; Wed, 27 May 2026 14:43:59 +0000 (GMT) Received: from p-imbrenda.aag-de.ibm.com (unknown [9.52.223.175]) by smtpav04.fra02v.mail.ibm.com (Postfix) with ESMTP; Wed, 27 May 2026 14:43:59 +0000 (GMT) From: Claudio Imbrenda To: linux-kernel@vger.kernel.org Cc: kvm@vger.kernel.org, linux-s390@vger.kernel.org, borntraeger@de.ibm.com, frankja@linux.ibm.com, david@kernel.org, seiden@linux.ibm.com, nrb@linux.ibm.com, schlameuss@linux.ibm.com, gra@linux.ibm.com, pbonzini@redhat.com, seanjc@google.com, yan.y.zhao@intel.com, isaku.yamahata@intel.com Subject: [PATCH v3 5/5] KVM: selftests: Enable pre_fault_memory_test for s390 Date: Wed, 27 May 2026 16:43:58 +0200 Message-ID: <20260527144358.186359-6-imbrenda@linux.ibm.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260527144358.186359-1-imbrenda@linux.ibm.com> References: <20260527144358.186359-1-imbrenda@linux.ibm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Authority-Analysis: v=2.4 cv=OdqoyBTY c=1 sm=1 tr=0 ts=6a170336 cx=c_pps a=bLidbwmWQ0KltjZqbj+ezA==:117 a=bLidbwmWQ0KltjZqbj+ezA==:17 a=NGcC8JguVDcA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=RzCfie-kr_QcCd8fBx8p:22 a=VnNF1IyMAAAA:8 a=f1nrkDJSyVtqXGSnAM4A:9 X-Proofpoint-GUID: HvJlXv20jNQbJ4xlqCncbhiXPFF-l_Ha X-Proofpoint-ORIG-GUID: MT0UQ_PVcczQy7XpaH6_HVrkfPa7NaVU X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTI3MDE0NCBTYWx0ZWRfX/BV8+xRwpHiN qdHd4XysGNKFdqdrQA02PRPqW3I0cWSuAsBpOkSfTuUtvL7XYvyEE5caYEv9241gdKF7NNrDQx6 4KKs1FgudJ39FdxO7+ofSk27N05Qkt/2fnMaGisjVna3T6FSCSF6fA8kHGyxlEXideyA7NtFVn4 tmP6bU3oy2ztbUNINj9Pb9TnfX82L8B2C+MUS8/ZjPlpdKWAOKZeehBqL7sxvZ2CfpY14j0I6WL o/2oLsuJxVHyCDUH1VacUs5z8R4Wo5Ta7WyPLTRKQCJs81huyf7+4H+RPatiLK0QGoB0JlR1ZGE TkQCxdyK91jYbQM79R9Q++vCITtZr6pu5rLSVagkGllQF+cvNahMJjwSn3/w2zFVtaZpUqs7I9K GV3AnjeNGSgQk1utEyz5ThRJztHCYLEU6rBz+/Cg4SEh619jJO9UYtM9KaUlt0/FEOAJzTgZD2t RYg9dwNqA4q+la8uaCQ== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.125,FMLib:17.12.100.49 definitions=2026-05-27_02,2026-05-26_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 impostorscore=0 clxscore=1015 malwarescore=0 lowpriorityscore=0 bulkscore=0 suspectscore=0 adultscore=0 spamscore=0 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605130000 definitions=main-2605270144 Content-Type: text/plain; charset="utf-8" Enable the pre_fault_memory_test to run on s390. Signed-off-by: Claudio Imbrenda Reviewed-by: Steffen Eiden --- tools/testing/selftests/kvm/Makefile.kvm | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/testing/selftests/kvm/Makefile.kvm b/tools/testing/selft= ests/kvm/Makefile.kvm index 9118a5a51b89..fff939db89cd 100644 --- a/tools/testing/selftests/kvm/Makefile.kvm +++ b/tools/testing/selftests/kvm/Makefile.kvm @@ -210,6 +210,7 @@ TEST_GEN_PROGS_s390 +=3D s390/keyop TEST_GEN_PROGS_s390 +=3D rseq_test TEST_GEN_PROGS_s390 +=3D s390/irq_routing TEST_GEN_PROGS_s390 +=3D mmu_stress_test +TEST_GEN_PROGS_s390 +=3D pre_fault_memory_test =20 TEST_GEN_PROGS_riscv =3D $(TEST_GEN_PROGS_COMMON) TEST_GEN_PROGS_riscv +=3D riscv/sbi_pmu_test --=20 2.54.0