From patchwork Tue Oct 17 05:44:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Verma, Vishal L" X-Patchwork-Id: 153917 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp3917612vqb; Mon, 16 Oct 2023 22:46:26 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGvDXex2ZP2mOx8YY3O+nzNSv8dHPki0cmZ9c4mvfxLeQlIFlfs3lJSBG/cDYG9wPA8wx/y X-Received: by 2002:a17:90b:4c11:b0:27d:193f:2130 with SMTP id na17-20020a17090b4c1100b0027d193f2130mr1349315pjb.3.1697521586438; Mon, 16 Oct 2023 22:46:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697521586; cv=none; d=google.com; s=arc-20160816; b=jHBTPQRnyfPKBEAjZAt5wRYvgmbzeyLCUCf0CCHpuTorPydp1WpQKlP0w4ff5Ydh1m ZuLqUvurJYUNKmIgoaiv58z9Ns+8szTDI8Jb7M4w5VhdbJM0vct/NUphKT1YE+MwTKMM bjA/qLmihP+qO9Wc+0Be0+b5G9QIBZ5UU5jql8d7Y/MVwUEsuhSLsPv88A89TOovYjoN ke0Q8kMihiF+PLYTjhieWgL1ZPIFhpDnSB0AEQYFcKa0NlrIllbJkM2ymbhdCVRwyYtO jcy9JTQA5DOCS/q22ysd1+1F8+7Xq+P6BVUmGvGW7EghQcqbPadLwBdVhK9dQiafCbd0 ijGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=buHYE9iI5wmsfHflMRRj91GyBS9pR6io2qcsf3d9XS4=; fh=ZJyl7lGIgKsdPRNZ+hASCGqYu4kS00HsOWlg75WSZ6w=; b=MGRlyCEKgWqn7HmBVqPTkAVmkbKBAysXdFx606nhysE16Oueyoy0uEua3gNQajB0wU tfzWUxkPeeAy/IyST1bOBGXf2hHS4D3Ckw1EEfFgc8xjwVUl5+UNG82o/G2P8HxnlUWL tPyKzUTiBvmKIa56nv+FPaHifr3tnu5MV8ZB4OQ5IgpImHhsJoQVMxf4l1qVm6fU4QlC wDiUgw5dL1FB+i7kxgz3oPsKUVk1I2ndvIVZ5+vYJtCI5f8xjejHVG3Fe6SgwokhBNeK i3MwRT5lnpysKvFzAayvRkP8SvM1YqiRXBIVX5/KZpmYUM/uAZT54mFkPT/LTaELk1FE eDMw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Pqek7vR5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id er23-20020a17090af6d700b00268178130a2si926321pjb.60.2023.10.16.22.46.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Oct 2023 22:46:26 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Pqek7vR5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id D61D0807479F; Mon, 16 Oct 2023 22:45:23 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230343AbjJQFpO (ORCPT + 19 others); Tue, 17 Oct 2023 01:45:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39518 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234451AbjJQFpJ (ORCPT ); Tue, 17 Oct 2023 01:45:09 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EC643EA; Mon, 16 Oct 2023 22:45:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1697521507; x=1729057507; h=from:date:subject:mime-version:content-transfer-encoding: message-id:references:in-reply-to:to:cc; bh=jE1m85E7fxIhhpuuUBH8EL0PB4Icod+o0o4Ao4dEZ0w=; b=Pqek7vR5tmoaaLHRZmec/CVgU/g6HX/alx5ZNRDihOsG35aD+vC+e2fA t0x8IzMpuI6vvAq6IIF6Vn8PMfE4dO1+YL1wONYFO7dqf8FWgWYgCt0GB o5DYd2WUj+rgtrGyx6yiNz+8BqWPtF9+lDUSGZjEqDKFrD9S2q1c7FlwM R0z0VbyooV+LwTf4Z+wYj+DvpKsjYG3T3q9BnKXI1ZAnC/3AaorZ9e5sF gnAPm7Vm5KVwp5NPJPKsxQGN9fSerA6X2ihWLmj7YOOyGoIl9267xGA2/ 7KEwX0QmQaeuSsJTyamtQX5Qm15rkn817zBgJ8eEGbqcda0AkeZPIuf4R Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10865"; a="384580751" X-IronPort-AV: E=Sophos;i="6.03,231,1694761200"; d="scan'208";a="384580751" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Oct 2023 22:45:06 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10865"; a="879694022" X-IronPort-AV: E=Sophos;i="6.03,231,1694761200"; d="scan'208";a="879694022" Received: from mjwirth-mobl.amr.corp.intel.com (HELO [192.168.1.200]) ([10.209.151.162]) by orsmga004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Oct 2023 22:45:02 -0700 From: Vishal Verma Date: Mon, 16 Oct 2023 23:44:55 -0600 Subject: [PATCH v6 1/3] mm/memory_hotplug: replace an open-coded kmemdup() in add_memory_resource() MIME-Version: 1.0 Message-Id: <20231016-vv-kmem_memmap-v6-1-078f0d3c0371@intel.com> References: <20231016-vv-kmem_memmap-v6-0-078f0d3c0371@intel.com> In-Reply-To: <20231016-vv-kmem_memmap-v6-0-078f0d3c0371@intel.com> To: Andrew Morton , David Hildenbrand , Oscar Salvador , Dan Williams , Dave Jiang Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, nvdimm@lists.linux.dev, linux-cxl@vger.kernel.org, Huang Ying , Dave Hansen , "Aneesh Kumar K.V" , Michal Hocko , Jonathan Cameron , Jeff Moyer , Vishal Verma X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=1311; i=vishal.l.verma@intel.com; h=from:subject:message-id; bh=jE1m85E7fxIhhpuuUBH8EL0PB4Icod+o0o4Ao4dEZ0w=; b=owGbwMvMwCXGf25diOft7jLG02pJDKl68jGKGn4bTxx1ebOqYNu6jh2vbXTSVs2Z/qryjOmFo KyTKpUmHaUsDGJcDLJiiix/93xkPCa3PZ8nMMERZg4rE8gQBi5OAZiIjgvDP8vfOR817jvMuqcp dK6592xXD8/HW2dSDdl9X3+bPs/AsZjhv5d+mfdFW7u/SxvW+W/I0nmkLHRYricuNbr191vtRba cTAA= X-Developer-Key: i=vishal.l.verma@intel.com; a=openpgp; fpr=F8682BE134C67A12332A2ED07AFA61BEA3B84DFF X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Mon, 16 Oct 2023 22:45:23 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779980394834185066 X-GMAIL-MSGID: 1779980394834185066 A review of the memmap_on_memory modifications to add_memory_resource() revealed an instance of an open-coded kmemdup(). Replace it with kmemdup(). Cc: Andrew Morton Cc: David Hildenbrand Cc: Michal Hocko Cc: Oscar Salvador Cc: Dan Williams Reported-by: Dan Williams Signed-off-by: Vishal Verma Reviewed-by: David Hildenbrand --- mm/memory_hotplug.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index f8d3e7427e32..6be7de9efa55 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -1439,11 +1439,11 @@ int __ref add_memory_resource(int nid, struct resource *res, mhp_t mhp_flags) if (mhp_flags & MHP_MEMMAP_ON_MEMORY) { if (mhp_supports_memmap_on_memory(size)) { mhp_altmap.free = memory_block_memmap_on_memory_pages(); - params.altmap = kmalloc(sizeof(struct vmem_altmap), GFP_KERNEL); + params.altmap = kmemdup(&mhp_altmap, + sizeof(struct vmem_altmap), + GFP_KERNEL); if (!params.altmap) goto error; - - memcpy(params.altmap, &mhp_altmap, sizeof(mhp_altmap)); } /* fallback to not using altmap */ } From patchwork Tue Oct 17 05:44:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Verma, Vishal L" X-Patchwork-Id: 153918 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp3917710vqb; Mon, 16 Oct 2023 22:46:42 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFMK0ImPXDlrSL+6qnhuQAw7owf6Hq+UOMoLB+cfod0CGhaT7XKQ/2vms7vVzCWFNpIRqG3 X-Received: by 2002:a05:6a00:2a41:b0:6bc:67ca:671d with SMTP id cf1-20020a056a002a4100b006bc67ca671dmr1241534pfb.1.1697521602046; Mon, 16 Oct 2023 22:46:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697521602; cv=none; d=google.com; s=arc-20160816; b=NDFoaZ2Wq4++9CcX6SuQU/eTZhiIlWc3UBuhlcQOREgS+k4r5kEt0NXICyvs3DEJe5 YmaXpVeAebdTQ+tmL9m3PkHL+qBXJdZxG/JBmZ/QKNluDOUZKnFNnAGxpufUGiT8SHnJ dQtZpsbUtiYDlta2kmZzrqb5dmMLlMyBbs8p2/XMcC+1cY0t82XH2pWorcQb6lI8WQyk Zm+SMsHSwUeVax7Bje14Gr4iYP3cLflWxORFdYWWoiBxTDrqfQDr/D+rycmPjW3jD1aS ei5Hz8forrfOKZa8GBqYiJKg3vUlNQQ1hbjIRIbUobkRRpP6h5qFCNaTYqvKsID4w4/c zOGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=XIctJZRnAvCF4SLkfSsIe0u0/HLNJDk/NHMQh7de5b0=; fh=ZJyl7lGIgKsdPRNZ+hASCGqYu4kS00HsOWlg75WSZ6w=; b=k1E99coQVyVUUc5HbcX3rJ8EjQpesxmxh1KygTkg36NY6/LdzteaaNAZIzyl6tSMS3 5qgpRO9uKZusBaRJ2z8ElSnzvJkDiL2COBK38f788mkl9jsZ5OXg5k4/HRdi8h4MP6Xn gBVw7RjVUy6PxYnzp113f+OKNbDMP2d5dHObYsvhJxCgnw2a0Uh9WbATXSb2plYZaAjf 7yad4M7l1pQ0hHNKgC5lB28FgKDrxH8Z2PIphz0CJRiAwGcCrSrYRRkJF/n2bgHfBZx3 hjiqYrR31fcaewn6qL0JXY5b7Ezvvp6zeIuubNjlzFlNTlf75XfgdGZKmCYpMlMSNonx XUnw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=CsdSQOCN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from groat.vger.email (groat.vger.email. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id z29-20020aa7949d000000b00690f9e835d8si888568pfk.132.2023.10.16.22.46.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Oct 2023 22:46:42 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=CsdSQOCN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id D7E7F8078309; Mon, 16 Oct 2023 22:45:33 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234498AbjJQFpW (ORCPT + 19 others); Tue, 17 Oct 2023 01:45:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39590 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234467AbjJQFpK (ORCPT ); Tue, 17 Oct 2023 01:45:10 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0BA33EB; Mon, 16 Oct 2023 22:45:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1697521508; x=1729057508; h=from:date:subject:mime-version:content-transfer-encoding: message-id:references:in-reply-to:to:cc; bh=Lq39RP77AGx79p/R4lwUeEqGvV0zLaTcEMTevTVFlkc=; b=CsdSQOCNQR+GlY1vecncX5FoVqlzZsdCkxoVmDa7b45lArJkz0c39vVn 3BN0t11/cih9Bkci/WsiXfNZhbKjJgppZuVmYNK2XZvBbZr2Bms+4CyfY 75VmyqEwlD794I4mMmu+OxcdLT7XM4eH6UwGIgCED7tbk+8qh3r7+zBu2 QW0Fy0pipN4VYnUWfgma3nl3AG/wi5EArWhT3H0RZZX1/SJHGTVZl18yK +CPCsls6WJk0RSI8lAqJGckXPJbrbewuxvT9vEam0WEOT7TYz8Mw2PU1Q HZ9pn0lI/LRry3kGTy5Q5+YufLKv984uUnjZ6PaYJihtUgGrYQF0l5LwA g==; X-IronPort-AV: E=McAfee;i="6600,9927,10865"; a="384580760" X-IronPort-AV: E=Sophos;i="6.03,231,1694761200"; d="scan'208";a="384580760" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Oct 2023 22:45:07 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10865"; a="879694028" X-IronPort-AV: E=Sophos;i="6.03,231,1694761200"; d="scan'208";a="879694028" Received: from mjwirth-mobl.amr.corp.intel.com (HELO [192.168.1.200]) ([10.209.151.162]) by orsmga004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Oct 2023 22:45:03 -0700 From: Vishal Verma Date: Mon, 16 Oct 2023 23:44:56 -0600 Subject: [PATCH v6 2/3] mm/memory_hotplug: split memmap_on_memory requests across memblocks MIME-Version: 1.0 Message-Id: <20231016-vv-kmem_memmap-v6-2-078f0d3c0371@intel.com> References: <20231016-vv-kmem_memmap-v6-0-078f0d3c0371@intel.com> In-Reply-To: <20231016-vv-kmem_memmap-v6-0-078f0d3c0371@intel.com> To: Andrew Morton , David Hildenbrand , Oscar Salvador , Dan Williams , Dave Jiang Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, nvdimm@lists.linux.dev, linux-cxl@vger.kernel.org, Huang Ying , Dave Hansen , "Aneesh Kumar K.V" , Michal Hocko , Jonathan Cameron , Jeff Moyer , Vishal Verma X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=9952; i=vishal.l.verma@intel.com; h=from:subject:message-id; bh=Lq39RP77AGx79p/R4lwUeEqGvV0zLaTcEMTevTVFlkc=; b=owGbwMvMwCXGf25diOft7jLG02pJDKl68jFqF6OYWHfL2patP9zwmjXKN3l1vZSNN8f1DX/85 5ke2r+1o5SFQYyLQVZMkeXvno+Mx+S25/MEJjjCzGFlAhnCwMUpABPJUmP4K9m0/j+T8YVPvx6o 3Xrq5PXw2RLm51K+3Vt3rXvI0HfmpSlQRaXxla1ltxb+USp/ynjofJbxrCX8J+NPXXPXXrdILsi ACQA= X-Developer-Key: i=vishal.l.verma@intel.com; a=openpgp; fpr=F8682BE134C67A12332A2ED07AFA61BEA3B84DFF X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Mon, 16 Oct 2023 22:45:33 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779980411284048686 X-GMAIL-MSGID: 1779980411284048686 The MHP_MEMMAP_ON_MEMORY flag for hotplugged memory is restricted to 'memblock_size' chunks of memory being added. Adding a larger span of memory precludes memmap_on_memory semantics. For users of hotplug such as kmem, large amounts of memory might get added from the CXL subsystem. In some cases, this amount may exceed the available 'main memory' to store the memmap for the memory being added. In this case, it is useful to have a way to place the memmap on the memory being added, even if it means splitting the addition into memblock-sized chunks. Change add_memory_resource() to loop over memblock-sized chunks of memory if caller requested memmap_on_memory, and if other conditions for it are met. Teach try_remove_memory() to also expect that a memory range being removed might have been split up into memblock sized chunks, and to loop through those as needed. This does preclude being able to use PUD mappings in the direct map; a proposal to how this could be optimized in the future is laid out here[1]. [1]: https://lore.kernel.org/linux-mm/b6753402-2de9-25b2-36e9-eacd49752b19@redhat.com/ Cc: Andrew Morton Cc: David Hildenbrand Cc: Michal Hocko Cc: Oscar Salvador Cc: Dan Williams Cc: Dave Jiang Cc: Dave Hansen Cc: Huang Ying Suggested-by: David Hildenbrand Reviewed-by: Dan Williams Signed-off-by: Vishal Verma --- mm/memory_hotplug.c | 214 ++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 148 insertions(+), 66 deletions(-) diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 6be7de9efa55..83e5ec377aad 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -1380,6 +1380,43 @@ static bool mhp_supports_memmap_on_memory(unsigned long size) return arch_supports_memmap_on_memory(vmemmap_size); } +static int add_memory_create_devices(int nid, struct memory_group *group, + u64 start, u64 size, mhp_t mhp_flags) +{ + struct mhp_params params = { .pgprot = pgprot_mhp(PAGE_KERNEL) }; + struct vmem_altmap mhp_altmap = { + .base_pfn = PHYS_PFN(start), + .end_pfn = PHYS_PFN(start + size - 1), + }; + int ret; + + if ((mhp_flags & MHP_MEMMAP_ON_MEMORY)) { + mhp_altmap.free = memory_block_memmap_on_memory_pages(); + params.altmap = kmemdup(&mhp_altmap, sizeof(struct vmem_altmap), + GFP_KERNEL); + if (!params.altmap) + return -ENOMEM; + } + + /* call arch's memory hotadd */ + ret = arch_add_memory(nid, start, size, ¶ms); + if (ret < 0) + goto error; + + /* create memory block devices after memory was added */ + ret = create_memory_block_devices(start, size, params.altmap, group); + if (ret) + goto err_bdev; + + return 0; + +err_bdev: + arch_remove_memory(start, size, NULL); +error: + kfree(params.altmap); + return ret; +} + /* * NOTE: The caller must call lock_device_hotplug() to serialize hotplug * and online/offline operations (triggered e.g. by sysfs). @@ -1388,14 +1425,10 @@ static bool mhp_supports_memmap_on_memory(unsigned long size) */ int __ref add_memory_resource(int nid, struct resource *res, mhp_t mhp_flags) { - struct mhp_params params = { .pgprot = pgprot_mhp(PAGE_KERNEL) }; + unsigned long memblock_size = memory_block_size_bytes(); enum memblock_flags memblock_flags = MEMBLOCK_NONE; - struct vmem_altmap mhp_altmap = { - .base_pfn = PHYS_PFN(res->start), - .end_pfn = PHYS_PFN(res->end), - }; struct memory_group *group = NULL; - u64 start, size; + u64 start, size, cur_start; bool new_node = false; int ret; @@ -1436,28 +1469,21 @@ int __ref add_memory_resource(int nid, struct resource *res, mhp_t mhp_flags) /* * Self hosted memmap array */ - if (mhp_flags & MHP_MEMMAP_ON_MEMORY) { - if (mhp_supports_memmap_on_memory(size)) { - mhp_altmap.free = memory_block_memmap_on_memory_pages(); - params.altmap = kmemdup(&mhp_altmap, - sizeof(struct vmem_altmap), - GFP_KERNEL); - if (!params.altmap) + if ((mhp_flags & MHP_MEMMAP_ON_MEMORY) && + mhp_supports_memmap_on_memory(memblock_size)) { + for (cur_start = start; cur_start < start + size; + cur_start += memblock_size) { + ret = add_memory_create_devices(nid, group, cur_start, + memblock_size, + mhp_flags); + if (ret) goto error; } - /* fallback to not using altmap */ - } - - /* call arch's memory hotadd */ - ret = arch_add_memory(nid, start, size, ¶ms); - if (ret < 0) - goto error_free; - - /* create memory block devices after memory was added */ - ret = create_memory_block_devices(start, size, params.altmap, group); - if (ret) { - arch_remove_memory(start, size, NULL); - goto error_free; + } else { + ret = add_memory_create_devices(nid, group, start, size, + mhp_flags); + if (ret) + goto error; } if (new_node) { @@ -1494,8 +1520,6 @@ int __ref add_memory_resource(int nid, struct resource *res, mhp_t mhp_flags) walk_memory_blocks(start, size, NULL, online_memory_block); return ret; -error_free: - kfree(params.altmap); error: if (IS_ENABLED(CONFIG_ARCH_KEEP_MEMBLOCK)) memblock_remove(start, size); @@ -2076,6 +2100,23 @@ static int test_has_altmap_cb(struct memory_block *mem, void *arg) return 0; } +struct memory_range_altmap_info { + u64 num_memblocks; + u64 num_altmaps; +}; + +static int count_memory_range_altmaps_cb(struct memory_block *mem, void *arg) +{ + struct memory_range_altmap_info *altmap_info = + (struct memory_range_altmap_info *)arg; + + altmap_info->num_memblocks += 1; + if (mem->altmap) + altmap_info->num_altmaps += 1; + + return 0; +} + static int check_cpu_on_node(int nid) { int cpu; @@ -2146,11 +2187,75 @@ void try_offline_node(int nid) } EXPORT_SYMBOL(try_offline_node); -static int __ref try_remove_memory(u64 start, u64 size) +static void __ref remove_memory_blocks_and_altmaps(u64 start, u64 size) { - struct memory_block *mem; - int rc = 0, nid = NUMA_NO_NODE; + unsigned long memblock_size = memory_block_size_bytes(); struct vmem_altmap *altmap = NULL; + struct memory_block *mem; + u64 cur_start; + int rc; + + /* + * For memmap_on_memory, the altmaps could have been added on + * a per-memblock basis. Loop through the entire range if so, + * and remove each memblock and its altmap. + */ + for (cur_start = start; cur_start < start + size; + cur_start += memblock_size) { + rc = walk_memory_blocks(cur_start, memblock_size, &mem, + test_has_altmap_cb); + if (rc) { + altmap = mem->altmap; + /* + * Mark altmap NULL so that we can add a debug + * check on memblock free. + */ + mem->altmap = NULL; + } + + /* + * Memory block device removal under the device_hotplug_lock is + * a barrier against racing online attempts. + */ + remove_memory_block_devices(cur_start, memblock_size); + + arch_remove_memory(cur_start, memblock_size, altmap); + + /* Verify that all vmemmap pages have actually been freed. */ + if (altmap) { + WARN(altmap->alloc, "Altmap not fully unmapped"); + kfree(altmap); + } + } +} + +static int memblocks_have_altmaps(u64 start, u64 size) +{ + struct memory_range_altmap_info altmap_info = { + .num_memblocks = 0, + .num_altmaps = 0 + }; + + if (!mhp_memmap_on_memory()) + return 0; + + walk_memory_blocks(start, size, &altmap_info, + count_memory_range_altmaps_cb); + + if (!altmap_info.num_altmaps) + return 0; + + if (altmap_info.num_memblocks != altmap_info.num_altmaps) { + WARN_ONCE(1, "Not all memblocks in range have altmaps"); + return -EINVAL; + } + + return 1; +} + +static int __ref try_remove_memory(u64 start, u64 size) +{ + int rc, nid = NUMA_NO_NODE; BUG_ON(check_hotplug_memory_range(start, size)); @@ -2167,45 +2272,21 @@ static int __ref try_remove_memory(u64 start, u64 size) if (rc) return rc; - /* - * We only support removing memory added with MHP_MEMMAP_ON_MEMORY in - * the same granularity it was added - a single memory block. - */ - if (mhp_memmap_on_memory()) { - rc = walk_memory_blocks(start, size, &mem, test_has_altmap_cb); - if (rc) { - if (size != memory_block_size_bytes()) { - pr_warn("Refuse to remove %#llx - %#llx," - "wrong granularity\n", - start, start + size); - return -EINVAL; - } - altmap = mem->altmap; - /* - * Mark altmap NULL so that we can add a debug - * check on memblock free. - */ - mem->altmap = NULL; - } - } - /* remove memmap entry */ firmware_map_remove(start, start + size, "System RAM"); - /* - * Memory block device removal under the device_hotplug_lock is - * a barrier against racing online attempts. - */ - remove_memory_block_devices(start, size); - mem_hotplug_begin(); - arch_remove_memory(start, size, altmap); - - /* Verify that all vmemmap pages have actually been freed. */ - if (altmap) { - WARN(altmap->alloc, "Altmap not fully unmapped"); - kfree(altmap); + rc = memblocks_have_altmaps(start, size); + if (rc < 0) { + goto err; + } else if (rc == 0) { + /* no altmaps, do the removal directly */ + remove_memory_block_devices(start, size); + arch_remove_memory(start, size, NULL); + } else { + /* all memblocks in the range have altmaps */ + remove_memory_blocks_and_altmaps(start, size); } if (IS_ENABLED(CONFIG_ARCH_KEEP_MEMBLOCK)) { @@ -2218,8 +2299,9 @@ static int __ref try_remove_memory(u64 start, u64 size) if (nid != NUMA_NO_NODE) try_offline_node(nid); +err: mem_hotplug_done(); - return 0; + return (rc < 0 ? rc : 0); } /** From patchwork Tue Oct 17 05:44:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Verma, Vishal L" X-Patchwork-Id: 153916 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp3917504vqb; Mon, 16 Oct 2023 22:46:06 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFleGi54axBiOS9rnFkJQLMdIJMllCt1p3n5j2eMyITzN5+WOhjvbZG1Dl2F3VdoJG59foe X-Received: by 2002:a05:6830:26dd:b0:6b9:b987:1337 with SMTP id m29-20020a05683026dd00b006b9b9871337mr1312009otu.1.1697521565921; Mon, 16 Oct 2023 22:46:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697521565; cv=none; d=google.com; s=arc-20160816; b=KiLMy3OglO0tT6t1kF0SVGMv61e54CI5MU9iBy5IWcBnVJ22giHWJ5O7O6dCWDePGK rBs0owoRBluIzLeia+CHa439uTVj8TAR/iXg2b7e7sjmUIQrQefS/kcS4mP+r+KFCEQR R4/CGQTEvCx6SdkfzL1NSJViIP7iogfxdOXYCCCz0hhiBhq8WZpPgVFXOmVTftRqNflE TBR98oTOv9eW1EVUOXaHvWo2pGu48tSivzTL+vUK9l9FPz2XBXrPmHnQbzVAKSsOwHcm 4HYJwI+euC0PkKKRr/4wM1mF3svXWrfqwcVHe0QYaVGMdiM+F1EPpe/94UJeNYmcv/Q4 Vzrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=veuv5HqD7AFEWi54guoE5dRp2blStvCKXb9PZntf1Gk=; fh=K6XmanfW69WIGlI+l+O18lb+dFEsDiql6DFppOVA05M=; b=dzBoSXJML6rnXdruPJT+8CQbif5xpGwpVVYq4Emjz5/YMAPMmLnEJJsvkTZ55LqmEh GgFGH7Vwmhai4eW6xyYM0bhxl4qB9H2m7kxdFkJZIqxG0nVz8YdpzxqjLjWMtw38ppkW YbuS0MMhfpitmx5/YJ3nyWNyc6T2rLzUp5vGLFsmQWfh+s1VH4KXGzPJbwMIav/ngz0E Qlhor3+WfMgGMiFUNtcT7TmGWp7opuTJGXWIpLaXGjfSorUE/LzHShD+Jhf5XNXI7Ag0 to26S0n82xIOulPCkiTlnMuiF6b/zQ5inAIKJlqUEc4vRapzJcseD284iIYe+BCTAJj0 Jmsw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=UK98nJdB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id o19-20020a056a0015d300b0068fb5ca50cdsi937704pfu.126.2023.10.16.22.46.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Oct 2023 22:46:05 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=UK98nJdB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id AEEBC809D455; Mon, 16 Oct 2023 22:46:03 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234486AbjJQFpS (ORCPT + 19 others); Tue, 17 Oct 2023 01:45:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39600 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234465AbjJQFpK (ORCPT ); Tue, 17 Oct 2023 01:45:10 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 950FBF1; Mon, 16 Oct 2023 22:45:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1697521508; x=1729057508; h=from:date:subject:mime-version:content-transfer-encoding: message-id:references:in-reply-to:to:cc; bh=mEPqGi0w6uK1G2oMRp9GXgOlOlinp7OhMTBnsnQmtwo=; b=UK98nJdBbbrgH0DT6Gk1VC3o8rrh7FwHbAwKUndOQ+JFb/LSD6z4Wpqv 5kQ3pUO6tyJTqqG6WvRKaDfIE1o4FXR30NJpzztFtCwCSiuG6fxT50gMJ CnfZdTmynmP+tgdM165FWNsQA0B4R6yEaqMPpPF0HAf4vlMrBhUpYcpJ4 D9IFA6TZ8ARMqTqNPdLsiTvf5czPr9VSDDp4sWwxUSUdSU53xzCCNEJtz qUo+j3g3bBVYVEOak2PWp+HYe9z8pU2JIVTu3YLKr/tmrHs9m0+2qGi8R M0eXjfDVminr5hSokRdZpYJSA8JYgu10ue0o06ktCQVIhIvyIRWegDyz4 A==; X-IronPort-AV: E=McAfee;i="6600,9927,10865"; a="384580770" X-IronPort-AV: E=Sophos;i="6.03,231,1694761200"; d="scan'208";a="384580770" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Oct 2023 22:45:07 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10865"; a="879694030" X-IronPort-AV: E=Sophos;i="6.03,231,1694761200"; d="scan'208";a="879694030" Received: from mjwirth-mobl.amr.corp.intel.com (HELO [192.168.1.200]) ([10.209.151.162]) by orsmga004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Oct 2023 22:45:04 -0700 From: Vishal Verma Date: Mon, 16 Oct 2023 23:44:57 -0600 Subject: [PATCH v6 3/3] dax/kmem: allow kmem to add memory with memmap_on_memory MIME-Version: 1.0 Message-Id: <20231016-vv-kmem_memmap-v6-3-078f0d3c0371@intel.com> References: <20231016-vv-kmem_memmap-v6-0-078f0d3c0371@intel.com> In-Reply-To: <20231016-vv-kmem_memmap-v6-0-078f0d3c0371@intel.com> To: Andrew Morton , David Hildenbrand , Oscar Salvador , Dan Williams , Dave Jiang Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, nvdimm@lists.linux.dev, linux-cxl@vger.kernel.org, Huang Ying , Dave Hansen , "Aneesh Kumar K.V" , Michal Hocko , Jonathan Cameron , Jeff Moyer , Vishal Verma , Jonathan Cameron X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=4972; i=vishal.l.verma@intel.com; h=from:subject:message-id; bh=mEPqGi0w6uK1G2oMRp9GXgOlOlinp7OhMTBnsnQmtwo=; b=owGbwMvMwCXGf25diOft7jLG02pJDKl68jEzt8d3qO3/2R3M0dv+gfv651PmOwQzOZilr5kzn l/89seZjlIWBjEuBlkxRZa/ez4yHpPbns8TmOAIM4eVCWQIAxenAEwkbgkjw7E7Lm+Z2b88qLgv Enox7OdGbbO9nLmXTvo+nsDxxX1WbCDD/7RVxdElk1n/SNmXxwW82D9HtfDNb3vGQlunA9vfr31 +mQcA X-Developer-Key: i=vishal.l.verma@intel.com; a=openpgp; fpr=F8682BE134C67A12332A2ED07AFA61BEA3B84DFF X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Mon, 16 Oct 2023 22:46:03 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779980373597791054 X-GMAIL-MSGID: 1779980373597791054 Large amounts of memory managed by the kmem driver may come in via CXL, and it is often desirable to have the memmap for this memory on the new memory itself. Enroll kmem-managed memory for memmap_on_memory semantics if the dax region originates via CXL. For non-CXL dax regions, retain the existing default behavior of hot adding without memmap_on_memory semantics. Cc: Andrew Morton Cc: David Hildenbrand Cc: Michal Hocko Cc: Oscar Salvador Cc: Dan Williams Cc: Dave Jiang Cc: Dave Hansen Cc: Huang Ying Reviewed-by: Jonathan Cameron Reviewed-by: David Hildenbrand Signed-off-by: Vishal Verma --- drivers/dax/bus.h | 1 + drivers/dax/dax-private.h | 1 + drivers/dax/bus.c | 3 +++ drivers/dax/cxl.c | 1 + drivers/dax/hmem/hmem.c | 1 + drivers/dax/kmem.c | 8 +++++++- drivers/dax/pmem.c | 1 + 7 files changed, 15 insertions(+), 1 deletion(-) diff --git a/drivers/dax/bus.h b/drivers/dax/bus.h index 1ccd23360124..cbbf64443098 100644 --- a/drivers/dax/bus.h +++ b/drivers/dax/bus.h @@ -23,6 +23,7 @@ struct dev_dax_data { struct dev_pagemap *pgmap; resource_size_t size; int id; + bool memmap_on_memory; }; struct dev_dax *devm_create_dev_dax(struct dev_dax_data *data); diff --git a/drivers/dax/dax-private.h b/drivers/dax/dax-private.h index 27cf2daaaa79..446617b73aea 100644 --- a/drivers/dax/dax-private.h +++ b/drivers/dax/dax-private.h @@ -70,6 +70,7 @@ struct dev_dax { struct ida ida; struct device dev; struct dev_pagemap *pgmap; + bool memmap_on_memory; int nr_range; struct dev_dax_range { unsigned long pgoff; diff --git a/drivers/dax/bus.c b/drivers/dax/bus.c index 0ee96e6fc426..ad9f821b8c78 100644 --- a/drivers/dax/bus.c +++ b/drivers/dax/bus.c @@ -367,6 +367,7 @@ static ssize_t create_store(struct device *dev, struct device_attribute *attr, .dax_region = dax_region, .size = 0, .id = -1, + .memmap_on_memory = false, }; struct dev_dax *dev_dax = devm_create_dev_dax(&data); @@ -1400,6 +1401,8 @@ struct dev_dax *devm_create_dev_dax(struct dev_dax_data *data) dev_dax->align = dax_region->align; ida_init(&dev_dax->ida); + dev_dax->memmap_on_memory = data->memmap_on_memory; + inode = dax_inode(dax_dev); dev->devt = inode->i_rdev; dev->bus = &dax_bus_type; diff --git a/drivers/dax/cxl.c b/drivers/dax/cxl.c index 8bc9d04034d6..c696837ab23c 100644 --- a/drivers/dax/cxl.c +++ b/drivers/dax/cxl.c @@ -26,6 +26,7 @@ static int cxl_dax_region_probe(struct device *dev) .dax_region = dax_region, .id = -1, .size = range_len(&cxlr_dax->hpa_range), + .memmap_on_memory = true, }; return PTR_ERR_OR_ZERO(devm_create_dev_dax(&data)); diff --git a/drivers/dax/hmem/hmem.c b/drivers/dax/hmem/hmem.c index 5d2ddef0f8f5..b9da69f92697 100644 --- a/drivers/dax/hmem/hmem.c +++ b/drivers/dax/hmem/hmem.c @@ -36,6 +36,7 @@ static int dax_hmem_probe(struct platform_device *pdev) .dax_region = dax_region, .id = -1, .size = region_idle ? 0 : range_len(&mri->range), + .memmap_on_memory = false, }; return PTR_ERR_OR_ZERO(devm_create_dev_dax(&data)); diff --git a/drivers/dax/kmem.c b/drivers/dax/kmem.c index c57acb73e3db..0aa6c45a4e5a 100644 --- a/drivers/dax/kmem.c +++ b/drivers/dax/kmem.c @@ -12,6 +12,7 @@ #include #include #include +#include #include "dax-private.h" #include "bus.h" @@ -56,6 +57,7 @@ static int dev_dax_kmem_probe(struct dev_dax *dev_dax) unsigned long total_len = 0; struct dax_kmem_data *data; int i, rc, mapped = 0; + mhp_t mhp_flags; int numa_node; /* @@ -136,12 +138,16 @@ static int dev_dax_kmem_probe(struct dev_dax *dev_dax) */ res->flags = IORESOURCE_SYSTEM_RAM; + mhp_flags = MHP_NID_IS_MGID; + if (dev_dax->memmap_on_memory) + mhp_flags |= MHP_MEMMAP_ON_MEMORY; + /* * Ensure that future kexec'd kernels will not treat * this as RAM automatically. */ rc = add_memory_driver_managed(data->mgid, range.start, - range_len(&range), kmem_name, MHP_NID_IS_MGID); + range_len(&range), kmem_name, mhp_flags); if (rc) { dev_warn(dev, "mapping%d: %#llx-%#llx memory add failed\n", diff --git a/drivers/dax/pmem.c b/drivers/dax/pmem.c index ae0cb113a5d3..f3c6c67b8412 100644 --- a/drivers/dax/pmem.c +++ b/drivers/dax/pmem.c @@ -63,6 +63,7 @@ static struct dev_dax *__dax_pmem_probe(struct device *dev) .id = id, .pgmap = &pgmap, .size = range_len(&range), + .memmap_on_memory = false, }; return devm_create_dev_dax(&data);