From: Florian Zumbiehl <[EMAIL PROTECTED]>
Date: Sun, 29 Jul 2007 08:04:23 +0200
> Hi,
>
> I'm not sure whether this is really worth it, but it looked so
> extremely inefficient that I couldn't resist - so let's hope providers
> will keep PPPoE around for a while, at least until terabit dsl ;-)
>
> The new code produces the same results as the old version and is
> ~ 3 to 6 times faster for 4-bit hashes on the CPUs I tested.
>
> Florian
>
> ---------------------------------------------------------------------------
> Signed-off-by: Florian Zumbiehl <[EMAIL PROTECTED]>
>
> diff --git a/drivers/net/pppoe.c b/drivers/net/pppoe.c
> index 9e51fcc..954328c 100644
> --- a/drivers/net/pppoe.c
> +++ b/drivers/net/pppoe.c
> @@ -108,19 +108,24 @@ static inline int cmp_addr(struct pppoe_addr *a,
> unsigned long sid, char *addr)
> (memcmp(a->remote,addr,ETH_ALEN) == 0));
> }
>
> -static int hash_item(unsigned long sid, unsigned char *addr)
> +#if 8%PPPOE_HASH_BITS
> +#error 8 must be a multiple of PPPOE_HASH_BITS
> +#endif
Since PPPOE_HASH_BITS is "4" I would think this check will break the
build. :-)
Anyways, I looked at this myself and half of the problem comes from
the fact that "sid" is passed around as an "unsigned long" throughout
this entire file yet the thing is just a "__u16".
So the first thing to fix is to use __u16 consistently for sid values.
Then the sid hash looks obviously wrong and is easy to fix.
Then you end up with a hash_item() that simply looks like:
static unsigned int hash_item(__u16 sid, unsigned char *addr)
{
unsigned int hash;
hash = (((unsigned int)addr[0] << 24) |
((unsigned int)addr[1] << 16) |
((unsigned int)addr[2] << 8) |
((unsigned int)addr[3] << 0));
hash ^= (((unsigned int)addr[4] << 8) |
((unsigned int)addr[5] << 0));
hash ^= sid;
return ((hash ^ (hash >> 8) ^ (hash >> 16)) &
(PPPOE_HASH_SIZE - 1));
}
which is what I've checked into my tree.
Thanks!
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
