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 DE2EEE95A91 for ; Mon, 9 Oct 2023 14:56:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6E6238D007C; Mon, 9 Oct 2023 10:56:13 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6966A8D0031; Mon, 9 Oct 2023 10:56:13 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 55DDE8D007C; Mon, 9 Oct 2023 10:56:13 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 44C268D0031 for ; Mon, 9 Oct 2023 10:56:13 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id F0E671602FF for ; Mon, 9 Oct 2023 14:56:12 +0000 (UTC) X-FDA: 81326223384.24.3A72AFA Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by imf05.hostedemail.com (Postfix) with ESMTP id 66384100013 for ; Mon, 9 Oct 2023 14:56:10 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=IenGN0dQ; spf=pass (imf05.hostedemail.com: domain of usama.arif@bytedance.com designates 209.85.221.51 as permitted sender) smtp.mailfrom=usama.arif@bytedance.com; dmarc=pass (policy=quarantine) header.from=bytedance.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1696863371; 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:references:dkim-signature; bh=fj3iSs9I07s+0bx1L727//TIOkD+aXcGIVkL4AdCGYI=; b=yqageLWVWbsEo+7NGlyPi5Q8br53dujknYXq+0htbg09tjwC2AjTi3BMPEKe0K4ZqqFGjg c/9iK1sbYn2Hmy3ac4m39n/8wIPmnjFIjl93+sKDTVN5vAoAZYXqBiDf5uBkONCli2c57I 9z+dzWU4RunuYBZXCxnhC53JhGxp8uQ= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1696863371; a=rsa-sha256; cv=none; b=xK6Pc1yTEL10NV+8uJiS837XG/qyp8KWH1mm95FMlTn+aKQd8eYZcGT090SLtaqnlj3sIB aaROBL9HoLwyufXTEC6s8wl1NEizcF3pgmLABursz2qlzUgfY3fH1pjjUarLDWNWpJXPWG 89JfHlIlmUAk3HRfSfxdBzbYp4Gwjos= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=IenGN0dQ; spf=pass (imf05.hostedemail.com: domain of usama.arif@bytedance.com designates 209.85.221.51 as permitted sender) smtp.mailfrom=usama.arif@bytedance.com; dmarc=pass (policy=quarantine) header.from=bytedance.com Received: by mail-wr1-f51.google.com with SMTP id ffacd0b85a97d-3231d6504e1so4300204f8f.2 for ; Mon, 09 Oct 2023 07:56:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1696863368; x=1697468168; darn=kvack.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=fj3iSs9I07s+0bx1L727//TIOkD+aXcGIVkL4AdCGYI=; b=IenGN0dQ2438/W9fzeT+IkVNLkWk2ML6Bx9J/qthHUBBZ5zOt00dBk+As2eq/nwx92 QHa60Uv7dX1eTxnRx7842k8djvBhaPTqvo8xgxLKd7WZNbqofuQRz2AlB055GIPk5bD+ 4auI64dozw9wDZG9jOcwklCuI5dcElQUY4uAFnUI+I82v8XRaKxUv/BL/cp6y9OcQ16v gL1MqSIlIIxMu2uToweSdIXDJ+5Pr6aHiP4uSP2PT50xmfJBSJoVvdhpn2SPvigZ13OR KPmC4MkOwkaMsGswJcF7GxYVIELyI+/w3K4dkWhGxxns7qNeZvAITRQIio7db/j7+dgv 1WlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696863368; x=1697468168; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=fj3iSs9I07s+0bx1L727//TIOkD+aXcGIVkL4AdCGYI=; b=IuIchFvvfAKbPuxrZDIDo/AC+hxR4ILh++h/PyzJS3R6F6vSko1NNXfM8Tj9EuLZh7 lFegnOHG/XyuEo0HHq994oLC7VySPZKbjxZUcZravliIK46kTvpg3bptqsg/b6Y7SzEg uZfhNAPiaj8/m+xVhK87S7yXQZxRJmMOK8kJKXRtM7H/ELNxJgbk9asToM3tt7Qz0nu+ x5ZUTljBY8bHkOD8iqILBZFjbIPsMY8yLmTlLj4ayYlU1axnKT6xOkqEU9oIR9Dh2hZm MMx5ZwfAnQB0c3QTdeBG/Am/JURiPo1SdMbLsPCfhTdsYQX8cUsAm4S7ei8NElQBvXgb 5INw== X-Gm-Message-State: AOJu0Yw25HGUhoucxZB4axczjmA4R7Y/RBrfuanDRYO9lT41YS2V1iPJ E/RtnGpqBPIC6FPII4YgrvzIi9kWkoRSKGoTQ1I= X-Google-Smtp-Source: AGHT+IHYSLObDLoA/qdhIh1iRz1HOR4N6RSOT4pgLJFX08n15tZbBT/CIBftt0i9sEERyIi1aEqhhQ== X-Received: by 2002:adf:fb0b:0:b0:31f:c1b5:d4c1 with SMTP id c11-20020adffb0b000000b0031fc1b5d4c1mr12721447wrr.35.1696863368447; Mon, 09 Oct 2023 07:56:08 -0700 (PDT) Received: from localhost.localdomain ([2a02:6b6a:b5c7:0:c1b1:1479:6449:a1ff]) by smtp.gmail.com with ESMTPSA id g7-20020a5d5407000000b00327df8fcbd9sm9965173wrv.9.2023.10.09.07.56.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 07:56:08 -0700 (PDT) From: Usama Arif To: linux-mm@kvack.org Cc: linux-kernel@vger.kernel.org, akpm@linux-foundation.org, muchun.song@linux.dev, mike.kravetz@oracle.com, songmuchun@bytedance.com, fam.zheng@bytedance.com, liangma@liangbit.com, punit.agrawal@bytedance.com, Usama Arif Subject: [PATCH] mm: hugetlb: Only prep and add allocated folios for non-gigantic pages Date: Mon, 9 Oct 2023 15:56:05 +0100 Message-Id: <20231009145605.2150897-1-usama.arif@bytedance.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Stat-Signature: np4j7xsxcf95pmisrnhgezic94az7oju X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 66384100013 X-Rspam-User: X-HE-Tag: 1696863370-525110 X-HE-Meta: U2FsdGVkX19f60t2iyBwko2wImxCloCye3Xmwc9a6xmUCBzjEsEhLmtQnAjAwMxKWIMgIbhodcC6Z4ircFNBqUxyV9yLy8hxEG/dUcwyGWBtSrS7JCSCFhMB1AE+FrYICVW9pv2vCiJluBi8S29EwYZuSjm0Y7a1jXGk1Gv28bMnHgqsO6YUHFMsiJvgUi78SX0agQo0TWiKpTpk5X4KWthlAro3sslXIUX9Otkf0Fe26WmvQKtb55BRFHfQsaWXFuHFYjp8/Tr3UdNQXTwgKVT78SlQ9acciBLkrPqy4kKU4sF0wyoP+imfv6vm2o9gmk1pvbNdOlVKuiT6pAxnI/ODoUnI9UcBduB6muvhu+1gEEPnLugyWSxoue9UGyjTINRNFY3r6i2OK/MxGFMZOfhurwLR1Rqw+XnTM1af77qcInuzAtOW9JLjQh9EcS2q/T8sQEyFltPjDVrrbyc4qLzQ9xfTVxgftIxJPOEIRbYipFU8nO0UK8vERT/ztrmhuQoHFyig3Fgi0UM7LnDFujkf7wF65MPibpLMtqS7axCyw6yGeLPeoepbMbWNk/eAZKJzcJOQ2yRgk9w+sF63l2k8k58hh2tPuBYuMgoekV+3IdHURC8azVxadntmCEIW91FadfeLVgZ3+AL0tiDPfNEDyXgjNzFIlOx9O+Pr7oOa9kfCXwgSu89JCJH0kOpsSP7UPY+n0FR/9aQXFmSY6PRfixKk2GX7s1P4PtCMQSEEKry9maywusJvUWyPa8rPgcc8BKfSANTAMyfPWhi7ZtREPUD2F7wwKk4cazzLSxPZRWVxzzFamlUqZ6jWlDWlNxAioW460cEsQFhKRb4CrQ1XkkGP8F5oXqZHs9JCYCjxg3NSdHhiYOTMt3N/6HovkKB35miDoqOh6ERC1c8oSWH/sBRRzU0i+0zyzR9YG2Cd7SKWH+7kCDz2NcMMgFrcAvh0jAm3aLlp0hZfuO3 2U8xnan/ yPtkkmqHgp7LY0yYeya1ho9g3Ys1hrMXU22O2M7rjuIhvqsThhDO0QMlo0yXwSPmSvDA7492csgsvm2ANPZInKGHI3uMh9GxPi9GvOBTupqQHsLMyhK73uuwCFmc7hvbjtJupmMYOWhpljmc1AtVWV9potmadunCysfcMUvwV+0HqWdq3C+ujACMUnRaTgaHdeHEZ4gXje6Lv33Cn3dXzgsDjAxycTjCdzdY+DzVwZLhdavVvYgWAbiwF0U4jfVaIzeBL2AKe0xGsEl3GO187xy8hRVli9Mdw5jBHpORfgMqYSROvkmWSOQlrr6898qO1l0q062voZ0I8Z6puF5jGayLW78e+bFurqvDKlXNqQ1XfqrMEX0htG3CjwoY8RmHQ+0BtGsVd4Sz6ZNBGNRuBreJgIwbcz8EuisCNBepO3aCRMk8= X-Bogosity: Ham, tests=bogofilter, spamicity=0.024424, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Calling prep_and_add_allocated_folios when allocating gigantic pages at boot time causes the kernel to crash as folio_list is empty and iterating it causes a NULL pointer dereference. Call this only for non-gigantic pages when folio_list has entires. Fixes: bfb41d6b2fe148 ("hugetlb: restructure pool allocations") Signed-off-by: Usama Arif --- mm/hugetlb.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index f3749fc125d4..b12f5fd295bb 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -3397,7 +3397,8 @@ static void __init hugetlb_hstate_alloc_pages(struct hstate *h) } /* list will be empty if hstate_is_gigantic */ - prep_and_add_allocated_folios(h, &folio_list); + if (!hstate_is_gigantic(h)) + prep_and_add_allocated_folios(h, &folio_list); if (i < h->max_huge_pages) { char buf[32]; -- 2.25.1