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 B3063C27C53 for ; Wed, 5 Jun 2024 11:41:52 +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=l/FkDjmBHYXKY5m6Nv1WTgxLbrqrNwcIPGHZFGlh4WA=; b=DQSWSb52LpEndb rGzJ9YhNImEBxrlgIvQZ5h4dOH6D7wThaiA367RC1awI+IOKxXRuB22ajQVMBpC0CqrJXX6kCycyz viJtkR93acdx6k5CmxknuEnmuDKwHqn3cte4GLsM5sMeMQuwsIdyeiIcev185zij+5porZfDZX2sL 7MAVkGzIAAFjy5zUFbBdY9iVdJEcKplzTcYmUGpMrL+HEBvhzZTKr/MW3+ikk7+TzF0rk9CNcMnLq aSesgDaNhxEVVRyzIHEca7yNljxCavYd5bQpbvIBAaHJWz5uDYhUUbhbkaRkJp1+KNX5FDfaJKZEf xMgD47b+HdG5AycVsNmA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sEp1Y-00000005k4Z-0JmW; Wed, 05 Jun 2024 11:41:48 +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 1sEp1U-00000005k0l-1iWf for linux-riscv@lists.infradead.org; Wed, 05 Jun 2024 11:41:47 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 816E461828; Wed, 5 Jun 2024 11:41:43 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 17BD5C4AF07; Wed, 5 Jun 2024 11:41:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1717587703; bh=leGoQp8DEEvTCeM4J9FC79a8Zz3S/PSgaRX/3/h/W8c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SrE60qV8oPpVdrRp9tUwh9ikl7xIxLTsNY63/3cH50PJYUc8iADgU6aQ2lWeBzVdC Bm/D+UZgx+0eqn6rNGPDrUbLTFBA2D98lam6/6CUgQU0w5daAlIVKzXOo3gLZtuy0q DQghfAdosXGf3Kxm7srDhYYV0bkMYx6RGPCm0Anlg7s8L2hxWW94oEgaGUZZBfR2+T 6x9wvIq33dfBPA55iWPQknOQO+x+spsb7EqaQ2bu9Mi4/U3NcJY07Uqia6jKeDvvXP miRZUaXHShRtvlG0Jg53UQWHeEHGOz94fFtNu/D+LJZ+EGh3HfDI3TAIw4rRxg72D7 1q6V+P31mOieA== 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 v4 06/11] riscv: mm: Add memory hotplugging support Date: Wed, 5 Jun 2024 13:40:49 +0200 Message-ID: <20240605114100.315918-7-bjorn@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240605114100.315918-1-bjorn@kernel.org> References: <20240605114100.315918-1-bjorn@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240605_044144_776314_E391A504 X-CRM114-Status: GOOD ( 19.36 ) 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 aC9yaXNjdi9tbS9pbml0LmMgfCAyNjcgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKwogMSBmaWxlIGNoYW5nZWQsIDI2NyBpbnNlcnRpb25zKCspCgpkaWZmIC0tZ2l0 IGEvYXJjaC9yaXNjdi9tbS9pbml0LmMgYi9hcmNoL3Jpc2N2L21tL2luaXQuYwppbmRleCAxZjdl N2MyMjNiZWMuLmJmYTJkZWE5NTM1NCAxMDA2NDQKLS0tIGEvYXJjaC9yaXNjdi9tbS9pbml0LmMK KysrIGIvYXJjaC9yaXNjdi9tbS9pbml0LmMKQEAgLTE1MzQsMyArMTUzNCwyNzAgQEAgc3RydWN0 IGV4ZWNtZW1faW5mbyBfX2luaXQgKmV4ZWNtZW1fYXJjaF9zZXR1cCh2b2lkKQogfQogI2VuZGlm IC8qIENPTkZJR19NTVUgKi8KICNlbmRpZiAvKiBDT05GSUdfRVhFQ01FTSAqLworCisjaWZkZWYg Q09ORklHX01FTU9SWV9IT1RQTFVHCitzdGF0aWMgdm9pZCBfX21lbWluaXQgZnJlZV9wdGVfdGFi bGUocHRlX3QgKnB0ZV9zdGFydCwgcG1kX3QgKnBtZCkKK3sKKwlzdHJ1Y3QgcGFnZSAqcGFnZSA9 IHBtZF9wYWdlKCpwbWQpOworCXN0cnVjdCBwdGRlc2MgKnB0ZGVzYyA9IHBhZ2VfcHRkZXNjKHBh Z2UpOworCXB0ZV90ICpwdGU7CisJaW50IGk7CisKKwlmb3IgKGkgPSAwOyBpIDwgUFRSU19QRVJf UFRFOyBpKyspIHsKKwkJcHRlID0gcHRlX3N0YXJ0ICsgaTsKKwkJaWYgKCFwdGVfbm9uZSgqcHRl KSkKKwkJCXJldHVybjsKKwl9CisKKwlwYWdldGFibGVfcHRlX2R0b3IocHRkZXNjKTsKKwlpZiAo UGFnZVJlc2VydmVkKHBhZ2UpKQorCQlmcmVlX3Jlc2VydmVkX3BhZ2UocGFnZSk7CisJZWxzZQor CQlwYWdldGFibGVfZnJlZShwdGRlc2MpOworCXBtZF9jbGVhcihwbWQpOworfQorCitzdGF0aWMg dm9pZCBfX21lbWluaXQgZnJlZV9wbWRfdGFibGUocG1kX3QgKnBtZF9zdGFydCwgcHVkX3QgKnB1 ZCkKK3sKKwlzdHJ1Y3QgcGFnZSAqcGFnZSA9IHB1ZF9wYWdlKCpwdWQpOworCXN0cnVjdCBwdGRl c2MgKnB0ZGVzYyA9IHBhZ2VfcHRkZXNjKHBhZ2UpOworCXBtZF90ICpwbWQ7CisJaW50IGk7CisK Kwlmb3IgKGkgPSAwOyBpIDwgUFRSU19QRVJfUE1EOyBpKyspIHsKKwkJcG1kID0gcG1kX3N0YXJ0 ICsgaTsKKwkJaWYgKCFwbWRfbm9uZSgqcG1kKSkKKwkJCXJldHVybjsKKwl9CisKKwlwYWdldGFi bGVfcG1kX2R0b3IocHRkZXNjKTsKKwlpZiAoUGFnZVJlc2VydmVkKHBhZ2UpKQorCQlmcmVlX3Jl c2VydmVkX3BhZ2UocGFnZSk7CisJZWxzZQorCQlwYWdldGFibGVfZnJlZShwdGRlc2MpOworCXB1 ZF9jbGVhcihwdWQpOworfQorCitzdGF0aWMgdm9pZCBfX21lbWluaXQgZnJlZV9wdWRfdGFibGUo cHVkX3QgKnB1ZF9zdGFydCwgcDRkX3QgKnA0ZCkKK3sKKwlzdHJ1Y3QgcGFnZSAqcGFnZSA9IHA0 ZF9wYWdlKCpwNGQpOworCXB1ZF90ICpwdWQ7CisJaW50IGk7CisKKwlmb3IgKGkgPSAwOyBpIDwg UFRSU19QRVJfUFVEOyBpKyspIHsKKwkJcHVkID0gcHVkX3N0YXJ0ICsgaTsKKwkJaWYgKCFwdWRf bm9uZSgqcHVkKSkKKwkJCXJldHVybjsKKwl9CisKKwlpZiAoUGFnZVJlc2VydmVkKHBhZ2UpKQor CQlmcmVlX3Jlc2VydmVkX3BhZ2UocGFnZSk7CisJZWxzZQorCQlmcmVlX3BhZ2VzKCh1bnNpZ25l ZCBsb25nKXBhZ2VfYWRkcmVzcyhwYWdlKSwgMCk7CisJcDRkX2NsZWFyKHA0ZCk7Cit9CisKK3N0 YXRpYyB2b2lkIF9fbWVtaW5pdCBmcmVlX3ZtZW1tYXBfc3RvcmFnZShzdHJ1Y3QgcGFnZSAqcGFn ZSwgc2l6ZV90IHNpemUsCisJCQkJCSAgIHN0cnVjdCB2bWVtX2FsdG1hcCAqYWx0bWFwKQorewor CWludCBvcmRlciA9IGdldF9vcmRlcihzaXplKTsKKworCWlmIChhbHRtYXApIHsKKwkJdm1lbV9h bHRtYXBfZnJlZShhbHRtYXAsIHNpemUgPj4gUEFHRV9TSElGVCk7CisJCXJldHVybjsKKwl9CisK KwlpZiAoUGFnZVJlc2VydmVkKHBhZ2UpKSB7CisJCXVuc2lnbmVkIGludCBucl9wYWdlcyA9IDEg PDwgb3JkZXI7CisKKwkJd2hpbGUgKG5yX3BhZ2VzLS0pCisJCQlmcmVlX3Jlc2VydmVkX3BhZ2Uo cGFnZSsrKTsKKwkJcmV0dXJuOworCX0KKworCWZyZWVfcGFnZXMoKHVuc2lnbmVkIGxvbmcpcGFn ZV9hZGRyZXNzKHBhZ2UpLCBvcmRlcik7Cit9CisKK3N0YXRpYyB2b2lkIF9fbWVtaW5pdCByZW1v dmVfcHRlX21hcHBpbmcocHRlX3QgKnB0ZV9iYXNlLCB1bnNpZ25lZCBsb25nIGFkZHIsIHVuc2ln bmVkIGxvbmcgZW5kLAorCQkJCQkgYm9vbCBpc192bWVtbWFwLCBzdHJ1Y3Qgdm1lbV9hbHRtYXAg KmFsdG1hcCkKK3sKKwl1bnNpZ25lZCBsb25nIG5leHQ7CisJcHRlX3QgKnB0ZXAsIHB0ZTsKKwor CWZvciAoOyBhZGRyIDwgZW5kOyBhZGRyID0gbmV4dCkgeworCQluZXh0ID0gKGFkZHIgKyBQQUdF X1NJWkUpICYgUEFHRV9NQVNLOworCQlpZiAobmV4dCA+IGVuZCkKKwkJCW5leHQgPSBlbmQ7CisK KwkJcHRlcCA9IHB0ZV9iYXNlICsgcHRlX2luZGV4KGFkZHIpOworCQlwdGUgPSBwdGVwX2dldChw dGVwKTsKKwkJaWYgKCFwdGVfcHJlc2VudCgqcHRlcCkpCisJCQljb250aW51ZTsKKworCQlwdGVf Y2xlYXIoJmluaXRfbW0sIGFkZHIsIHB0ZXApOworCQlpZiAoaXNfdm1lbW1hcCkKKwkJCWZyZWVf dm1lbW1hcF9zdG9yYWdlKHB0ZV9wYWdlKHB0ZSksIFBBR0VfU0laRSwgYWx0bWFwKTsKKwl9Cit9 CisKK3N0YXRpYyB2b2lkIF9fbWVtaW5pdCByZW1vdmVfcG1kX21hcHBpbmcocG1kX3QgKnBtZF9i YXNlLCB1bnNpZ25lZCBsb25nIGFkZHIsIHVuc2lnbmVkIGxvbmcgZW5kLAorCQkJCQkgYm9vbCBp c192bWVtbWFwLCBzdHJ1Y3Qgdm1lbV9hbHRtYXAgKmFsdG1hcCkKK3sKKwl1bnNpZ25lZCBsb25n IG5leHQ7CisJcHRlX3QgKnB0ZV9iYXNlOworCXBtZF90ICpwbWRwLCBwbWQ7CisKKwlmb3IgKDsg YWRkciA8IGVuZDsgYWRkciA9IG5leHQpIHsKKwkJbmV4dCA9IHBtZF9hZGRyX2VuZChhZGRyLCBl bmQpOworCQlwbWRwID0gcG1kX2Jhc2UgKyBwbWRfaW5kZXgoYWRkcik7CisJCXBtZCA9IHBtZHBf Z2V0KHBtZHApOworCQlpZiAoIXBtZF9wcmVzZW50KHBtZCkpCisJCQljb250aW51ZTsKKworCQlp ZiAocG1kX2xlYWYocG1kKSkgeworCQkJcG1kX2NsZWFyKHBtZHApOworCQkJaWYgKGlzX3ZtZW1t YXApCisJCQkJZnJlZV92bWVtbWFwX3N0b3JhZ2UocG1kX3BhZ2UocG1kKSwgUE1EX1NJWkUsIGFs dG1hcCk7CisJCQljb250aW51ZTsKKwkJfQorCisJCXB0ZV9iYXNlID0gKHB0ZV90ICopcG1kX3Bh Z2VfdmFkZHIoKnBtZHApOworCQlyZW1vdmVfcHRlX21hcHBpbmcocHRlX2Jhc2UsIGFkZHIsIG5l eHQsIGlzX3ZtZW1tYXAsIGFsdG1hcCk7CisJCWZyZWVfcHRlX3RhYmxlKHB0ZV9iYXNlLCBwbWRw KTsKKwl9Cit9CisKK3N0YXRpYyB2b2lkIF9fbWVtaW5pdCByZW1vdmVfcHVkX21hcHBpbmcocHVk X3QgKnB1ZF9iYXNlLCB1bnNpZ25lZCBsb25nIGFkZHIsIHVuc2lnbmVkIGxvbmcgZW5kLAorCQkJ CQkgYm9vbCBpc192bWVtbWFwLCBzdHJ1Y3Qgdm1lbV9hbHRtYXAgKmFsdG1hcCkKK3sKKwl1bnNp Z25lZCBsb25nIG5leHQ7CisJcHVkX3QgKnB1ZHAsIHB1ZDsKKwlwbWRfdCAqcG1kX2Jhc2U7CisK Kwlmb3IgKDsgYWRkciA8IGVuZDsgYWRkciA9IG5leHQpIHsKKwkJbmV4dCA9IHB1ZF9hZGRyX2Vu ZChhZGRyLCBlbmQpOworCQlwdWRwID0gcHVkX2Jhc2UgKyBwdWRfaW5kZXgoYWRkcik7CisJCXB1 ZCA9IHB1ZHBfZ2V0KHB1ZHApOworCQlpZiAoIXB1ZF9wcmVzZW50KHB1ZCkpCisJCQljb250aW51 ZTsKKworCQlpZiAocHVkX2xlYWYocHVkKSkgeworCQkJaWYgKHBndGFibGVfbDRfZW5hYmxlZCkg eworCQkJCXB1ZF9jbGVhcihwdWRwKTsKKwkJCQlpZiAoaXNfdm1lbW1hcCkKKwkJCQkJZnJlZV92 bWVtbWFwX3N0b3JhZ2UocHVkX3BhZ2UocHVkKSwgUFVEX1NJWkUsIGFsdG1hcCk7CisJCQl9CisJ CQljb250aW51ZTsKKwkJfQorCisJCXBtZF9iYXNlID0gcG1kX29mZnNldChwdWRwLCAwKTsKKwkJ cmVtb3ZlX3BtZF9tYXBwaW5nKHBtZF9iYXNlLCBhZGRyLCBuZXh0LCBpc192bWVtbWFwLCBhbHRt YXApOworCisJCWlmIChwZ3RhYmxlX2w0X2VuYWJsZWQpCisJCQlmcmVlX3BtZF90YWJsZShwbWRf YmFzZSwgcHVkcCk7CisJfQorfQorCitzdGF0aWMgdm9pZCBfX21lbWluaXQgcmVtb3ZlX3A0ZF9t YXBwaW5nKHA0ZF90ICpwNGRfYmFzZSwgdW5zaWduZWQgbG9uZyBhZGRyLCB1bnNpZ25lZCBsb25n IGVuZCwKKwkJCQkJIGJvb2wgaXNfdm1lbW1hcCwgc3RydWN0IHZtZW1fYWx0bWFwICphbHRtYXAp Cit7CisJdW5zaWduZWQgbG9uZyBuZXh0OworCXA0ZF90ICpwNGRwLCBwNGQ7CisJcHVkX3QgKnB1 ZF9iYXNlOworCisJZm9yICg7IGFkZHIgPCBlbmQ7IGFkZHIgPSBuZXh0KSB7CisJCW5leHQgPSBw NGRfYWRkcl9lbmQoYWRkciwgZW5kKTsKKwkJcDRkcCA9IHA0ZF9iYXNlICsgcDRkX2luZGV4KGFk ZHIpOworCQlwNGQgPSBwNGRwX2dldChwNGRwKTsKKwkJaWYgKCFwNGRfcHJlc2VudChwNGQpKQor CQkJY29udGludWU7CisKKwkJaWYgKHA0ZF9sZWFmKHA0ZCkpIHsKKwkJCWlmIChwZ3RhYmxlX2w1 X2VuYWJsZWQpIHsKKwkJCQlwNGRfY2xlYXIocDRkcCk7CisJCQkJaWYgKGlzX3ZtZW1tYXApCisJ CQkJCWZyZWVfdm1lbW1hcF9zdG9yYWdlKHA0ZF9wYWdlKHA0ZCksIFA0RF9TSVpFLCBhbHRtYXAp OworCQkJfQorCQkJY29udGludWU7CisJCX0KKworCQlwdWRfYmFzZSA9IHB1ZF9vZmZzZXQocDRk cCwgMCk7CisJCXJlbW92ZV9wdWRfbWFwcGluZyhwdWRfYmFzZSwgYWRkciwgbmV4dCwgaXNfdm1l bW1hcCwgYWx0bWFwKTsKKworCQlpZiAocGd0YWJsZV9sNV9lbmFibGVkKQorCQkJZnJlZV9wdWRf dGFibGUocHVkX2Jhc2UsIHA0ZHApOworCX0KK30KKworc3RhdGljIHZvaWQgX19tZW1pbml0IHJl bW92ZV9wZ2RfbWFwcGluZyh1bnNpZ25lZCBsb25nIHZhLCB1bnNpZ25lZCBsb25nIGVuZCwgYm9v bCBpc192bWVtbWFwLAorCQkJCQkgc3RydWN0IHZtZW1fYWx0bWFwICphbHRtYXApCit7CisJdW5z aWduZWQgbG9uZyBhZGRyLCBuZXh0OworCXA0ZF90ICpwNGRfYmFzZTsKKwlwZ2RfdCAqcGdkOwor CisJZm9yIChhZGRyID0gdmE7IGFkZHIgPCBlbmQ7IGFkZHIgPSBuZXh0KSB7CisJCW5leHQgPSBw Z2RfYWRkcl9lbmQoYWRkciwgZW5kKTsKKwkJcGdkID0gcGdkX29mZnNldF9rKGFkZHIpOworCisJ CWlmICghcGdkX3ByZXNlbnQoKnBnZCkpCisJCQljb250aW51ZTsKKworCQlpZiAocGdkX2xlYWYo KnBnZCkpCisJCQljb250aW51ZTsKKworCQlwNGRfYmFzZSA9IHA0ZF9vZmZzZXQocGdkLCAwKTsK KwkJcmVtb3ZlX3A0ZF9tYXBwaW5nKHA0ZF9iYXNlLCBhZGRyLCBuZXh0LCBpc192bWVtbWFwLCBh bHRtYXApOworCX0KKworCWZsdXNoX3RsYl9hbGwoKTsKK30KKworc3RhdGljIHZvaWQgX19tZW1p bml0IHJlbW92ZV9saW5lYXJfbWFwcGluZyhwaHlzX2FkZHJfdCBzdGFydCwgdTY0IHNpemUpCit7 CisJdW5zaWduZWQgbG9uZyB2YSA9ICh1bnNpZ25lZCBsb25nKV9fdmEoc3RhcnQpOworCXVuc2ln bmVkIGxvbmcgZW5kID0gKHVuc2lnbmVkIGxvbmcpX192YShzdGFydCArIHNpemUpOworCisJcmVt b3ZlX3BnZF9tYXBwaW5nKHZhLCBlbmQsIGZhbHNlLCBOVUxMKTsKK30KKworc3RydWN0IHJhbmdl IGFyY2hfZ2V0X21hcHBhYmxlX3JhbmdlKHZvaWQpCit7CisJc3RydWN0IHJhbmdlIG1ocF9yYW5n ZTsKKworCW1ocF9yYW5nZS5zdGFydCA9IF9fcGEoUEFHRV9PRkZTRVQpOworCW1ocF9yYW5nZS5l bmQgPSBfX3BhKFBBR0VfRU5EIC0gMSk7CisJcmV0dXJuIG1ocF9yYW5nZTsKK30KKworaW50IF9f cmVmIGFyY2hfYWRkX21lbW9yeShpbnQgbmlkLCB1NjQgc3RhcnQsIHU2NCBzaXplLCBzdHJ1Y3Qg bWhwX3BhcmFtcyAqcGFyYW1zKQoreworCWludCByZXQgPSAwOworCisJY3JlYXRlX2xpbmVhcl9t YXBwaW5nX3JhbmdlKHN0YXJ0LCBzdGFydCArIHNpemUsIDAsICZwYXJhbXMtPnBncHJvdCk7CisJ cmV0ID0gX19hZGRfcGFnZXMobmlkLCBzdGFydCA+PiBQQUdFX1NISUZULCBzaXplID4+IFBBR0Vf U0hJRlQsIHBhcmFtcyk7CisJaWYgKHJldCkgeworCQlyZW1vdmVfbGluZWFyX21hcHBpbmcoc3Rh cnQsIHNpemUpOworCQlnb3RvIG91dDsKKwl9CisKKwltYXhfcGZuID0gUEZOX1VQKHN0YXJ0ICsg c2l6ZSk7CisJbWF4X2xvd19wZm4gPSBtYXhfcGZuOworCisgb3V0OgorCWZsdXNoX3RsYl9hbGwo KTsKKwlyZXR1cm4gcmV0OworfQorCit2b2lkIF9fcmVmIGFyY2hfcmVtb3ZlX21lbW9yeSh1NjQg c3RhcnQsIHU2NCBzaXplLCBzdHJ1Y3Qgdm1lbV9hbHRtYXAgKmFsdG1hcCkKK3sKKwlfX3JlbW92 ZV9wYWdlcyhzdGFydCA+PiBQQUdFX1NISUZULCBzaXplID4+IFBBR0VfU0hJRlQsIGFsdG1hcCk7 CisJcmVtb3ZlX2xpbmVhcl9tYXBwaW5nKHN0YXJ0LCBzaXplKTsKKwlmbHVzaF90bGJfYWxsKCk7 Cit9CisKK3ZvaWQgX19yZWYgdm1lbW1hcF9mcmVlKHVuc2lnbmVkIGxvbmcgc3RhcnQsIHVuc2ln bmVkIGxvbmcgZW5kLCBzdHJ1Y3Qgdm1lbV9hbHRtYXAgKmFsdG1hcCkKK3sKKwlyZW1vdmVfcGdk X21hcHBpbmcoc3RhcnQsIGVuZCwgdHJ1ZSwgYWx0bWFwKTsKK30KKyNlbmRpZiAvKiBDT05GSUdf TUVNT1JZX0hPVFBMVUcgKi8KLS0gCjIuNDMuMAoKCl9fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fCmxpbnV4LXJpc2N2IG1haWxpbmcgbGlzdApsaW51eC1yaXNj dkBsaXN0cy5pbmZyYWRlYWQub3JnCmh0dHA6Ly9saXN0cy5pbmZyYWRlYWQub3JnL21haWxtYW4v bGlzdGluZm8vbGludXgtcmlzY3YK 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 3A0D5194A5F for ; Wed, 5 Jun 2024 11:41:45 +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=1717587708; cv=none; b=lTNdNiORtziz2uRhPtB52ifFgiEKwh1Qce6DlB2QCfwgI2AfDRdeIIvTmgSCLVM/SLr/gyUwaH+1aAr5rgC6oVdUwX7OEX2EIQuVx3U+PciAHNzyHxjUsHJiIMwlpFIuZbeqWyti7jeSUw6WCIW6h5ypheZPAmeePgmdcyU14hM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717587708; c=relaxed/simple; bh=leGoQp8DEEvTCeM4J9FC79a8Zz3S/PSgaRX/3/h/W8c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=tYifaWSewdRGRhJn4Gv2ifpv+HJWtv5k8HRAsHy3OqIAOEqp/VxU5PKHm5j3BritXMa/FyHxWQOpQPiBUpLetIhBOgk1ofSBxtFLZuDBUGSORfnhAAMf85JcTu4LCv51U9zQx5a3c1logBO/An8mCJXti7TORU9Md2T7IBTbeAc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=SrE60qV8; 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="SrE60qV8" Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id B942541749 for ; Wed, 5 Jun 2024 11:41:45 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org X-Spam-Flag: NO X-Spam-Score: -4.401 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 LPTwg7KbPyZ1 for ; Wed, 5 Jun 2024 11:41:44 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2604:1380:4641:c500::1; helo=dfw.source.kernel.org; envelope-from=bjorn@kernel.org; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp4.osuosl.org 5280340323 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 5280340323 Authentication-Results: smtp4.osuosl.org; dkim=pass (2048-bit key, unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=SrE60qV8 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by smtp4.osuosl.org (Postfix) with ESMTPS id 5280340323 for ; Wed, 5 Jun 2024 11:41:44 +0000 (UTC) Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 816E461828; Wed, 5 Jun 2024 11:41:43 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 17BD5C4AF07; Wed, 5 Jun 2024 11:41:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1717587703; bh=leGoQp8DEEvTCeM4J9FC79a8Zz3S/PSgaRX/3/h/W8c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SrE60qV8oPpVdrRp9tUwh9ikl7xIxLTsNY63/3cH50PJYUc8iADgU6aQ2lWeBzVdC Bm/D+UZgx+0eqn6rNGPDrUbLTFBA2D98lam6/6CUgQU0w5daAlIVKzXOo3gLZtuy0q DQghfAdosXGf3Kxm7srDhYYV0bkMYx6RGPCm0Anlg7s8L2hxWW94oEgaGUZZBfR2+T 6x9wvIq33dfBPA55iWPQknOQO+x+spsb7EqaQ2bu9Mi4/U3NcJY07Uqia6jKeDvvXP miRZUaXHShRtvlG0Jg53UQWHeEHGOz94fFtNu/D+LJZ+EGh3HfDI3TAIw4rRxg72D7 1q6V+P31mOieA== 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 v4 06/11] riscv: mm: Add memory hotplugging support Date: Wed, 5 Jun 2024 13:40:49 +0200 Message-ID: <20240605114100.315918-7-bjorn@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240605114100.315918-1-bjorn@kernel.org> References: <20240605114100.315918-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 | 267 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 267 insertions(+) diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c index 1f7e7c223bec..bfa2dea95354 100644 --- a/arch/riscv/mm/init.c +++ b/arch/riscv/mm/init.c @@ -1534,3 +1534,270 @@ struct execmem_info __init *execmem_arch_setup(void) } #endif /* CONFIG_MMU */ #endif /* CONFIG_EXECMEM */ + +#ifdef CONFIG_MEMORY_HOTPLUG +static void __meminit free_pte_table(pte_t *pte_start, pmd_t *pmd) +{ + struct page *page = pmd_page(*pmd); + struct ptdesc *ptdesc = page_ptdesc(page); + pte_t *pte; + int i; + + for (i = 0; i < PTRS_PER_PTE; i++) { + pte = pte_start + i; + if (!pte_none(*pte)) + return; + } + + pagetable_pte_dtor(ptdesc); + if (PageReserved(page)) + free_reserved_page(page); + else + pagetable_free(ptdesc); + pmd_clear(pmd); +} + +static void __meminit free_pmd_table(pmd_t *pmd_start, pud_t *pud) +{ + struct page *page = pud_page(*pud); + struct ptdesc *ptdesc = page_ptdesc(page); + pmd_t *pmd; + int i; + + for (i = 0; i < PTRS_PER_PMD; i++) { + pmd = pmd_start + i; + if (!pmd_none(*pmd)) + return; + } + + pagetable_pmd_dtor(ptdesc); + if (PageReserved(page)) + free_reserved_page(page); + else + pagetable_free(ptdesc); + pud_clear(pud); +} + +static void __meminit free_pud_table(pud_t *pud_start, p4d_t *p4d) +{ + struct page *page = p4d_page(*p4d); + pud_t *pud; + int i; + + for (i = 0; i < PTRS_PER_PUD; i++) { + pud = pud_start + i; + if (!pud_none(*pud)) + return; + } + + if (PageReserved(page)) + free_reserved_page(page); + else + free_pages((unsigned long)page_address(page), 0); + p4d_clear(p4d); +} + +static void __meminit free_vmemmap_storage(struct page *page, size_t size, + struct vmem_altmap *altmap) +{ + int order = get_order(size); + + if (altmap) { + vmem_altmap_free(altmap, size >> PAGE_SHIFT); + return; + } + + if (PageReserved(page)) { + unsigned int nr_pages = 1 << order; + + while (nr_pages--) + free_reserved_page(page++); + return; + } + + free_pages((unsigned long)page_address(page), order); +} + +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 = ptep_get(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 = pmdp_get(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 = pudp_get(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 = p4dp_get(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.43.0