From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 258DBCD11C2 for ; Wed, 10 Apr 2024 17:45:02 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 02BCB6B008A; Wed, 10 Apr 2024 13:44:58 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id ECE386B008C; Wed, 10 Apr 2024 13:44:57 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CE1E56B0092; Wed, 10 Apr 2024 13:44:57 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id A5EE76B008C for ; Wed, 10 Apr 2024 13:44:57 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 630B4140892 for ; Wed, 10 Apr 2024 17:44:57 +0000 (UTC) X-FDA: 81994347834.02.DA74188 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by imf23.hostedemail.com (Postfix) with ESMTP id 0ADAC14000D for ; Wed, 10 Apr 2024 17:44:54 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=cQyhRkTI; dmarc=pass (policy=none) header.from=ibm.com; spf=pass (imf23.hostedemail.com: domain of imbrenda@linux.ibm.com designates 148.163.158.5 as permitted sender) smtp.mailfrom=imbrenda@linux.ibm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1712771095; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=isCwm2VVj9IIusgK5+U+9pg2r2c/kDAQFXY6w8ShkCo=; b=PaIVIW0ygktNEL62mHJ8SdjK0bcHXQAssXbIvmkZ2c8XKb9g0VGJd6sT5LnysFKPAWKX2B qnem0fojveOMGLssE/OF11AfAxEY9rwIGq5dRQpUuKhSlpqO5unDK95HAwMHcTfMovU2iS SvKVHvfv8YsTN52O4s77XppC9F35dfs= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=cQyhRkTI; dmarc=pass (policy=none) header.from=ibm.com; spf=pass (imf23.hostedemail.com: domain of imbrenda@linux.ibm.com designates 148.163.158.5 as permitted sender) smtp.mailfrom=imbrenda@linux.ibm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1712771095; a=rsa-sha256; cv=none; b=AbEaaJzB8XaCMvSyCqmGMWN7Lprshtiby1O+Jj+VeE0Ynn4V/IMAcxou3sXkb+UweEq7Yj 4aFW5qS2vZpf8zoGCdQ/VFGWfqmpk7Ko2r28zzFwnSkxTeKTUX/eS/y6rVLGoG0Mk4TYMb ZDlE2B/sSWat/Im7sJdoQx9vBL5k8Os= Received: from pps.filterd (m0353725.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 43AHVgZG007470; Wed, 10 Apr 2024 17:44:45 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=date : from : to : cc : subject : message-id : in-reply-to : references : mime-version : content-type : content-transfer-encoding; s=pp1; bh=isCwm2VVj9IIusgK5+U+9pg2r2c/kDAQFXY6w8ShkCo=; b=cQyhRkTIl4/qjhddQzjTxEMo4+0zNfE/pYfoBe4duwiQM3YX0MM3wh4+fX3V2x4G2sGk rI5sq25FyKI/19HBz9K4CxvOHy8HTyW4DMcl0QroHMJfRi/+dxRfusOKHwGEiyCS5Dqh cWgRC/xIyRmRY1G6dDXwx8HbmsBiPYl094ARqFspKKeKPKXHat6tlY/3lz51tQYlThGk p6ZAFpiO0EC4dVcVRkvYivrcWjEKSjz6noBSleZi084mMoTS/pOvz2gB6kZPUzN/Nhts XA4RBIagt349h3W3X1jfaeq1fyoo2Cmtgb+MFo2nCwM6JHr6L1WFpBfCHniycPphxx8l og== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3xdy1tr1xs-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 10 Apr 2024 17:44:44 +0000 Received: from m0353725.ppops.net (m0353725.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 43AHii2d029421; Wed, 10 Apr 2024 17:44:44 GMT 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 3xdy1tr1xn-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 10 Apr 2024 17:44:44 +0000 Received: from pps.filterd (ppma11.dal12v.mail.ibm.com [127.0.0.1]) by ppma11.dal12v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 43AFK6e1017031; Wed, 10 Apr 2024 17:44:43 GMT Received: from smtprelay07.fra02v.mail.ibm.com ([9.218.2.229]) by ppma11.dal12v.mail.ibm.com (PPS) with ESMTPS id 3xbke2nuf3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 10 Apr 2024 17:44:43 +0000 Received: from smtpav07.fra02v.mail.ibm.com (smtpav07.fra02v.mail.ibm.com [10.20.54.106]) by smtprelay07.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 43AHibNo53150022 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 10 Apr 2024 17:44:40 GMT Received: from smtpav07.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id D948620043; Wed, 10 Apr 2024 17:44:37 +0000 (GMT) Received: from smtpav07.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id AAFD920040; Wed, 10 Apr 2024 17:44:37 +0000 (GMT) Received: from p-imbrenda (unknown [9.152.224.66]) by smtpav07.fra02v.mail.ibm.com (Postfix) with ESMTP; Wed, 10 Apr 2024 17:44:37 +0000 (GMT) Date: Wed, 10 Apr 2024 19:42:36 +0200 From: Claudio Imbrenda To: David Hildenbrand Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-s390@vger.kernel.org, kvm@vger.kernel.org, Matthew Wilcox , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle , Janosch Frank , Gerald Schaefer , Thomas Huth Subject: Re: [PATCH v1 3/5] s390/uv: convert PG_arch_1 users to only work on small folios Message-ID: <20240410194236.1c89eb7d@p-imbrenda> In-Reply-To: <20240404163642.1125529-4-david@redhat.com> References: <20240404163642.1125529-1-david@redhat.com> <20240404163642.1125529-4-david@redhat.com> Organization: IBM X-Mailer: Claws Mail 4.2.0 (GTK 3.24.41; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-TM-AS-GCONF: 00 X-Proofpoint-GUID: hz7Bxbv-xN-ZtiKpIDAhRT2UsI1w_po4 X-Proofpoint-ORIG-GUID: -P0lAWXIohdv_lozvSe4QhK7TZVjsEOR X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-04-10_04,2024-04-09_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 spamscore=0 malwarescore=0 bulkscore=0 phishscore=0 priorityscore=1501 suspectscore=0 mlxlogscore=999 adultscore=0 impostorscore=0 mlxscore=0 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2404010000 definitions=main-2404100130 X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 0ADAC14000D X-Stat-Signature: dhfeshbkahrg8q8uwmx78pfftphqnxyw X-HE-Tag: 1712771094-837022 X-HE-Meta: U2FsdGVkX1/AtOp2EK98TlkSQK4TpLslE08QNAuNuP0HkMFJ8f8iJGnhtUcNjUtpEYCF7+GtpGtVJ3skZPhEM2B/9vxmNjDcneapD+Al0wlfxolZCCYk/G8sBrbUgnwCku1rHzxtLsIRs0JjHjwBcToejnD3uyIyZPiiRLEZEVlyJYE7mPO5gp2zv4U66JcbFN3/k1rR7s9cXcKEefQAabOi1obhn5ilOA7mQZ9gCOJ7GYYfRTm60KmUcE3cl6eajznPAkf6z3U/KQ+Z4Guy3oElcVIAPSMhDEAeV32OFiRPzINCqBkqp5fmcQAWxpW5CgisCaUXQRwMscvrun8B3YrcSIT3rQ4rCzp+DIIGZCTPj84SqQNiK+OjCPb2emQbgVonfs6QP7PnRaVhaz5kWuZzIUCY5eaaEBFxn/IMpPOCxSV/mldYy8FjEb9WoZDor0CAMT221rr5WfPgbeVcFByYnipiq8wC2FpWw4e67mvxaHxpXIOpE630Glc1f5mHscx4NCPo9R56GwQhLN2z/e3qVffC9GqdhvDbTGrszTyO/B0EAcHT1Q0qWX4S2Ri2KZp3/eramSGxswiZQyMXokkqClnSlyE4pDTfkDhCln1bV7PXyy9B4Bwd7OhKpe/Q6oBoVH6V838LQ1h6XNS7X9OC8ogac3dahiBc1GY2ixrX+4RUGBnZMe0qEomdp7zu/zYvWuVG8OM0VK+bqLK5Y8lwiUNuaa1TCIGPtD3f/ETfsJMoa9802ziGr2OTbBEdEYcdUO2d8cffCuUYo8RS0qGZRWMI4KErwPsb17tNnOXG8JgsV3ZkrCQYiTq0pZhbTM597dBSH8niNPP1dB/I4rztcqXkZdSVKIvRtK+j4RKyqx49TK31pW0+ee1Yb/sZYUUQvFzKwhDaUi0G+18e/OgYSKW2NqQ5eC4qJzz2K9NBxMnjcVgJwGAfShNDEUzfbPB/2Lc/PqHO8hcqvQy VOwuiKaY 8xFKz6XIxh70KS2py/f52agt1l2AIqhRdbrcP96nGw3uKWD7Amgu6LN4YpIdrzChE2Al9pNE3nvwjmng6EKv8tbQnC40GLWChzQmYubJZLGblrmTUjyy6zkQ2R6/epTsBw0ifPfp0g5XPyxdJr1SCtwP2YgPKpucAdlhv7DaKzqv2AcJPFkf+VHzCGHpTh0ZuUAlsUAXJGrlH4HDD4/N4QRwvPS78INgL1vlxoO6Iwh2qjwT7uIuhDDX547ZpMWzJ+3RBfi2vanm+vaIL/GTe2e+RonEzo3uBK32IxytbKQ7kO0ByT6ouvHLeOhqr0Og/Iv5OT4b0yXblRkbR3LkTRLBGrvm/iKfzGmQe329uzLm5SHU= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: On Thu, 4 Apr 2024 18:36:40 +0200 David Hildenbrand wrote: > Now that make_folio_secure() may only set PG_arch_1 for small folios, > let's convert relevant remaining UV code to only work on (small) folios > and simply reject large folios early. This way, we'll never end up > touching PG_arch_1 on tail pages of a large folio in UV code. > > The folio_get()/folio_put() for functions that are documented to already > hold a folio reference look weird and it should probably be removed. > Similarly, uv_destroy_owned_page() and uv_convert_owned_from_secure() > should really consume a folio reference instead. But these are cleanups for > another day. > > Signed-off-by: David Hildenbrand > --- > arch/s390/include/asm/page.h | 1 + > arch/s390/kernel/uv.c | 39 +++++++++++++++++++++--------------- > 2 files changed, 24 insertions(+), 16 deletions(-) > > diff --git a/arch/s390/include/asm/page.h b/arch/s390/include/asm/page.h > index 54d015bcd8e3..b64384872c0f 100644 > --- a/arch/s390/include/asm/page.h > +++ b/arch/s390/include/asm/page.h > @@ -214,6 +214,7 @@ static inline unsigned long __phys_addr(unsigned long x, bool is_31bit) > #define pfn_to_phys(pfn) ((pfn) << PAGE_SHIFT) > > #define phys_to_page(phys) pfn_to_page(phys_to_pfn(phys)) > +#define phys_to_folio(phys) page_folio(phys_to_page(phys)) > #define page_to_phys(page) pfn_to_phys(page_to_pfn(page)) > #define folio_to_phys(page) pfn_to_phys(folio_pfn(folio)) > > diff --git a/arch/s390/kernel/uv.c b/arch/s390/kernel/uv.c > index adcbd4b13035..9c0113b26735 100644 > --- a/arch/s390/kernel/uv.c > +++ b/arch/s390/kernel/uv.c > @@ -134,14 +134,17 @@ static int uv_destroy_page(unsigned long paddr) > */ > int uv_destroy_owned_page(unsigned long paddr) > { > - struct page *page = phys_to_page(paddr); > + struct folio *folio = phys_to_folio(paddr); > int rc; > > - get_page(page); > + if (unlikely(folio_test_large(folio))) > + return 0; please add a comment here to explain why it's ok to just return 0 here... > + > + folio_get(folio); > rc = uv_destroy_page(paddr); > if (!rc) > - clear_bit(PG_arch_1, &page->flags); > - put_page(page); > + clear_bit(PG_arch_1, &folio->flags); > + folio_put(folio); > return rc; > } > > @@ -169,14 +172,17 @@ int uv_convert_from_secure(unsigned long paddr) > */ > int uv_convert_owned_from_secure(unsigned long paddr) > { > - struct page *page = phys_to_page(paddr); > + struct folio *folio = phys_to_folio(paddr); > int rc; > > - get_page(page); > + if (unlikely(folio_test_large(folio))) > + return 0; ... and here > + > + folio_get(folio); > rc = uv_convert_from_secure(paddr); > if (!rc) > - clear_bit(PG_arch_1, &page->flags); > - put_page(page); > + clear_bit(PG_arch_1, &folio->flags); > + folio_put(folio); > return rc; > } > > @@ -457,33 +463,34 @@ EXPORT_SYMBOL_GPL(gmap_destroy_page); > */ > int arch_make_page_accessible(struct page *page) > { > + struct folio *folio = page_folio(page); > int rc = 0; > > - /* Hugepage cannot be protected, so nothing to do */ > - if (PageHuge(page)) > + /* Large folios cannot be protected, so nothing to do */ > + if (unlikely(folio_test_large(folio))) > return 0; > > /* > * PG_arch_1 is used in 3 places: > * 1. for kernel page tables during early boot > * 2. for storage keys of huge pages and KVM > - * 3. As an indication that this page might be secure. This can > + * 3. As an indication that this small folio might be secure. This can > * overindicate, e.g. we set the bit before calling > * convert_to_secure. > * As secure pages are never huge, all 3 variants can co-exists. > */ > - if (!test_bit(PG_arch_1, &page->flags)) > + if (!test_bit(PG_arch_1, &folio->flags)) > return 0; > > - rc = uv_pin_shared(page_to_phys(page)); > + rc = uv_pin_shared(folio_to_phys(folio)); > if (!rc) { > - clear_bit(PG_arch_1, &page->flags); > + clear_bit(PG_arch_1, &folio->flags); > return 0; > } > > - rc = uv_convert_from_secure(page_to_phys(page)); > + rc = uv_convert_from_secure(folio_to_phys(folio)); > if (!rc) { > - clear_bit(PG_arch_1, &page->flags); > + clear_bit(PG_arch_1, &folio->flags); > return 0; > } >