From patchwork Fri Jun 17 13:56:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Muchun Song X-Patchwork-Id: 12885725 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 1C215C433EF for ; Fri, 17 Jun 2022 13:58:21 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8C3476B0075; Fri, 17 Jun 2022 09:58:20 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 872C16B0078; Fri, 17 Jun 2022 09:58:20 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 73AE76B007B; Fri, 17 Jun 2022 09:58:20 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 64A4D6B0075 for ; Fri, 17 Jun 2022 09:58:20 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 1879735630 for ; Fri, 17 Jun 2022 13:58:20 +0000 (UTC) X-FDA: 79587882360.19.3428A7E Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by imf03.hostedemail.com (Postfix) with ESMTP id BBAF820082 for ; Fri, 17 Jun 2022 13:58:19 +0000 (UTC) Received: by mail-pl1-f181.google.com with SMTP id i15so3964388plr.1 for ; Fri, 17 Jun 2022 06:58:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=EMatSV1+t4qFy1NZ5GBQuBSsvAWCaC/xn6RiPVNR2iY=; b=DLgDdvgAiDYnxxGK0kizD0rVOn7tYa/8ez/L+HVhsX01j4WfdiAS7MSgpst303DfHZ L6bwt6PTV4zPEnsPg+50xx+ona2i2Z4YhG2RPzA+8j5v9tsVAUEMNYA3Yre14T6XU3pM degBA1XhN9KMMYkat8iu4BZrQ7o5IkOcQvskdrwGor6Zq+0VUBRw16zTxnzhEIcJrKPl 4rNIyaqVLioAyijg/u5Z7aYJALFk1ywKDQg91qhVk+b3uE9fjUzdfhf5YAps+gnpNfwb K4DLEfTi+hOkveRn5qccdXKv5l6xGzrZh6COVf3d6zLzpf/byrjioEGsEC3Ot3dCoAvL zg0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=EMatSV1+t4qFy1NZ5GBQuBSsvAWCaC/xn6RiPVNR2iY=; b=YCfCjYYIW8p9uqu1M7hXccqggRn3u+ziryujVCm5tfZP8H49P0fOfhfcQ7yOnUJFmc 7EAgxSJNbxnRD/GypEl0zzkZEHiXXS6iULbgmMJX1jmUjUOWSKFp3XYfjq0Xf53LqZvI oZQqjBilE3HtlC73oaY8Oq7bt2vUQJs0VY89pyP57txyetiWT1USrqj9JPROcQ+i6zUB NRiAltZ/ZyK8VxReknlI/PqwzNkcwlZx5INYxj1t4+MT4035iqmBijpkBoQ5hdGVjsaR Xuxs2T7uwrsjC57gK4bekNgagjoYFY7cGhT/G1blNx+zh7uMlttulvAvXquYoi+NDjq6 NrHg== X-Gm-Message-State: AJIora8i96ZPw/DdOzrhCLFCxSFAankyDISzDvAiwdkQ3QVvvNBY4eTc fNDeZcjySgOSTtiymVgQ3vtkCA== X-Google-Smtp-Source: AGRyM1vJNmuLAuXSWdMYIgHaMxFecDj98dF84vb69573D8juQRY+AEtOMLzRXelhvc3vm0JdgDSJ+w== X-Received: by 2002:a17:90b:164a:b0:1e8:8e0c:88dc with SMTP id il10-20020a17090b164a00b001e88e0c88dcmr10823433pjb.237.1655474298733; Fri, 17 Jun 2022 06:58:18 -0700 (PDT) Received: from FVFYT0MHHV2J.bytedance.net ([139.177.225.255]) by smtp.gmail.com with ESMTPSA id e3-20020a170903240300b0015e8d4eb277sm3605869plo.193.2022.06.17.06.58.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jun 2022 06:58:12 -0700 (PDT) From: Muchun Song To: akpm@linux-foundation.org, corbet@lwn.net, david@redhat.com, mike.kravetz@oracle.com, osalvador@suse.de, paulmck@kernel.org Cc: linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, duanxiongchun@bytedance.com, smuchun@gmail.com, Muchun Song Subject: [PATCH v3 1/2] mm: memory_hotplug: enumerate all supported section flags Date: Fri, 17 Jun 2022 21:56:49 +0800 Message-Id: <20220617135650.74901-2-songmuchun@bytedance.com> X-Mailer: git-send-email 2.32.1 (Apple Git-133) In-Reply-To: <20220617135650.74901-1-songmuchun@bytedance.com> References: <20220617135650.74901-1-songmuchun@bytedance.com> MIME-Version: 1.0 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1655474299; 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=EMatSV1+t4qFy1NZ5GBQuBSsvAWCaC/xn6RiPVNR2iY=; b=IBjemn8VMo2pIlpanQttdKEsQJ4M5DbXUekU6kGdmVIUjejBHCqhgKTRowutKhhuowv9ZH Ndz9M/9D7FqUw+6qmu3FBBo6+JNZXtZI7bjTQoyVOWqOzRdNo2wk/7fhm6x9VPg566LPKg zoT1XYbx+mR3yFaPZLNT0IwwtmRcBOw= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1655474299; a=rsa-sha256; cv=none; b=UDyhQ3vlMsxmTRGT5BSBQ2KH0cTbxS/x6Uh/AAW73ITRX82S0AADIVHagv6Ka6TbCHujHp V2QAc8SOrhMzGHSMXwuRJxioG6Ix/s5Tv+i3jmdIkTpY3g6eDGEfHZ4qkGvi3qo5cDKaI0 HnGglcwSyRC2xKELgQtLCWLP2HBxd/g= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=bytedance-com.20210112.gappssmtp.com header.s=20210112 header.b=DLgDdvgA; dmarc=pass (policy=none) header.from=bytedance.com; spf=pass (imf03.hostedemail.com: domain of songmuchun@bytedance.com designates 209.85.214.181 as permitted sender) smtp.mailfrom=songmuchun@bytedance.com X-Stat-Signature: w4ngshuxwuuxzkma7iko9d1f5tpesjyb X-Rspamd-Queue-Id: BBAF820082 Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=bytedance-com.20210112.gappssmtp.com header.s=20210112 header.b=DLgDdvgA; dmarc=pass (policy=none) header.from=bytedance.com; spf=pass (imf03.hostedemail.com: domain of songmuchun@bytedance.com designates 209.85.214.181 as permitted sender) smtp.mailfrom=songmuchun@bytedance.com X-Rspamd-Server: rspam01 X-Rspam-User: X-HE-Tag: 1655474299-554887 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: We are almost running out of section flags, only one bit is available in the worst case (powerpc with 256k pages). However, there are still some free bits (in ->section_mem_map) on other architectures (e.g. x86_64 has 10 bits available, arm64 has 8 bits available with worst case of 64K pages). We have hard coded those numbers in code, it is inconvenient to use those bits on other architectures except powerpc. So transfer those section flags to enumeration to make it easy to add new section flags in the future. Also, move SECTION_TAINT_ZONE_DEVICE into the scope of CONFIG_ZONE_DEVICE to save a bit on non-zone-device case. Signed-off-by: Muchun Song --- include/linux/mmzone.h | 44 +++++++++++++++++++++++++++++++++++--------- mm/memory_hotplug.c | 6 ++++++ mm/sparse.c | 2 +- 3 files changed, 42 insertions(+), 10 deletions(-) diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index aab70355d64f..932843c6459b 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -1418,16 +1418,35 @@ extern size_t mem_section_usage_size(void); * (equal SECTION_SIZE_BITS - PAGE_SHIFT), and the * worst combination is powerpc with 256k pages, * which results in PFN_SECTION_SHIFT equal 6. - * To sum it up, at least 6 bits are available. + * To sum it up, at least 6 bits are available on all architectures. + * However, we can exceed 6 bits on some other architectures except + * powerpc (e.g. 15 bits are available on x86_64, 13 bits are available + * with the worst case of 64K pages on arm64) if we make sure the + * exceeded bit is not applicable to powerpc. */ -#define SECTION_MARKED_PRESENT (1UL<<0) -#define SECTION_HAS_MEM_MAP (1UL<<1) -#define SECTION_IS_ONLINE (1UL<<2) -#define SECTION_IS_EARLY (1UL<<3) -#define SECTION_TAINT_ZONE_DEVICE (1UL<<4) -#define SECTION_MAP_LAST_BIT (1UL<<5) -#define SECTION_MAP_MASK (~(SECTION_MAP_LAST_BIT-1)) -#define SECTION_NID_SHIFT 6 +enum { + SECTION_MARKED_PRESENT_BIT, + SECTION_HAS_MEM_MAP_BIT, + SECTION_IS_ONLINE_BIT, + SECTION_IS_EARLY_BIT, +#ifdef CONFIG_ZONE_DEVICE + SECTION_TAINT_ZONE_DEVICE_BIT, +#endif + SECTION_MAP_LAST_BIT, +}; + +enum { + SECTION_MARKED_PRESENT = BIT(SECTION_MARKED_PRESENT_BIT), + SECTION_HAS_MEM_MAP = BIT(SECTION_HAS_MEM_MAP_BIT), + SECTION_IS_ONLINE = BIT(SECTION_IS_ONLINE_BIT), + SECTION_IS_EARLY = BIT(SECTION_IS_EARLY_BIT), +#ifdef CONFIG_ZONE_DEVICE + SECTION_TAINT_ZONE_DEVICE = BIT(SECTION_TAINT_ZONE_DEVICE_BIT), +#endif +}; + +#define SECTION_MAP_MASK (~(BIT(SECTION_MAP_LAST_BIT) - 1)) +#define SECTION_NID_SHIFT SECTION_MAP_LAST_BIT static inline struct page *__section_mem_map_addr(struct mem_section *section) { @@ -1466,12 +1485,19 @@ static inline int online_section(struct mem_section *section) return (section && (section->section_mem_map & SECTION_IS_ONLINE)); } +#ifdef CONFIG_ZONE_DEVICE static inline int online_device_section(struct mem_section *section) { unsigned long flags = SECTION_IS_ONLINE | SECTION_TAINT_ZONE_DEVICE; return section && ((section->section_mem_map & flags) == flags); } +#else +static inline int online_device_section(struct mem_section *section) +{ + return 0; +} +#endif static inline int online_section_nr(unsigned long nr) { diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 1f1a730c4499..6662b86e9e64 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -670,12 +670,18 @@ static void __meminit resize_pgdat_range(struct pglist_data *pgdat, unsigned lon } +#ifdef CONFIG_ZONE_DEVICE static void section_taint_zone_device(unsigned long pfn) { struct mem_section *ms = __pfn_to_section(pfn); ms->section_mem_map |= SECTION_TAINT_ZONE_DEVICE; } +#else +static inline void section_taint_zone_device(unsigned long pfn) +{ +} +#endif /* * Associate the pfn range with the given zone, initializing the memmaps diff --git a/mm/sparse.c b/mm/sparse.c index cb3bfae64036..e5a8a3a0edd7 100644 --- a/mm/sparse.c +++ b/mm/sparse.c @@ -281,7 +281,7 @@ static unsigned long sparse_encode_mem_map(struct page *mem_map, unsigned long p { unsigned long coded_mem_map = (unsigned long)(mem_map - (section_nr_to_pfn(pnum))); - BUILD_BUG_ON(SECTION_MAP_LAST_BIT > (1UL< PFN_SECTION_SHIFT); BUG_ON(coded_mem_map & ~SECTION_MAP_MASK); return coded_mem_map; }