From mboxrd@z Thu Jan 1 00:00:00 1970 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 52FBC400E11; Fri, 17 Jul 2026 13:32:43 +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=1784295164; cv=none; b=Q2jrbGALM4JoekBHZ/2xbgk7lv5O7tDIErdQhcBRL5AU40ODao0A8yjOFPou7UjnnU3EII2AWyP7H/vjfmEUWR/GtGqVS8jWZH8tMmOZgmTRr4htpWqk2d2/kCk4K5bCwcoErDlaHFcPo1QopAWNfPrD/ChDK7g/76u1HEZQQGE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784295164; c=relaxed/simple; bh=Zo7VJgD36k3dGYhSi8oKWuRMaZWE1bR2Ls3ILVmOLkA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=evjA8buDm72/2322COmoz5doLOxhU6uMV16Y+DaaNqRcqfAMcEYo9Z/JmaOyaHH4ldkjHx9kZAVzfuW/IWUkDzEHyl5N4k/JZJCHoyHW7Zs23kbYP76K5uHpOu+rQamdqFiW4Qn7VEPAp96g2A4clmt4YJJizAOsayB6giBghy0= 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=DahiS0tq; 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="DahiS0tq" Received: from pps.filterd (m0360083.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66HCfYmE2047880; Fri, 17 Jul 2026 13:32:28 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=i6MAPSOtfow276eUF 3Xe6qEnwK6XLk455QrSg12o/Uo=; b=DahiS0tqzO9lnBZt1OMv47D7A1v5+LAPj CH/aqiWtGW2afMScSS7jImNTbPkh5RAH6Tnr4pB80eq1TQjd3bccjHTHE1/LBQo2 L0CDYVqYQ2VxW9k+3ydbl+TSdGTLYtZD8PbjjD8tWyQhGSLTwi9m7ABLjQDr2Ese sETsMvyhQEnopaN+hidySqnqgNrmzEJPFnfwwo2LEQ2t5/nLPAr/+q6QX9KnvP3+ khQG25yOjXPkG4wd5nTqMnhUnCj3/ESUFkDgkuyfC10PIuYumi06Y07AyKzF9Jd2 +c5KH8pNbe4ZndXT/hmsrhvmyCPUFgtcqen1rGj5/e3p+qVjQtulg== Received: from ppma11.dal12v.mail.ibm.com (db.9e.1632.ip4.static.sl-reverse.com [50.22.158.219]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4fbepxxnp3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 17 Jul 2026 13:32:27 +0000 (GMT) Received: from pps.filterd (ppma11.dal12v.mail.ibm.com [127.0.0.1]) by ppma11.dal12v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 66HDJf8I018515; Fri, 17 Jul 2026 13:32:26 GMT Received: from smtprelay05.fra02v.mail.ibm.com ([9.218.2.225]) by ppma11.dal12v.mail.ibm.com (PPS) with ESMTPS id 4fc2uyhjng-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 17 Jul 2026 13:32:26 +0000 (GMT) Received: from smtpav01.fra02v.mail.ibm.com (smtpav01.fra02v.mail.ibm.com [10.20.54.100]) by smtprelay05.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 66HDWNik43385300 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 17 Jul 2026 13:32:23 GMT Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id E2A092004F; Fri, 17 Jul 2026 13:32:22 +0000 (GMT) Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id B7D462004D; Fri, 17 Jul 2026 13:32:22 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.87.85.9]) by smtpav01.fra02v.mail.ibm.com (Postfix) with SMTP; Fri, 17 Jul 2026 13:32:22 +0000 (GMT) Received: by tuxmaker.boeblingen.de.ibm.com (Postfix, from userid 55669) id 9F8CC162755; Fri, 17 Jul 2026 15:32:22 +0200 (CEST) From: Alexander Gordeev To: Kevin Brodsky , David Hildenbrand , Chris Li , Gerald Schaefer , Heiko Carstens , Christian Borntraeger , Claudio Imbrenda Cc: linux-s390@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-sparse@vger.kernel.org Subject: [RFC PATCH 4/4] s390/mm: implement __ptent-aware pte_t type Date: Fri, 17 Jul 2026 15:32:22 +0200 Message-ID: <2580c0c643125fb89247f255ff42803bea44e4c3.1784292223.git.agordeev@linux.ibm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: References: 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: K1SWd8x3gKV5j6296YUSXLjfWYwZ0oEb X-Proofpoint-Spam-Info: AW1haW4tMjYwNzE3MDEzNCBTYWx0ZWRfX7TV/eW1/02Ov JzQPvI2jpf+5VWdWMs9PhWmVgV08H6ZsSKAg0H8CKmpvqOTtt/7d5lvVO8eOcj9g7VVOscHu1YV bnA+FF9164abOQHuAMg3/TR0FOmz71Q= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzE3MDEzNCBTYWx0ZWRfX4HNVZADoQJg/ uMaLhfDvH65JzqfMxrRVIYFXA9e1KcfaEiSOeHgBeR+XI2KKeBpeX2Y0xq3WF1WW1zfZZZtOenD tCqRLPGgtL/ojBmRQL6CD7Hmvv0+53SBL0o95bAaP74aoKXGS2WD0iVBYQe+DgwoeJ3vllGrZoS e2wUCGhyU0+qxH6qBHm7mVDkGsMsXJbsSzThm058DUFXPdIk85WdwsL5ws9rWj2tESFeA9iKLLQ E9VcsHCo1QFuZPF3IvRZoD96l2f/oUHzWiwz8oaLtxkLSSgCKqsIhr0lQlTHE9D5g8yMw8Qy44O 96q1AZ0gd4N6D4uh62byEprqyBaTWYnKkAtaRqlIPEz2NsW9MtUFSO/GJr4VkOHnK2USGOHHB3W VzHBQlzMl7CsHKqR/V4PhmOI5YRA2vl5e8a7YYOY7FsDO1eS7cQOLpP2JqDj+yz9OfGZeb6qeKe vm/wb93jdovnJ/3/P3g== X-Authority-Analysis: v=2.4 cv=XbS5Co55 c=1 sm=1 tr=0 ts=6a5a2eeb cx=c_pps a=aDMHemPKRhS1OARIsFnwRA==:117 a=aDMHemPKRhS1OARIsFnwRA==:17 a=RAioF0-LDSMA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=iQ6ETzBq9ecOQQE5vZCe:22 a=VnNF1IyMAAAA:8 a=xjXagFC_2LMuDb4xjsMA:9 X-Proofpoint-ORIG-GUID: K1SWd8x3gKV5j6296YUSXLjfWYwZ0oEb X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-17_03,2026-07-17_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1011 suspectscore=0 spamscore=0 phishscore=0 lowpriorityscore=0 priorityscore=1501 adultscore=0 malwarescore=0 impostorscore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607170134 Signed-off-by: Alexander Gordeev --- arch/s390/include/asm/page.h | 16 ++++++++++-- arch/s390/include/asm/pgtable.h | 44 +++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 2 deletions(-) diff --git a/arch/s390/include/asm/page.h b/arch/s390/include/asm/page.h index 56da819a79e6..ce68994a0292 100644 --- a/arch/s390/include/asm/page.h +++ b/arch/s390/include/asm/page.h @@ -76,8 +76,10 @@ static inline void copy_page(void *to, void *from) =20 #ifdef STRICT_MM_TYPECHECKS =20 +typedef struct { unsigned long pte; } pteraw_t; +typedef pteraw_t __ptent pte_t; + typedef struct { unsigned long pgprot; } pgprot_t; -typedef struct { unsigned long pte; } pte_t; typedef struct { unsigned long pmd; } pmd_t; typedef struct { unsigned long pud; } pud_t; typedef struct { unsigned long p4d; } p4d_t; @@ -89,6 +91,11 @@ static __always_inline unsigned long name ## _val(name= ## _t name) \ return name.name; \ } =20 +static inline unsigned long pte_val(pte_t pte) +{ + return ((__force pteraw_t *)&pte)->pte; +} + #else /* STRICT_MM_TYPECHECKS */ =20 typedef unsigned long pgprot_t; @@ -98,6 +105,11 @@ typedef unsigned long pud_t; typedef unsigned long p4d_t; typedef unsigned long pgd_t; =20 +static inline unsigned long pte_val(pte_t pte) +{ + return pte; +} + #define DEFINE_PGVAL_FUNC(name) \ static __always_inline unsigned long name ## _val(name ## _t name) \ { \ @@ -107,7 +119,6 @@ static __always_inline unsigned long name ## _val(nam= e ## _t name) \ #endif /* STRICT_MM_TYPECHECKS */ =20 DEFINE_PGVAL_FUNC(pgprot) -DEFINE_PGVAL_FUNC(pte) DEFINE_PGVAL_FUNC(pmd) DEFINE_PGVAL_FUNC(pud) DEFINE_PGVAL_FUNC(p4d) @@ -116,6 +127,7 @@ DEFINE_PGVAL_FUNC(pgd) typedef pte_t *pgtable_t; =20 #define __pgprot(x) ((pgprot_t) { (x) } ) +#define __pteraw(x) ((pteraw_t) { (x) } ) #define __pte(x) ((pte_t) { (x) } ) #define __pmd(x) ((pmd_t) { (x) } ) #define __pud(x) ((pud_t) { (x) } ) diff --git a/arch/s390/include/asm/pgtable.h b/arch/s390/include/asm/pgta= ble.h index 859ce7c7d454..6398f58c09ce 100644 --- a/arch/s390/include/asm/pgtable.h +++ b/arch/s390/include/asm/pgtable.h @@ -978,6 +978,49 @@ static inline void set_pmd(pmd_t *pmdp, pmd_t pmd) WRITE_ONCE(*pmdp, pmd); } =20 +#ifdef STRICT_MM_TYPECHECKS +static inline void set_pte(pte_t *ptep, pte_t pte) +{ + pteraw_t *pteraw_ptep =3D (__force pteraw_t *)ptep; + pteraw_t pteraw =3D __pteraw(pte_val(pte)); + + if (pte_present(pte)) + pte =3D clear_pte_bit(pte, __pgprot(_PAGE_UNUSED)); + WRITE_ONCE(*pteraw_ptep, pteraw); +} + +#define ptep_get ptep_get +static inline pte_t ptep_get(pte_t *ptep) +{ + pteraw_t *pteraw_ptep =3D (__force pteraw_t *)ptep; + pteraw_t pteraw =3D READ_ONCE(*pteraw_ptep); + + return __pte(pteraw.pte); +} + +#define ptep_get_nopgtable ptep_get_nopgtable +static inline pte_t ptep_get_nopgtable(pte_t *ptep) +{ + /* + * Ensure this is a pointer to a copy not a pointer into a page table. + * If this is a stack value, it won't be a valid virtual address, but + * that's fine because it also cannot be pointing into the page table. + */ + VM_WARN_ON(virt_addr_valid(ptep) && PageTable(virt_to_page(ptep))); + + return (__force pte_t)(*(pteraw_t *)ptep); +} + +#define set_pte_nopgtable set_pte_nopgtable +static inline void set_pte_nopgtable(pte_t *ptep, pte_t pte) +{ + /* + * See comment in ptep_get_nopgtable(). + */ + VM_WARN_ON(virt_addr_valid(ptep) && PageTable(virt_to_page(ptep))); + *(pteraw_t *)ptep =3D (__force pteraw_t)pte; +} +#else static inline void set_pte(pte_t *ptep, pte_t pte) { if (pte_present(pte)) @@ -990,6 +1033,7 @@ static inline pte_t ptep_get(pte_t *ptep) { return READ_ONCE(*ptep); } +#endif =20 #define pmdp_get pmdp_get static inline pmd_t pmdp_get(pmd_t *pmdp) --=20 2.53.0