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 D8DD0C3DA6E for ; Mon, 8 Jan 2024 13:28:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CEDDD6B0083; Mon, 8 Jan 2024 08:28:14 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id C9E016B0085; Mon, 8 Jan 2024 08:28:14 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AA3146B0087; Mon, 8 Jan 2024 08:28:14 -0500 (EST) 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 95E886B0083 for ; Mon, 8 Jan 2024 08:28:14 -0500 (EST) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 74A5E80836 for ; Mon, 8 Jan 2024 13:28:14 +0000 (UTC) X-FDA: 81656222508.30.5144B17 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by imf03.hostedemail.com (Postfix) with ESMTP id 1F07820003 for ; Mon, 8 Jan 2024 13:28:11 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=T7NWUx1k; spf=pass (imf03.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=1704720492; 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=mAMWAmx4tTbSFhnG6X+oeskqJ2cVVuibj42I4REYo6w=; b=S5l+6lOBaS8blMstFyKWwBjhxC4+zPmllDgkf4K0TMYdgeCrZ+uw34Ov+7TWkGtsTm675t FJcCW2jRnP3AIp9+odbgtbL9jgU0ebxFyoqQVqui/Cy+hT4N0VU7c7p2i9nRIketXryDkh FKn3mw2G138AlLA7N4wQkHTioeE1ysU= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1704720492; a=rsa-sha256; cv=none; b=Zn+04XLxiNi0TdHAgs2fQstMABeZt6Qlf4Z9Dz5do0poNifGHOR3IVSMEa6i+XYA+YtfwM ygk+TnZrWQsa6a3A6FOVXSeY9AurnCbkma5YvUQwPpPyek2AIFgmfTdlTEG5nAUC8OqUOX 3RpgeR0TzgTZ2IaxWPRF15fsFcEWTI0= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=T7NWUx1k; spf=pass (imf03.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 (m0353728.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 408Cl0WU001332; Mon, 8 Jan 2024 13:28:08 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=mAMWAmx4tTbSFhnG6X+oeskqJ2cVVuibj42I4REYo6w=; b=T7NWUx1kZCIMJ4BzZTm+M2/2Zx0FpHAaAjni7YrHbHX7MuQnY1DCxPGS+ZgFyg81n6qp /wkaGhwRtjs0i+Syn7oD8xEgYEwcC4Sq/yR0pmyD6ZOhS40DDKSzCGhtpEly5KyL96cL 4AUvo1lboNP/wDawXTRePpfDKODDZj788zYExuUCwymeWD8igNTIJED8fgar6yF755ut i4T6yZiLRpMrITJs3/ZjBkQkqnZTojuPYTPDW6FmogQ7WKoAnb3My3HvTiHAvpxaoV8n 3Emn/DdRnWTyDgFXsIt5rwNffEpRP1qkl5mbbUgjrf0uWrkK+rfsttjN8fODdvBnjHmi 8A== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3vf1qexmer-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 08 Jan 2024 13:28:08 +0000 Received: from m0353728.ppops.net (m0353728.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 408CP5r1024343; Mon, 8 Jan 2024 13:28:07 GMT 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 3vf1qexmdu-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 08 Jan 2024 13:28:07 +0000 Received: from pps.filterd (ppma22.wdc07v.mail.ibm.com [127.0.0.1]) by ppma22.wdc07v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 408C6kmv022799; Mon, 8 Jan 2024 13:28:06 GMT Received: from smtprelay02.fra02v.mail.ibm.com ([9.218.2.226]) by ppma22.wdc07v.mail.ibm.com (PPS) with ESMTPS id 3vfhjy87yk-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 08 Jan 2024 13:28:06 +0000 Received: from smtpav05.fra02v.mail.ibm.com (smtpav05.fra02v.mail.ibm.com [10.20.54.104]) by smtprelay02.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 408DS2267799544 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 8 Jan 2024 13:28:02 GMT Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id B3C862004E; Mon, 8 Jan 2024 13:27:59 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 21F3720067; Mon, 8 Jan 2024 13:27:59 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.152.85.9]) by smtpav05.fra02v.mail.ibm.com (Postfix) with ESMTP; Mon, 8 Jan 2024 13:27:59 +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 , Sumanth Korikkar Subject: [PATCH v6 4/5] s390/mm: implement MEM_PREPARE_ONLINE/MEM_FINISH_OFFLINE notifiers Date: Mon, 8 Jan 2024 14:27:46 +0100 Message-Id: <20240108132747.3238763-5-sumanthk@linux.ibm.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240108132747.3238763-1-sumanthk@linux.ibm.com> References: <20240108132747.3238763-1-sumanthk@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-GUID: 7mkCTFBZ_igCm35Up3nk_f_xNDDv_oAk X-Proofpoint-ORIG-GUID: Xa9P41lBTiK1qvAcU4rzOO1CifOtzvCO X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.997,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-01-08_04,2024-01-08_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 priorityscore=1501 impostorscore=0 mlxlogscore=999 bulkscore=0 adultscore=0 malwarescore=0 phishscore=0 spamscore=0 mlxscore=0 lowpriorityscore=0 clxscore=1015 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2401080115 X-Rspamd-Queue-Id: 1F07820003 X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: 5th9n3i8k4ytui5q8rnr4xdqwoannomq X-HE-Tag: 1704720491-969196 X-HE-Meta: U2FsdGVkX18kNMWcsFKCkAeNtx/C9UQw4SW06dxk72eP1tESEC0bhyaOdypN1lTyNKAuR+rFccFPHrBI5A/uxzPx+M8TyxJr8jnan4lGsWYlliOrSwdUZN7JbGVOPKfGHqD/ZHtkfKxlAZXpmv8R6+VE+jfKvokXx/97XHObqFBm4ahHdTw9DQcV/xjkxHvkKwvmOG6aIq3uoivAsP0RHBr5gdwirOt5PywzRSfRc+EaO+prNhH5KfmovqzjhaI5KunJ3/MAmeR1PfrFcGPyZ/bzsdScLujEO4R2gO7/hsE6ysSalGpglOYbr2c2YhjJsx8wIJHA41hYJxwqQeREIqVbSnu3NZxqdcVW1RsbJtD/rpmjCYhI6jQ/XvbgmE0t/hA2tAA0F0NryyZQUEx/XIhWJEgfsY5JeMEL220nPG4SxXkj3wjDWraigQl9ouo9u1IKb9rKgjjVj3wRHl5UYCMwwk1xBhDKEJUDgnjzgF0jFQbG19NlMycfCqXcrR5ahTQRExKKg0oR30PlMWohAEv/uJhtMEfMc4tEh22kpfqQOWxvp8Sp9DmYSg/fddpVsWIYj88hVnFTVkGqZHdkkzQfwYYTkHIhZnOEdww4jeUTQ37n0/YFw+eLYMUtB/VFk6PfwmFCpYc87SgBGzCF1QN8r3q5Dz0IQEcOIBT97fLDRGJ0gH8Xx2UX5qBn/g4rxsEQbFFQWmFjMRguE7zGoNsa2Tfz3pXoqOR9esEC9zwdQSU9LJws6JAQegopeuTtXuVVQc5mK8afJeaL9It4WZsVyJzbL6BIQI1BeHnbuuGYNCKv/86Vfj6d+XW5Wb/VEMXG/ipQ0WueNzszAuFjkViYSUJP5I7/TugtffNFuGopFtzRuB1VBfJ90SU37AjlFRO8oMNGmlAFNCvS5cK4gX2TlS0qF1k6sbmDkSNYlbm3GeD5shL395oXiyHaW0sUX5IBLNT8/LtUIVjuJr1 5kFwrisA mrHJPCyxRSliF46QuTqzd0t8/pvomXfrHyvE92d5ehPAb6Q6XU83VbhNwZ5Xu8JISDIbGL+y1Q/mGlEcWj2oBPV5GK5YA59YWKa/b4v45d/5qTNVyV3qcGhI6Ac5I1kRdFG4Yd7XTIAmzHQxDyoQIXl7QnJdLC/lH1qP20AAVw7wub91L8DON/0r/ctxTr2LBrRk//bWNKBlUjWklBHGhwS8Apg== 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 Reviewed-by: David Hildenbrand Signed-off-by: Sumanth Korikkar --- drivers/s390/char/sclp_cmd.c | 41 ++++++++++++++++++++++++++++++------ 1 file changed, 35 insertions(+), 6 deletions(-) diff --git a/drivers/s390/char/sclp_cmd.c b/drivers/s390/char/sclp_cmd.c index 355e63e44e95..7815e9bea69a 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" @@ -340,13 +342,38 @@ 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_FINISH_OFFLINE notifiers. + * + * When altmap is in use, take the specified memory range + * online, which includes the altmap. + */ + if (arg->altmap_nr_pages) { + start = PFN_PHYS(arg->altmap_start_pfn); + size += PFN_PHYS(arg->altmap_nr_pages); + } rc = sclp_mem_change_state(start, size, 1); + if (rc || !arg->altmap_nr_pages) + 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: + /* + * When altmap is in use, take the specified memory range + * offline, which includes the altmap. + */ + if (arg->altmap_nr_pages) { + start = PFN_PHYS(arg->altmap_start_pfn); + size += PFN_PHYS(arg->altmap_nr_pages); + } sclp_mem_change_state(start, size, 0); break; default: @@ -397,7 +424,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.40.1