From: Michael Buesch <mbuesch@freenet.de>
To: Andrew Morton <akpm@osdl.org>
Cc: linux kernel mailing list <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH 2.6.6] bootmem.c cleanup
Date: Fri, 14 May 2004 22:43:45 +0200 [thread overview]
Message-ID: <200405142243.45647.mbuesch@freenet.de> (raw)
In-Reply-To: <20040514133353.236acf3a.akpm@osdl.org>
On Friday 14 May 2004 22:33, you wrote:
> Please don't put expressions whihc actually change state inside BUG_ON().
> Someone may decide to make BUG_ON() a no-op to save space.
>
> I'm not aware of anyone actually trying that, but it's a good objective.
Ok, so what about the following?
--
Regards Michael Buesch [ http://www.tuxsoft.de.vu ]
--- linux-2.6.6/mm/bootmem.c.orig 2004-05-14 21:55:00.000000000 +0200
+++ linux-2.6.6/mm/bootmem.c 2004-05-14 22:42:48.000000000 +0200
@@ -82,14 +82,11 @@
PAGE_SIZE-1)/PAGE_SIZE;
unsigned long end = (addr + size + PAGE_SIZE-1)/PAGE_SIZE;
- if (!size) BUG();
+ BUG_ON(!size);
+ BUG_ON(sidx >= eidx);
+ BUG_ON((addr >> PAGE_SHIFT) >= bdata->node_low_pfn);
+ BUG_ON(end > bdata->node_low_pfn);
- if (sidx >= eidx)
- BUG();
- if ((addr >> PAGE_SHIFT) >= bdata->node_low_pfn)
- BUG();
- if (end > bdata->node_low_pfn)
- BUG();
for (i = sidx; i < eidx; i++)
if (test_and_set_bit(i, bdata->node_bootmem_map)) {
#ifdef CONFIG_DEBUG_BOOTMEM
@@ -110,9 +107,8 @@
unsigned long eidx = (addr + size - bdata->node_boot_start)/PAGE_SIZE;
unsigned long end = (addr + size)/PAGE_SIZE;
- if (!size) BUG();
- if (end > bdata->node_low_pfn)
- BUG();
+ BUG_ON(!size);
+ BUG_ON(end > bdata->node_low_pfn);
if (addr < bdata->last_success)
bdata->last_success = addr;
@@ -124,7 +120,7 @@
sidx = start - (bdata->node_boot_start/PAGE_SIZE);
for (i = sidx; i < eidx; i++) {
- if (!test_and_clear_bit(i, bdata->node_bootmem_map))
+ if (unlikely(!test_and_clear_bit(i, bdata->node_bootmem_map)))
BUG();
}
}
@@ -140,7 +136,7 @@
*
* alignment has to be a power of 2 value.
*
- * NOTE: This function is _not_ reenetrant.
+ * NOTE: This function is _not_ reentrant.
*/
static void * __init
__alloc_bootmem_core(struct bootmem_data *bdata, unsigned long size,
@@ -152,7 +148,6 @@
if(!size) {
printk("__alloc_bootmem_core(): zero-sized request\n");
- dump_stack();
BUG();
}
BUG_ON(align & (align-1));
@@ -260,7 +255,7 @@
unsigned long idx;
unsigned long *map;
- if (!bdata->node_bootmem_map) BUG();
+ BUG_ON(!bdata->node_bootmem_map);
count = 0;
/* first extant page of the node */
next prev parent reply other threads:[~2004-05-14 20:44 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-05-14 20:05 [PATCH 2.6.6] bootmem.c cleanup Michael Buesch
2004-05-14 20:33 ` Andrew Morton
2004-05-14 20:43 ` Michael Buesch [this message]
2004-05-17 0:43 ` H. Peter Anvin
2004-05-18 19:50 ` Matt Mackall
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200405142243.45647.mbuesch@freenet.de \
--to=mbuesch@freenet.de \
--cc=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox