Re: [PATCH] netfilter: replace horrible hack with ksize()

[Patrick McHardy]

Pekka J Enberg wrote:
> On Thu, 6 Mar 2008, Pekka J Enberg wrote:
> > > > -	if (newlen >= ct->ext->real_len) {
> > > > +	if (newlen >= ksize(ct->ext)) {
> > > This needs to look at the currently allocated size, otherwise
> > > it will always realloc when adding new extensions after having
> > > used up ksize(ct->ext) space.
> > Lets say you
> >
> >   p = kmalloc(8, ...);
> >
> > Then ksize(p) will return the currently allocated size which is 32 bytes 
> > when page size is 4 KB, and not 8 bytes. So it should be equivalent of 
> > what the current code does.
> >
> > What am I missing here?
>
> Ok, it's not equivalent. We have two sizes: object size (8 bytes) and 
> buffer size (32 bytes) here. In netfilter, ->real_len is same as object 
> size, not buffer size as ksize() is.
>
> But now I am officially even more confused, why does the netfilter code 
> decided whether to reallocate based on _object size_ and not _buffer size_ 
> (as krealloc() does, for example)?


It decides to reallocate when the remaining space isn't enough
to hold the new data. NF_CT_EXT_MIN_SIZE is used to make sure it
doesn't allocate anything smaller than the minimum slab size and
hopefully avoid reallocations in the future. Unless I'm
misunderstanding what ksize() does, the easiest way to get
rid of this would be to replace NF_CT_EXT_MIN_SIZE by ksize(0).

Even better would be to not only avoid waste on the first allocation,
but also on reallocations. This would look something like this:

__nf_ct_ext_add():
{
        struct nf_ct_ext *new;
-       int i, newlen, newoff;
+	int i, newlen, newoff, reallen;
...
        if (newlen >= ct->ext->real_len) {
+		reallen = ksize(newlen);
-               new = kmalloc(newlen, gfp);
+		new = kmalloc(reallen, gfp);
                if (!new)
                        return NULL;
...
-               new->real_len = newlen;
+		new->real_len = reallen;
                ct->ext = new;
        }

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/