2008-07-19 12:30:51

by Pekka Enberg

Subject: [PATCH 2/8] slub: Replace ctor field with ops field in /sys/slab/*

From: Christoph Lameter <[email protected]>

Create an ops field in /sys/slab/*/ops to contain all the operations defined
on a slab. This will be used to display the additional operations that will
be defined soon.

Reviewed-by: Rik van Riel <[email protected]>
Signed-off-by: Christoph Lameter <[email protected]>
Signed-off-by: Pekka Enberg <[email protected]>
---
mm/slub.c | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/mm/slub.c b/mm/slub.c
index 1b910ab..f21ffb9 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -3843,16 +3843,18 @@ static ssize_t order_show(struct kmem_cache *s, char *buf)
}
SLAB_ATTR(order);

-static ssize_t ctor_show(struct kmem_cache *s, char *buf)
+static ssize_t ops_show(struct kmem_cache *s, char *buf)
{
- if (s->ctor) {
- int n = sprint_symbol(buf, (unsigned long)s->ctor);
+ int x = 0;

- return n + sprintf(buf + n, "\n");
+ if (s->ctor) {
+ x += sprintf(buf + x, "ctor : ");
+ x += sprint_symbol(buf + x, (unsigned long)s->ctor);
+ x += sprintf(buf + x, "\n");
}
- return 0;
+ return x;
}
-SLAB_ATTR_RO(ctor);
+SLAB_ATTR_RO(ops);

static ssize_t aliases_show(struct kmem_cache *s, char *buf)
{
@@ -4185,7 +4187,7 @@ static struct attribute *slab_attrs[] = {
&slabs_attr.attr,
&partial_attr.attr,
&cpu_slabs_attr.attr,
- &ctor_attr.attr,
+ &ops_attr.attr,
&aliases_attr.attr,
&align_attr.attr,
&sanity_checks_attr.attr,
--
1.5.4.3

2008-07-19 17:44:40

by OGAWA Hirofumi

Subject: Re: [PATCH 2/8] slub: Replace ctor field with ops field in /sys/slab/*

Pekka J Enberg <[email protected]> writes:

> + if (s->ctor) {
> + x += sprintf(buf + x, "ctor : ");
> + x += sprint_symbol(buf + x, (unsigned long)s->ctor);
> + x += sprintf(buf + x, "\n");

How about new "%pS" like following for it? If CONFIG_KALLSYMS=n, it has
difference though...

x += sprintf(buf + x, "ctor : %pS\n", (unsigned long)s->ctor);
--
OGAWA Hirofumi <[email protected]>

2008-07-19 17:48:15

by OGAWA Hirofumi

Subject: Re: [PATCH 2/8] slub: Replace ctor field with ops field in /sys/slab/*

OGAWA Hirofumi <[email protected]> writes:

> Pekka J Enberg <[email protected]> writes:
>
>> + if (s->ctor) {
>> + x += sprintf(buf + x, "ctor : ");
>> + x += sprint_symbol(buf + x, (unsigned long)s->ctor);
>> + x += sprintf(buf + x, "\n");
>
> How about new "%pS" like following for it? If CONFIG_KALLSYMS=n, it has
> difference though...
>
> x += sprintf(buf + x, "ctor : %pS\n", (unsigned long)s->ctor);

Oops, it should be pointer.

x += sprintf(buf + x, "ctor : %pS\n", s->ctor);
--
OGAWA Hirofumi <[email protected]>

2008-07-21 09:08:59

by Pekka Enberg

Subject: Re: [PATCH 2/8] slub: Replace ctor field with ops field in /sys/slab/*

Hi,

Pekka J Enberg <[email protected]> writes:
> > + if (s->ctor) {
> > + x += sprintf(buf + x, "ctor : ");
> > + x += sprint_symbol(buf + x, (unsigned long)s->ctor);
> > + x += sprintf(buf + x, "\n");

On Sun, 2008-07-20 at 02:44 +0900, OGAWA Hirofumi wrote:
> How about new "%pS" like following for it? If CONFIG_KALLSYMS=n, it has
> difference though...
>
> x += sprintf(buf + x, "ctor : %pS\n", (unsigned long)s->ctor);

Looks good to me. I'd prefer to wait until this patchset is merged and
do all of mm/slub.c in one go.

Pekka