From patchwork Fri Mar 21 07:00:19 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhenhua Huang X-Patchwork-Id: 14024899 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 B3BC4C35FF3 for ; Fri, 21 Mar 2025 07:00:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2618C280002; Fri, 21 Mar 2025 03:00:57 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 210C8280001; Fri, 21 Mar 2025 03:00:57 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0E69F280002; Fri, 21 Mar 2025 03:00:57 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id E2AC6280001 for ; Fri, 21 Mar 2025 03:00:56 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id ABC331A2146 for ; Fri, 21 Mar 2025 07:00:57 +0000 (UTC) X-FDA: 83244660954.14.5D669D0 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) by imf15.hostedemail.com (Postfix) with ESMTP id 79665A0020 for ; Fri, 21 Mar 2025 07:00:55 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=quicinc.com header.s=qcppdkim1 header.b=GJr3cUVl; dmarc=pass (policy=none) header.from=quicinc.com; spf=pass (imf15.hostedemail.com: domain of quic_zhenhuah@quicinc.com designates 205.220.180.131 as permitted sender) smtp.mailfrom=quic_zhenhuah@quicinc.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1742540455; 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: references:dkim-signature; bh=PK0BeTHmcdd/qcMUUN81vS2AduMCdU/azMiQVglHyhE=; b=diiEUFOqCZ++LFnMugprZxI0ZW1740ij/LZ35hGrc555u5FptGdJInCYJc7MGENet37NpM +zGfTifHHW0maegCjE2gocQi67QxsT+ZtdFsqM7Y9iK9wo3Q6kLXoRlzW7zi2t4DZo/Sa6 RV64UauNFfJLaqBQ/MRo8qavjgJ8ExQ= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1742540455; a=rsa-sha256; cv=none; b=RzT3KASyzGMfkMVL+dYLMS/68AUFV70xzjHWpIF+2yWmtzEnuRSyI+yS/DL7gd/b3AqGkY R+z2hvRNdjjMxpVBAtZi0j4wV7aVYgzJ4SnWGIdBfkL3eLfSgJmpvtfFsgQCnZN0Jac2Qw X+GT3Nf9iMlP+U60dzc7ehD6FrGbzu4= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=quicinc.com header.s=qcppdkim1 header.b=GJr3cUVl; dmarc=pass (policy=none) header.from=quicinc.com; spf=pass (imf15.hostedemail.com: domain of quic_zhenhuah@quicinc.com designates 205.220.180.131 as permitted sender) smtp.mailfrom=quic_zhenhuah@quicinc.com Received: from pps.filterd (m0279873.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 52L1WgjF030882; Fri, 21 Mar 2025 07:00:43 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h= cc:content-transfer-encoding:content-type:date:from:message-id :mime-version:subject:to; s=qcppdkim1; bh=PK0BeTHmcdd/qcMUUN81vS 2AduMCdU/azMiQVglHyhE=; b=GJr3cUVlt7col3IiWsW0y4BBvH5RvRnMOuO6c8 bYOK5zygh5lMqrFFFKdGkt6b/83EnIiX6tHRzpZ7K8hAuhZ6uqKqTRzm6XsGKYtQ lPexFlYYEqr9/Qf8p9OuoKf2Bb3nO+CT1k5Jzy7f7rzIHx8QJt4nFhdqTjASYVxr XrnIvqYBmch1ypzP5gV6mSIfQeGUBH4E+3eF1c2m/l2B4OVJAgzHMIRyXBd37lgm H3JGm5LtDz7er3GijXdKRYksIFzZ15t+6NtDrZYfpNr8fPvixdQDCoj0QoDN2Gie cCpukVTfS4hvfvVIXXG3ON7/TSr7Bn8LiiDPS46Oj/zrFb3g== Received: from nalasppmta05.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 45gcd1bw5j-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 21 Mar 2025 07:00:42 +0000 (GMT) Received: from nalasex01a.na.qualcomm.com (nalasex01a.na.qualcomm.com [10.47.209.196]) by NALASPPMTA05.qualcomm.com (8.18.1.2/8.18.1.2) with ESMTPS id 52L70g6H010467 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 21 Mar 2025 07:00:42 GMT Received: from ap-kernel-sh01-lnx.qualcomm.com (10.80.80.8) by nalasex01a.na.qualcomm.com (10.47.209.196) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.9; Fri, 21 Mar 2025 00:00:37 -0700 From: Zhenhua Huang To: , , , , , , , , , , , , CC: , , , Subject: [PATCH] arm64: mm: Correct the update of max_pfn Date: Fri, 21 Mar 2025 15:00:19 +0800 Message-ID: <20250321070019.1271859-1-quic_zhenhuah@quicinc.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: nasanex01a.na.qualcomm.com (10.52.223.231) To nalasex01a.na.qualcomm.com (10.47.209.196) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Authority-Analysis: v=2.4 cv=bfFrUPPB c=1 sm=1 tr=0 ts=67dd0e9b cx=c_pps a=ouPCqIW2jiPt+lZRy3xVPw==:117 a=ouPCqIW2jiPt+lZRy3xVPw==:17 a=GEpy-HfZoHoA:10 a=Vs1iUdzkB0EA:10 a=COk6AnOGAAAA:8 a=ZcgGWeM3x-1IUL8PSGgA:9 a=TjNXssC_j7lpFel5tvFf:22 X-Proofpoint-GUID: vhqnlhEx7zteyR5jia7Iia7zm_iS-JR7 X-Proofpoint-ORIG-GUID: vhqnlhEx7zteyR5jia7Iia7zm_iS-JR7 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1093,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-03-21_02,2025-03-20_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 impostorscore=0 clxscore=1011 suspectscore=0 malwarescore=0 bulkscore=0 mlxlogscore=576 priorityscore=1501 lowpriorityscore=0 mlxscore=0 adultscore=0 phishscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2502280000 definitions=main-2503210049 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 79665A0020 X-Stat-Signature: nd658pos8jeqhdhxcb3kgng19erq9h1b X-Rspam-User: X-HE-Tag: 1742540455-151695 X-HE-Meta: U2FsdGVkX1+1tgycpKoAUy+BC4n7lGgn9iYHgjP7kzgSdssVulVc6TEqtgV+rVIo7Rl93dPDBEeNCJ5IUOa+TvZ5H55UfNK0zcyupcASRcUpGGCACyj+GwGDhTn6Dze5k7t/ctZBtQbHnuwtRUCAYxn5z7DhJg9Kv5fXUUWbKVAXJkVXqJ30/H9A5arhGfqrveFQnIk1PC3FYJdm7B+Nmv0NlFtR2OtcLS42osbmbg7DBQnHj8PEyrBRFOMYDjcg2pf8W8TqAtodTyXarNJYMX46K0aSSnvvUf+nemMyZfPFFSoT36aO50PXdgXsZzbFBX7popWAkhDyaHFYjiKTh7i55zqnI5jNULn8QXCj38rybqFXpAz4Mtm7upG4IZP7tW77BHgWfmTtXZFdUZI2OchBTltHRJJ93XL9Fjh1jCLvJIUkhjxOGn0OsmalOt8e5B1mVbbYRIcNIBc19gak1Y+MDMUcHxWaQOLaJCymVi9nY5pUnK3k6zkNr6w12+ZLf4sJvBnkpZmJirq2IvgL4Ap5omYFL7fD/2STeXpT4LfybHN1+WX9O9cOjG0QMIjny3b6PWEzjkoevb2jeNRgpsSMb07DLGOtDmysOWCYx3uMl5lvnkAHSIDDRwTkoD6BIb3UCdcXCG8YobmL0tCV3N1QCS6NEaOmWmxj+/EHdoz805CBsFRwtGc6id76GPo4W1GjTh03KHz9b09LWkVEz8cukbx0LmjfoZzGaM37DoUKe3rKrA5H++A8wHHoaejT3izntvm4bbJg4gkChXSTS2RmLqms23ZtduF7mIhRbhEB53gqLgItIgCjyHKtqG3cXRREi/GX0vyyLswGv+t5ZBfyidlih6hYk6DD8z2+2cwHYgLcnNDb41+dvStqBwY4WXX78jAC5GasFRSLHXGTL0pfHGgxs1fd6VIgEmWIF3GqqsuX0Kz6zIZMKbmRPELwnerfgRmHwZ2DoEHLn4/ S8+YCQht EUir244dtUqch1iWhEeMhosr2pgFDE6qPss+P1IFohuH77eDYwuR0T+MuGmJen5770M8wVaIMlBdRXMKAqsKXIl+tB4Cd2HF8LFVTb2Q33/KhLYjGl5moI1bv+H3EwJdAjtbVVLWRhChmYyfDMn0tcvfIP8wWLJbIUJQaQnd5BctjjeihVuIASZpmEqdWwptOuamioyDBd8EU89mIHBh5H5wGnnu7dGO6reuTxuFeT9uKJurMfICJdIkJi3sztc352f4wVeCsxqX1RIDEeeg/vF04Hnj2H6xBrZuYO77MPg9bebNAfnQ/T/17H9bxY2BAwBkJBn8n9LYm1pebnGR0fJJo+4qQ4i+s7cS54hvqpI2cl7NU697rDzZb1e9WqwnYT4JluQfDB1PEPlCPYoift0Cjag== 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: Hotplugged memory can be smaller than the original memory. For example, on my target: root@genericarmv8:~# cat /sys/kernel/debug/memblock/memory 0: 0x0000000064005000..0x0000000064023fff 0 NOMAP 1: 0x0000000064400000..0x00000000647fffff 0 NOMAP 2: 0x0000000068000000..0x000000006fffffff 0 DRV_MNG 3: 0x0000000088800000..0x0000000094ffefff 0 NONE 4: 0x0000000094fff000..0x0000000094ffffff 0 NOMAP max_pfn will affect read_page_owner. Therefore, it should first compare and then select the larger value for max_pfn. Fixes: 8fac67ca236b ("arm64: mm: update max_pfn after memory hotplug") Signed-off-by: Zhenhua Huang Acked-by: David Hildenbrand Reviewed-by: Anshuman Khandual Acked-by: David Hildenbrand --- arch/arm64/mm/mmu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c index 1dfe1a8efdbe..310ff75891ef 100644 --- a/arch/arm64/mm/mmu.c +++ b/arch/arm64/mm/mmu.c @@ -1361,7 +1361,8 @@ int arch_add_memory(int nid, u64 start, u64 size, __remove_pgd_mapping(swapper_pg_dir, __phys_to_virt(start), size); else { - max_pfn = PFN_UP(start + size); + /* Address of hotplugged memory can be smaller */ + max_pfn = max(max_pfn, PFN_UP(start + size)); max_low_pfn = max_pfn; }