From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1nYimV-0005dz-CZ for mharc-grub-devel@gnu.org; Mon, 28 Mar 2022 02:23:11 -0400 Received: from eggs.gnu.org ([209.51.188.92]:50208) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nYimQ-0005bW-0u for grub-devel@gnu.org; Mon, 28 Mar 2022 02:23:06 -0400 Received: from [2607:f8b0:4864:20::52f] (port=44960 helo=mail-pg1-x52f.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nYimO-0005GR-K6 for grub-devel@gnu.org; Mon, 28 Mar 2022 02:23:05 -0400 Received: by mail-pg1-x52f.google.com with SMTP id c11so11456435pgu.11 for ; Sun, 27 Mar 2022 23:23:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axtens.net; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=CuDoNcOcdFyQWnoVtLER9/bRlykEArKYnfhWrNjGLNo=; b=liFoTGf0BMIz/UQ9KFLJjXcC91RxaZsw/cOV2Tz/s0AleZj0eRnd2mhgCCz1PbI/9I oCRDrYnWAAmmUnyk6IYY8QIdjhd1LjMcKrDgSkJQNfmPX/eMOUnvBCmZTQLEsjxC7b/O d2yiI0TSCo87xcwcpxPIAjDfMmt/zIAfMa4SQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=CuDoNcOcdFyQWnoVtLER9/bRlykEArKYnfhWrNjGLNo=; b=preUdTrYUpAu0N5YgKTmZ/hOhLfdBNkGAqW97fsqFIEaTgkmUur1OGU5wk9e+xBaTy H+nb8lcAsJToqo3ZjrwDl4uV9TGXY4ezWKnVpfYRZUvsSOvRrwBKM6eoyAgCfRey6ec5 qjhZ2mNkAy/rMyx70FaPZ/iMKcXfvZgGOcyywt52Ip4wz0cBSrx7HDceSZYh4I10uYth XcN1FNumqQDW7eUqsVs4yqykN7wldnLsn48ttkq/jbfJWPIN61hoiihpweS0l+o6eSBt RSiTX2dWtLIctctaKWIaa9JayyJ9Doe2+0D/detlbGoyj2dNkEcCn4czXZmdKEbweQq6 pDNw== X-Gm-Message-State: AOAM531Z9k4mF2VMtzlRwsf+WENUtfBkVebr34QQwJ2R35PN9t55Wexe iJ87Y2Uf1gz93+f6hz70Cpsu3GP8pcJZPw== X-Google-Smtp-Source: ABdhPJw4C4jCXrbeNnvBFbazF9KnbTkaVScWw4AfURie1FKRdOQBz/6wVEWVcK2Xhl5KxoXEaQj21w== X-Received: by 2002:a05:6a00:1d03:b0:4fa:7710:7b1b with SMTP id a3-20020a056a001d0300b004fa77107b1bmr21805213pfx.29.1648448581580; Sun, 27 Mar 2022 23:23:01 -0700 (PDT) Received: from localhost ([2001:4479:e000:e400:743e:bc3e:ec72:bf20]) by smtp.gmail.com with ESMTPSA id v13-20020a17090a088d00b001c64d30fa8bsm16062880pjc.1.2022.03.27.23.23.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Mar 2022 23:23:01 -0700 (PDT) From: Daniel Axtens To: grub-devel@gnu.org Cc: leif@nuviainc.com, stefanb@linux.ibm.com, ps@pks.im, dkiper@net-space.pl, Daniel Axtens Subject: [PATCH v2 04/15] mm: debug support for region operations Date: Mon, 28 Mar 2022 17:22:29 +1100 Message-Id: <20220328062240.878781-5-dja@axtens.net> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220328062240.878781-1-dja@axtens.net> References: <20220328062240.878781-1-dja@axtens.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::52f (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::52f; envelope-from=dja@axtens.net; helo=mail-pg1-x52f.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Mar 2022 06:23:08 -0000 This is handy for debugging. Enable with `set debug=regions`. Signed-off-by: Daniel Axtens --- grub-core/kern/mm.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/grub-core/kern/mm.c b/grub-core/kern/mm.c index 94e78f9a910d..f36499865632 100644 --- a/grub-core/kern/mm.c +++ b/grub-core/kern/mm.c @@ -115,9 +115,8 @@ grub_mm_init_region (void *addr, grub_size_t size) grub_mm_header_t h; grub_mm_region_t r, *p, q; -#if 0 - grub_printf ("Using memory for heap: start=%p, end=%p\n", addr, addr + (unsigned int) size); -#endif + grub_dprintf ("regions", "Using memory for heap: start=%p, end=%p\n", + addr, (char *) addr + (unsigned int) size); /* Exclude last 4K to avoid overflows. */ /* If addr + 0x1000 overflows then whole region is in excluded zone. */ @@ -142,8 +141,14 @@ grub_mm_init_region (void *addr, grub_size_t size) * addr q * |----size-----|-q->pre_size-|| */ + grub_dprintf ("regions", "Can we extend into region above?" + " %p + %" PRIxGRUB_SIZE " + %" PRIxGRUB_SIZE " ?=? %p\n", + (grub_uint8_t *) addr, size, q->pre_size, (grub_uint8_t *) q); if ((grub_uint8_t *) addr + size + q->pre_size == (grub_uint8_t *) q) { + grub_dprintf ("regions", "Yes: extending a region: (%p -> %p) -> (%p -> %p)\n", + q, (grub_uint8_t *) q + sizeof (*q) + q->size, + addr, (grub_uint8_t *) q + sizeof (*q) + q->size); /* * Yes, we can merge the memory starting at addr into the * existing region from below. Align up addr to GRUB_MM_ALIGN @@ -185,9 +190,15 @@ grub_mm_init_region (void *addr, grub_size_t size) * q addr * ||-q->post_size-|----size-----| */ + grub_dprintf ("regions", "Can we extend into region below?" + " %p + %" PRIxGRUB_SIZE " + %" PRIxGRUB_SIZE " + %" PRIxGRUB_SIZE " ?=? %p\n", + (grub_uint8_t *) q, sizeof(*q), q->size, q->post_size, (grub_uint8_t *) addr); if ((grub_uint8_t *)q + sizeof(*q) + q->size + q->post_size == (grub_uint8_t *) addr) { + grub_dprintf ("regions", "Yes: extending a region: (%p -> %p) -> (%p -> %p)\n", + q, (grub_uint8_t *) q + sizeof (*q) + q->size, + q, (grub_uint8_t *) addr + size); /* * Yes! Follow a similar pattern to above, but simpler. * Our header starts at address - post_size, which should align us @@ -206,6 +217,8 @@ grub_mm_init_region (void *addr, grub_size_t size) } } + grub_dprintf ("regions", "No: considering a new region at %p of size %" PRIxGRUB_SIZE "\n", + addr, size); /* Allocate a region from the head. */ r = (grub_mm_region_t) ALIGN_UP ((grub_addr_t) addr, GRUB_MM_ALIGN); -- 2.32.0