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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 97704C25B74 for ; Tue, 21 May 2024 11:49:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=TUvwkldzFkXC1NrqSZPOBDASdF2xYXODd+lRKd7DH60=; b=LfA4CXiwCXdZaN LTcFuFb+fHGc28fM75H4us5VpJ7WYkH2M9oMaJ6b66q9QNH+VqVfLKEV3DjU8shj2PPgonaNB8ZVe vnPiWoqWobw0xQW6tHXEx3lq0VGVYRkkK2D0LcVHT0OtehYrcB/JkeBEkH+WeADHiti8l2POAgE3d 8ZjAJRUat/0GKh4L8+rsBuFLRjt463M86ROAEqHof0g2LvxQr/2gVlDBFq+nr9aZhx+mSJKNVHbFe wn3pMRW4F/FSmziT64Q5V902uoPFD3K85PZriybT3v96fyK3xbW1U4T4l2+/D81aFPF1H0jwTw8y9 LEyeO+JrR4iocRJyANkA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1s9NzS-0000000HKir-3qaX; Tue, 21 May 2024 11:49:10 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1s9NzQ-0000000HKh5-1s42 for linux-riscv@lists.infradead.org; Tue, 21 May 2024 11:49:09 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id D3FD462213; Tue, 21 May 2024 11:49:07 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CC39FC2BD11; Tue, 21 May 2024 11:49:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1716292147; bh=YmNQGTYS7tg+RvjQBa8mIUVU0Q8jznFPplKEu6+/K8U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UzvEzHHexF7JresSjbUV+sseX7MhZnOt/Q6RxfcvlB4jlYBbvS+Mc5EYr2OPt3w1n VnthCTVkILvDLIi1nYESspY9tZiEk/S8GdRdvBNtYuxxGJgGKsmeVaJ4NdBI2fjNpL O4lr9BqHQjAn99ZqfKqqrd8aspSj2moxL790uHQs3eJW+b7TxXtKU8u1ydUEtbB+SJ pUsoV8TCLbwqbeD5kw7g+Jin6DjIO1XOT1XywHo8E6kMryiVfWswgG3ubvVFBby7xy B5SfqddkJ20baZ98Z3B4D3Kkq65i2wxIOluwx6t+d5EhaQjAj2Q9LikQm46I4C6dpm fz3dUdiRyl1CQ== From: =?UTF-8?q?Bj=C3=B6rn=20T=C3=B6pel?= To: Alexandre Ghiti , Albert Ou , David Hildenbrand , Palmer Dabbelt , Paul Walmsley , linux-riscv@lists.infradead.org, Oscar Salvador Subject: [PATCH v3 5/9] riscv: mm: Add memory hotplugging support Date: Tue, 21 May 2024 13:48:26 +0200 Message-Id: <20240521114830.841660-6-bjorn@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240521114830.841660-1-bjorn@kernel.org> References: <20240521114830.841660-1-bjorn@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240521_044908_673167_8D403C87 X-CRM114-Status: GOOD ( 19.43 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Lorenzo Stoakes , Chethan Seshadri , linux-kernel@vger.kernel.org, Andrew Bresticker , =?UTF-8?q?Bj=C3=B6rn=20T=C3=B6pel?= , Santosh Mamila , linux-mm@kvack.org, Sivakumar Munnangi , virtualization@lists.linux-foundation.org Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org RnJvbTogQmrDtnJuIFTDtnBlbCA8Ympvcm5Acml2b3NpbmMuY29tPgoKRm9yIGFuIGFyY2hpdGVj dHVyZSB0byBzdXBwb3J0IG1lbW9yeSBob3RwbHVnZ2luZywgYSBjb3VwbGUgb2YKY2FsbGJhY2tz IG5lZWRzIHRvIGJlIGltcGxlbWVudGVkOgoKIGFyY2hfYWRkX21lbW9yeSgpCiAgVGhpcyBjYWxs YmFjayBpcyByZXNwb25zaWJsZSBmb3IgYWRkaW5nIHRoZSBwaHlzaWNhbCBtZW1vcnkgaW50byB0 aGUKICBkaXJlY3QgbWFwLCBhbmQgY2FsbCBpbnRvIHRoZSBtZW1vcnkgaG90cGx1Z2dpbmcgZ2Vu ZXJpYyBjb2RlIHZpYQogIF9fYWRkX3BhZ2VzKCkgdGhhdCBhZGRzIHRoZSBjb3JyZXNwb25kaW5n IHN0cnVjdCBwYWdlIGVudHJpZXMsIGFuZAogIHVwZGF0ZXMgdGhlIHZtZW1tYXAgbWFwcGluZy4K CiBhcmNoX3JlbW92ZV9tZW1vcnkoKQogIFRoaXMgaXMgdGhlIGludmVyc2Ugb2YgdGhlIGNhbGxi YWNrIGFib3ZlLgoKIHZtZW1tYXBfZnJlZSgpCiAgVGhpcyBmdW5jdGlvbiB0ZWFycyBkb3duIHRo ZSB2bWVtbWFwIG1hcHBpbmdzIChpZgogIENPTkZJR19TUEFSU0VNRU1fVk1FTU1BUCBpcyBlbmFi bGVkKSwgYW5kIGFsc28gZGVhbGxvY2F0ZXMgdGhlCiAgYmFja2luZyB2bWVtbWFwIHBhZ2VzLiBO b3RlIHRoYXQgZm9yIHBlcnNpc3RlbnQgbWVtb3J5LCBhbgogIGFsdGVybmF0aXZlIGFsbG9jYXRv ciBmb3IgdGhlIGJhY2tpbmcgcGFnZXMgY2FuIGJlIHVzZWQ7IFRoZQogIHZtZW1fYWx0bWFwLiBU aGlzIG1lYW5zIHRoYXQgd2hlbiB0aGUgYmFja2luZyBwYWdlcyBhcmUgY2xlYXJlZCwKICBleHRy YSBjYXJlIGlzIG5lZWRlZCBzbyB0aGF0IHRoZSBjb3JyZWN0IGRlYWxsb2NhdGlvbiBtZXRob2Qg aXMKICB1c2VkLgoKIGFyY2hfZ2V0X21hcHBhYmxlX3JhbmdlKCkKICBUaGlzIGZ1bmN0aW9ucyBy ZXR1cm5zIHRoZSBQQSByYW5nZSB0aGF0IHRoZSBkaXJlY3QgbWFwIGNhbiBtYXAuCiAgVXNlZCBi eSB0aGUgTUhQIGludGVybmFscyBmb3Igc2FuaXR5IGNoZWNrcy4KClRoZSBwYWdlIHRhYmxlIHVu bWFwL3RlYXJkb3duIGZ1bmN0aW9ucyBhcmUgaGVhdmlseSBiYXNlZCBvbiBjb2RlIGZyb20KdGhl IHg4NiB0cmVlLiBUaGUgc2FtZSByZW1vdmVfcGdkX21hcHBpbmcoKSBmdW5jdGlvbiBpcyB1c2Vk IGluIGJvdGgKdm1lbW1hcF9mcmVlKCkgYW5kIGFyY2hfcmVtb3ZlX21lbW9yeSgpLCBidXQgaW4g dGhlIGxhdHRlciBmdW5jdGlvbgp0aGUgYmFja2luZyBwYWdlcyBhcmUgbm90IHJlbW92ZWQuCgpT aWduZWQtb2ZmLWJ5OiBCasO2cm4gVMO2cGVsIDxiam9ybkByaXZvc2luYy5jb20+Ci0tLQogYXJj aC9yaXNjdi9tbS9pbml0LmMgfCAyNjEgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKwogMSBmaWxlIGNoYW5nZWQsIDI2MSBpbnNlcnRpb25zKCspCgpkaWZmIC0tZ2l0 IGEvYXJjaC9yaXNjdi9tbS9pbml0LmMgYi9hcmNoL3Jpc2N2L21tL2luaXQuYwppbmRleCA2Zjcy YjBiMmI4NTQuLjY2OTNiNzQyYmYyZiAxMDA2NDQKLS0tIGEvYXJjaC9yaXNjdi9tbS9pbml0LmMK KysrIGIvYXJjaC9yaXNjdi9tbS9pbml0LmMKQEAgLTE0OTMsMyArMTQ5MywyNjQgQEAgdm9pZCBf X2luaXQgcGd0YWJsZV9jYWNoZV9pbml0KHZvaWQpCiAJfQogfQogI2VuZGlmCisKKyNpZmRlZiBD T05GSUdfTUVNT1JZX0hPVFBMVUcKK3N0YXRpYyB2b2lkIF9fbWVtaW5pdCBmcmVlX3BhZ2V0YWJs ZShzdHJ1Y3QgcGFnZSAqcGFnZSwgaW50IG9yZGVyKQoreworCXVuc2lnbmVkIGludCBucl9wYWdl cyA9IDEgPDwgb3JkZXI7CisKKwkvKgorCSAqIHZtZW1tYXAvZGlyZWN0IHBhZ2UgdGFibGVzIGNh biBiZSByZXNlcnZlZCwgaWYgYWRkZWQgYXQKKwkgKiBib290LgorCSAqLworCWlmIChQYWdlUmVz ZXJ2ZWQocGFnZSkpIHsKKwkJX19DbGVhclBhZ2VSZXNlcnZlZChwYWdlKTsKKwkJd2hpbGUgKG5y X3BhZ2VzLS0pCisJCQlmcmVlX3Jlc2VydmVkX3BhZ2UocGFnZSsrKTsKKwkJcmV0dXJuOworCX0K KworCWZyZWVfcGFnZXMoKHVuc2lnbmVkIGxvbmcpcGFnZV9hZGRyZXNzKHBhZ2UpLCBvcmRlcik7 Cit9CisKK3N0YXRpYyB2b2lkIF9fbWVtaW5pdCBmcmVlX3B0ZV90YWJsZShwdGVfdCAqcHRlX3N0 YXJ0LCBwbWRfdCAqcG1kKQoreworCXB0ZV90ICpwdGU7CisJaW50IGk7CisKKwlmb3IgKGkgPSAw OyBpIDwgUFRSU19QRVJfUFRFOyBpKyspIHsKKwkJcHRlID0gcHRlX3N0YXJ0ICsgaTsKKwkJaWYg KCFwdGVfbm9uZSgqcHRlKSkKKwkJCXJldHVybjsKKwl9CisKKwlmcmVlX3BhZ2V0YWJsZShwbWRf cGFnZSgqcG1kKSwgMCk7CisJcG1kX2NsZWFyKHBtZCk7Cit9CisKK3N0YXRpYyB2b2lkIF9fbWVt aW5pdCBmcmVlX3BtZF90YWJsZShwbWRfdCAqcG1kX3N0YXJ0LCBwdWRfdCAqcHVkKQoreworCXBt ZF90ICpwbWQ7CisJaW50IGk7CisKKwlmb3IgKGkgPSAwOyBpIDwgUFRSU19QRVJfUE1EOyBpKysp IHsKKwkJcG1kID0gcG1kX3N0YXJ0ICsgaTsKKwkJaWYgKCFwbWRfbm9uZSgqcG1kKSkKKwkJCXJl dHVybjsKKwl9CisKKwlmcmVlX3BhZ2V0YWJsZShwdWRfcGFnZSgqcHVkKSwgMCk7CisJcHVkX2Ns ZWFyKHB1ZCk7Cit9CisKK3N0YXRpYyB2b2lkIF9fbWVtaW5pdCBmcmVlX3B1ZF90YWJsZShwdWRf dCAqcHVkX3N0YXJ0LCBwNGRfdCAqcDRkKQoreworCXB1ZF90ICpwdWQ7CisJaW50IGk7CisKKwlm b3IgKGkgPSAwOyBpIDwgUFRSU19QRVJfUFVEOyBpKyspIHsKKwkJcHVkID0gcHVkX3N0YXJ0ICsg aTsKKwkJaWYgKCFwdWRfbm9uZSgqcHVkKSkKKwkJCXJldHVybjsKKwl9CisKKwlmcmVlX3BhZ2V0 YWJsZShwNGRfcGFnZSgqcDRkKSwgMCk7CisJcDRkX2NsZWFyKHA0ZCk7Cit9CisKK3N0YXRpYyB2 b2lkIF9fbWVtaW5pdCBmcmVlX3ZtZW1tYXBfc3RvcmFnZShzdHJ1Y3QgcGFnZSAqcGFnZSwgc2l6 ZV90IHNpemUsCisJCQkJCSAgIHN0cnVjdCB2bWVtX2FsdG1hcCAqYWx0bWFwKQoreworCWlmIChh bHRtYXApCisJCXZtZW1fYWx0bWFwX2ZyZWUoYWx0bWFwLCBzaXplID4+IFBBR0VfU0hJRlQpOwor CWVsc2UKKwkJZnJlZV9wYWdldGFibGUocGFnZSwgZ2V0X29yZGVyKHNpemUpKTsKK30KKworc3Rh dGljIHZvaWQgX19tZW1pbml0IHJlbW92ZV9wdGVfbWFwcGluZyhwdGVfdCAqcHRlX2Jhc2UsIHVu c2lnbmVkIGxvbmcgYWRkciwgdW5zaWduZWQgbG9uZyBlbmQsCisJCQkJCSBib29sIGlzX3ZtZW1t YXAsIHN0cnVjdCB2bWVtX2FsdG1hcCAqYWx0bWFwKQoreworCXVuc2lnbmVkIGxvbmcgbmV4dDsK KwlwdGVfdCAqcHRlcCwgcHRlOworCisJZm9yICg7IGFkZHIgPCBlbmQ7IGFkZHIgPSBuZXh0KSB7 CisJCW5leHQgPSAoYWRkciArIFBBR0VfU0laRSkgJiBQQUdFX01BU0s7CisJCWlmIChuZXh0ID4g ZW5kKQorCQkJbmV4dCA9IGVuZDsKKworCQlwdGVwID0gcHRlX2Jhc2UgKyBwdGVfaW5kZXgoYWRk cik7CisJCXB0ZSA9IFJFQURfT05DRSgqcHRlcCk7CisKKwkJaWYgKCFwdGVfcHJlc2VudCgqcHRl cCkpCisJCQljb250aW51ZTsKKworCQlwdGVfY2xlYXIoJmluaXRfbW0sIGFkZHIsIHB0ZXApOwor CQlpZiAoaXNfdm1lbW1hcCkKKwkJCWZyZWVfdm1lbW1hcF9zdG9yYWdlKHB0ZV9wYWdlKHB0ZSks IFBBR0VfU0laRSwgYWx0bWFwKTsKKwl9Cit9CisKK3N0YXRpYyB2b2lkIF9fbWVtaW5pdCByZW1v dmVfcG1kX21hcHBpbmcocG1kX3QgKnBtZF9iYXNlLCB1bnNpZ25lZCBsb25nIGFkZHIsIHVuc2ln bmVkIGxvbmcgZW5kLAorCQkJCQkgYm9vbCBpc192bWVtbWFwLCBzdHJ1Y3Qgdm1lbV9hbHRtYXAg KmFsdG1hcCkKK3sKKwl1bnNpZ25lZCBsb25nIG5leHQ7CisJcHRlX3QgKnB0ZV9iYXNlOworCXBt ZF90ICpwbWRwLCBwbWQ7CisKKwlmb3IgKDsgYWRkciA8IGVuZDsgYWRkciA9IG5leHQpIHsKKwkJ bmV4dCA9IHBtZF9hZGRyX2VuZChhZGRyLCBlbmQpOworCQlwbWRwID0gcG1kX2Jhc2UgKyBwbWRf aW5kZXgoYWRkcik7CisJCXBtZCA9IFJFQURfT05DRSgqcG1kcCk7CisKKwkJaWYgKCFwbWRfcHJl c2VudChwbWQpKQorCQkJY29udGludWU7CisKKwkJaWYgKHBtZF9sZWFmKHBtZCkpIHsKKwkJCXBt ZF9jbGVhcihwbWRwKTsKKwkJCWlmIChpc192bWVtbWFwKQorCQkJCWZyZWVfdm1lbW1hcF9zdG9y YWdlKHBtZF9wYWdlKHBtZCksIFBNRF9TSVpFLCBhbHRtYXApOworCQkJY29udGludWU7CisJCX0K KworCQlwdGVfYmFzZSA9IChwdGVfdCAqKXBtZF9wYWdlX3ZhZGRyKCpwbWRwKTsKKwkJcmVtb3Zl X3B0ZV9tYXBwaW5nKHB0ZV9iYXNlLCBhZGRyLCBuZXh0LCBpc192bWVtbWFwLCBhbHRtYXApOwor CQlmcmVlX3B0ZV90YWJsZShwdGVfYmFzZSwgcG1kcCk7CisJfQorfQorCitzdGF0aWMgdm9pZCBf X21lbWluaXQgcmVtb3ZlX3B1ZF9tYXBwaW5nKHB1ZF90ICpwdWRfYmFzZSwgdW5zaWduZWQgbG9u ZyBhZGRyLCB1bnNpZ25lZCBsb25nIGVuZCwKKwkJCQkJIGJvb2wgaXNfdm1lbW1hcCwgc3RydWN0 IHZtZW1fYWx0bWFwICphbHRtYXApCit7CisJdW5zaWduZWQgbG9uZyBuZXh0OworCXB1ZF90ICpw dWRwLCBwdWQ7CisJcG1kX3QgKnBtZF9iYXNlOworCisJZm9yICg7IGFkZHIgPCBlbmQ7IGFkZHIg PSBuZXh0KSB7CisJCW5leHQgPSBwdWRfYWRkcl9lbmQoYWRkciwgZW5kKTsKKwkJcHVkcCA9IHB1 ZF9iYXNlICsgcHVkX2luZGV4KGFkZHIpOworCQlwdWQgPSBSRUFEX09OQ0UoKnB1ZHApOworCisJ CWlmICghcHVkX3ByZXNlbnQocHVkKSkKKwkJCWNvbnRpbnVlOworCisJCWlmIChwdWRfbGVhZihw dWQpKSB7CisJCQlpZiAocGd0YWJsZV9sNF9lbmFibGVkKSB7CisJCQkJcHVkX2NsZWFyKHB1ZHAp OworCQkJCWlmIChpc192bWVtbWFwKQorCQkJCQlmcmVlX3ZtZW1tYXBfc3RvcmFnZShwdWRfcGFn ZShwdWQpLCBQVURfU0laRSwgYWx0bWFwKTsKKwkJCX0KKwkJCWNvbnRpbnVlOworCQl9CisKKwkJ cG1kX2Jhc2UgPSBwbWRfb2Zmc2V0KHB1ZHAsIDApOworCQlyZW1vdmVfcG1kX21hcHBpbmcocG1k X2Jhc2UsIGFkZHIsIG5leHQsIGlzX3ZtZW1tYXAsIGFsdG1hcCk7CisKKwkJaWYgKHBndGFibGVf bDRfZW5hYmxlZCkKKwkJCWZyZWVfcG1kX3RhYmxlKHBtZF9iYXNlLCBwdWRwKTsKKwl9Cit9CisK K3N0YXRpYyB2b2lkIF9fbWVtaW5pdCByZW1vdmVfcDRkX21hcHBpbmcocDRkX3QgKnA0ZF9iYXNl LCB1bnNpZ25lZCBsb25nIGFkZHIsIHVuc2lnbmVkIGxvbmcgZW5kLAorCQkJCQkgYm9vbCBpc192 bWVtbWFwLCBzdHJ1Y3Qgdm1lbV9hbHRtYXAgKmFsdG1hcCkKK3sKKwl1bnNpZ25lZCBsb25nIG5l eHQ7CisJcDRkX3QgKnA0ZHAsIHA0ZDsKKwlwdWRfdCAqcHVkX2Jhc2U7CisKKwlmb3IgKDsgYWRk ciA8IGVuZDsgYWRkciA9IG5leHQpIHsKKwkJbmV4dCA9IHA0ZF9hZGRyX2VuZChhZGRyLCBlbmQp OworCQlwNGRwID0gcDRkX2Jhc2UgKyBwNGRfaW5kZXgoYWRkcik7CisJCXA0ZCA9IFJFQURfT05D RSgqcDRkcCk7CisKKwkJaWYgKCFwNGRfcHJlc2VudChwNGQpKQorCQkJY29udGludWU7CisKKwkJ aWYgKHA0ZF9sZWFmKHA0ZCkpIHsKKwkJCWlmIChwZ3RhYmxlX2w1X2VuYWJsZWQpIHsKKwkJCQlw NGRfY2xlYXIocDRkcCk7CisJCQkJaWYgKGlzX3ZtZW1tYXApCisJCQkJCWZyZWVfdm1lbW1hcF9z dG9yYWdlKHA0ZF9wYWdlKHA0ZCksIFA0RF9TSVpFLCBhbHRtYXApOworCQkJfQorCQkJY29udGlu dWU7CisJCX0KKworCQlwdWRfYmFzZSA9IHB1ZF9vZmZzZXQocDRkcCwgMCk7CisJCXJlbW92ZV9w dWRfbWFwcGluZyhwdWRfYmFzZSwgYWRkciwgbmV4dCwgaXNfdm1lbW1hcCwgYWx0bWFwKTsKKwor CQlpZiAocGd0YWJsZV9sNV9lbmFibGVkKQorCQkJZnJlZV9wdWRfdGFibGUocHVkX2Jhc2UsIHA0 ZHApOworCX0KK30KKworc3RhdGljIHZvaWQgX19tZW1pbml0IHJlbW92ZV9wZ2RfbWFwcGluZyh1 bnNpZ25lZCBsb25nIHZhLCB1bnNpZ25lZCBsb25nIGVuZCwgYm9vbCBpc192bWVtbWFwLAorCQkJ CQkgc3RydWN0IHZtZW1fYWx0bWFwICphbHRtYXApCit7CisJdW5zaWduZWQgbG9uZyBhZGRyLCBu ZXh0OworCXA0ZF90ICpwNGRfYmFzZTsKKwlwZ2RfdCAqcGdkOworCisJZm9yIChhZGRyID0gdmE7 IGFkZHIgPCBlbmQ7IGFkZHIgPSBuZXh0KSB7CisJCW5leHQgPSBwZ2RfYWRkcl9lbmQoYWRkciwg ZW5kKTsKKwkJcGdkID0gcGdkX29mZnNldF9rKGFkZHIpOworCisJCWlmICghcGdkX3ByZXNlbnQo KnBnZCkpCisJCQljb250aW51ZTsKKworCQlpZiAocGdkX2xlYWYoKnBnZCkpCisJCQljb250aW51 ZTsKKworCQlwNGRfYmFzZSA9IHA0ZF9vZmZzZXQocGdkLCAwKTsKKwkJcmVtb3ZlX3A0ZF9tYXBw aW5nKHA0ZF9iYXNlLCBhZGRyLCBuZXh0LCBpc192bWVtbWFwLCBhbHRtYXApOworCX0KKworCWZs dXNoX3RsYl9hbGwoKTsKK30KKworc3RhdGljIHZvaWQgX19tZW1pbml0IHJlbW92ZV9saW5lYXJf bWFwcGluZyhwaHlzX2FkZHJfdCBzdGFydCwgdTY0IHNpemUpCit7CisJdW5zaWduZWQgbG9uZyB2 YSA9ICh1bnNpZ25lZCBsb25nKV9fdmEoc3RhcnQpOworCXVuc2lnbmVkIGxvbmcgZW5kID0gKHVu c2lnbmVkIGxvbmcpX192YShzdGFydCArIHNpemUpOworCisJcmVtb3ZlX3BnZF9tYXBwaW5nKHZh LCBlbmQsIGZhbHNlLCBOVUxMKTsKK30KKworc3RydWN0IHJhbmdlIGFyY2hfZ2V0X21hcHBhYmxl X3JhbmdlKHZvaWQpCit7CisJc3RydWN0IHJhbmdlIG1ocF9yYW5nZTsKKworCW1ocF9yYW5nZS5z dGFydCA9IF9fcGEoUEFHRV9PRkZTRVQpOworCW1ocF9yYW5nZS5lbmQgPSBfX3BhKFBBR0VfRU5E IC0gMSk7CisJcmV0dXJuIG1ocF9yYW5nZTsKK30KKworaW50IF9fcmVmIGFyY2hfYWRkX21lbW9y eShpbnQgbmlkLCB1NjQgc3RhcnQsIHU2NCBzaXplLCBzdHJ1Y3QgbWhwX3BhcmFtcyAqcGFyYW1z KQoreworCWludCByZXQgPSAwOworCisJY3JlYXRlX2xpbmVhcl9tYXBwaW5nX3JhbmdlKHN0YXJ0 LCBzdGFydCArIHNpemUsIDAsICZwYXJhbXMtPnBncHJvdCk7CisJcmV0ID0gX19hZGRfcGFnZXMo bmlkLCBzdGFydCA+PiBQQUdFX1NISUZULCBzaXplID4+IFBBR0VfU0hJRlQsIHBhcmFtcyk7CisJ aWYgKHJldCkgeworCQlyZW1vdmVfbGluZWFyX21hcHBpbmcoc3RhcnQsIHNpemUpOworCQlnb3Rv IG91dDsKKwl9CisKKwltYXhfcGZuID0gUEZOX1VQKHN0YXJ0ICsgc2l6ZSk7CisJbWF4X2xvd19w Zm4gPSBtYXhfcGZuOworCisgb3V0OgorCWZsdXNoX3RsYl9hbGwoKTsKKwlyZXR1cm4gcmV0Owor fQorCit2b2lkIF9fcmVmIGFyY2hfcmVtb3ZlX21lbW9yeSh1NjQgc3RhcnQsIHU2NCBzaXplLCBz dHJ1Y3Qgdm1lbV9hbHRtYXAgKmFsdG1hcCkKK3sKKwlfX3JlbW92ZV9wYWdlcyhzdGFydCA+PiBQ QUdFX1NISUZULCBzaXplID4+IFBBR0VfU0hJRlQsIGFsdG1hcCk7CisJcmVtb3ZlX2xpbmVhcl9t YXBwaW5nKHN0YXJ0LCBzaXplKTsKKwlmbHVzaF90bGJfYWxsKCk7Cit9CisKK3ZvaWQgX19yZWYg dm1lbW1hcF9mcmVlKHVuc2lnbmVkIGxvbmcgc3RhcnQsIHVuc2lnbmVkIGxvbmcgZW5kLCBzdHJ1 Y3Qgdm1lbV9hbHRtYXAgKmFsdG1hcCkKK3sKKwlyZW1vdmVfcGdkX21hcHBpbmcoc3RhcnQsIGVu ZCwgdHJ1ZSwgYWx0bWFwKTsKK30KKyNlbmRpZiAvKiBDT05GSUdfTUVNT1JZX0hPVFBMVUcgKi8K LS0gCjIuNDAuMQoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fCmxpbnV4LXJpc2N2IG1haWxpbmcgbGlzdApsaW51eC1yaXNjdkBsaXN0cy5pbmZyYWRlYWQu b3JnCmh0dHA6Ly9saXN0cy5pbmZyYWRlYWQub3JnL21haWxtYW4vbGlzdGluZm8vbGludXgtcmlz Y3YK From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2C48078C8D for ; Tue, 21 May 2024 11:49:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=140.211.166.137 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716292151; cv=none; b=GgSgmiUb7xRxlD/IYCuDIFLhDBRd4FSLGz0N0EJsG7QRN6k7axa6pNtn8gKfaoPkrSFV0dLX9N+wEBt1Q+YCRB8s9CPLg1NRZJDUJwmQa52l4H0isKclY4i9vCQ/Z4Hl13V9APEBj+ZA04JXfFSqeKW0eS1LC2to78xve/xJBZw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716292151; c=relaxed/simple; bh=YmNQGTYS7tg+RvjQBa8mIUVU0Q8jznFPplKEu6+/K8U=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=W7Ifjg7YmMQXjOC3y3pFTTQL/Yp1KorlOopTpUeTG3uQRiJMNWdVMC5BG8n7+RIxAnF4A9RDnucSrQ5WaYUMM6YEt0adDyRkAcuWmvanAtO/4aKuGF6ja1vn6dcqHZckJDSU2cbjtISZ0ZjCMDDoD23n/TEnLfSKb+qz7xqhFmY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=UzvEzHHe; arc=none smtp.client-ip=140.211.166.137 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="UzvEzHHe" Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id C7A75401C5 for ; Tue, 21 May 2024 11:49:09 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org X-Spam-Flag: NO X-Spam-Score: -7.101 X-Spam-Level: Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id MTeSvtHq3gcL for ; Tue, 21 May 2024 11:49:08 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=139.178.84.217; helo=dfw.source.kernel.org; envelope-from=bjorn@kernel.org; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp4.osuosl.org 79CDC401C3 Authentication-Results: smtp4.osuosl.org; dmarc=pass (p=none dis=none) header.from=kernel.org DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 79CDC401C3 Authentication-Results: smtp4.osuosl.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=UzvEzHHe Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by smtp4.osuosl.org (Postfix) with ESMTPS id 79CDC401C3 for ; Tue, 21 May 2024 11:49:08 +0000 (UTC) Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id D3FD462213; Tue, 21 May 2024 11:49:07 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CC39FC2BD11; Tue, 21 May 2024 11:49:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1716292147; bh=YmNQGTYS7tg+RvjQBa8mIUVU0Q8jznFPplKEu6+/K8U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UzvEzHHexF7JresSjbUV+sseX7MhZnOt/Q6RxfcvlB4jlYBbvS+Mc5EYr2OPt3w1n VnthCTVkILvDLIi1nYESspY9tZiEk/S8GdRdvBNtYuxxGJgGKsmeVaJ4NdBI2fjNpL O4lr9BqHQjAn99ZqfKqqrd8aspSj2moxL790uHQs3eJW+b7TxXtKU8u1ydUEtbB+SJ pUsoV8TCLbwqbeD5kw7g+Jin6DjIO1XOT1XywHo8E6kMryiVfWswgG3ubvVFBby7xy B5SfqddkJ20baZ98Z3B4D3Kkq65i2wxIOluwx6t+d5EhaQjAj2Q9LikQm46I4C6dpm fz3dUdiRyl1CQ== From: =?UTF-8?q?Bj=C3=B6rn=20T=C3=B6pel?= To: Alexandre Ghiti , Albert Ou , David Hildenbrand , Palmer Dabbelt , Paul Walmsley , linux-riscv@lists.infradead.org, Oscar Salvador Cc: =?UTF-8?q?Bj=C3=B6rn=20T=C3=B6pel?= , Andrew Bresticker , Chethan Seshadri , Lorenzo Stoakes , Santosh Mamila , Sivakumar Munnangi , Sunil V L , linux-kernel@vger.kernel.org, linux-mm@kvack.org, virtualization@lists.linux-foundation.org Subject: [PATCH v3 5/9] riscv: mm: Add memory hotplugging support Date: Tue, 21 May 2024 13:48:26 +0200 Message-Id: <20240521114830.841660-6-bjorn@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240521114830.841660-1-bjorn@kernel.org> References: <20240521114830.841660-1-bjorn@kernel.org> Precedence: bulk X-Mailing-List: virtualization@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Björn Töpel For an architecture to support memory hotplugging, a couple of callbacks needs to be implemented: arch_add_memory() This callback is responsible for adding the physical memory into the direct map, and call into the memory hotplugging generic code via __add_pages() that adds the corresponding struct page entries, and updates the vmemmap mapping. arch_remove_memory() This is the inverse of the callback above. vmemmap_free() This function tears down the vmemmap mappings (if CONFIG_SPARSEMEM_VMEMMAP is enabled), and also deallocates the backing vmemmap pages. Note that for persistent memory, an alternative allocator for the backing pages can be used; The vmem_altmap. This means that when the backing pages are cleared, extra care is needed so that the correct deallocation method is used. arch_get_mappable_range() This functions returns the PA range that the direct map can map. Used by the MHP internals for sanity checks. The page table unmap/teardown functions are heavily based on code from the x86 tree. The same remove_pgd_mapping() function is used in both vmemmap_free() and arch_remove_memory(), but in the latter function the backing pages are not removed. Signed-off-by: Björn Töpel --- arch/riscv/mm/init.c | 261 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 261 insertions(+) diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c index 6f72b0b2b854..6693b742bf2f 100644 --- a/arch/riscv/mm/init.c +++ b/arch/riscv/mm/init.c @@ -1493,3 +1493,264 @@ void __init pgtable_cache_init(void) } } #endif + +#ifdef CONFIG_MEMORY_HOTPLUG +static void __meminit free_pagetable(struct page *page, int order) +{ + unsigned int nr_pages = 1 << order; + + /* + * vmemmap/direct page tables can be reserved, if added at + * boot. + */ + if (PageReserved(page)) { + __ClearPageReserved(page); + while (nr_pages--) + free_reserved_page(page++); + return; + } + + free_pages((unsigned long)page_address(page), order); +} + +static void __meminit free_pte_table(pte_t *pte_start, pmd_t *pmd) +{ + pte_t *pte; + int i; + + for (i = 0; i < PTRS_PER_PTE; i++) { + pte = pte_start + i; + if (!pte_none(*pte)) + return; + } + + free_pagetable(pmd_page(*pmd), 0); + pmd_clear(pmd); +} + +static void __meminit free_pmd_table(pmd_t *pmd_start, pud_t *pud) +{ + pmd_t *pmd; + int i; + + for (i = 0; i < PTRS_PER_PMD; i++) { + pmd = pmd_start + i; + if (!pmd_none(*pmd)) + return; + } + + free_pagetable(pud_page(*pud), 0); + pud_clear(pud); +} + +static void __meminit free_pud_table(pud_t *pud_start, p4d_t *p4d) +{ + pud_t *pud; + int i; + + for (i = 0; i < PTRS_PER_PUD; i++) { + pud = pud_start + i; + if (!pud_none(*pud)) + return; + } + + free_pagetable(p4d_page(*p4d), 0); + p4d_clear(p4d); +} + +static void __meminit free_vmemmap_storage(struct page *page, size_t size, + struct vmem_altmap *altmap) +{ + if (altmap) + vmem_altmap_free(altmap, size >> PAGE_SHIFT); + else + free_pagetable(page, get_order(size)); +} + +static void __meminit remove_pte_mapping(pte_t *pte_base, unsigned long addr, unsigned long end, + bool is_vmemmap, struct vmem_altmap *altmap) +{ + unsigned long next; + pte_t *ptep, pte; + + for (; addr < end; addr = next) { + next = (addr + PAGE_SIZE) & PAGE_MASK; + if (next > end) + next = end; + + ptep = pte_base + pte_index(addr); + pte = READ_ONCE(*ptep); + + if (!pte_present(*ptep)) + continue; + + pte_clear(&init_mm, addr, ptep); + if (is_vmemmap) + free_vmemmap_storage(pte_page(pte), PAGE_SIZE, altmap); + } +} + +static void __meminit remove_pmd_mapping(pmd_t *pmd_base, unsigned long addr, unsigned long end, + bool is_vmemmap, struct vmem_altmap *altmap) +{ + unsigned long next; + pte_t *pte_base; + pmd_t *pmdp, pmd; + + for (; addr < end; addr = next) { + next = pmd_addr_end(addr, end); + pmdp = pmd_base + pmd_index(addr); + pmd = READ_ONCE(*pmdp); + + if (!pmd_present(pmd)) + continue; + + if (pmd_leaf(pmd)) { + pmd_clear(pmdp); + if (is_vmemmap) + free_vmemmap_storage(pmd_page(pmd), PMD_SIZE, altmap); + continue; + } + + pte_base = (pte_t *)pmd_page_vaddr(*pmdp); + remove_pte_mapping(pte_base, addr, next, is_vmemmap, altmap); + free_pte_table(pte_base, pmdp); + } +} + +static void __meminit remove_pud_mapping(pud_t *pud_base, unsigned long addr, unsigned long end, + bool is_vmemmap, struct vmem_altmap *altmap) +{ + unsigned long next; + pud_t *pudp, pud; + pmd_t *pmd_base; + + for (; addr < end; addr = next) { + next = pud_addr_end(addr, end); + pudp = pud_base + pud_index(addr); + pud = READ_ONCE(*pudp); + + if (!pud_present(pud)) + continue; + + if (pud_leaf(pud)) { + if (pgtable_l4_enabled) { + pud_clear(pudp); + if (is_vmemmap) + free_vmemmap_storage(pud_page(pud), PUD_SIZE, altmap); + } + continue; + } + + pmd_base = pmd_offset(pudp, 0); + remove_pmd_mapping(pmd_base, addr, next, is_vmemmap, altmap); + + if (pgtable_l4_enabled) + free_pmd_table(pmd_base, pudp); + } +} + +static void __meminit remove_p4d_mapping(p4d_t *p4d_base, unsigned long addr, unsigned long end, + bool is_vmemmap, struct vmem_altmap *altmap) +{ + unsigned long next; + p4d_t *p4dp, p4d; + pud_t *pud_base; + + for (; addr < end; addr = next) { + next = p4d_addr_end(addr, end); + p4dp = p4d_base + p4d_index(addr); + p4d = READ_ONCE(*p4dp); + + if (!p4d_present(p4d)) + continue; + + if (p4d_leaf(p4d)) { + if (pgtable_l5_enabled) { + p4d_clear(p4dp); + if (is_vmemmap) + free_vmemmap_storage(p4d_page(p4d), P4D_SIZE, altmap); + } + continue; + } + + pud_base = pud_offset(p4dp, 0); + remove_pud_mapping(pud_base, addr, next, is_vmemmap, altmap); + + if (pgtable_l5_enabled) + free_pud_table(pud_base, p4dp); + } +} + +static void __meminit remove_pgd_mapping(unsigned long va, unsigned long end, bool is_vmemmap, + struct vmem_altmap *altmap) +{ + unsigned long addr, next; + p4d_t *p4d_base; + pgd_t *pgd; + + for (addr = va; addr < end; addr = next) { + next = pgd_addr_end(addr, end); + pgd = pgd_offset_k(addr); + + if (!pgd_present(*pgd)) + continue; + + if (pgd_leaf(*pgd)) + continue; + + p4d_base = p4d_offset(pgd, 0); + remove_p4d_mapping(p4d_base, addr, next, is_vmemmap, altmap); + } + + flush_tlb_all(); +} + +static void __meminit remove_linear_mapping(phys_addr_t start, u64 size) +{ + unsigned long va = (unsigned long)__va(start); + unsigned long end = (unsigned long)__va(start + size); + + remove_pgd_mapping(va, end, false, NULL); +} + +struct range arch_get_mappable_range(void) +{ + struct range mhp_range; + + mhp_range.start = __pa(PAGE_OFFSET); + mhp_range.end = __pa(PAGE_END - 1); + return mhp_range; +} + +int __ref arch_add_memory(int nid, u64 start, u64 size, struct mhp_params *params) +{ + int ret = 0; + + create_linear_mapping_range(start, start + size, 0, ¶ms->pgprot); + ret = __add_pages(nid, start >> PAGE_SHIFT, size >> PAGE_SHIFT, params); + if (ret) { + remove_linear_mapping(start, size); + goto out; + } + + max_pfn = PFN_UP(start + size); + max_low_pfn = max_pfn; + + out: + flush_tlb_all(); + return ret; +} + +void __ref arch_remove_memory(u64 start, u64 size, struct vmem_altmap *altmap) +{ + __remove_pages(start >> PAGE_SHIFT, size >> PAGE_SHIFT, altmap); + remove_linear_mapping(start, size); + flush_tlb_all(); +} + +void __ref vmemmap_free(unsigned long start, unsigned long end, struct vmem_altmap *altmap) +{ + remove_pgd_mapping(start, end, true, altmap); +} +#endif /* CONFIG_MEMORY_HOTPLUG */ -- 2.40.1