From: Andrey Ryabinin <a.ryabinin@samsung.com>
To: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-kernel@vger.kernel.org, Andrey Ryabinin <a.ryabinin@samsung.com>
Subject: [PATCH 2/3] kernel: irq: use a kmem_cache for allocating struct irq_desc
Date: Mon, 10 Nov 2014 15:06:57 +0300 [thread overview]
Message-ID: <1415621218-6438-2-git-send-email-a.ryabinin@samsung.com> (raw)
In-Reply-To: <1415621218-6438-1-git-send-email-a.ryabinin@samsung.com>
After enabling alignment checks in UBSan I've noticed a lot of
reports like this:
UBSan: Undefined behaviour in ../kernel/irq/chip.c:195:14
member access within misaligned address ffff88003e80d6f8
for type 'struct irq_desc' which requires 16 byte alignment
struct irq_desc declared with ____cacheline_internodealigned_in_smp
attribute. However in some cases it allocated dynamically via kmalloc().
In general case kmalloc() guaranties only sizeof(void *) alignment.
We should use a separate slab cache to make struct irq_desc
properly aligned on SMP configuration.
This also could slightly reduce memory usage on some configurations.
E.g. in my setup sizeof(struct irq_desc) == 320. Which means that
kmalloc-512 will be used for allocating irg_desc via kmalloc().
In that case using separate slab cache will save us 192 bytes per
each irq_desc.
Note: UBSan reports says that 'struct irq_desc' requires 16 byte alignment.
It's wrong, in my setup it should be 64 bytes. This looks like a gcc bug,
but it doesn't change the fact that irq_desc is misaligned.
Signed-off-by: Andrey Ryabinin <a.ryabinin@samsung.com>
---
kernel/irq/irqdesc.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/kernel/irq/irqdesc.c b/kernel/irq/irqdesc.c
index a1782f8..f22cb87 100644
--- a/kernel/irq/irqdesc.c
+++ b/kernel/irq/irqdesc.c
@@ -23,6 +23,8 @@
*/
static struct lock_class_key irq_desc_lock_class;
+static struct kmem_cache *irq_desc_cachep;
+
#if defined(CONFIG_SMP)
static void __init init_irq_default_affinity(void)
{
@@ -137,9 +139,10 @@ static struct irq_desc *alloc_desc(int irq, int node, struct module *owner)
struct irq_desc *desc;
gfp_t gfp = GFP_KERNEL;
- desc = kzalloc_node(sizeof(*desc), gfp, node);
+ desc = kmem_cache_zalloc_node(irq_desc_cachep, gfp, node);
if (!desc)
return NULL;
+
/* allocate based on nr_cpu_ids */
desc->kstat_irqs = alloc_percpu(unsigned int);
if (!desc->kstat_irqs)
@@ -158,7 +161,7 @@ static struct irq_desc *alloc_desc(int irq, int node, struct module *owner)
err_kstat:
free_percpu(desc->kstat_irqs);
err_desc:
- kfree(desc);
+ kmem_cache_free(irq_desc_cachep, desc);
return NULL;
}
@@ -174,7 +177,7 @@ static void free_desc(unsigned int irq)
free_masks(desc);
free_percpu(desc->kstat_irqs);
- kfree(desc);
+ kmem_cache_free(irq_desc_cachep, desc);
}
static int alloc_descs(unsigned int start, unsigned int cnt, int node,
@@ -218,6 +221,8 @@ int __init early_irq_init(void)
init_irq_default_affinity();
+ irq_desc_cachep = KMEM_CACHE(irq_desc, SLAB_PANIC);
+
/* Let arch update nr_irqs and return the nr of preallocated irqs */
initcnt = arch_probe_nr_irqs();
printk(KERN_INFO "NR_IRQS:%d nr_irqs:%d %d\n", NR_IRQS, nr_irqs, initcnt);
--
2.1.3
next prev parent reply other threads:[~2014-11-10 12:09 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-10 12:06 [PATCH 1/3] mm: sl[aou]b: introduce kmem_cache_zalloc_node() Andrey Ryabinin
2014-11-10 12:06 ` Andrey Ryabinin [this message]
2014-11-19 23:52 ` [PATCH 2/3] kernel: irq: use a kmem_cache for allocating struct irq_desc David Rientjes
2014-11-20 8:53 ` Andrey Ryabinin
2014-11-10 12:06 ` [PATCH 3/3] kernel: irq: use kmem_cache for allocating struct irqaction Andrey Ryabinin
2014-11-19 23:46 ` [PATCH 1/3] mm: sl[aou]b: introduce kmem_cache_zalloc_node() David Rientjes
2014-11-20 8:47 ` Andrey Ryabinin
2014-11-20 20:03 ` Christoph Lameter
2014-11-20 22:31 ` David Rientjes
2014-11-21 6:29 ` Andrey Ryabinin
2014-11-21 9:57 ` David Rientjes
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=1415621218-6438-2-git-send-email-a.ryabinin@samsung.com \
--to=a.ryabinin@samsung.com \
--cc=linux-kernel@vger.kernel.org \
--cc=tglx@linutronix.de \
/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
all inboxes | Powered by JetHome®