From nobody Tue Dec 2 02:04:17 2025 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 2BB4F3242BA; Thu, 20 Nov 2025 17:16:25 +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=1763658988; cv=none; b=g44FjKN+SaOGG8LRr5YbPhwVhgJ3LBspaFlpW5mkNy+DiEnJFAazwj1tlVN7Cc3ka2Ydjz6cI1/+HGE1mNvpjXJHkmveOZ15NzDec8JcUxXHlNpAPH7JjpC92lLcsoV3mOYK78LjgXckaK37hXUTJZ7Pleb1T0GjV1nONptJ7Wc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763658988; c=relaxed/simple; bh=gDd+ju82f/6QL4NVbuYQTLPj68kvejVxzOtVImmcLJw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=E0qZKWtJlGnP7CqxM9eaTkDcZkrcwCo5u+SPpOfjPs4zymD7zGwNSO9bRDL1PJZsYksx94XGMRsbnQvlw6bcTP8LTWOvQ/7+LLSD0oIv6+MT6CUdP748n5JuR5g6fw2b9SQJl80U5UZpyAo4v5WBNEpA9CfrI6QZHw59ZT7LYWg= 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=q6VXvAMF; 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="q6VXvAMF" 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 5AKBvek3021517; Thu, 20 Nov 2025 17:16:23 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=XWjRLxEiNnrndkhSi lvqCpJUgLPdel7vWAFKkrY4Tgc=; b=q6VXvAMF5EVYjkk2C2N8xvb8RQYqH12xq ONJItZOqgA178iRcXAb1QuVN7s24T3JwTAxIEkUvNVe+x+cEQtP6u9uSMIOTiHp8 lX2/KPL5HA+0xtorB2YrsrfXGw3g++K4Pjky6HqfaAhcHoTBeBLyeMJhoX9h++RZ GwGO2M/pf4NLTuo5f664YcKjYchUd6PfEBLNtvh2l+Eaz3f+dPXJWzlLm9GIuhYP eLGlGc5IxJngQTmAL3gNdBKoFCNcx3GjaogluhzkbqCJQYaAgNhjV3iKjETEPnl6 DiMD2n0AY9A+mxtsV61qz/Cx4r5HyIDBzcVQrXE7hpp5rt2r6GAtg== 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 4aejjwfrej-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 20 Nov 2025 17:16:23 +0000 (GMT) Received: from pps.filterd (ppma12.dal12v.mail.ibm.com [127.0.0.1]) by ppma12.dal12v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 5AKGUuJ4010406; Thu, 20 Nov 2025 17:16:22 GMT Received: from smtprelay05.fra02v.mail.ibm.com ([9.218.2.225]) by ppma12.dal12v.mail.ibm.com (PPS) with ESMTPS id 4af3usfsg0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 20 Nov 2025 17:16:22 +0000 Received: from smtpav04.fra02v.mail.ibm.com (smtpav04.fra02v.mail.ibm.com [10.20.54.103]) by smtprelay05.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 5AKHGJRr40763898 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 20 Nov 2025 17:16:19 GMT Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id E673420043; Thu, 20 Nov 2025 17:16:18 +0000 (GMT) Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id E0ABD20040; Thu, 20 Nov 2025 17:16:16 +0000 (GMT) Received: from p-imbrenda.ibmuc.com (unknown [9.111.12.33]) by smtpav04.fra02v.mail.ibm.com (Postfix) with ESMTP; Thu, 20 Nov 2025 17:16:16 +0000 (GMT) From: Claudio Imbrenda To: kvm@vger.kernel.org Cc: linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org, borntraeger@de.ibm.com, frankja@linux.ibm.com, nsg@linux.ibm.com, nrb@linux.ibm.com, seiden@linux.ibm.com, gra@linux.ibm.com, schlameuss@linux.ibm.com, hca@linux.ibm.com, svens@linux.ibm.com, agordeev@linux.ibm.com, gor@linux.ibm.com, david@redhat.com, gerald.schaefer@linux.ibm.com Subject: [PATCH v4 17/23] KVM: s390: Stop using CONFIG_PGSTE Date: Thu, 20 Nov 2025 18:15:38 +0100 Message-ID: <20251120171544.96841-18-imbrenda@linux.ibm.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251120171544.96841-1-imbrenda@linux.ibm.com> References: <20251120171544.96841-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-Authority-Analysis: v=2.4 cv=BanVE7t2 c=1 sm=1 tr=0 ts=691f4ce7 cx=c_pps a=bLidbwmWQ0KltjZqbj+ezA==:117 a=bLidbwmWQ0KltjZqbj+ezA==:17 a=6UeiqGixMTsA:10 a=VkNPw1HP01LnGYTKEx00:22 a=VnNF1IyMAAAA:8 a=WeuG7GAIFJ3A7Xv3FmEA:9 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMTE1MDAzMiBTYWx0ZWRfX5JUf94NnNSxb WSUPX/kDBRVkhv8rX3ABfQ120VchBWsqltQrfQbO6JAZlIglUtV9iq/HWzfmpjhpkH0AxcdTiWj ohQqcu1yoGsjmCCE83CCJsZksYx/uAMxVmLUyiAW5VJLrldxXAnMACWBiXrQQNGuj+CyMCqQ3J9 IleHpGWQ5sNqEEhqfY3sSLbQX80AWRx95NTAfqJRBPOu6fl4dbRP2XRPq6xWsmKanbPcrIWdG2X 8VjhuAA3kWIFYhK8chBmhyu2yBAKAZcHP7cJ2ptFksN3hU+K+9QeWkOyNx8d0fkUFk15FDib653 kgV+LNCuQCCUlYJadfdcrlYNttUMC+ZJxzuRKY8MqUE3N1EQqbJaxm0wV7AW4rlHGwa57G58KE3 YQqUuFYPnIvrl/YrIHiqz6jj0DR/eQ== X-Proofpoint-GUID: yYsqBvOYUz9iDVCl1gcPXL8HVry68v8i X-Proofpoint-ORIG-GUID: yYsqBvOYUz9iDVCl1gcPXL8HVry68v8i X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.100.49 definitions=2025-11-20_06,2025-11-20_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 lowpriorityscore=0 suspectscore=0 spamscore=0 impostorscore=0 priorityscore=1501 clxscore=1015 phishscore=0 bulkscore=0 adultscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2510240000 definitions=main-2511150032 Content-Type: text/plain; charset="utf-8" Switch to using IS_ENABLED(CONFIG_KVM) instead of CONFIG_PGSTE, since the latter will be removed soon. Many CONFIG_PGSTE are left behind, because they will be removed completely in upcoming patches. The ones replaced here are mostly the ones that will stay. Signed-off-by: Claudio Imbrenda Reviewed-by: Steffen Eiden --- arch/s390/include/asm/mmu_context.h | 2 +- arch/s390/include/asm/pgtable.h | 4 ++-- arch/s390/mm/fault.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/s390/include/asm/mmu_context.h b/arch/s390/include/asm/mm= u_context.h index d9b8501bc93d..48e548c01daa 100644 --- a/arch/s390/include/asm/mmu_context.h +++ b/arch/s390/include/asm/mmu_context.h @@ -29,7 +29,7 @@ static inline int init_new_context(struct task_struct *ts= k, atomic_set(&mm->context.protected_count, 0); mm->context.gmap_asce =3D 0; mm->context.flush_mm =3D 0; -#ifdef CONFIG_PGSTE +#if IS_ENABLED(CONFIG_KVM) mm->context.has_pgste =3D 0; mm->context.uses_skeys =3D 0; mm->context.uses_cmm =3D 0; diff --git a/arch/s390/include/asm/pgtable.h b/arch/s390/include/asm/pgtabl= e.h index 3ddc62fcf6dd..7ccad785e4fe 100644 --- a/arch/s390/include/asm/pgtable.h +++ b/arch/s390/include/asm/pgtable.h @@ -577,7 +577,7 @@ static inline int mm_has_pgste(struct mm_struct *mm) =20 static inline int mm_is_protected(struct mm_struct *mm) { -#ifdef CONFIG_PGSTE +#if IS_ENABLED(CONFIG_KVM) if (unlikely(atomic_read(&mm->context.protected_count))) return 1; #endif @@ -632,7 +632,7 @@ static inline pud_t set_pud_bit(pud_t pud, pgprot_t pro= t) #define mm_forbids_zeropage mm_forbids_zeropage static inline int mm_forbids_zeropage(struct mm_struct *mm) { -#ifdef CONFIG_PGSTE +#if IS_ENABLED(CONFIG_KVM) if (!mm->context.allow_cow_sharing) return 1; #endif diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c index e1ad05bfd28a..683afd496190 100644 --- a/arch/s390/mm/fault.c +++ b/arch/s390/mm/fault.c @@ -398,7 +398,7 @@ void do_dat_exception(struct pt_regs *regs) } NOKPROBE_SYMBOL(do_dat_exception); =20 -#if IS_ENABLED(CONFIG_PGSTE) +#if IS_ENABLED(CONFIG_KVM) =20 void do_secure_storage_access(struct pt_regs *regs) { @@ -465,4 +465,4 @@ void do_secure_storage_access(struct pt_regs *regs) } NOKPROBE_SYMBOL(do_secure_storage_access); =20 -#endif /* CONFIG_PGSTE */ +#endif /* CONFIG_KVM */ --=20 2.51.1