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 C9678C4167B for ; Tue, 28 Nov 2023 11:04:01 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1480B6B02A5; Tue, 28 Nov 2023 06:03:59 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 05E836B02B2; Tue, 28 Nov 2023 06:03:58 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C69956B02AE; Tue, 28 Nov 2023 06:03:58 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id B4D4A6B02A5 for ; Tue, 28 Nov 2023 06:03:58 -0500 (EST) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 93E731601A2 for ; Tue, 28 Nov 2023 11:03:58 +0000 (UTC) X-FDA: 81507078156.15.D3C11A4 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by imf06.hostedemail.com (Postfix) with ESMTP id 05BD3180016 for ; Tue, 28 Nov 2023 11:03:54 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=Ii2DDpGl; spf=pass (imf06.hostedemail.com: domain of sumanthk@linux.ibm.com designates 148.163.156.1 as permitted sender) smtp.mailfrom=sumanthk@linux.ibm.com; dmarc=pass (policy=none) header.from=ibm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1701169435; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=shUyYZ2Z3ut3Lwca1JzgJ1p3wYsUGEfvmN4QGWlAmEo=; b=M2NLUFG4D+tP6068vM6wXt1YsRCU3SQtBNEmeF/fIsllQi2M5q7ng5ddypwixT5r/JuTqA Usn1t5vaQMPuElrNrVO/Kby9p3f76XyQA4WsxnFiYyFtfN2R68k79NKKZsTXPNfGCAIjY6 ixoyDNy5JR6Xk6/ckUHRACp2Anw0xkM= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1701169435; a=rsa-sha256; cv=none; b=4IwDOaEBxldY/7kl5cAouZbeqQU9JQHblWkPKiGv9XMmDeW6NqMYcye+cbM/31XcPuuZDX 7SfwPOnC8GYy9cKwG1Jnfkho2rCrzp4ran2q3lt/XNV5/xt3UCaG5HL141FH75snJVn8Hd aecfWY3o4RqI8xfra5dvNonirq699ks= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=Ii2DDpGl; spf=pass (imf06.hostedemail.com: domain of sumanthk@linux.ibm.com designates 148.163.156.1 as permitted sender) smtp.mailfrom=sumanthk@linux.ibm.com; dmarc=pass (policy=none) header.from=ibm.com Received: from pps.filterd (m0353729.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3ASB254f025913; Tue, 28 Nov 2023 11:03:51 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=shUyYZ2Z3ut3Lwca1JzgJ1p3wYsUGEfvmN4QGWlAmEo=; b=Ii2DDpGlAY78NEZPp39Mb2qf2zQBdPJWr/Cma2NLVgMqYXpQU5bW69GK1dkk858fi84u 5Sml7RPJg2gnM84fcQJ5yK6AGHPIHE2yavobp7cUdHVsUPSHZUvEF1bIOmENQOob7rgM mgCF49OSqcsCV3I8ac4TaCjTh2XUhKwLpONy3C3/3BizeMMi8iOyo1WKehzLggSEBN+F CGSevQShpRkyem7LDMYqRN83u7GpxlVaGIdu9rotKWDixtNHgKaNLgXcJFdtt3XnIMeR GndqL1dSwWV0PzkzM08UIsUP4jL++QXzTbjKGWrZCgCxYVi1eCgfQdMs1c7ofBf5xwpP 7Q== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3uneyp818k-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 28 Nov 2023 11:03:51 +0000 Received: from m0353729.ppops.net (m0353729.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 3ASB3oaK031307; Tue, 28 Nov 2023 11:03:50 GMT 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 3uneyp817s-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 28 Nov 2023 11:03:50 +0000 Received: from pps.filterd (ppma23.wdc07v.mail.ibm.com [127.0.0.1]) by ppma23.wdc07v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 3ASAYt6s012206; Tue, 28 Nov 2023 11:03:49 GMT Received: from smtprelay03.fra02v.mail.ibm.com ([9.218.2.224]) by ppma23.wdc07v.mail.ibm.com (PPS) with ESMTPS id 3ukvrkf1me-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 28 Nov 2023 11:03:49 +0000 Received: from smtpav03.fra02v.mail.ibm.com (smtpav03.fra02v.mail.ibm.com [10.20.54.102]) by smtprelay03.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 3ASB3kZP11403954 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 28 Nov 2023 11:03:46 GMT Received: from smtpav03.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 40FAA20040; Tue, 28 Nov 2023 11:03:46 +0000 (GMT) Received: from smtpav03.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id E708820043; Tue, 28 Nov 2023 11:03:45 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.152.85.9]) by smtpav03.fra02v.mail.ibm.com (Postfix) with ESMTP; Tue, 28 Nov 2023 11:03:45 +0000 (GMT) From: Sumanth Korikkar To: linux-mm , Andrew Morton , David Hildenbrand Cc: Oscar Salvador , Michal Hocko , "Aneesh Kumar K.V" , Anshuman Khandual , Gerald Schaefer , Alexander Gordeev , Heiko Carstens , Vasily Gorbik , linux-s390 , LKML Subject: [PATCH v4 4/5] s390/mm: implement MEM_PREPARE_ONLINE/MEM_FINISH_OFFLINE notifiers Date: Tue, 28 Nov 2023 12:03:41 +0100 Message-Id: <20231128110342.102096-5-sumanthk@linux.ibm.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231128110342.102096-1-sumanthk@linux.ibm.com> References: <20231128110342.102096-1-sumanthk@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: 98U7NOVK_bxOH5XumKU7eprbvIZmuzMp X-Proofpoint-GUID: iSk767hBzyOipeNYXEJmkIyF_QDcPhhc X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.987,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-11-28_10,2023-11-27_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxlogscore=999 impostorscore=0 lowpriorityscore=0 malwarescore=0 priorityscore=1501 mlxscore=0 spamscore=0 adultscore=0 clxscore=1015 suspectscore=0 phishscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311060000 definitions=main-2311280087 X-Rspamd-Queue-Id: 05BD3180016 X-Rspam-User: X-Stat-Signature: cy3hi1npuy1kaunmyagtmc6pozoeemuh X-Rspamd-Server: rspam03 X-HE-Tag: 1701169434-487254 X-HE-Meta: U2FsdGVkX183Z+EU9ZGHntP8OQNNG3GdnMB7xdcz22qHg9acZNgKwm7kDRfNi8JOhO6NmuoBxIkDxQdj73bqdjzWSP1KYvtFl6RqI2uoWaQgOWg4A+Pz/3agn3GD3z3J9uzHrRREEPtUcLmS/cmgDfYfEguRl+B5s30MSSEHI54rejBrq3ESOvsX3rMLLZ1sK+WdDkRdIJBQ2OA5MKvmIXfp7PEzpaVJ0udaiXRX/JqnmRMcXpTKUI8RSpSUX5JsqZrE8GQ1vN0+9TKICiJghpYZCE3qA6nrGaT//tqjpw/rvHAbadrB3xfvkpvPGKWb50cYLusvlJ+Md8UY2QTYQSTBO0G9pMCIA06XGwERzQ+VbUScdMIS8g2bqfmwu/12n21hb9jK+zQLMqGF+2nfmKtET2USilNLzlzvNz6OeUBKhoJHNGLG89bPAi20bNzAG0Y3Wt+SGNk+cz69yEYl05jC1Vx/Tsh62M7UBeDj8WYFDz+TK5spbOkYIlThFmjZU5O6AzUO/BK5F/UIedMV3LKwL8KikEHZlOTadwMLU9WYl36fiQ0LiSknTZDTxVwziiGN0QA5AhCg64gng5CpuxaGzD7NQpMUCadffXAX4V19bX+YKc/fgFKzeF/r3r90yvvpWgqnotBlrJHj3/Cpi7WVz7LAPHaNxJR3teC6W9cRHCaZ3itYrB8oLlnwjLyzBgSgvQWfs+rE6UHx6ohAPk+UtZPxUA7sRFM+GK28PdA5If+JnmnZ2Z1D3CGMjZxMc4RpxJk8ZfHj+uQiWuuGVycAtd6p8VW4c+kz2YF9huk5s1Ak0Y9yKveOY/zg0jJXLcWdx4XkWh+uuMUw0l4JcS9WOK9BEV22tYFvVHfeH9nURJWfWdqSaKAtv2kAzwVdj3vqUPRBFoF+Adc7TrWkQgqoeslpNJ0ZRPTEnzUBHt1V+2BGFW/c7yjnlrpSk7DiNDLU/PrPBTuBnQSZs/M aONZsHFd q2jAoAAs5Qs3HBLtjNu5BhOoMwwqtx+B0qkSOG4mKQQCB/pCUwFSfIEhWUSzKR+XLYsunxzp17hUGvtgIwa4M6G2DCah5BF+GsRsPqDklmrOeUeNTjj9iS/xu1N6qOZXfZh0iUDoVZdichmBEgfqJV7PLwYUskJZlJBcJH+bq7CMUbIcaZscGVlsjHo8jc7T//qee 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: MEM_PREPARE_ONLINE memory notifier makes memory block physical accessible via sclp assign command. The notifier ensures self-contained memory maps are accessible and hence enabling the "memmap on memory" on s390. MEM_FINISH_OFFLINE memory notifier shifts the memory block to an inaccessible state via sclp unassign command. Implementation considerations: * When MHP_MEMMAP_ON_MEMORY is disabled, the system retains the old behavior. This means the memory map is allocated from default memory. * If MACHINE_HAS_EDAT1 is unavailable, MHP_MEMMAP_ON_MEMORY is automatically disabled. This ensures that vmemmap pagetables do not consume additional memory from the default memory allocator. * The MEM_GOING_ONLINE notifier has been modified to perform no operation, as MEM_PREPARE_ONLINE already executes the sclp assign command. * The MEM_CANCEL_ONLINE/MEM_OFFLINE notifier now performs no operation, as MEM_FINISH_OFFLINE already executes the sclp unassign command. Reviewed-by: Gerald Schaefer Signed-off-by: Sumanth Korikkar --- drivers/s390/char/sclp_cmd.c | 47 +++++++++++++++++++++++++++++++----- 1 file changed, 41 insertions(+), 6 deletions(-) diff --git a/drivers/s390/char/sclp_cmd.c b/drivers/s390/char/sclp_cmd.c index 355e63e44e95..c551dc6734fe 100644 --- a/drivers/s390/char/sclp_cmd.c +++ b/drivers/s390/char/sclp_cmd.c @@ -18,6 +18,7 @@ #include #include #include +#include #include #include #include @@ -26,6 +27,7 @@ #include #include #include +#include #include "sclp.h" @@ -319,6 +321,7 @@ static bool contains_standby_increment(unsigned long start, unsigned long end) static int sclp_mem_notifier(struct notifier_block *nb, unsigned long action, void *data) { + unsigned long altmap_start, altmap_size; unsigned long start, size; struct memory_notify *arg; unsigned char id; @@ -340,13 +343,43 @@ static int sclp_mem_notifier(struct notifier_block *nb, if (contains_standby_increment(start, start + size)) rc = -EPERM; break; - case MEM_GOING_ONLINE: + case MEM_PREPARE_ONLINE: + /* + * Access the altmap_start_pfn and altmap_nr_pages fields + * within the struct memory_notify specifically when dealing + * with only MEM_PREPARE_ONLINE/MEM_PREPARE_OFFLINE notifiers. + */ + altmap_start = arg->altmap_start_pfn << PAGE_SHIFT; + altmap_size = arg->altmap_nr_pages << PAGE_SHIFT; + /* + * When altmap is in use, take the specified memory range + * online, which includes the altmap. + */ + if (altmap_size) { + start = altmap_start; + size += altmap_size; + } rc = sclp_mem_change_state(start, size, 1); + if (rc || !altmap_size) + break; + /* + * Set CMMA state to nodat here, since the struct page memory + * at the beginning of the memory block will not go through the + * buddy allocator later. + */ + __arch_set_page_nodat((void *)__va(start), arg->altmap_nr_pages); break; - case MEM_CANCEL_ONLINE: - sclp_mem_change_state(start, size, 0); - break; - case MEM_OFFLINE: + case MEM_FINISH_OFFLINE: + altmap_start = arg->altmap_start_pfn << PAGE_SHIFT; + altmap_size = arg->altmap_nr_pages << PAGE_SHIFT; + /* + * When altmap is in use, take the specified memory range + * offline, which includes the altmap. + */ + if (altmap_size) { + start = altmap_start; + size += altmap_size; + } sclp_mem_change_state(start, size, 0); break; default: @@ -397,7 +430,9 @@ static void __init add_memory_merged(u16 rn) if (!size) goto skip_add; for (addr = start; addr < start + size; addr += block_size) - add_memory(0, addr, block_size, MHP_NONE); + add_memory(0, addr, block_size, + MACHINE_HAS_EDAT1 ? + MHP_MEMMAP_ON_MEMORY | MHP_OFFLINE_INACCESSIBLE : MHP_NONE); skip_add: first_rn = rn; num = 1; -- 2.41.0