From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8461DC77B6F for ; Thu, 6 Apr 2023 15:14:53 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B2AFA6B007D; Thu, 6 Apr 2023 11:14:50 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A3A3B6B0081; Thu, 6 Apr 2023 11:14:50 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8B4466B0082; Thu, 6 Apr 2023 11:14:50 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 592D96B0080 for ; Thu, 6 Apr 2023 11:14:50 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 09E44812AB for ; Thu, 6 Apr 2023 15:14:50 +0000 (UTC) X-FDA: 80651313540.30.122DCA4 Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by imf29.hostedemail.com (Postfix) with ESMTP id 29FFE12001C for ; Thu, 6 Apr 2023 15:14:46 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=none; spf=pass (imf29.hostedemail.com: domain of tanurelinux@gmail.com designates 209.85.128.48 as permitted sender) smtp.mailfrom=tanurelinux@gmail.com; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1680794087; 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; bh=KTGfYrqfzS07zpfH0JC+lthwHQN3E94OuA9UZu3JUac=; b=x4jNNKIGipfjUoJXvFoZ0ukXeKsE2IRb/4Xy6+DUUFrk9kaI6NtVOrtV87IDhgfNMbxl11 8iI9FKPID/tnIdHgMUUqjMLEBXgj8QB0m3gmdZfk/gvDgB33MFBLF7tJhWMsRiI2fXYCKc IAEEnVVdxxCudWyVJLaFORJX1GUZyyM= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=none; spf=pass (imf29.hostedemail.com: domain of tanurelinux@gmail.com designates 209.85.128.48 as permitted sender) smtp.mailfrom=tanurelinux@gmail.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1680794087; a=rsa-sha256; cv=none; b=itHaTaY7otHseiVFmR6V3xdBB1N7T3kLRZcOONydzFnVTZ5fqQd09sp2rDrT7UavrARD57 OnlS+tJH7Rzj50Q9VqywKaBcB8MksKaAhSdMa0fRSYzaa84NcCaZRWT575Lxt1I5ULdXHU RK4ph4vTltO3CKp/xPfTDHorZ9UPdXE= Received: by mail-wm1-f48.google.com with SMTP id j18-20020a05600c1c1200b003ee5157346cso25722700wms.1 for ; Thu, 06 Apr 2023 08:14:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680794086; x=1683386086; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=KTGfYrqfzS07zpfH0JC+lthwHQN3E94OuA9UZu3JUac=; b=vpI2Qx1bDB10TVaKsR7UbqnKMKrZ5hDYF6rF9JNuW90FZ0d7+Z3Ok3e3UCEAo5dvkL qSLKUg+RBzJ2YoWmqrwJ4faPS/sJr+Lz+ZrDcfcTMLD8dF1nCXPsU3/oMtNsSu01XtZ6 t3Zi18dq8jZrPxCiTvcwcnKu5/dtgVUjdqv7Uw5Lj1UxkAvr7ABxNnYdBCvjkI6/5rcK Xb5BKrhBq8KzqleTTr375fIFrjjsNldxFwBQOZBvfUNRrB6o1z7Jf0gt/2QOSTr2aT3G uP/Pm/BRZlqoqvSkIAHEla8W51eFq4UQKdsGjBJZHbVIEY1KmV6q6n/TSbrgcPl0Zn7T uowQ== X-Gm-Message-State: AAQBX9eQmGNt6smpn63O+xVBi+1D8imEJwl2wG353E72NvIa1aUSuzhS /+uQ5/nDJdmWkGSEzCmG5mo= X-Google-Smtp-Source: AKy350bioooJgfp2IytRIDWd0TtyTY5KBmKx4pJ+VtEwGO+IsLJWXioFGYateblkCLF62e/3sqxzDw== X-Received: by 2002:a7b:c38a:0:b0:3ed:e715:1784 with SMTP id s10-20020a7bc38a000000b003ede7151784mr8689914wmj.15.1680794085640; Thu, 06 Apr 2023 08:14:45 -0700 (PDT) Received: from ryzen.lan (cpc87451-finc19-2-0-cust61.4-2.cable.virginm.net. [82.11.51.62]) by smtp.gmail.com with ESMTPSA id fj12-20020a05600c0c8c00b003ef67848a21sm5560213wmb.13.2023.04.06.08.14.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Apr 2023 08:14:45 -0700 (PDT) From: Lucas Tanure To: Rob Herring , Frank Rowand , Mike Rapoport , Andrew Morton Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, jbrunet@baylibre.com, linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org, martin.blumenstingl@googlemail.com, narmstrong@baylibre.com, stefan@agner.ch, Lucas Tanure Subject: [PATCH 1/2] memblock: Differentiate regions overlap from both regions being the same Date: Thu, 6 Apr 2023 16:14:28 +0100 Message-Id: <20230406151429.524591-2-tanure@linux.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230406151429.524591-1-tanure@linux.com> References: <20230406151429.524591-1-tanure@linux.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam03 X-Stat-Signature: g9hg3qha7xod1tookmz9ena6s9esfwg4 X-Rspamd-Queue-Id: 29FFE12001C X-HE-Tag: 1680794086-128069 X-HE-Meta: U2FsdGVkX19PlpZdNKdsbuqn5HPB3NZm3ehhw/vTwsw9IWpPsbA2poIcDrDCkCTOfKrOdptSIdUh3g7HtXiJTy6Xi714h6/HMeEUJgh82F3lViYbmcWDDhiY5ygs2LgGLy+lGVbMSUrRnSbiYGeT3K6JFSSvICeqfPD58WzA4JC6p/CnqtZcMP0Wa/UQ2vPmgnHCgr5bxeotyTsufsZQOAIpCv18Q8rZL3MBMCV2TGOHBSiciNR/IYi/0KmlMAKf9onyEfFx6aec6Z4jNei0iTkx/TF1nuR7of8wWV9ktTqyQ0x4NHj0IA2wu7FUfiez+Nj9L0g9LFcCoaXT7cmTTTtV4OH5HSjYcaiCeOchtdkHg0a90fTI4BevyiVkoU3w08ooWviphg4UMWqe6rBqiVRNV3AG6pSa6YZukRIXXsvNZLDJluEUtlAnpH7hdqQh8WOhKTJ+GY7J2UYJFWRBtRfPLQ/yZim0VJYGEMn+EYzNnrfSqPQORRTO/YSkaanPTpd0NI8zKQvOF7KRx4A9c4TBzqBvD76w8Aq1FskJcGoE4Fcu4be4ysF9InPsJd2oCCiiZCPKZEf2lyXpJPM9WcK0rAb/Z8I1laOvcjAN3/z4ZalanEpuQVL024uLQwBeIWZVPHsbawcJpTnyvceZv+tKOA7362t3Dt+yGDT1um+GwkRuVIiM7zvO1wR1/I3VLipbmbEEqBOM9R0QZPF4re2o+wUZeh08NrA+WhXIiymqpIzwrbC13V8BVUqJBPmVGxX16cTTQcOqSKuy9+/zuNFLFoPGbe6iKSuEr8PE6xrDvnYln/tWhAZmysCc0W2zMbnMHeKNLtYtHgogyxZ2Cv+35A4pJ9JvLd8y8nzt5jkcwN1zlJwuE6Z8IRXeDGncAm1oTMyy72D5o2GBDK62XFyUpOrmA+VvQde4Q3KkTX8eky2QrpeWovYclZG7DqVqqNme7a7Ov2z8cgsedfj INVkVaQT 8l6OaR6BaZK8uOe4674GjmEjR736A8z30V47ydT7updEKOFtk129sw+Ak949crClk89vR+DGXo7WZbeVEvntgPwwZurLFlZcoPs5XWTTRbpBQEV58N5IqYcR14195N3SPwcKPzhHTaNPaSj4256RxB0suZzCfd6YIXqYb9OugUeEYELZGCxrbEHqAlIVLJmnxZzngruuGCP3+kP1Uk01Ke1dHc9AAclwB4i1pESA97RrSJFlYJC3u9iwuoKMQiEg9b34KgoliDNXx6EiRBt5UyykSMYc+8FmqyekWstvKCWjDl8wir0DUKQGVILaLL+6LMK3cUhu16Y3gVJ0xXuZwzVkLx2Gn4H8IWteu54mS9wyY0UhPVrIC0Y6ZJ3rOaQTmeg69TEJmHWD7AmjvUL0oBlV6Lo0hxlRLd2KNMKHlcfkyY7F0eRKzt1Kt1YVE4l3u1YjegPmW2ph+QLNsZfWLmT1oUHEV1HHJT/WD/9xB7pucDIjSnTSlgsYmrK3idgQns0OAX2JJGHT6z3v4lHwQz5N2Rw== 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: Add support for memblock_addrs_overlap to return a different value when both regions are exactly the same region, where base and size are equal between the regions. Signed-off-by: Lucas Tanure --- include/linux/memblock.h | 18 +++++++++++++++--- mm/memblock.c | 37 ++++++++++++++++++++++++------------- 2 files changed, 39 insertions(+), 16 deletions(-) diff --git a/include/linux/memblock.h b/include/linux/memblock.h index 50ad19662a32..c7ba8b01a637 100644 --- a/include/linux/memblock.h +++ b/include/linux/memblock.h @@ -49,6 +49,18 @@ enum memblock_flags { MEMBLOCK_DRIVER_MANAGED = 0x8, /* always detected via a driver */ }; +/** + * enum memblock_overlap_type - result of comparison between two memory regions + * @MEMBLOCK_NO_OVERLAPS: there is no overlap between the two regions + * @MEMBLOCK_OVERLAPS: the two regions overlap each other, but are not the same + * @MEMBLOCK_EQUAL: both bases and sizes are equal, so the two regions are exactly the same + */ +enum memblock_overlap_type { + MEMBLOCK_NO_OVERLAPS, + MEMBLOCK_OVERLAPS, + MEMBLOCK_EQUAL, +}; + /** * struct memblock_region - represents a memory region * @base: base address of the region @@ -118,8 +130,8 @@ int memblock_reserve(phys_addr_t base, phys_addr_t size); int memblock_physmem_add(phys_addr_t base, phys_addr_t size); #endif void memblock_trim_memory(phys_addr_t align); -bool memblock_overlaps_region(struct memblock_type *type, - phys_addr_t base, phys_addr_t size); +unsigned int memblock_overlaps_region(struct memblock_type *type, + phys_addr_t base, phys_addr_t size); int memblock_mark_hotplug(phys_addr_t base, phys_addr_t size); int memblock_clear_hotplug(phys_addr_t base, phys_addr_t size); int memblock_mark_mirror(phys_addr_t base, phys_addr_t size); @@ -486,7 +498,7 @@ bool memblock_is_memory(phys_addr_t addr); bool memblock_is_map_memory(phys_addr_t addr); bool memblock_is_region_memory(phys_addr_t base, phys_addr_t size); bool memblock_is_reserved(phys_addr_t addr); -bool memblock_is_region_reserved(phys_addr_t base, phys_addr_t size); +unsigned int memblock_is_region_reserved(phys_addr_t base, phys_addr_t size); void memblock_dump_all(void); diff --git a/mm/memblock.c b/mm/memblock.c index 25fd0626a9e7..948cc1bc3edf 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -175,24 +175,33 @@ static inline phys_addr_t memblock_cap_size(phys_addr_t base, phys_addr_t *size) /* * Address comparison utilities */ -static unsigned long __init_memblock memblock_addrs_overlap(phys_addr_t base1, phys_addr_t size1, - phys_addr_t base2, phys_addr_t size2) +static unsigned int __init_memblock memblock_addrs_overlap(phys_addr_t base1, phys_addr_t size1, + phys_addr_t base2, phys_addr_t size2) { - return ((base1 < (base2 + size2)) && (base2 < (base1 + size1))); + if (base1 == base2 && size1 == size2) + return MEMBLOCK_EQUAL; + + if ((base1 < (base2 + size2)) && (base2 < (base1 + size1))) + return MEMBLOCK_OVERLAPS; + + return MEMBLOCK_NO_OVERLAPS; } -bool __init_memblock memblock_overlaps_region(struct memblock_type *type, - phys_addr_t base, phys_addr_t size) +unsigned int __init_memblock memblock_overlaps_region(struct memblock_type *type, + phys_addr_t base, phys_addr_t size) { - unsigned long i; + unsigned long i, ret; memblock_cap_size(base, &size); - for (i = 0; i < type->cnt; i++) - if (memblock_addrs_overlap(base, size, type->regions[i].base, - type->regions[i].size)) - break; - return i < type->cnt; + for (i = 0; i < type->cnt; i++) { + ret = memblock_addrs_overlap(base, size, type->regions[i].base, + type->regions[i].size); + if (ret) + return ret; + } + + return MEMBLOCK_NO_OVERLAPS; } /** @@ -1857,9 +1866,11 @@ bool __init_memblock memblock_is_region_memory(phys_addr_t base, phys_addr_t siz * memory block. * * Return: - * True if they intersect, false if not. + * MEMBLOCK_NO_OVERLAPS if there is no intersection, + * MEMBLOCK_OVERLAPS if they only intersect, + * MEMBLOCK_EQUAL if the region matches base and size to an reserved memory. */ -bool __init_memblock memblock_is_region_reserved(phys_addr_t base, phys_addr_t size) +unsigned int __init_memblock memblock_is_region_reserved(phys_addr_t base, phys_addr_t size) { return memblock_overlaps_region(&memblock.reserved, base, size); } -- 2.40.0