From nobody Sun Feb 8 00:38:53 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 5C2E927B501; Wed, 14 May 2025 16:39:04 +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=1747240746; cv=none; b=YE3Iz844NwLs16NLHNOQA6RUsWLV3jEgB5jQKzANlsYHLNynPeLmmR1Puoy5L65j5GWeUJ5FFRIImfQ2AxJ5GFAfsJ0kxOsRhqPTmHC57OXExgsIPrBOQugr5crDuEpVw37ynV7QSJdSiGjC1a1NhuQ9NtpVoObq7jrfRyjmj2g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747240746; c=relaxed/simple; bh=v5oJ6LelhKm1BMisOq88FXrXEk7LLz1XOmZv5UdWLkU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FrXMW0wuvrTOc+aoXlqJbLYn21XfKZ6FpI6UZ6VErSBCEL1lylappDX8Ou7acKrqaEk0fKsbcyPaEnSJi/KaC4385GT+tevvw2zxmZweppEGlC8PT0iTq2kDee5YQU6wkPZX7g5jwnLbTi8DQc6BX0VhogTgLH4cj9jFj4t66GA= 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=ETqXOEPx; 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="ETqXOEPx" Received: from pps.filterd (m0360072.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 54EFrJl8024793; Wed, 14 May 2025 16:39:01 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=WGmFhySZ+qQk6Nvva nCfjh0KpSa7FtwQiRvlOxz6uEc=; b=ETqXOEPx07G55VETYnoHdWhu4DFg/Esyt 49i8sIl+9oSk1FKGXGWdZdfpntsSZLCRTKyymkzLmNJiYobx3U/QElbT+2RWk4IC q0Xlp4JsI4AtpMHc+FXoe7FVgmEjIwlME8f7wfO6qGfzo1/vZteN8FXcSRomeo2C UWpqjuK/vBOicly8xcAGTgW6I+TbEiq3tzgMA7IDptuweJgty0vVusyJY33ueTFJ sWxHxQjWk5oTR0oDj8uYPT6R/DsDKJdsncyMRsXyFkidKoRPe9dh8KrXNgbvUn/k Yp38Wfxjg2S2tHmsYFLE2YGaUNijBPiO7vXwdUJh+3ii16oBR9rOg== 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 46mbs6nf0s-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 14 May 2025 16:39:01 +0000 (GMT) Received: from pps.filterd (ppma22.wdc07v.mail.ibm.com [127.0.0.1]) by ppma22.wdc07v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 54EGaBfb021797; Wed, 14 May 2025 16:39:01 GMT Received: from smtprelay07.fra02v.mail.ibm.com ([9.218.2.229]) by ppma22.wdc07v.mail.ibm.com (PPS) with ESMTPS id 46mbfpn9y4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 14 May 2025 16:39:00 +0000 Received: from smtpav02.fra02v.mail.ibm.com (smtpav02.fra02v.mail.ibm.com [10.20.54.101]) by smtprelay07.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 54EGcuHM52560364 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 14 May 2025 16:38:57 GMT Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id CE6AD20043; Wed, 14 May 2025 16:38:56 +0000 (GMT) Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 6F56E2004B; Wed, 14 May 2025 16:38:56 +0000 (GMT) Received: from p-imbrenda.boeblingen.de.ibm.com (unknown [9.152.224.66]) by smtpav02.fra02v.mail.ibm.com (Postfix) with ESMTP; Wed, 14 May 2025 16:38:56 +0000 (GMT) From: Claudio Imbrenda To: linux-kernel@vger.kernel.org Cc: kvm@vger.kernel.org, linux-s390@vger.kernel.org, frankja@linux.ibm.com, borntraeger@de.ibm.com, seiden@linux.ibm.com, nsg@linux.ibm.com, nrb@linux.ibm.com, david@redhat.com, hca@linux.ibm.com, agordeev@linux.ibm.com, svens@linux.ibm.com, gor@linux.ibm.com Subject: [PATCH v1 1/5] s390: remove unneeded includes Date: Wed, 14 May 2025 18:38:51 +0200 Message-ID: <20250514163855.124471-2-imbrenda@linux.ibm.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250514163855.124471-1-imbrenda@linux.ibm.com> References: <20250514163855.124471-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-Spam-Details-Enc: AW1haW4tMjUwNTE0MDE0OSBTYWx0ZWRfXzHHD2sr7LjA0 X6co1Iyx+iH3ldUXAhC5wDxvEpsIpIezmwBuoAIvuK9akRY8p8AXywpKvX29J+7SWB3Rxg+J19T apHzDQLr9CZCZdIHJfqhn8hUQhpKL4XOk1afQgcIp1lCS+ZYbzJtY2f/rM/aXZrilp/3+3TGS7x 2QAueor9FUR9KF4r0A0oRdjqlsutNUUjmyMEbBhhV+PFhA65rjUvrmjDiP4qJfk3A+boVyMtoFh fdjpEqpKroXKYGTRaSIf/LY3r/4aJ3o8o7XAFn/fpVcv3lTZ7lbrtnUpiOGkqhTP7ZJ0hFc164F LM8zAaUdzy04tArCjayPwqJmjmP7sqAS1z6z6t3atrenTVQCCcS2O0zs604pLc7l7psHGEjmXvW bz+SwgPRctR+I3xiTALt25TbBQ5rMOWDWfGB+u+NtSNX5E2hF0MG1x/P0FGaqvFDSIgBcgNN X-Proofpoint-ORIG-GUID: X6lkkZRtUxm0xMKPq0UDGKVt39QUySv4 X-Authority-Analysis: v=2.4 cv=d5f1yQjE c=1 sm=1 tr=0 ts=6824c725 cx=c_pps a=5BHTudwdYE3Te8bg5FgnPg==:117 a=5BHTudwdYE3Te8bg5FgnPg==:17 a=dt9VzEwgFbYA:10 a=VnNF1IyMAAAA:8 a=uOUJJYmQgii9-mSc-xUA:9 X-Proofpoint-GUID: X6lkkZRtUxm0xMKPq0UDGKVt39QUySv4 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-05-14_04,2025-05-14_03,2025-02-21_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 bulkscore=0 spamscore=0 clxscore=1015 mlxscore=0 lowpriorityscore=0 priorityscore=1501 suspectscore=0 mlxlogscore=892 impostorscore=0 adultscore=0 phishscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505070000 definitions=main-2505140149 Content-Type: text/plain; charset="utf-8" Many files don't need to include asm/tlb.h or asm/gmap.h. On the other hand, asm/tlb.h does need to include asm/gmap.h. Remove all unneeded includes so that asm/tlb.h is not directly used by s390 arch code anymore. Remove asm/gmap.h from a few other files as well, so that now only KVM code, mm/gmap.c, and asm/tlb.h include it. Signed-off-by: Claudio Imbrenda Reviewed-by: Christoph Schlameuss --- arch/s390/include/asm/tlb.h | 1 + arch/s390/include/asm/uv.h | 1 - arch/s390/kvm/intercept.c | 1 + arch/s390/mm/fault.c | 1 - arch/s390/mm/gmap.c | 1 - arch/s390/mm/init.c | 1 - arch/s390/mm/pgalloc.c | 2 -- arch/s390/mm/pgtable.c | 1 - 8 files changed, 2 insertions(+), 7 deletions(-) diff --git a/arch/s390/include/asm/tlb.h b/arch/s390/include/asm/tlb.h index f20601995bb0..56d5f9e0eb2e 100644 --- a/arch/s390/include/asm/tlb.h +++ b/arch/s390/include/asm/tlb.h @@ -36,6 +36,7 @@ static inline bool __tlb_remove_folio_pages(struct mmu_ga= ther *tlb, =20 #include #include +#include =20 /* * Release the page cache reference for a pte removed by diff --git a/arch/s390/include/asm/uv.h b/arch/s390/include/asm/uv.h index 46fb0ef6f984..eeb2db4783e6 100644 --- a/arch/s390/include/asm/uv.h +++ b/arch/s390/include/asm/uv.h @@ -16,7 +16,6 @@ #include #include #include -#include #include =20 #define UVC_CC_OK 0 diff --git a/arch/s390/kvm/intercept.c b/arch/s390/kvm/intercept.c index a06a000f196c..b4834bd4d216 100644 --- a/arch/s390/kvm/intercept.c +++ b/arch/s390/kvm/intercept.c @@ -16,6 +16,7 @@ #include #include #include +#include =20 #include "kvm-s390.h" #include "gaccess.h" diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c index da84ff6770de..3829521450dd 100644 --- a/arch/s390/mm/fault.c +++ b/arch/s390/mm/fault.c @@ -40,7 +40,6 @@ #include #include #include -#include #include #include #include diff --git a/arch/s390/mm/gmap.c b/arch/s390/mm/gmap.c index a94bd4870c65..4869555ff403 100644 --- a/arch/s390/mm/gmap.c +++ b/arch/s390/mm/gmap.c @@ -24,7 +24,6 @@ #include #include #include -#include =20 /* * The address is saved in a radix tree directly; NULL would be ambiguous, diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c index afa085e8186c..074bf4fb4ce2 100644 --- a/arch/s390/mm/init.c +++ b/arch/s390/mm/init.c @@ -40,7 +40,6 @@ #include #include #include -#include #include #include #include diff --git a/arch/s390/mm/pgalloc.c b/arch/s390/mm/pgalloc.c index e3a6f8ae156c..ddab36875370 100644 --- a/arch/s390/mm/pgalloc.c +++ b/arch/s390/mm/pgalloc.c @@ -12,8 +12,6 @@ #include #include #include -#include -#include #include =20 unsigned long *crst_table_alloc(struct mm_struct *mm) diff --git a/arch/s390/mm/pgtable.c b/arch/s390/mm/pgtable.c index 9901934284ec..7df70cd8f739 100644 --- a/arch/s390/mm/pgtable.c +++ b/arch/s390/mm/pgtable.c @@ -20,7 +20,6 @@ #include #include =20 -#include #include #include #include --=20 2.49.0 From nobody Sun Feb 8 00:38:53 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 85AA818C011; Wed, 14 May 2025 16:39:05 +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=1747240747; cv=none; b=Qw4+og2TDloY0AANSytca3Jk+jZ2M1qad+Zot++VKbQrqewd9QpnsRAkigIb5mh7/5NETZjvTdjL+K1n/bxYbLzPDSLjz/HA3cbeGDDPVxTBLj8xxy9mZFHt1WxkxOd23SLQgFTHdot5ZPYPYIzB56jWKji92S6dckzs7PBIesM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747240747; c=relaxed/simple; bh=G60b3ECJ7wnNCGvp6dLGMelR55TedPtrt178s8wBAjo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=N4k+7j6UD5QeS56McFKgSxjC+DThk8XhPjodrj0+xoPg/CGeouCXMZZ/aByfee1HztpcIqhLwQFn5PLpblSWiwYqFJ/BzWP8WgopJHW76Mp7ZJqEAej8eIhFuDysVYFDDok79i5tSSxfCyTgx2tXnGknS6D+Ya9rJZYjVHNKVZ4= 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=OR0RCHb9; 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="OR0RCHb9" Received: from pps.filterd (m0356517.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 54EEiVle016990; Wed, 14 May 2025 16:39:03 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=5fz9ydSZjyCZWvdkL a28gUUo3haPpqVuA8Xt7kmDnQM=; b=OR0RCHb9jv8SW/pgkpR+woXwCkFOUZSXB kYfRcNgrcsWA2Kom1rnk0DszSuh0ds0pa++ZBhdD20EEYNSuG/S3Ko/5CnRFmAGf fzxvwrp0EaXRRiPclt08AMvfcpbfLtcOCP9NgWa7fORdrj3ELV0JaTdQHZI4WW4T HIfLS20d7piOUdKJ7E8/DsthwUAjQpWx3tdx4M9663ntttGSiihBxLX8HVeQ9ueo kN1ttoA1GSVFkwqsGGG2T/Pho2qEH7o2hVxyD8xdrlOFQ+ULrwRh4IVaM1xWcue4 gIduZH0tGzDi7zcyLJSAIGCe3E10MBPciyA5dFtbk1w2oOgZ/nLSA== Received: from ppma23.wdc07v.mail.ibm.com (5d.69.3da9.ip4.static.sl-reverse.com [169.61.105.93]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 46mbq8nn8j-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 14 May 2025 16:39:02 +0000 (GMT) Received: from pps.filterd (ppma23.wdc07v.mail.ibm.com [127.0.0.1]) by ppma23.wdc07v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 54EGcJGl024279; Wed, 14 May 2025 16:39:01 GMT Received: from smtprelay04.fra02v.mail.ibm.com ([9.218.2.228]) by ppma23.wdc07v.mail.ibm.com (PPS) with ESMTPS id 46mbfs59jw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 14 May 2025 16:39:01 +0000 Received: from smtpav02.fra02v.mail.ibm.com (smtpav02.fra02v.mail.ibm.com [10.20.54.101]) by smtprelay04.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 54EGcvJe28639776 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 14 May 2025 16:38:57 GMT Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 4F7B620043; Wed, 14 May 2025 16:38:57 +0000 (GMT) Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id DAB1B2004E; Wed, 14 May 2025 16:38:56 +0000 (GMT) Received: from p-imbrenda.boeblingen.de.ibm.com (unknown [9.152.224.66]) by smtpav02.fra02v.mail.ibm.com (Postfix) with ESMTP; Wed, 14 May 2025 16:38:56 +0000 (GMT) From: Claudio Imbrenda To: linux-kernel@vger.kernel.org Cc: kvm@vger.kernel.org, linux-s390@vger.kernel.org, frankja@linux.ibm.com, borntraeger@de.ibm.com, seiden@linux.ibm.com, nsg@linux.ibm.com, nrb@linux.ibm.com, david@redhat.com, hca@linux.ibm.com, agordeev@linux.ibm.com, svens@linux.ibm.com, gor@linux.ibm.com Subject: [PATCH v1 2/5] KVM: s390: remove unneeded srcu lock Date: Wed, 14 May 2025 18:38:52 +0200 Message-ID: <20250514163855.124471-3-imbrenda@linux.ibm.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250514163855.124471-1-imbrenda@linux.ibm.com> References: <20250514163855.124471-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-ORIG-GUID: 4xL1AtLynSzsmBhHUhtre0eVzbqZXfAk X-Authority-Analysis: v=2.4 cv=GrRC+l1C c=1 sm=1 tr=0 ts=6824c726 cx=c_pps a=3Bg1Hr4SwmMryq2xdFQyZA==:117 a=3Bg1Hr4SwmMryq2xdFQyZA==:17 a=dt9VzEwgFbYA:10 a=VnNF1IyMAAAA:8 a=ELDMwNJArE-rEd5HdXMA:9 a=ZXulRonScM0A:10 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNTE0MDE0OSBTYWx0ZWRfX6PTtbMi3mZLO LfCYfCyuQO5H8KnJdnVlcsep2OJCj5r/2y3hl/oRFdM3zMflYx9XQMGqwmWRnvHpPFG6stEjk8M WFa/ZUGcYtGduEjFK3tO+BroriOkynZD6q8L0kmIktGpLTzN/FDNqcsRbNwcRrvVfmcBe7QDiNa hul+SbslcUyxqAOaTiuy1WF3O7Hdje1lRk0pF2J+jMQEYPhJSIHQiMzRIjGd0eCSddYIeOEpgJm Z9zuZ647ZkGtAHPScp8+I9I90NjCksiejF6EJ8O1+fFttzsxb0i8tq8IxWxMZWWYqBTId+FlqlS RsMgPbaYxgdlRo7jsc4u5jZUMRw/J4yuUJumghvXJAzMnwngLTtj2kpK9RNTloznI3/4yJB4qnS znZLVtVgEHbj+0P42DBhPWz0nsFTTnQYVCnk8KawVJhlgqPUuKnbe6Iv+ptFkDjAnvW7UudT X-Proofpoint-GUID: 4xL1AtLynSzsmBhHUhtre0eVzbqZXfAk X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-05-14_04,2025-05-14_03,2025-02-21_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 malwarescore=0 lowpriorityscore=0 phishscore=0 mlxscore=0 clxscore=1015 mlxlogscore=667 spamscore=0 priorityscore=1501 adultscore=0 bulkscore=0 suspectscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505070000 definitions=main-2505140149 Content-Type: text/plain; charset="utf-8" All paths leading to handle_essa() already hold the kvm->srcu. Remove unneeded srcu locking from handle_essa(). Signed-off-by: Claudio Imbrenda Reviewed-by: Christian Borntraeger Reviewed-by: Nina Schoetterl-Glausch --- arch/s390/kvm/priv.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/arch/s390/kvm/priv.c b/arch/s390/kvm/priv.c index 1a49b89706f8..758cefb5bac7 100644 --- a/arch/s390/kvm/priv.c +++ b/arch/s390/kvm/priv.c @@ -1297,12 +1297,8 @@ static int handle_essa(struct kvm_vcpu *vcpu) /* Retry the ESSA instruction */ kvm_s390_retry_instr(vcpu); } else { - int srcu_idx; - mmap_read_lock(vcpu->kvm->mm); - srcu_idx =3D srcu_read_lock(&vcpu->kvm->srcu); i =3D __do_essa(vcpu, orc); - srcu_read_unlock(&vcpu->kvm->srcu, srcu_idx); mmap_read_unlock(vcpu->kvm->mm); if (i < 0) return i; --=20 2.49.0 From nobody Sun Feb 8 00:38:53 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 4B15027B506; Wed, 14 May 2025 16:39:04 +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=1747240747; cv=none; b=hHJtMsKzO5Rpuyf+iGUiAzPSJBhbd5T+scNWTl1UM0nj5w74qVQuafSV98R+ukIe6QYuCt5nGGws+uOTlh8esRwUHeTJQVPjphIhZWVCnqz95zisu1gS0r9hkCihWRHr5XiE0d1f3Vhv+kLut0L8sGVgTW/sTrDerC4VaozxDTE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747240747; c=relaxed/simple; bh=iHZvcX63K1uEZ12At1/792SaV5OrCUKqkUJCTIspoKA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qz7r5I9yXJzwwVtcA0z8kcnV6pEBAucau/jydtVN1HSUD6K+1cPuLUW4EY4UPh/AZYjWnPby+855WIpOZNQwrxJpLy120+SfD5Yk47NSn8H5x+ZGemJoeHjSbbFmMs0DgwNRqfBDEL+aNJABD7Hf/8JFI8I8zuh7N0BIH6V07ng= 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=n09S+Wbh; 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="n09S+Wbh" Received: from pps.filterd (m0360072.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 54E7YbBC025522; Wed, 14 May 2025 16:39:02 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=zm0nO3kZha1Icct/b LZBBxBIDj2brp4fW2Jn6nUlIY8=; b=n09S+Wbhn2aSTu4dy3vdamwv2E2nLSqyW 915E9E7aa8eQhrGjYJTZqhLV6CFlGAhFJHeZgijqW8bJIV5+Zf6GhRGMiXRXrnk7 uMf0vRDSZYJi9Z9G60o4zkcW4/PqZ8/qPezPpxbJW/P9h4j3OGZooRBYZZukUwYG ptqeRvavJ/bm/n600GKc9noEejhizsUh1dIuzqPi/qr8YcVZN+6Kf+u80i6V6fk8 nTb+EpAV2MwbA52XfEmqWKHxvvC0s45MJr0TYJdFpYTpYo9frE8BrE2u+3/Q7pE+ ap4KKx3j7B0beIo9SJJKV1+keSaf6rjGhuJ9VKdtTRXvMn8gT4LKw== 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 46mbs6nf0t-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 14 May 2025 16:39:02 +0000 (GMT) Received: from pps.filterd (ppma21.wdc07v.mail.ibm.com [127.0.0.1]) by ppma21.wdc07v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 54EGY7jK021408; Wed, 14 May 2025 16:39:01 GMT Received: from smtprelay04.fra02v.mail.ibm.com ([9.218.2.228]) by ppma21.wdc07v.mail.ibm.com (PPS) with ESMTPS id 46mbfrn9br-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 14 May 2025 16:39:01 +0000 Received: from smtpav02.fra02v.mail.ibm.com (smtpav02.fra02v.mail.ibm.com [10.20.54.101]) by smtprelay04.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 54EGcv1L30999150 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 14 May 2025 16:38:58 GMT Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id CB43F2004E; Wed, 14 May 2025 16:38:57 +0000 (GMT) Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 5CF3E2004B; Wed, 14 May 2025 16:38:57 +0000 (GMT) Received: from p-imbrenda.boeblingen.de.ibm.com (unknown [9.152.224.66]) by smtpav02.fra02v.mail.ibm.com (Postfix) with ESMTP; Wed, 14 May 2025 16:38:57 +0000 (GMT) From: Claudio Imbrenda To: linux-kernel@vger.kernel.org Cc: kvm@vger.kernel.org, linux-s390@vger.kernel.org, frankja@linux.ibm.com, borntraeger@de.ibm.com, seiden@linux.ibm.com, nsg@linux.ibm.com, nrb@linux.ibm.com, david@redhat.com, hca@linux.ibm.com, agordeev@linux.ibm.com, svens@linux.ibm.com, gor@linux.ibm.com Subject: [PATCH v1 3/5] KVM: s390: refactor some functions in priv.c Date: Wed, 14 May 2025 18:38:53 +0200 Message-ID: <20250514163855.124471-4-imbrenda@linux.ibm.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250514163855.124471-1-imbrenda@linux.ibm.com> References: <20250514163855.124471-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-Spam-Details-Enc: AW1haW4tMjUwNTE0MDE0OSBTYWx0ZWRfX+usHbN7QpQy7 1gfway2hmgHv8dBqBHkKkod9eivL1oVfVxbOU6Ol+tkqtkjDT2yV6PusGjVhOqFK9toj04W9Uz9 e+IyTZHj8ywL98gLbEngk0NDEb1PRG1NREelybsAno1pok07u76mtqjata9wopxWpj+LGtPZ9Nx DgykvnqAkDKH9cGnBEhFMyMSahjp6QIN6QR7Ta65Mpbi4GQ9CIGrszLOPeYn6WBT8thtJ9Yr8ss XK09xADuuSLM5SXmKjVLZCRf3AQC/2PI8TfftphuFsAZbwVcaoxCfL2Z0vhqDmzql2CdJ23u1Pf //xH01SKaupoQ42nudvXVca+kzDHOjVW6ENhUdQJaVe2o0jnj+5wWmbGOAxGG2if8u1l4KxDyp7 1HBxOKzXBRr9Ah2QsthMG6+HZ+WYaQZhgMVJD3UpopR9loZQcXM1rAWNiO+FYE69Q1O0f5+u X-Proofpoint-ORIG-GUID: ttaAWLonSLBfyl3F1sudZ39_5rdcXbOK X-Authority-Analysis: v=2.4 cv=d5f1yQjE c=1 sm=1 tr=0 ts=6824c726 cx=c_pps a=GFwsV6G8L6GxiO2Y/PsHdQ==:117 a=GFwsV6G8L6GxiO2Y/PsHdQ==:17 a=dt9VzEwgFbYA:10 a=VnNF1IyMAAAA:8 a=ilECb7VF1RFgedB8ViUA:9 X-Proofpoint-GUID: ttaAWLonSLBfyl3F1sudZ39_5rdcXbOK X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-05-14_04,2025-05-14_03,2025-02-21_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 bulkscore=0 spamscore=0 clxscore=1015 mlxscore=0 lowpriorityscore=0 priorityscore=1501 suspectscore=0 mlxlogscore=712 impostorscore=0 adultscore=0 phishscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505070000 definitions=main-2505140149 Content-Type: text/plain; charset="utf-8" Refactor some functions in priv.c to make them more readable. handle_{iske,rrbe,sske}: move duplicated checks into a single function. handle{pfmf,epsw}: improve readability. handle_lpswe{,y}: merge implementations since they are almost the same. Use u64_replace_bits() where it makes sense. Signed-off-by: Claudio Imbrenda --- arch/s390/kvm/kvm-s390.h | 15 ++ arch/s390/kvm/priv.c | 288 ++++++++++++++++++--------------------- 2 files changed, 148 insertions(+), 155 deletions(-) diff --git a/arch/s390/kvm/kvm-s390.h b/arch/s390/kvm/kvm-s390.h index 8d3bbb2dd8d2..f8c32527c4e4 100644 --- a/arch/s390/kvm/kvm-s390.h +++ b/arch/s390/kvm/kvm-s390.h @@ -22,6 +22,21 @@ =20 #define KVM_S390_UCONTROL_MEMSLOT (KVM_USER_MEM_SLOTS + 0) =20 +static inline bool kvm_s390_is_amode_24(struct kvm_vcpu *vcpu) +{ + return psw_bits(vcpu->arch.sie_block->gpsw).eaba =3D=3D PSW_BITS_AMODE_24= BIT; +} + +static inline bool kvm_s390_is_amode_31(struct kvm_vcpu *vcpu) +{ + return psw_bits(vcpu->arch.sie_block->gpsw).eaba =3D=3D PSW_BITS_AMODE_31= BIT; +} + +static inline bool kvm_s390_is_amode_64(struct kvm_vcpu *vcpu) +{ + return psw_bits(vcpu->arch.sie_block->gpsw).eaba =3D=3D PSW_BITS_AMODE_64= BIT; +} + static inline void kvm_s390_fpu_store(struct kvm_run *run) { fpu_stfpc(&run->s.regs.fpc); diff --git a/arch/s390/kvm/priv.c b/arch/s390/kvm/priv.c index 758cefb5bac7..1a26aa591c2e 100644 --- a/arch/s390/kvm/priv.c +++ b/arch/s390/kvm/priv.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include @@ -253,29 +254,50 @@ static int try_handle_skey(struct kvm_vcpu *vcpu) return 0; } =20 +struct skeys_ops_state { + int reg1; + int reg2; + int rc; + unsigned long gaddr; +}; + +static bool skeys_common_checks(struct kvm_vcpu *vcpu, struct skeys_ops_st= ate *state, bool abs) +{ + if (vcpu->arch.sie_block->gpsw.mask & PSW_MASK_PSTATE) { + state->rc =3D kvm_s390_inject_program_int(vcpu, PGM_PRIVILEGED_OP); + return true; + } + + state->rc =3D try_handle_skey(vcpu); + if (state->rc) + return true; + + kvm_s390_get_regs_rre(vcpu, &state->reg1, &state->reg2); + + state->gaddr =3D vcpu->run->s.regs.gprs[state->reg2] & PAGE_MASK; + state->gaddr =3D kvm_s390_logical_to_effective(vcpu, state->gaddr); + if (!abs) + state->gaddr =3D kvm_s390_real_to_abs(vcpu, state->gaddr); + + return false; +} + static int handle_iske(struct kvm_vcpu *vcpu) { - unsigned long gaddr, vmaddr; + struct skeys_ops_state state; + unsigned long vmaddr; unsigned char key; - int reg1, reg2; bool unlocked; + u64 *r1; int rc; =20 vcpu->stat.instruction_iske++; =20 - if (vcpu->arch.sie_block->gpsw.mask & PSW_MASK_PSTATE) - return kvm_s390_inject_program_int(vcpu, PGM_PRIVILEGED_OP); - - rc =3D try_handle_skey(vcpu); - if (rc) - return rc !=3D -EAGAIN ? rc : 0; - - kvm_s390_get_regs_rre(vcpu, ®1, ®2); + if (skeys_common_checks(vcpu, &state, false)) + return state.rc; + r1 =3D vcpu->run->s.regs.gprs + state.reg1; =20 - gaddr =3D vcpu->run->s.regs.gprs[reg2] & PAGE_MASK; - gaddr =3D kvm_s390_logical_to_effective(vcpu, gaddr); - gaddr =3D kvm_s390_real_to_abs(vcpu, gaddr); - vmaddr =3D gfn_to_hva(vcpu->kvm, gpa_to_gfn(gaddr)); + vmaddr =3D gfn_to_hva(vcpu->kvm, gpa_to_gfn(state.gaddr)); if (kvm_is_error_hva(vmaddr)) return kvm_s390_inject_program_int(vcpu, PGM_ADDRESSING); retry: @@ -296,33 +318,23 @@ static int handle_iske(struct kvm_vcpu *vcpu) return kvm_s390_inject_program_int(vcpu, PGM_ADDRESSING); if (rc < 0) return rc; - vcpu->run->s.regs.gprs[reg1] &=3D ~0xff; - vcpu->run->s.regs.gprs[reg1] |=3D key; + *r1 =3D u64_replace_bits(*r1, key, 0xff); return 0; } =20 static int handle_rrbe(struct kvm_vcpu *vcpu) { - unsigned long vmaddr, gaddr; - int reg1, reg2; + struct skeys_ops_state state; + unsigned long vmaddr; bool unlocked; int rc; =20 vcpu->stat.instruction_rrbe++; =20 - if (vcpu->arch.sie_block->gpsw.mask & PSW_MASK_PSTATE) - return kvm_s390_inject_program_int(vcpu, PGM_PRIVILEGED_OP); - - rc =3D try_handle_skey(vcpu); - if (rc) - return rc !=3D -EAGAIN ? rc : 0; - - kvm_s390_get_regs_rre(vcpu, ®1, ®2); + if (skeys_common_checks(vcpu, &state, false)) + return state.rc; =20 - gaddr =3D vcpu->run->s.regs.gprs[reg2] & PAGE_MASK; - gaddr =3D kvm_s390_logical_to_effective(vcpu, gaddr); - gaddr =3D kvm_s390_real_to_abs(vcpu, gaddr); - vmaddr =3D gfn_to_hva(vcpu->kvm, gpa_to_gfn(gaddr)); + vmaddr =3D gfn_to_hva(vcpu->kvm, gpa_to_gfn(state.gaddr)); if (kvm_is_error_hva(vmaddr)) return kvm_s390_inject_program_int(vcpu, PGM_ADDRESSING); retry: @@ -353,40 +365,30 @@ static int handle_rrbe(struct kvm_vcpu *vcpu) static int handle_sske(struct kvm_vcpu *vcpu) { unsigned char m3 =3D vcpu->arch.sie_block->ipb >> 28; + struct skeys_ops_state state; unsigned long start, end; unsigned char key, oldkey; - int reg1, reg2; + bool nq, mr, mc, mb; bool unlocked; + u64 *r1, *r2; int rc; =20 vcpu->stat.instruction_sske++; =20 - if (vcpu->arch.sie_block->gpsw.mask & PSW_MASK_PSTATE) - return kvm_s390_inject_program_int(vcpu, PGM_PRIVILEGED_OP); - - rc =3D try_handle_skey(vcpu); - if (rc) - return rc !=3D -EAGAIN ? rc : 0; - - if (!test_kvm_facility(vcpu->kvm, 8)) - m3 &=3D ~SSKE_MB; - if (!test_kvm_facility(vcpu->kvm, 10)) - m3 &=3D ~(SSKE_MC | SSKE_MR); - if (!test_kvm_facility(vcpu->kvm, 14)) - m3 &=3D ~SSKE_NQ; + mb =3D test_kvm_facility(vcpu->kvm, 8) && (m3 & SSKE_MB); + mr =3D test_kvm_facility(vcpu->kvm, 10) && (m3 & SSKE_MR); + mc =3D test_kvm_facility(vcpu->kvm, 10) && (m3 & SSKE_MC); + nq =3D test_kvm_facility(vcpu->kvm, 14) && (m3 & SSKE_NQ); =20 - kvm_s390_get_regs_rre(vcpu, ®1, ®2); + /* start already designates an absolute address if MB is set */ + if (skeys_common_checks(vcpu, &state, mb)) + return state.rc; =20 - key =3D vcpu->run->s.regs.gprs[reg1] & 0xfe; - start =3D vcpu->run->s.regs.gprs[reg2] & PAGE_MASK; - start =3D kvm_s390_logical_to_effective(vcpu, start); - if (m3 & SSKE_MB) { - /* start already designates an absolute address */ - end =3D (start + _SEGMENT_SIZE) & ~(_SEGMENT_SIZE - 1); - } else { - start =3D kvm_s390_real_to_abs(vcpu, start); - end =3D start + PAGE_SIZE; - } + start =3D state.gaddr; + end =3D mb ? ALIGN(start + 1, _SEGMENT_SIZE) : start + PAGE_SIZE; + r1 =3D vcpu->run->s.regs.gprs + state.reg1; + r2 =3D vcpu->run->s.regs.gprs + state.reg2; + key =3D *r1 & 0xfe; =20 while (start !=3D end) { unsigned long vmaddr =3D gfn_to_hva(vcpu->kvm, gpa_to_gfn(start)); @@ -396,9 +398,7 @@ static int handle_sske(struct kvm_vcpu *vcpu) return kvm_s390_inject_program_int(vcpu, PGM_ADDRESSING); =20 mmap_read_lock(current->mm); - rc =3D cond_set_guest_storage_key(current->mm, vmaddr, key, &oldkey, - m3 & SSKE_NQ, m3 & SSKE_MR, - m3 & SSKE_MC); + rc =3D cond_set_guest_storage_key(current->mm, vmaddr, key, &oldkey, nq,= mr, mc); =20 if (rc < 0) { rc =3D fixup_user_fault(current->mm, vmaddr, @@ -415,23 +415,21 @@ static int handle_sske(struct kvm_vcpu *vcpu) start +=3D PAGE_SIZE; } =20 - if (m3 & (SSKE_MC | SSKE_MR)) { - if (m3 & SSKE_MB) { + if (mc || mr) { + if (mb) { /* skey in reg1 is unpredictable */ kvm_s390_set_psw_cc(vcpu, 3); } else { kvm_s390_set_psw_cc(vcpu, rc); - vcpu->run->s.regs.gprs[reg1] &=3D ~0xff00UL; - vcpu->run->s.regs.gprs[reg1] |=3D (u64) oldkey << 8; + *r1 =3D u64_replace_bits(*r1, oldkey << 8, 0xff00); } } - if (m3 & SSKE_MB) { - if (psw_bits(vcpu->arch.sie_block->gpsw).eaba =3D=3D PSW_BITS_AMODE_64BI= T) - vcpu->run->s.regs.gprs[reg2] &=3D ~PAGE_MASK; - else - vcpu->run->s.regs.gprs[reg2] &=3D ~0xfffff000UL; + if (mb) { end =3D kvm_s390_logical_to_effective(vcpu, end); - vcpu->run->s.regs.gprs[reg2] |=3D end; + if (kvm_s390_is_amode_64(vcpu)) + *r2 =3D u64_replace_bits(*r2, end, PAGE_MASK); + else + *r2 =3D u64_replace_bits(*r2, end, 0xfffff000); } return 0; } @@ -773,46 +771,28 @@ int kvm_s390_handle_lpsw(struct kvm_vcpu *vcpu) return 0; } =20 -static int handle_lpswe(struct kvm_vcpu *vcpu) +static int handle_lpswe_y(struct kvm_vcpu *vcpu, bool lpswey) { psw_t new_psw; u64 addr; int rc; u8 ar; =20 - vcpu->stat.instruction_lpswe++; - - if (vcpu->arch.sie_block->gpsw.mask & PSW_MASK_PSTATE) - return kvm_s390_inject_program_int(vcpu, PGM_PRIVILEGED_OP); - - addr =3D kvm_s390_get_base_disp_s(vcpu, &ar); - if (addr & 7) - return kvm_s390_inject_program_int(vcpu, PGM_SPECIFICATION); - rc =3D read_guest(vcpu, addr, ar, &new_psw, sizeof(new_psw)); - if (rc) - return kvm_s390_inject_prog_cond(vcpu, rc); - vcpu->arch.sie_block->gpsw =3D new_psw; - if (!is_valid_psw(&vcpu->arch.sie_block->gpsw)) - return kvm_s390_inject_program_int(vcpu, PGM_SPECIFICATION); - return 0; -} - -static int handle_lpswey(struct kvm_vcpu *vcpu) -{ - psw_t new_psw; - u64 addr; - int rc; - u8 ar; - - vcpu->stat.instruction_lpswey++; + if (lpswey) + vcpu->stat.instruction_lpswey++; + else + vcpu->stat.instruction_lpswe++; =20 - if (!test_kvm_facility(vcpu->kvm, 193)) + if (lpswey && !test_kvm_facility(vcpu->kvm, 193)) return kvm_s390_inject_program_int(vcpu, PGM_OPERATION); =20 if (vcpu->arch.sie_block->gpsw.mask & PSW_MASK_PSTATE) return kvm_s390_inject_program_int(vcpu, PGM_PRIVILEGED_OP); =20 - addr =3D kvm_s390_get_base_disp_siy(vcpu, &ar); + if (!lpswey) + addr =3D kvm_s390_get_base_disp_s(vcpu, &ar); + else + addr =3D kvm_s390_get_base_disp_siy(vcpu, &ar); if (addr & 7) return kvm_s390_inject_program_int(vcpu, PGM_SPECIFICATION); =20 @@ -1034,7 +1014,7 @@ int kvm_s390_handle_b2(struct kvm_vcpu *vcpu) case 0xb1: return handle_stfl(vcpu); case 0xb2: - return handle_lpswe(vcpu); + return handle_lpswe_y(vcpu, false); default: return -EOPNOTSUPP; } @@ -1043,42 +1023,50 @@ int kvm_s390_handle_b2(struct kvm_vcpu *vcpu) static int handle_epsw(struct kvm_vcpu *vcpu) { int reg1, reg2; + u64 *r1, *r2; =20 vcpu->stat.instruction_epsw++; =20 kvm_s390_get_regs_rre(vcpu, ®1, ®2); + r1 =3D vcpu->run->s.regs.gprs + reg1; + r2 =3D vcpu->run->s.regs.gprs + reg2; =20 /* This basically extracts the mask half of the psw. */ - vcpu->run->s.regs.gprs[reg1] &=3D 0xffffffff00000000UL; - vcpu->run->s.regs.gprs[reg1] |=3D vcpu->arch.sie_block->gpsw.mask >> 32; - if (reg2) { - vcpu->run->s.regs.gprs[reg2] &=3D 0xffffffff00000000UL; - vcpu->run->s.regs.gprs[reg2] |=3D - vcpu->arch.sie_block->gpsw.mask & 0x00000000ffffffffUL; - } + *r1 =3D u64_replace_bits(*r1, vcpu->arch.sie_block->gpsw.mask >> 32, 0xff= ffffff); + if (reg2) + *r2 =3D u64_replace_bits(*r2, vcpu->arch.sie_block->gpsw.mask, 0xfffffff= f); return 0; } =20 #define PFMF_RESERVED 0xfffc0101UL -#define PFMF_SK 0x00020000UL -#define PFMF_CF 0x00010000UL -#define PFMF_UI 0x00008000UL -#define PFMF_FSC 0x00007000UL -#define PFMF_NQ 0x00000800UL -#define PFMF_MR 0x00000400UL -#define PFMF_MC 0x00000200UL -#define PFMF_KEY 0x000000feUL +union pfmf_r1 { + unsigned long val; + struct { + unsigned long :46; + unsigned long sk : 1; + unsigned long cf : 1; + unsigned long ui : 1; + unsigned long fsc: 3; + unsigned long nq : 1; + unsigned long mr : 1; + unsigned long mc : 1; + unsigned long : 1; + unsigned char skey; + } __packed; +}; + +static_assert(sizeof(union pfmf_r1) =3D=3D sizeof(unsigned long)); =20 static int handle_pfmf(struct kvm_vcpu *vcpu) { - bool mr =3D false, mc =3D false, nq; int reg1, reg2; unsigned long start, end; - unsigned char key; + union pfmf_r1 r1; =20 vcpu->stat.instruction_pfmf++; =20 kvm_s390_get_regs_rre(vcpu, ®1, ®2); + r1.val =3D vcpu->run->s.regs.gprs[reg1]; =20 if (!test_kvm_facility(vcpu->kvm, 8)) return kvm_s390_inject_program_int(vcpu, PGM_OPERATION); @@ -1086,47 +1074,38 @@ static int handle_pfmf(struct kvm_vcpu *vcpu) if (vcpu->arch.sie_block->gpsw.mask & PSW_MASK_PSTATE) return kvm_s390_inject_program_int(vcpu, PGM_PRIVILEGED_OP); =20 - if (vcpu->run->s.regs.gprs[reg1] & PFMF_RESERVED) + if (r1.val & PFMF_RESERVED) return kvm_s390_inject_program_int(vcpu, PGM_SPECIFICATION); =20 /* Only provide non-quiescing support if enabled for the guest */ - if (vcpu->run->s.regs.gprs[reg1] & PFMF_NQ && - !test_kvm_facility(vcpu->kvm, 14)) + if (r1.nq && !test_kvm_facility(vcpu->kvm, 14)) return kvm_s390_inject_program_int(vcpu, PGM_SPECIFICATION); =20 /* Only provide conditional-SSKE support if enabled for the guest */ - if (vcpu->run->s.regs.gprs[reg1] & PFMF_SK && - test_kvm_facility(vcpu->kvm, 10)) { - mr =3D vcpu->run->s.regs.gprs[reg1] & PFMF_MR; - mc =3D vcpu->run->s.regs.gprs[reg1] & PFMF_MC; - } + if (!r1.sk || !test_kvm_facility(vcpu->kvm, 10)) + r1.mr =3D r1.mc =3D 0; =20 - nq =3D vcpu->run->s.regs.gprs[reg1] & PFMF_NQ; - key =3D vcpu->run->s.regs.gprs[reg1] & PFMF_KEY; start =3D vcpu->run->s.regs.gprs[reg2] & PAGE_MASK; start =3D kvm_s390_logical_to_effective(vcpu, start); =20 - if (vcpu->run->s.regs.gprs[reg1] & PFMF_CF) { - if (kvm_s390_check_low_addr_prot_real(vcpu, start)) - return kvm_s390_inject_prog_irq(vcpu, &vcpu->arch.pgm); - } + if (r1.cf && kvm_s390_check_low_addr_prot_real(vcpu, start)) + return kvm_s390_inject_prog_irq(vcpu, &vcpu->arch.pgm); =20 - switch (vcpu->run->s.regs.gprs[reg1] & PFMF_FSC) { - case 0x00000000: + switch (r1.fsc) { + case 0: /* only 4k frames specify a real address */ start =3D kvm_s390_real_to_abs(vcpu, start); - end =3D (start + PAGE_SIZE) & ~(PAGE_SIZE - 1); + end =3D ALIGN(start + 1, PAGE_SIZE); break; - case 0x00001000: - end =3D (start + _SEGMENT_SIZE) & ~(_SEGMENT_SIZE - 1); + case 1: + end =3D ALIGN(start + 1, _SEGMENT_SIZE); break; - case 0x00002000: + case 2: /* only support 2G frame size if EDAT2 is available and we are not in 24-bit addressing mode */ - if (!test_kvm_facility(vcpu->kvm, 78) || - psw_bits(vcpu->arch.sie_block->gpsw).eaba =3D=3D PSW_BITS_AMODE_24BI= T) + if (!test_kvm_facility(vcpu->kvm, 78) || kvm_s390_is_amode_24(vcpu)) return kvm_s390_inject_program_int(vcpu, PGM_SPECIFICATION); - end =3D (start + _REGION3_SIZE) & ~(_REGION3_SIZE - 1); + end =3D ALIGN(start + 1, _REGION3_SIZE); break; default: return kvm_s390_inject_program_int(vcpu, PGM_SPECIFICATION); @@ -1141,19 +1120,17 @@ static int handle_pfmf(struct kvm_vcpu *vcpu) if (kvm_is_error_hva(vmaddr)) return kvm_s390_inject_program_int(vcpu, PGM_ADDRESSING); =20 - if (vcpu->run->s.regs.gprs[reg1] & PFMF_CF) { - if (kvm_clear_guest(vcpu->kvm, start, PAGE_SIZE)) - return kvm_s390_inject_program_int(vcpu, PGM_ADDRESSING); - } + if (r1.cf && kvm_clear_guest(vcpu->kvm, start, PAGE_SIZE)) + return kvm_s390_inject_program_int(vcpu, PGM_ADDRESSING); =20 - if (vcpu->run->s.regs.gprs[reg1] & PFMF_SK) { + if (r1.sk) { int rc =3D kvm_s390_skey_check_enable(vcpu); =20 if (rc) return rc; mmap_read_lock(current->mm); - rc =3D cond_set_guest_storage_key(current->mm, vmaddr, - key, NULL, nq, mr, mc); + rc =3D cond_set_guest_storage_key(current->mm, vmaddr, r1.skey, NULL, + r1.nq, r1.mr, r1.mc); if (rc < 0) { rc =3D fixup_user_fault(current->mm, vmaddr, FAULT_FLAG_WRITE, &unlocked); @@ -1169,14 +1146,14 @@ static int handle_pfmf(struct kvm_vcpu *vcpu) } start +=3D PAGE_SIZE; } - if (vcpu->run->s.regs.gprs[reg1] & PFMF_FSC) { - if (psw_bits(vcpu->arch.sie_block->gpsw).eaba =3D=3D PSW_BITS_AMODE_64BI= T) { - vcpu->run->s.regs.gprs[reg2] =3D end; - } else { - vcpu->run->s.regs.gprs[reg2] &=3D ~0xffffffffUL; - end =3D kvm_s390_logical_to_effective(vcpu, end); - vcpu->run->s.regs.gprs[reg2] |=3D end; - } + if (r1.fsc) { + u64 *r2 =3D vcpu->run->s.regs.gprs + reg2; + + end =3D kvm_s390_logical_to_effective(vcpu, end); + if (kvm_s390_is_amode_64(vcpu)) + *r2 =3D u64_replace_bits(*r2, end, PAGE_MASK); + else + *r2 =3D u64_replace_bits(*r2, end, 0xfffff000); } return 0; } @@ -1361,8 +1338,9 @@ int kvm_s390_handle_lctl(struct kvm_vcpu *vcpu) reg =3D reg1; nr_regs =3D 0; do { - vcpu->arch.sie_block->gcr[reg] &=3D 0xffffffff00000000ul; - vcpu->arch.sie_block->gcr[reg] |=3D ctl_array[nr_regs++]; + u64 *cr =3D vcpu->arch.sie_block->gcr + reg; + + *cr =3D u64_replace_bits(*cr, ctl_array[nr_regs++], 0xffffffff); if (reg =3D=3D reg3) break; reg =3D (reg + 1) % 16; @@ -1489,7 +1467,7 @@ int kvm_s390_handle_eb(struct kvm_vcpu *vcpu) case 0x62: return handle_ri(vcpu); case 0x71: - return handle_lpswey(vcpu); + return handle_lpswe_y(vcpu, true); default: return -EOPNOTSUPP; } --=20 2.49.0 From nobody Sun Feb 8 00:38:53 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 85B1F27BF6D; Wed, 14 May 2025 16:39:05 +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=1747240748; cv=none; b=NBCpcLjgPsJzJy/fgbX8ytCp0ZNh11itJUA6tcvJR3s/Je5qyzNsXAo/8VysRXK6I1YS2n6zdVotG7pz+4GonLakxusRreIxVbYcOw7YB5E3q38gU9HLTHeWa3/26Bb84fL8BDumxQVF0ZR06utjQW227wWGaAg8ve3NW7Kit04= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747240748; c=relaxed/simple; bh=cXkiTjNyMTUQ0CEhk4Ivv+HIUj/AjXbhXy/gqdfHoL4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZUOuNSioYoBggEmGElyoP+FEEphMcLLYbZiPw5EnDUQihFLmNymJu4CYuuo5opd2r4QQYL30WrfUlKzDrWdql0lG9dhcQEEySzsjDN4CsAVOUXL2rjsxU8Je4qtlJC+gKeDwS19Ag7nrTJ5olW69xei6RW7mKLsZ6Z8FAZu9DQE= 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=qjUqlxyj; 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="qjUqlxyj" Received: from pps.filterd (m0353725.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 54EDn3x0003546; Wed, 14 May 2025 16:39:03 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=qH9m47ufgLQOaLqHI 0z7HfSlmTCqwOUg0uG7DaqQOms=; b=qjUqlxyjR2tyR8BngLU+ws0q5fE/ypf8/ pZ1Jp7d1m0TGy+8xY1NFHwazx522OyETMzEowboseS8QgvnGE8rlP6mifYdXCsoT NSUo7hAdLJcDpX5ddWVZ/54xtbBa80FIy+NT5hFx8IwCjflWLlTtu1LgsCLo1kDJ uldijDw4PMKggXVQ9a7yFhPeh+bONi/b8BiMQQjYIT+TRSUx9NLGuyiB50EXJ3qO OWwpIOtP4sXCsAeS2S1IYRRN0JFCCrDloj8CtLauOq23oVxiXiKtsatVPFZJfAaJ 0IX2tw9HGiDtmZwVSIrHzGbiZhQLigMXy08dKZzobeR3GCCNa5xPA== 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 46mvd38yrf-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 14 May 2025 16:39:03 +0000 (GMT) Received: from pps.filterd (ppma22.wdc07v.mail.ibm.com [127.0.0.1]) by ppma22.wdc07v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 54EDc8a8021809; Wed, 14 May 2025 16:39:02 GMT Received: from smtprelay05.fra02v.mail.ibm.com ([9.218.2.225]) by ppma22.wdc07v.mail.ibm.com (PPS) with ESMTPS id 46mbfpn9y7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 14 May 2025 16:39:02 +0000 Received: from smtpav02.fra02v.mail.ibm.com (smtpav02.fra02v.mail.ibm.com [10.20.54.101]) by smtprelay05.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 54EGcwSW54460672 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 14 May 2025 16:38:58 GMT Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 51BAD20043; Wed, 14 May 2025 16:38:58 +0000 (GMT) Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id D80312004F; Wed, 14 May 2025 16:38:57 +0000 (GMT) Received: from p-imbrenda.boeblingen.de.ibm.com (unknown [9.152.224.66]) by smtpav02.fra02v.mail.ibm.com (Postfix) with ESMTP; Wed, 14 May 2025 16:38:57 +0000 (GMT) From: Claudio Imbrenda To: linux-kernel@vger.kernel.org Cc: kvm@vger.kernel.org, linux-s390@vger.kernel.org, frankja@linux.ibm.com, borntraeger@de.ibm.com, seiden@linux.ibm.com, nsg@linux.ibm.com, nrb@linux.ibm.com, david@redhat.com, hca@linux.ibm.com, agordeev@linux.ibm.com, svens@linux.ibm.com, gor@linux.ibm.com Subject: [PATCH v1 4/5] KVM: s390: refactor and split some gmap helpers Date: Wed, 14 May 2025 18:38:54 +0200 Message-ID: <20250514163855.124471-5-imbrenda@linux.ibm.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250514163855.124471-1-imbrenda@linux.ibm.com> References: <20250514163855.124471-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-GUID: hXlZ2t_HXwYlow1lrM6fY11IHbOyUjfb X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNTE0MDE0OSBTYWx0ZWRfX/PvNSM6zETDq 0eKLQMiyOUj51pZkhzR+mzJiUHna5hMMUn1/O+3CR2/Qg2M9OchI93jnPzvsdfnOIc2iDjxP38q CzpIQ+5wzE4/K2Pjpw5xbW2n2dNgNfitB7C3EcDngsemVuuKm6Rw1UmjuFYz6OIQHDupk7R5NAr gahlIopHGse6Q3HGFJHcvpEhgS4v7hA2FnVtAZoSg/jhQly6VhVhg83bWkpD/wAWH/KmFL9Mqck DGMKe6RA+9HcSPigIk9tIUII2EluAlcJi+OCmQLpLT7gmSAUzz/NcN4HtVeOS/FjzbL+5tN+/dP innSyvxTgi4keN1mqoBJyX4eGsEPwMICMtsZ++8pAOKfEnhli9hcOi2Y38hPkvM6LQLm16CQxwy QB420a1I31RwfAz07T1YZNIX5N7dBpdvF1Tm/bcF/oG2KylPqZiivQxNblX8jHfAz66PR8M/ X-Proofpoint-ORIG-GUID: hXlZ2t_HXwYlow1lrM6fY11IHbOyUjfb X-Authority-Analysis: v=2.4 cv=GbEXnRXL c=1 sm=1 tr=0 ts=6824c727 cx=c_pps a=5BHTudwdYE3Te8bg5FgnPg==:117 a=5BHTudwdYE3Te8bg5FgnPg==:17 a=dt9VzEwgFbYA:10 a=VnNF1IyMAAAA:8 a=VwQbUJbxAAAA:8 a=20KFwNOVAAAA:8 a=8ssDtH6PqloMMPyZm6EA:9 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-05-14_04,2025-05-14_03,2025-02-21_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 impostorscore=0 clxscore=1015 priorityscore=1501 lowpriorityscore=0 suspectscore=0 mlxlogscore=999 phishscore=0 bulkscore=0 malwarescore=0 mlxscore=0 spamscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505070000 definitions=main-2505140149 Content-Type: text/plain; charset="utf-8" Refactor some gmap functions; move the implementation into a separate file with only helper functions. The new helper functions work on vm addresses, leaving all gmap logic in the gmap functions, which mostly become just wrappers. The whole gmap handling is going to be moved inside KVM soon, but the helper functions need to touch core mm functions, and thus need to stay in the core of kernel. Signed-off-by: Claudio Imbrenda --- MAINTAINERS | 2 + arch/s390/include/asm/gmap_helpers.h | 18 ++ arch/s390/kvm/diag.c | 11 +- arch/s390/kvm/kvm-s390.c | 3 +- arch/s390/mm/Makefile | 2 + arch/s390/mm/gmap.c | 46 ++--- arch/s390/mm/gmap_helpers.c | 266 +++++++++++++++++++++++++++ 7 files changed, 307 insertions(+), 41 deletions(-) create mode 100644 arch/s390/include/asm/gmap_helpers.h create mode 100644 arch/s390/mm/gmap_helpers.c diff --git a/MAINTAINERS b/MAINTAINERS index f21f1dabb5fe..b0a8fb5a254c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -13093,12 +13093,14 @@ S: Supported T: git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git F: Documentation/virt/kvm/s390* F: arch/s390/include/asm/gmap.h +F: arch/s390/include/asm/gmap_helpers.h F: arch/s390/include/asm/kvm* F: arch/s390/include/uapi/asm/kvm* F: arch/s390/include/uapi/asm/uvdevice.h F: arch/s390/kernel/uv.c F: arch/s390/kvm/ F: arch/s390/mm/gmap.c +F: arch/s390/mm/gmap_helpers.c F: drivers/s390/char/uvdevice.c F: tools/testing/selftests/drivers/s390x/uvdevice/ F: tools/testing/selftests/kvm/*/s390/ diff --git a/arch/s390/include/asm/gmap_helpers.h b/arch/s390/include/asm/g= map_helpers.h new file mode 100644 index 000000000000..1854fe6a8c33 --- /dev/null +++ b/arch/s390/include/asm/gmap_helpers.h @@ -0,0 +1,18 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Helper functions for KVM guest address space mapping code + * + * Copyright IBM Corp. 2007, 2025 + * Author(s): Claudio Imbrenda + */ + +#ifndef _ASM_S390_GMAP_HELPERS_H +#define _ASM_S390_GMAP_HELPERS_H + +void __gmap_helper_zap_one(struct mm_struct *mm, unsigned long vmaddr); +void __gmap_helper_discard(struct mm_struct *mm, unsigned long vmaddr, uns= igned long end); +void gmap_helper_discard(struct mm_struct *mm, unsigned long vmaddr, unsig= ned long end); +void __gmap_helper_set_unused(struct mm_struct *mm, unsigned long vmaddr); +int gmap_helper_disable_cow_sharing(void); + +#endif /* _ASM_S390_GMAP_HELPERS_H */ diff --git a/arch/s390/kvm/diag.c b/arch/s390/kvm/diag.c index 74f73141f9b9..ce8b2f8125c4 100644 --- a/arch/s390/kvm/diag.c +++ b/arch/s390/kvm/diag.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include "kvm-s390.h" #include "trace.h" @@ -37,7 +38,7 @@ static int diag_release_pages(struct kvm_vcpu *vcpu) * fast path (no prefix swap page involved) */ if (end <=3D prefix || start >=3D prefix + 2 * PAGE_SIZE) { - gmap_discard(vcpu->arch.gmap, start, end); + gmap_helper_discard(vcpu->kvm->mm, start, end); } else { /* * This is slow path. gmap_discard will check for start @@ -45,12 +46,12 @@ static int diag_release_pages(struct kvm_vcpu *vcpu) * prefix and let gmap_discard make some of these calls * NOPs. */ - gmap_discard(vcpu->arch.gmap, start, prefix); + gmap_helper_discard(vcpu->kvm->mm, start, prefix); if (start <=3D prefix) - gmap_discard(vcpu->arch.gmap, 0, PAGE_SIZE); + gmap_helper_discard(vcpu->kvm->mm, 0, PAGE_SIZE); if (end > prefix + PAGE_SIZE) - gmap_discard(vcpu->arch.gmap, PAGE_SIZE, 2 * PAGE_SIZE); - gmap_discard(vcpu->arch.gmap, prefix + 2 * PAGE_SIZE, end); + gmap_helper_discard(vcpu->kvm->mm, PAGE_SIZE, 2 * PAGE_SIZE); + gmap_helper_discard(vcpu->kvm->mm, prefix + 2 * PAGE_SIZE, end); } return 0; } diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c index 3f3175193fd7..b904f1bcb363 100644 --- a/arch/s390/kvm/kvm-s390.c +++ b/arch/s390/kvm/kvm-s390.c @@ -40,6 +40,7 @@ #include #include #include +#include #include #include #include @@ -2674,7 +2675,7 @@ static int kvm_s390_handle_pv(struct kvm *kvm, struct= kvm_pv_cmd *cmd) if (r) break; =20 - r =3D s390_disable_cow_sharing(); + r =3D gmap_helper_disable_cow_sharing(); if (r) break; =20 diff --git a/arch/s390/mm/Makefile b/arch/s390/mm/Makefile index 9726b91fe7e4..bd0401cc7ca5 100644 --- a/arch/s390/mm/Makefile +++ b/arch/s390/mm/Makefile @@ -12,3 +12,5 @@ obj-$(CONFIG_HUGETLB_PAGE) +=3D hugetlbpage.o obj-$(CONFIG_PTDUMP) +=3D dump_pagetables.o obj-$(CONFIG_PGSTE) +=3D gmap.o obj-$(CONFIG_PFAULT) +=3D pfault.o + +obj-$(subst m,y,$(CONFIG_KVM)) +=3D gmap_helpers.o diff --git a/arch/s390/mm/gmap.c b/arch/s390/mm/gmap.c index 4869555ff403..17a2a57de3a2 100644 --- a/arch/s390/mm/gmap.c +++ b/arch/s390/mm/gmap.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include =20 @@ -619,58 +620,33 @@ EXPORT_SYMBOL(__gmap_link); */ void __gmap_zap(struct gmap *gmap, unsigned long gaddr) { - struct vm_area_struct *vma; unsigned long vmaddr; - spinlock_t *ptl; - pte_t *ptep; + + mmap_assert_locked(gmap->mm); =20 /* Find the vm address for the guest address */ vmaddr =3D (unsigned long) radix_tree_lookup(&gmap->guest_to_host, gaddr >> PMD_SHIFT); if (vmaddr) { vmaddr |=3D gaddr & ~PMD_MASK; - - vma =3D vma_lookup(gmap->mm, vmaddr); - if (!vma || is_vm_hugetlb_page(vma)) - return; - - /* Get pointer to the page table entry */ - ptep =3D get_locked_pte(gmap->mm, vmaddr, &ptl); - if (likely(ptep)) { - ptep_zap_unused(gmap->mm, vmaddr, ptep, 0); - pte_unmap_unlock(ptep, ptl); - } + __gmap_helper_zap_one(gmap->mm, vmaddr); } } EXPORT_SYMBOL_GPL(__gmap_zap); =20 void gmap_discard(struct gmap *gmap, unsigned long from, unsigned long to) { - unsigned long gaddr, vmaddr, size; - struct vm_area_struct *vma; + unsigned long vmaddr, next, start, end; =20 mmap_read_lock(gmap->mm); - for (gaddr =3D from; gaddr < to; - gaddr =3D (gaddr + PMD_SIZE) & PMD_MASK) { - /* Find the vm address for the guest address */ - vmaddr =3D (unsigned long) - radix_tree_lookup(&gmap->guest_to_host, - gaddr >> PMD_SHIFT); + for ( ; from < to; from =3D next) { + next =3D ALIGN(from + 1, PMD_SIZE); + vmaddr =3D (unsigned long)radix_tree_lookup(&gmap->guest_to_host, from >= > PMD_SHIFT); if (!vmaddr) continue; - vmaddr |=3D gaddr & ~PMD_MASK; - /* Find vma in the parent mm */ - vma =3D find_vma(gmap->mm, vmaddr); - if (!vma) - continue; - /* - * We do not discard pages that are backed by - * hugetlbfs, so we don't have to refault them. - */ - if (is_vm_hugetlb_page(vma)) - continue; - size =3D min(to - gaddr, PMD_SIZE - (gaddr & ~PMD_MASK)); - zap_page_range_single(vma, vmaddr, size, NULL); + start =3D vmaddr | (from & ~PMD_MASK); + end =3D (vmaddr | (min(to - 1, next - 1) & ~PMD_MASK)) + 1; + __gmap_helper_discard(gmap->mm, start, end); } mmap_read_unlock(gmap->mm); } diff --git a/arch/s390/mm/gmap_helpers.c b/arch/s390/mm/gmap_helpers.c new file mode 100644 index 000000000000..8e66586718f6 --- /dev/null +++ b/arch/s390/mm/gmap_helpers.c @@ -0,0 +1,266 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Helper functions for KVM guest address space mapping code + * + * Copyright IBM Corp. 2007, 2025 + * Author(s): Claudio Imbrenda + * Martin Schwidefsky + * David Hildenbrand + * Janosch Frank + */ +#include +#include +#include +#include +#include +#include +#include + +static void ptep_zap_swap_entry(struct mm_struct *mm, swp_entry_t entry) +{ + if (!non_swap_entry(entry)) + dec_mm_counter(mm, MM_SWAPENTS); + else if (is_migration_entry(entry)) + dec_mm_counter(mm, mm_counter(pfn_swap_entry_folio(entry))); + free_swap_and_cache(entry); +} + +void __gmap_helper_zap_one(struct mm_struct *mm, unsigned long vmaddr) +{ + struct vm_area_struct *vma; + spinlock_t *ptl; + pte_t *ptep; + + mmap_assert_locked(mm); + + /* Find the vm address for the guest address */ + vma =3D vma_lookup(mm, vmaddr); + if (!vma || is_vm_hugetlb_page(vma)) + return; + + /* Get pointer to the page table entry */ + ptep =3D get_locked_pte(mm, vmaddr, &ptl); + if (!likely(ptep)) + return; + if (pte_swap(*ptep)) + ptep_zap_swap_entry(mm, pte_to_swp_entry(*ptep)); + pte_unmap_unlock(ptep, ptl); +} +EXPORT_SYMBOL_GPL(__gmap_helper_zap_one); + +void __gmap_helper_discard(struct mm_struct *mm, unsigned long vmaddr, uns= igned long end) +{ + struct vm_area_struct *vma; + unsigned long next; + + mmap_assert_locked(mm); + + while (vmaddr < end) { + vma =3D find_vma_intersection(mm, vmaddr, end); + if (!vma) + break; + vmaddr =3D max(vmaddr, vma->vm_start); + next =3D min(end, vma->vm_end); + if (!is_vm_hugetlb_page(vma)) + zap_page_range_single(vma, vmaddr, next - vmaddr, NULL); + vmaddr =3D next; + } +} + +void gmap_helper_discard(struct mm_struct *mm, unsigned long vmaddr, unsig= ned long end) +{ + mmap_read_lock(mm); + __gmap_helper_discard(mm, vmaddr, end); + mmap_read_unlock(mm); +} +EXPORT_SYMBOL_GPL(gmap_helper_discard); + +static int pmd_lookup(struct mm_struct *mm, unsigned long addr, pmd_t **pm= dp) +{ + struct vm_area_struct *vma; + pgd_t *pgd; + p4d_t *p4d; + pud_t *pud; + + /* We need a valid VMA, otherwise this is clearly a fault. */ + vma =3D vma_lookup(mm, addr); + if (!vma) + return -EFAULT; + + pgd =3D pgd_offset(mm, addr); + if (!pgd_present(*pgd)) + return -ENOENT; + + p4d =3D p4d_offset(pgd, addr); + if (!p4d_present(*p4d)) + return -ENOENT; + + pud =3D pud_offset(p4d, addr); + if (!pud_present(*pud)) + return -ENOENT; + + /* Large PUDs are not supported yet. */ + if (pud_leaf(*pud)) + return -EFAULT; + + *pmdp =3D pmd_offset(pud, addr); + return 0; +} + +void __gmap_helper_set_unused(struct mm_struct *mm, unsigned long vmaddr) +{ + spinlock_t *ptl; + pmd_t *pmdp; + pte_t *ptep; + + mmap_assert_locked(mm); + + if (pmd_lookup(mm, vmaddr, &pmdp)) + return; + ptl =3D pmd_lock(mm, pmdp); + if (!pmd_present(*pmdp) || pmd_leaf(*pmdp)) { + spin_unlock(ptl); + return; + } + spin_unlock(ptl); + + ptep =3D pte_offset_map_lock(mm, pmdp, vmaddr, &ptl); + if (!ptep) + return; + /* The last byte of a pte can be changed freely without ipte */ + __atomic64_or(_PAGE_UNUSED, (long *)ptep); + pte_unmap_unlock(ptep, ptl); +} +EXPORT_SYMBOL_GPL(__gmap_helper_set_unused); + +static int find_zeropage_pte_entry(pte_t *pte, unsigned long addr, + unsigned long end, struct mm_walk *walk) +{ + unsigned long *found_addr =3D walk->private; + + /* Return 1 of the page is a zeropage. */ + if (is_zero_pfn(pte_pfn(*pte))) { + /* + * Shared zeropage in e.g., a FS DAX mapping? We cannot do the + * right thing and likely don't care: FAULT_FLAG_UNSHARE + * currently only works in COW mappings, which is also where + * mm_forbids_zeropage() is checked. + */ + if (!is_cow_mapping(walk->vma->vm_flags)) + return -EFAULT; + + *found_addr =3D addr; + return 1; + } + return 0; +} + +static const struct mm_walk_ops find_zeropage_ops =3D { + .pte_entry =3D find_zeropage_pte_entry, + .walk_lock =3D PGWALK_WRLOCK, +}; + +/* + * Unshare all shared zeropages, replacing them by anonymous pages. Note t= hat + * we cannot simply zap all shared zeropages, because this could later + * trigger unexpected userfaultfd missing events. + * + * This must be called after mm->context.allow_cow_sharing was + * set to 0, to avoid future mappings of shared zeropages. + * + * mm contracts with s390, that even if mm were to remove a page table, + * and racing with walk_page_range_vma() calling pte_offset_map_lock() + * would fail, it will never insert a page table containing empty zero + * pages once mm_forbids_zeropage(mm) i.e. + * mm->context.allow_cow_sharing is set to 0. + */ +static int __gmap_helper_unshare_zeropages(struct mm_struct *mm) +{ + struct vm_area_struct *vma; + VMA_ITERATOR(vmi, mm, 0); + unsigned long addr; + vm_fault_t fault; + int rc; + + for_each_vma(vmi, vma) { + /* + * We could only look at COW mappings, but it's more future + * proof to catch unexpected zeropages in other mappings and + * fail. + */ + if ((vma->vm_flags & VM_PFNMAP) || is_vm_hugetlb_page(vma)) + continue; + addr =3D vma->vm_start; + +retry: + rc =3D walk_page_range_vma(vma, addr, vma->vm_end, + &find_zeropage_ops, &addr); + if (rc < 0) + return rc; + else if (!rc) + continue; + + /* addr was updated by find_zeropage_pte_entry() */ + fault =3D handle_mm_fault(vma, addr, + FAULT_FLAG_UNSHARE | FAULT_FLAG_REMOTE, + NULL); + if (fault & VM_FAULT_OOM) + return -ENOMEM; + /* + * See break_ksm(): even after handle_mm_fault() returned 0, we + * must start the lookup from the current address, because + * handle_mm_fault() may back out if there's any difficulty. + * + * VM_FAULT_SIGBUS and VM_FAULT_SIGSEGV are unexpected but + * maybe they could trigger in the future on concurrent + * truncation. In that case, the shared zeropage would be gone + * and we can simply retry and make progress. + */ + cond_resched(); + goto retry; + } + + return 0; +} + +static int __gmap_helper_disable_cow_sharing(struct mm_struct *mm) +{ + int rc; + + if (!mm->context.allow_cow_sharing) + return 0; + + mm->context.allow_cow_sharing =3D 0; + + /* Replace all shared zeropages by anonymous pages. */ + rc =3D __gmap_helper_unshare_zeropages(mm); + /* + * Make sure to disable KSM (if enabled for the whole process or + * individual VMAs). Note that nothing currently hinders user space + * from re-enabling it. + */ + if (!rc) + rc =3D ksm_disable(mm); + if (rc) + mm->context.allow_cow_sharing =3D 1; + return rc; +} + +/* + * Disable most COW-sharing of memory pages for the whole process: + * (1) Disable KSM and unmerge/unshare any KSM pages. + * (2) Disallow shared zeropages and unshare any zerpages that are mapped. + * + * Not that we currently don't bother with COW-shared pages that are shared + * with parent/child processes due to fork(). + */ +int gmap_helper_disable_cow_sharing(void) +{ + int rc; + + mmap_write_lock(current->mm); + rc =3D __gmap_helper_disable_cow_sharing(current->mm); + mmap_write_unlock(current->mm); + return rc; +} +EXPORT_SYMBOL_GPL(gmap_helper_disable_cow_sharing); --=20 2.49.0 From nobody Sun Feb 8 00:38:53 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 D039B27C844; Wed, 14 May 2025 16:39:05 +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=1747240748; cv=none; b=I2KA6HH3WiNmoar2wRn3jM+xuQjnrn0qeqkvFn2+6iHwUiM3jidkPxHtMpnO9AeVmHk2tKZktwNbd3Avrixk67UigFy92PZp+t0L7KZEF1PnwFKR1pGwuq9Nw5qWA1ghhjFzBZlQ84nt4VEIbpVpEqAYYc+fiFSinCWUIds8rVY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747240748; c=relaxed/simple; bh=G6WI09b3UN4Ned7sW72mvkp0PkbWym+hABZ6hbdZnW0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=m9X/lLLe11ojfOnue3voNgxwueCUKxctObgNtZPbx17kps5xwoku+9SR6piT+52dIhSdXLYKhXSyW+AeKIYZidmdes0JvErzYAD2WvbPMFH5RHtt3DHKLQj/2Rm0byKE4FsPkeoESS9fIj1ux2eKLmSuKZoz5FZMgI8jmISswDI= 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=lBDOYgVb; 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="lBDOYgVb" Received: from pps.filterd (m0360072.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 54EFgM5i025386; Wed, 14 May 2025 16:39:03 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=z7ra5O7ngRL8jlxfu YwJdoMAyo5DhAimtptoJDnpqZ8=; b=lBDOYgVbVl03DWnN7sQ/xpLD/mg/H5ZkA eIHwGib+5WuJ5t/nclz+rK4u4bAHnpfr3J5GMoNpuQkD+1p95xcth4a8PLxlyGu4 G1HjgjxhV/BDH77qP1r1W0NmioA2eb2Zl7rMTFo7/mZUWQuiyCdRi1v94GxUDa1s 1MKfEjUUzxJMRLjtIgHWCOYlWKWfDGG+c1KGO4OCST+nDC1JxQLehphvg/ztioBp us+kaJr7vHWeyfZa2783rkUtxeY+jrIn7WlXcvCtsu9xwK8pqjI4Ex9cCob4sJCj mw/2vvwt/f8lft9AENDGZUAyDccZQ4NecQ1t2pY670VBgwuqF03jA== 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 46mbs6nf0v-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 14 May 2025 16:39:03 +0000 (GMT) Received: from pps.filterd (ppma13.dal12v.mail.ibm.com [127.0.0.1]) by ppma13.dal12v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 54EDjWu9019451; Wed, 14 May 2025 16:39:02 GMT Received: from smtprelay05.fra02v.mail.ibm.com ([9.218.2.225]) by ppma13.dal12v.mail.ibm.com (PPS) with ESMTPS id 46mbfrn9pj-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 14 May 2025 16:39:02 +0000 Received: from smtpav02.fra02v.mail.ibm.com (smtpav02.fra02v.mail.ibm.com [10.20.54.101]) by smtprelay05.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 54EGcw5348890330 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 14 May 2025 16:38:58 GMT Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id CA3C220043; Wed, 14 May 2025 16:38:58 +0000 (GMT) Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 5DEDE2004B; Wed, 14 May 2025 16:38:58 +0000 (GMT) Received: from p-imbrenda.boeblingen.de.ibm.com (unknown [9.152.224.66]) by smtpav02.fra02v.mail.ibm.com (Postfix) with ESMTP; Wed, 14 May 2025 16:38:58 +0000 (GMT) From: Claudio Imbrenda To: linux-kernel@vger.kernel.org Cc: kvm@vger.kernel.org, linux-s390@vger.kernel.org, frankja@linux.ibm.com, borntraeger@de.ibm.com, seiden@linux.ibm.com, nsg@linux.ibm.com, nrb@linux.ibm.com, david@redhat.com, hca@linux.ibm.com, agordeev@linux.ibm.com, svens@linux.ibm.com, gor@linux.ibm.com Subject: [PATCH v1 5/5] KVM: s390: simplify and move pv code Date: Wed, 14 May 2025 18:38:55 +0200 Message-ID: <20250514163855.124471-6-imbrenda@linux.ibm.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250514163855.124471-1-imbrenda@linux.ibm.com> References: <20250514163855.124471-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-Spam-Details-Enc: AW1haW4tMjUwNTE0MDE0OSBTYWx0ZWRfX8066P0x1Vp6w uRFnBuz8jN9uGY8e6++RuUdeHzEBObExV7IdJQs9jezcDL/glkeVM0m1QTuwkZ3jn8RBuhB2Pvb P51IkLH6S+KG33U+y+AfFrh9OkW5kRijObtsRfpoOFehzhL+JdHJ2dHPdlev6Kg89po+fXfZute tUuY4TEJi5Y3n/Pc1zuNLbHWVbBPwmFoD/HyPCceLUrx84y4HCZHJfXmk4Xr0BQiTiMSIYkHxAI QV3LraBl45cWJp+x0KG55d/b0AxOOSUHjYJsnDS4w9LRzcDgsZxGypJD4oHrnK9Fuiy2Aazn37B 03oXUntHTC8aOfPY61YPveRK3E3l1qMhl7B8OAC8mlZuL9FctUjKlmaariYeNRx9yJnsyunzDnR TvnhKxGn1rNhOc3HWM8z1xuD2PQ1qEGlRxEI82GLXOqJjreEBH/2816NvenjuA+WmRSu9bP9 X-Proofpoint-ORIG-GUID: gvTDPETjAfBBJLkVGPIuOuhWScox4Rmd X-Authority-Analysis: v=2.4 cv=d5f1yQjE c=1 sm=1 tr=0 ts=6824c727 cx=c_pps a=AfN7/Ok6k8XGzOShvHwTGQ==:117 a=AfN7/Ok6k8XGzOShvHwTGQ==:17 a=dt9VzEwgFbYA:10 a=VnNF1IyMAAAA:8 a=20KFwNOVAAAA:8 a=7_jnfmalSeIvgFZyEUQA:9 X-Proofpoint-GUID: gvTDPETjAfBBJLkVGPIuOuhWScox4Rmd X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-05-14_04,2025-05-14_03,2025-02-21_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 bulkscore=0 spamscore=0 clxscore=1015 mlxscore=0 lowpriorityscore=0 priorityscore=1501 suspectscore=0 mlxlogscore=999 impostorscore=0 adultscore=0 phishscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505070000 definitions=main-2505140149 Content-Type: text/plain; charset="utf-8" All functions in kvm/gmap.c fit better in kvm/pv.c instead. Move and rename them appropriately, then delete the now empty kvm/gmap.c and kvm/gmap.h. Signed-off-by: Claudio Imbrenda Reviewed-by: Nina Schoetterl-Glausch --- arch/s390/kernel/uv.c | 12 ++-- arch/s390/kvm/Makefile | 2 +- arch/s390/kvm/gaccess.c | 3 +- arch/s390/kvm/gmap-vsie.c | 1 - arch/s390/kvm/gmap.c | 121 -------------------------------------- arch/s390/kvm/gmap.h | 39 ------------ arch/s390/kvm/intercept.c | 9 +-- arch/s390/kvm/kvm-s390.c | 5 +- arch/s390/kvm/kvm-s390.h | 42 +++++++++++++ arch/s390/kvm/pv.c | 61 ++++++++++++++++++- arch/s390/kvm/vsie.c | 19 +++++- 11 files changed, 133 insertions(+), 181 deletions(-) delete mode 100644 arch/s390/kvm/gmap.c delete mode 100644 arch/s390/kvm/gmap.h diff --git a/arch/s390/kernel/uv.c b/arch/s390/kernel/uv.c index 9a5d5be8acf4..644c110287c4 100644 --- a/arch/s390/kernel/uv.c +++ b/arch/s390/kernel/uv.c @@ -135,7 +135,7 @@ int uv_destroy_folio(struct folio *folio) { int rc; =20 - /* See gmap_make_secure(): large folios cannot be secure */ + /* Large folios cannot be secure */ if (unlikely(folio_test_large(folio))) return 0; =20 @@ -184,7 +184,7 @@ int uv_convert_from_secure_folio(struct folio *folio) { int rc; =20 - /* See gmap_make_secure(): large folios cannot be secure */ + /* Large folios cannot be secure */ if (unlikely(folio_test_large(folio))) return 0; =20 @@ -403,15 +403,15 @@ EXPORT_SYMBOL_GPL(make_hva_secure); =20 /* * To be called with the folio locked or with an extra reference! This will - * prevent gmap_make_secure from touching the folio concurrently. Having 2 - * parallel arch_make_folio_accessible is fine, as the UV calls will becom= e a - * no-op if the folio is already exported. + * prevent kvm_s390_pv_make_secure() from touching the folio concurrently. + * Having 2 parallel arch_make_folio_accessible is fine, as the UV calls w= ill + * become a no-op if the folio is already exported. */ int arch_make_folio_accessible(struct folio *folio) { int rc =3D 0; =20 - /* See gmap_make_secure(): large folios cannot be secure */ + /* Large folios cannot be secure */ if (unlikely(folio_test_large(folio))) return 0; =20 diff --git a/arch/s390/kvm/Makefile b/arch/s390/kvm/Makefile index f0ffe874adc2..9a723c48b05a 100644 --- a/arch/s390/kvm/Makefile +++ b/arch/s390/kvm/Makefile @@ -8,7 +8,7 @@ include $(srctree)/virt/kvm/Makefile.kvm ccflags-y :=3D -Ivirt/kvm -Iarch/s390/kvm =20 kvm-y +=3D kvm-s390.o intercept.o interrupt.o priv.o sigp.o -kvm-y +=3D diag.o gaccess.o guestdbg.o vsie.o pv.o gmap.o gmap-vsie.o +kvm-y +=3D diag.o gaccess.o guestdbg.o vsie.o pv.o gmap-vsie.o =20 kvm-$(CONFIG_VFIO_PCI_ZDEV_KVM) +=3D pci.o obj-$(CONFIG_KVM) +=3D kvm.o diff --git a/arch/s390/kvm/gaccess.c b/arch/s390/kvm/gaccess.c index f6fded15633a..e23670e1949c 100644 --- a/arch/s390/kvm/gaccess.c +++ b/arch/s390/kvm/gaccess.c @@ -16,9 +16,10 @@ #include #include #include "kvm-s390.h" -#include "gmap.h" #include "gaccess.h" =20 +#define GMAP_SHADOW_FAKE_TABLE 1ULL + /* * vaddress union in order to easily decode a virtual address into its * region first index, region second index etc. parts. diff --git a/arch/s390/kvm/gmap-vsie.c b/arch/s390/kvm/gmap-vsie.c index a6d1dbb04c97..56ef153eb8fe 100644 --- a/arch/s390/kvm/gmap-vsie.c +++ b/arch/s390/kvm/gmap-vsie.c @@ -22,7 +22,6 @@ #include =20 #include "kvm-s390.h" -#include "gmap.h" =20 /** * gmap_find_shadow - find a specific asce in the list of shadow tables diff --git a/arch/s390/kvm/gmap.c b/arch/s390/kvm/gmap.c deleted file mode 100644 index 6d8944d1b4a0..000000000000 --- a/arch/s390/kvm/gmap.c +++ /dev/null @@ -1,121 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * Guest memory management for KVM/s390 - * - * Copyright IBM Corp. 2008, 2020, 2024 - * - * Author(s): Claudio Imbrenda - * Martin Schwidefsky - * David Hildenbrand - * Janosch Frank - */ - -#include -#include -#include -#include -#include - -#include -#include -#include - -#include "gmap.h" - -/** - * gmap_make_secure() - make one guest page secure - * @gmap: the guest gmap - * @gaddr: the guest address that needs to be made secure - * @uvcb: the UVCB specifying which operation needs to be performed - * - * Context: needs to be called with kvm->srcu held. - * Return: 0 on success, < 0 in case of error. - */ -int gmap_make_secure(struct gmap *gmap, unsigned long gaddr, void *uvcb) -{ - struct kvm *kvm =3D gmap->private; - unsigned long vmaddr; - - lockdep_assert_held(&kvm->srcu); - - vmaddr =3D gfn_to_hva(kvm, gpa_to_gfn(gaddr)); - if (kvm_is_error_hva(vmaddr)) - return -EFAULT; - return make_hva_secure(gmap->mm, vmaddr, uvcb); -} - -int gmap_convert_to_secure(struct gmap *gmap, unsigned long gaddr) -{ - struct uv_cb_cts uvcb =3D { - .header.cmd =3D UVC_CMD_CONV_TO_SEC_STOR, - .header.len =3D sizeof(uvcb), - .guest_handle =3D gmap->guest_handle, - .gaddr =3D gaddr, - }; - - return gmap_make_secure(gmap, gaddr, &uvcb); -} - -/** - * __gmap_destroy_page() - Destroy a guest page. - * @gmap: the gmap of the guest - * @page: the page to destroy - * - * An attempt will be made to destroy the given guest page. If the attempt - * fails, an attempt is made to export the page. If both attempts fail, an - * appropriate error is returned. - * - * Context: must be called holding the mm lock for gmap->mm - */ -static int __gmap_destroy_page(struct gmap *gmap, struct page *page) -{ - struct folio *folio =3D page_folio(page); - int rc; - - /* - * See gmap_make_secure(): large folios cannot be secure. Small - * folio implies FW_LEVEL_PTE. - */ - if (folio_test_large(folio)) - return -EFAULT; - - rc =3D uv_destroy_folio(folio); - /* - * Fault handlers can race; it is possible that two CPUs will fault - * on the same secure page. One CPU can destroy the page, reboot, - * re-enter secure mode and import it, while the second CPU was - * stuck at the beginning of the handler. At some point the second - * CPU will be able to progress, and it will not be able to destroy - * the page. In that case we do not want to terminate the process, - * we instead try to export the page. - */ - if (rc) - rc =3D uv_convert_from_secure_folio(folio); - - return rc; -} - -/** - * gmap_destroy_page() - Destroy a guest page. - * @gmap: the gmap of the guest - * @gaddr: the guest address to destroy - * - * An attempt will be made to destroy the given guest page. If the attempt - * fails, an attempt is made to export the page. If both attempts fail, an - * appropriate error is returned. - * - * Context: may sleep. - */ -int gmap_destroy_page(struct gmap *gmap, unsigned long gaddr) -{ - struct page *page; - int rc =3D 0; - - mmap_read_lock(gmap->mm); - page =3D gfn_to_page(gmap->private, gpa_to_gfn(gaddr)); - if (page) - rc =3D __gmap_destroy_page(gmap, page); - kvm_release_page_clean(page); - mmap_read_unlock(gmap->mm); - return rc; -} diff --git a/arch/s390/kvm/gmap.h b/arch/s390/kvm/gmap.h deleted file mode 100644 index c8f031c9ea5f..000000000000 --- a/arch/s390/kvm/gmap.h +++ /dev/null @@ -1,39 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* - * KVM guest address space mapping code - * - * Copyright IBM Corp. 2007, 2016, 2025 - * Author(s): Martin Schwidefsky - * Claudio Imbrenda - */ - -#ifndef ARCH_KVM_S390_GMAP_H -#define ARCH_KVM_S390_GMAP_H - -#define GMAP_SHADOW_FAKE_TABLE 1ULL - -int gmap_make_secure(struct gmap *gmap, unsigned long gaddr, void *uvcb); -int gmap_convert_to_secure(struct gmap *gmap, unsigned long gaddr); -int gmap_destroy_page(struct gmap *gmap, unsigned long gaddr); -struct gmap *gmap_shadow(struct gmap *parent, unsigned long asce, int edat= _level); - -/** - * gmap_shadow_valid - check if a shadow guest address space matches the - * given properties and is still valid - * @sg: pointer to the shadow guest address space structure - * @asce: ASCE for which the shadow table is requested - * @edat_level: edat level to be used for the shadow translation - * - * Returns 1 if the gmap shadow is still valid and matches the given - * properties, the caller can continue using it. Returns 0 otherwise, the - * caller has to request a new shadow gmap in this case. - * - */ -static inline int gmap_shadow_valid(struct gmap *sg, unsigned long asce, i= nt edat_level) -{ - if (sg->removed) - return 0; - return sg->orig_asce =3D=3D asce && sg->edat_level =3D=3D edat_level; -} - -#endif diff --git a/arch/s390/kvm/intercept.c b/arch/s390/kvm/intercept.c index b4834bd4d216..a2724c15b6f6 100644 --- a/arch/s390/kvm/intercept.c +++ b/arch/s390/kvm/intercept.c @@ -22,7 +22,6 @@ #include "gaccess.h" #include "trace.h" #include "trace-s390.h" -#include "gmap.h" =20 u8 kvm_s390_get_ilen(struct kvm_vcpu *vcpu) { @@ -546,7 +545,7 @@ static int handle_pv_uvc(struct kvm_vcpu *vcpu) guest_uvcb->header.cmd); return 0; } - rc =3D gmap_make_secure(vcpu->arch.gmap, uvcb.gaddr, &uvcb); + rc =3D kvm_s390_pv_make_secure(vcpu->kvm, uvcb.gaddr, &uvcb); /* * If the unpin did not succeed, the guest will exit again for the UVC * and we will retry the unpin. @@ -654,10 +653,8 @@ int kvm_handle_sie_intercept(struct kvm_vcpu *vcpu) break; case ICPT_PV_PREF: rc =3D 0; - gmap_convert_to_secure(vcpu->arch.gmap, - kvm_s390_get_prefix(vcpu)); - gmap_convert_to_secure(vcpu->arch.gmap, - kvm_s390_get_prefix(vcpu) + PAGE_SIZE); + kvm_s390_pv_convert_to_secure(vcpu->kvm, kvm_s390_get_prefix(vcpu)); + kvm_s390_pv_convert_to_secure(vcpu->kvm, kvm_s390_get_prefix(vcpu) + PAG= E_SIZE); break; default: return -EOPNOTSUPP; diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c index b904f1bcb363..905e025a5084 100644 --- a/arch/s390/kvm/kvm-s390.c +++ b/arch/s390/kvm/kvm-s390.c @@ -53,7 +53,6 @@ #include "kvm-s390.h" #include "gaccess.h" #include "pci.h" -#include "gmap.h" =20 #define CREATE_TRACE_POINTS #include "trace.h" @@ -4974,7 +4973,7 @@ static int vcpu_post_run_handle_fault(struct kvm_vcpu= *vcpu) * previous protected guest. The old pages need to be destroyed * so the new guest can use them. */ - if (gmap_destroy_page(vcpu->arch.gmap, gaddr)) { + if (kvm_s390_pv_destroy_page(vcpu->kvm, gaddr)) { /* * Either KVM messed up the secure guest mapping or the * same page is mapped into multiple secure guests. @@ -4996,7 +4995,7 @@ static int vcpu_post_run_handle_fault(struct kvm_vcpu= *vcpu) * guest has not been imported yet. Try to import the page into * the protected guest. */ - rc =3D gmap_convert_to_secure(vcpu->arch.gmap, gaddr); + rc =3D kvm_s390_pv_convert_to_secure(vcpu->kvm, gaddr); if (rc =3D=3D -EINVAL) send_sig(SIGSEGV, current, 0); if (rc !=3D -ENXIO) diff --git a/arch/s390/kvm/kvm-s390.h b/arch/s390/kvm/kvm-s390.h index f8c32527c4e4..855f0980dc78 100644 --- a/arch/s390/kvm/kvm-s390.h +++ b/arch/s390/kvm/kvm-s390.h @@ -323,6 +323,9 @@ int kvm_s390_pv_dump_stor_state(struct kvm *kvm, void _= _user *buff_user, u64 *gaddr, u64 buff_user_len, u16 *rc, u16 *rrc); int kvm_s390_pv_dump_complete(struct kvm *kvm, void __user *buff_user, u16 *rc, u16 *rrc); +int kvm_s390_pv_destroy_page(struct kvm *kvm, unsigned long gaddr); +int kvm_s390_pv_convert_to_secure(struct kvm *kvm, unsigned long gaddr); +int kvm_s390_pv_make_secure(struct kvm *kvm, unsigned long gaddr, void *uv= cb); =20 static inline u64 kvm_s390_pv_get_handle(struct kvm *kvm) { @@ -334,6 +337,41 @@ static inline u64 kvm_s390_pv_cpu_get_handle(struct kv= m_vcpu *vcpu) return vcpu->arch.pv.handle; } =20 +/** + * __kvm_s390_pv_destroy_page() - Destroy a guest page. + * @page: the page to destroy + * + * An attempt will be made to destroy the given guest page. If the attempt + * fails, an attempt is made to export the page. If both attempts fail, an + * appropriate error is returned. + * + * Context: must be called holding the mm lock for gmap->mm + */ +static inline int __kvm_s390_pv_destroy_page(struct page *page) +{ + struct folio *folio =3D page_folio(page); + int rc; + + /* Large folios cannot be secure. Small folio implies FW_LEVEL_PTE. */ + if (folio_test_large(folio)) + return -EFAULT; + + rc =3D uv_destroy_folio(folio); + /* + * Fault handlers can race; it is possible that two CPUs will fault + * on the same secure page. One CPU can destroy the page, reboot, + * re-enter secure mode and import it, while the second CPU was + * stuck at the beginning of the handler. At some point the second + * CPU will be able to progress, and it will not be able to destroy + * the page. In that case we do not want to terminate the process, + * we instead try to export the page. + */ + if (rc) + rc =3D uv_convert_from_secure_folio(folio); + + return rc; +} + /* implemented in interrupt.c */ int kvm_s390_handle_wait(struct kvm_vcpu *vcpu); void kvm_s390_vcpu_wakeup(struct kvm_vcpu *vcpu); @@ -413,6 +451,10 @@ void kvm_s390_vsie_gmap_notifier(struct gmap *gmap, un= signed long start, unsigned long end); void kvm_s390_vsie_init(struct kvm *kvm); void kvm_s390_vsie_destroy(struct kvm *kvm); +int gmap_shadow_valid(struct gmap *sg, unsigned long asce, int edat_level); + +/* implemented in gmap-vsie.c */ +struct gmap *gmap_shadow(struct gmap *parent, unsigned long asce, int edat= _level); =20 /* implemented in sigp.c */ int kvm_s390_handle_sigp(struct kvm_vcpu *vcpu); diff --git a/arch/s390/kvm/pv.c b/arch/s390/kvm/pv.c index 22c012aa5206..14c330ec8ceb 100644 --- a/arch/s390/kvm/pv.c +++ b/arch/s390/kvm/pv.c @@ -17,7 +17,6 @@ #include #include #include "kvm-s390.h" -#include "gmap.h" =20 bool kvm_s390_pv_is_protected(struct kvm *kvm) { @@ -33,6 +32,64 @@ bool kvm_s390_pv_cpu_is_protected(struct kvm_vcpu *vcpu) } EXPORT_SYMBOL_GPL(kvm_s390_pv_cpu_is_protected); =20 +/** + * kvm_s390_pv_make_secure() - make one guest page secure + * @kvm: the guest + * @gaddr: the guest address that needs to be made secure + * @uvcb: the UVCB specifying which operation needs to be performed + * + * Context: needs to be called with kvm->srcu held. + * Return: 0 on success, < 0 in case of error. + */ +int kvm_s390_pv_make_secure(struct kvm *kvm, unsigned long gaddr, void *uv= cb) +{ + unsigned long vmaddr; + + lockdep_assert_held(&kvm->srcu); + + vmaddr =3D gfn_to_hva(kvm, gpa_to_gfn(gaddr)); + if (kvm_is_error_hva(vmaddr)) + return -EFAULT; + return make_hva_secure(kvm->mm, vmaddr, uvcb); +} + +int kvm_s390_pv_convert_to_secure(struct kvm *kvm, unsigned long gaddr) +{ + struct uv_cb_cts uvcb =3D { + .header.cmd =3D UVC_CMD_CONV_TO_SEC_STOR, + .header.len =3D sizeof(uvcb), + .guest_handle =3D kvm_s390_pv_get_handle(kvm), + .gaddr =3D gaddr, + }; + + return kvm_s390_pv_make_secure(kvm, gaddr, &uvcb); +} + +/** + * kvm_s390_pv_destroy_page() - Destroy a guest page. + * @kvm: the guest + * @gaddr: the guest address to destroy + * + * An attempt will be made to destroy the given guest page. If the attempt + * fails, an attempt is made to export the page. If both attempts fail, an + * appropriate error is returned. + * + * Context: may sleep. + */ +int kvm_s390_pv_destroy_page(struct kvm *kvm, unsigned long gaddr) +{ + struct page *page; + int rc =3D 0; + + mmap_read_lock(kvm->mm); + page =3D gfn_to_page(kvm, gpa_to_gfn(gaddr)); + if (page) + rc =3D __kvm_s390_pv_destroy_page(page); + kvm_release_page_clean(page); + mmap_read_unlock(kvm->mm); + return rc; +} + /** * struct pv_vm_to_be_destroyed - Represents a protected VM that needs to * be destroyed @@ -638,7 +695,7 @@ static int unpack_one(struct kvm *kvm, unsigned long ad= dr, u64 tweak, .tweak[0] =3D tweak, .tweak[1] =3D offset, }; - int ret =3D gmap_make_secure(kvm->arch.gmap, addr, &uvcb); + int ret =3D kvm_s390_pv_make_secure(kvm, addr, &uvcb); unsigned long vmaddr; bool unlocked; =20 diff --git a/arch/s390/kvm/vsie.c b/arch/s390/kvm/vsie.c index a78df3a4f353..13a9661d2b28 100644 --- a/arch/s390/kvm/vsie.c +++ b/arch/s390/kvm/vsie.c @@ -23,7 +23,6 @@ #include #include "kvm-s390.h" #include "gaccess.h" -#include "gmap.h" =20 enum vsie_page_flags { VSIE_PAGE_IN_USE =3D 0, @@ -68,6 +67,24 @@ struct vsie_page { __u8 fac[S390_ARCH_FAC_LIST_SIZE_BYTE]; /* 0x0800 */ }; =20 +/** + * gmap_shadow_valid() - check if a shadow guest address space matches the + * given properties and is still valid + * @sg: pointer to the shadow guest address space structure + * @asce: ASCE for which the shadow table is requested + * @edat_level: edat level to be used for the shadow translation + * + * Returns 1 if the gmap shadow is still valid and matches the given + * properties, the caller can continue using it. Returns 0 otherwise; the + * caller has to request a new shadow gmap in this case. + */ +int gmap_shadow_valid(struct gmap *sg, unsigned long asce, int edat_level) +{ + if (sg->removed) + return 0; + return sg->orig_asce =3D=3D asce && sg->edat_level =3D=3D edat_level; +} + /* trigger a validity icpt for the given scb */ static int set_validity_icpt(struct kvm_s390_sie_block *scb, __u16 reason_code) --=20 2.49.0