Commit b95bf1e0 authored by David S. Miller's avatar David S. Miller

Merge branch 'kill_arch_fast_hash'

Daniel Borkmann says:

====================
Kill arch_fast_hash

Due to the size of changes I have based this against net-next,
also given 3.18 is already out. I've split this into 3 parts,
the first two to remove existing users (so they can optionally
go to stable) and the last one to kill the remaining library bits.

Let me know if there are any issues.
====================
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 7d339890 0cb6c969
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
generic-y += clkdev.h generic-y += clkdev.h
generic-y += cputime.h generic-y += cputime.h
generic-y += exec.h generic-y += exec.h
generic-y += hash.h
generic-y += irq_work.h generic-y += irq_work.h
generic-y += mcs_spinlock.h generic-y += mcs_spinlock.h
generic-y += preempt.h generic-y += preempt.h
......
...@@ -12,7 +12,6 @@ generic-y += fb.h ...@@ -12,7 +12,6 @@ generic-y += fb.h
generic-y += fcntl.h generic-y += fcntl.h
generic-y += ftrace.h generic-y += ftrace.h
generic-y += hardirq.h generic-y += hardirq.h
generic-y += hash.h
generic-y += hw_irq.h generic-y += hw_irq.h
generic-y += ioctl.h generic-y += ioctl.h
generic-y += ioctls.h generic-y += ioctls.h
......
...@@ -7,7 +7,6 @@ generic-y += current.h ...@@ -7,7 +7,6 @@ generic-y += current.h
generic-y += emergency-restart.h generic-y += emergency-restart.h
generic-y += errno.h generic-y += errno.h
generic-y += exec.h generic-y += exec.h
generic-y += hash.h
generic-y += ioctl.h generic-y += ioctl.h
generic-y += ipcbuf.h generic-y += ipcbuf.h
generic-y += irq_regs.h generic-y += irq_regs.h
......
...@@ -14,7 +14,6 @@ generic-y += early_ioremap.h ...@@ -14,7 +14,6 @@ generic-y += early_ioremap.h
generic-y += emergency-restart.h generic-y += emergency-restart.h
generic-y += errno.h generic-y += errno.h
generic-y += ftrace.h generic-y += ftrace.h
generic-y += hash.h
generic-y += hw_irq.h generic-y += hw_irq.h
generic-y += ioctl.h generic-y += ioctl.h
generic-y += ioctls.h generic-y += ioctls.h
......
...@@ -7,7 +7,6 @@ generic-y += div64.h ...@@ -7,7 +7,6 @@ generic-y += div64.h
generic-y += emergency-restart.h generic-y += emergency-restart.h
generic-y += exec.h generic-y += exec.h
generic-y += futex.h generic-y += futex.h
generic-y += hash.h
generic-y += irq_regs.h generic-y += irq_regs.h
generic-y += irq_work.h generic-y += irq_work.h
generic-y += local.h generic-y += local.h
......
...@@ -10,7 +10,6 @@ generic-y += emergency-restart.h ...@@ -10,7 +10,6 @@ generic-y += emergency-restart.h
generic-y += errno.h generic-y += errno.h
generic-y += fb.h generic-y += fb.h
generic-y += futex.h generic-y += futex.h
generic-y += hash.h
generic-y += hw_irq.h generic-y += hw_irq.h
generic-y += ioctl.h generic-y += ioctl.h
generic-y += ipcbuf.h generic-y += ipcbuf.h
......
...@@ -15,7 +15,6 @@ generic-y += exec.h ...@@ -15,7 +15,6 @@ generic-y += exec.h
generic-y += fb.h generic-y += fb.h
generic-y += fcntl.h generic-y += fcntl.h
generic-y += futex.h generic-y += futex.h
generic-y += hash.h
generic-y += hw_irq.h generic-y += hw_irq.h
generic-y += io.h generic-y += io.h
generic-y += ioctl.h generic-y += ioctl.h
......
...@@ -7,7 +7,6 @@ generic-y += barrier.h ...@@ -7,7 +7,6 @@ generic-y += barrier.h
generic-y += clkdev.h generic-y += clkdev.h
generic-y += cputime.h generic-y += cputime.h
generic-y += exec.h generic-y += exec.h
generic-y += hash.h
generic-y += irq_work.h generic-y += irq_work.h
generic-y += kvm_para.h generic-y += kvm_para.h
generic-y += linkage.h generic-y += linkage.h
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
generic-y += clkdev.h generic-y += clkdev.h
generic-y += cputime.h generic-y += cputime.h
generic-y += exec.h generic-y += exec.h
generic-y += hash.h
generic-y += irq_work.h generic-y += irq_work.h
generic-y += mcs_spinlock.h generic-y += mcs_spinlock.h
generic-y += preempt.h generic-y += preempt.h
......
...@@ -16,7 +16,6 @@ generic-y += fb.h ...@@ -16,7 +16,6 @@ generic-y += fb.h
generic-y += fcntl.h generic-y += fcntl.h
generic-y += ftrace.h generic-y += ftrace.h
generic-y += hardirq.h generic-y += hardirq.h
generic-y += hash.h
generic-y += hw_irq.h generic-y += hw_irq.h
generic-y += ioctl.h generic-y += ioctl.h
generic-y += ioctls.h generic-y += ioctls.h
......
generic-y += clkdev.h generic-y += clkdev.h
generic-y += exec.h generic-y += exec.h
generic-y += hash.h
generic-y += irq_work.h generic-y += irq_work.h
generic-y += kvm_para.h generic-y += kvm_para.h
generic-y += mcs_spinlock.h generic-y += mcs_spinlock.h
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
generic-y += clkdev.h generic-y += clkdev.h
generic-y += cputime.h generic-y += cputime.h
generic-y += exec.h generic-y += exec.h
generic-y += hash.h
generic-y += irq_work.h generic-y += irq_work.h
generic-y += mcs_spinlock.h generic-y += mcs_spinlock.h
generic-y += module.h generic-y += module.h
......
...@@ -6,7 +6,6 @@ generic-y += device.h ...@@ -6,7 +6,6 @@ generic-y += device.h
generic-y += emergency-restart.h generic-y += emergency-restart.h
generic-y += errno.h generic-y += errno.h
generic-y += exec.h generic-y += exec.h
generic-y += hash.h
generic-y += hw_irq.h generic-y += hw_irq.h
generic-y += ioctl.h generic-y += ioctl.h
generic-y += ipcbuf.h generic-y += ipcbuf.h
......
...@@ -13,7 +13,6 @@ generic-y += fb.h ...@@ -13,7 +13,6 @@ generic-y += fb.h
generic-y += fcntl.h generic-y += fcntl.h
generic-y += futex.h generic-y += futex.h
generic-y += hardirq.h generic-y += hardirq.h
generic-y += hash.h
generic-y += hw_irq.h generic-y += hw_irq.h
generic-y += ioctl.h generic-y += ioctl.h
generic-y += ioctls.h generic-y += ioctls.h
......
...@@ -4,7 +4,6 @@ generic-y += clkdev.h ...@@ -4,7 +4,6 @@ generic-y += clkdev.h
generic-y += cputime.h generic-y += cputime.h
generic-y += device.h generic-y += device.h
generic-y += exec.h generic-y += exec.h
generic-y += hash.h
generic-y += irq_work.h generic-y += irq_work.h
generic-y += mcs_spinlock.h generic-y += mcs_spinlock.h
generic-y += preempt.h generic-y += preempt.h
......
...@@ -3,7 +3,6 @@ generic-y += cputime.h ...@@ -3,7 +3,6 @@ generic-y += cputime.h
generic-y += current.h generic-y += current.h
generic-y += dma-contiguous.h generic-y += dma-contiguous.h
generic-y += emergency-restart.h generic-y += emergency-restart.h
generic-y += hash.h
generic-y += irq_work.h generic-y += irq_work.h
generic-y += local64.h generic-y += local64.h
generic-y += mcs_spinlock.h generic-y += mcs_spinlock.h
......
...@@ -3,7 +3,6 @@ generic-y += barrier.h ...@@ -3,7 +3,6 @@ generic-y += barrier.h
generic-y += clkdev.h generic-y += clkdev.h
generic-y += cputime.h generic-y += cputime.h
generic-y += exec.h generic-y += exec.h
generic-y += hash.h
generic-y += irq_work.h generic-y += irq_work.h
generic-y += mcs_spinlock.h generic-y += mcs_spinlock.h
generic-y += preempt.h generic-y += preempt.h
......
...@@ -25,7 +25,6 @@ generic-y += fcntl.h ...@@ -25,7 +25,6 @@ generic-y += fcntl.h
generic-y += ftrace.h generic-y += ftrace.h
generic-y += futex.h generic-y += futex.h
generic-y += hardirq.h generic-y += hardirq.h
generic-y += hash.h
generic-y += hw_irq.h generic-y += hw_irq.h
generic-y += ioctl.h generic-y += ioctl.h
generic-y += ioctls.h generic-y += ioctls.h
......
...@@ -7,7 +7,6 @@ generic-y += device.h ...@@ -7,7 +7,6 @@ generic-y += device.h
generic-y += div64.h generic-y += div64.h
generic-y += emergency-restart.h generic-y += emergency-restart.h
generic-y += exec.h generic-y += exec.h
generic-y += hash.h
generic-y += hw_irq.h generic-y += hw_irq.h
generic-y += irq_regs.h generic-y += irq_regs.h
generic-y += irq_work.h generic-y += irq_work.h
......
generic-y += clkdev.h generic-y += clkdev.h
generic-y += hash.h
generic-y += irq_work.h generic-y += irq_work.h
generic-y += mcs_spinlock.h generic-y += mcs_spinlock.h
generic-y += preempt.h generic-y += preempt.h
......
generic-y += clkdev.h generic-y += clkdev.h
generic-y += hash.h
generic-y += irq_work.h generic-y += irq_work.h
generic-y += mcs_spinlock.h generic-y += mcs_spinlock.h
generic-y += preempt.h generic-y += preempt.h
......
...@@ -5,7 +5,6 @@ header-y += ...@@ -5,7 +5,6 @@ header-y +=
generic-y += barrier.h generic-y += barrier.h
generic-y += clkdev.h generic-y += clkdev.h
generic-y += cputime.h generic-y += cputime.h
generic-y += hash.h
generic-y += irq_work.h generic-y += irq_work.h
generic-y += mcs_spinlock.h generic-y += mcs_spinlock.h
generic-y += preempt.h generic-y += preempt.h
......
...@@ -8,7 +8,6 @@ generic-y += emergency-restart.h ...@@ -8,7 +8,6 @@ generic-y += emergency-restart.h
generic-y += errno.h generic-y += errno.h
generic-y += exec.h generic-y += exec.h
generic-y += fcntl.h generic-y += fcntl.h
generic-y += hash.h
generic-y += ioctl.h generic-y += ioctl.h
generic-y += ipcbuf.h generic-y += ipcbuf.h
generic-y += irq_regs.h generic-y += irq_regs.h
......
...@@ -6,7 +6,6 @@ generic-y += cputime.h ...@@ -6,7 +6,6 @@ generic-y += cputime.h
generic-y += div64.h generic-y += div64.h
generic-y += emergency-restart.h generic-y += emergency-restart.h
generic-y += exec.h generic-y += exec.h
generic-y += hash.h
generic-y += irq_regs.h generic-y += irq_regs.h
generic-y += irq_work.h generic-y += irq_work.h
generic-y += linkage.h generic-y += linkage.h
......
...@@ -11,7 +11,6 @@ generic-y += errno.h ...@@ -11,7 +11,6 @@ generic-y += errno.h
generic-y += exec.h generic-y += exec.h
generic-y += fb.h generic-y += fb.h
generic-y += fcntl.h generic-y += fcntl.h
generic-y += hash.h
generic-y += hw_irq.h generic-y += hw_irq.h
generic-y += ioctl.h generic-y += ioctl.h
generic-y += ioctls.h generic-y += ioctls.h
......
...@@ -10,7 +10,6 @@ generic-y += exec.h ...@@ -10,7 +10,6 @@ generic-y += exec.h
generic-y += ftrace.h generic-y += ftrace.h
generic-y += futex.h generic-y += futex.h
generic-y += hardirq.h generic-y += hardirq.h
generic-y += hash.h
generic-y += hw_irq.h generic-y += hw_irq.h
generic-y += io.h generic-y += io.h
generic-y += irq_regs.h generic-y += irq_regs.h
......
...@@ -16,7 +16,6 @@ generic-y += fcntl.h ...@@ -16,7 +16,6 @@ generic-y += fcntl.h
generic-y += ftrace.h generic-y += ftrace.h
generic-y += futex.h generic-y += futex.h
generic-y += hardirq.h generic-y += hardirq.h
generic-y += hash.h
generic-y += hw_irq.h generic-y += hw_irq.h
generic-y += ioctl.h generic-y += ioctl.h
generic-y += ioctls.h generic-y += ioctls.h
......
#ifndef _ASM_X86_HASH_H
#define _ASM_X86_HASH_H
struct fast_hash_ops;
extern void setup_arch_fast_hash(struct fast_hash_ops *ops);
#endif /* _ASM_X86_HASH_H */
...@@ -23,7 +23,7 @@ lib-y += memcpy_$(BITS).o ...@@ -23,7 +23,7 @@ lib-y += memcpy_$(BITS).o
lib-$(CONFIG_RWSEM_XCHGADD_ALGORITHM) += rwsem.o lib-$(CONFIG_RWSEM_XCHGADD_ALGORITHM) += rwsem.o
lib-$(CONFIG_INSTRUCTION_DECODER) += insn.o inat.o lib-$(CONFIG_INSTRUCTION_DECODER) += insn.o inat.o
obj-y += msr.o msr-reg.o msr-reg-export.o hash.o obj-y += msr.o msr-reg.o msr-reg-export.o
ifeq ($(CONFIG_X86_32),y) ifeq ($(CONFIG_X86_32),y)
obj-y += atomic64_32.o obj-y += atomic64_32.o
......
/*
* Some portions derived from code covered by the following notice:
*
* Copyright (c) 2010-2013 Intel Corporation. All rights reserved.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
* * Neither the name of Intel Corporation nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <linux/hash.h>
#include <linux/init.h>
#include <asm/processor.h>
#include <asm/cpufeature.h>
#include <asm/hash.h>
static inline u32 crc32_u32(u32 crc, u32 val)
{
#ifdef CONFIG_AS_CRC32
asm ("crc32l %1,%0\n" : "+r" (crc) : "rm" (val));
#else
asm (".byte 0xf2, 0x0f, 0x38, 0xf1, 0xc1" : "+a" (crc) : "c" (val));
#endif
return crc;
}
static u32 intel_crc4_2_hash(const void *data, u32 len, u32 seed)
{
const u32 *p32 = (const u32 *) data;
u32 i, tmp = 0;
for (i = 0; i < len / 4; i++)
seed = crc32_u32(seed, *p32++);
switch (len & 3) {
case 3:
tmp |= *((const u8 *) p32 + 2) << 16;
/* fallthrough */
case 2:
tmp |= *((const u8 *) p32 + 1) << 8;
/* fallthrough */
case 1:
tmp |= *((const u8 *) p32);
seed = crc32_u32(seed, tmp);
break;
}
return seed;
}
static u32 intel_crc4_2_hash2(const u32 *data, u32 len, u32 seed)
{
const u32 *p32 = (const u32 *) data;
u32 i;
for (i = 0; i < len; i++)
seed = crc32_u32(seed, *p32++);
return seed;
}
void __init setup_arch_fast_hash(struct fast_hash_ops *ops)
{
if (cpu_has_xmm4_2) {
ops->hash = intel_crc4_2_hash;
ops->hash2 = intel_crc4_2_hash2;
}
}
...@@ -9,7 +9,6 @@ generic-y += errno.h ...@@ -9,7 +9,6 @@ generic-y += errno.h
generic-y += exec.h generic-y += exec.h
generic-y += fcntl.h generic-y += fcntl.h
generic-y += hardirq.h generic-y += hardirq.h
generic-y += hash.h
generic-y += ioctl.h generic-y += ioctl.h
generic-y += irq_regs.h generic-y += irq_regs.h
generic-y += irq_work.h generic-y += irq_work.h
......
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
#include <linux/ratelimit.h> #include <linux/ratelimit.h>
#include <linux/sunrpc/svcauth_gss.h> #include <linux/sunrpc/svcauth_gss.h>
#include <linux/sunrpc/addr.h> #include <linux/sunrpc/addr.h>
#include <linux/hash.h> #include <linux/jhash.h>
#include "xdr4.h" #include "xdr4.h"
#include "xdr4cb.h" #include "xdr4cb.h"
#include "vfs.h" #include "vfs.h"
...@@ -594,7 +594,7 @@ static int delegation_blocked(struct knfsd_fh *fh) ...@@ -594,7 +594,7 @@ static int delegation_blocked(struct knfsd_fh *fh)
} }
spin_unlock(&blocked_delegations_lock); spin_unlock(&blocked_delegations_lock);
} }
hash = arch_fast_hash(&fh->fh_base, fh->fh_size, 0); hash = jhash(&fh->fh_base, fh->fh_size, 0);
if (test_bit(hash&255, bd->set[0]) && if (test_bit(hash&255, bd->set[0]) &&
test_bit((hash>>8)&255, bd->set[0]) && test_bit((hash>>8)&255, bd->set[0]) &&
test_bit((hash>>16)&255, bd->set[0])) test_bit((hash>>16)&255, bd->set[0]))
...@@ -613,7 +613,7 @@ static void block_delegations(struct knfsd_fh *fh) ...@@ -613,7 +613,7 @@ static void block_delegations(struct knfsd_fh *fh)
u32 hash; u32 hash;
struct bloom_pair *bd = &blocked_delegations; struct bloom_pair *bd = &blocked_delegations;
hash = arch_fast_hash(&fh->fh_base, fh->fh_size, 0); hash = jhash(&fh->fh_base, fh->fh_size, 0);
spin_lock(&blocked_delegations_lock); spin_lock(&blocked_delegations_lock);
__set_bit(hash&255, bd->set[bd->new]); __set_bit(hash&255, bd->set[bd->new]);
......
#ifndef __ASM_GENERIC_HASH_H
#define __ASM_GENERIC_HASH_H
struct fast_hash_ops;
static inline void setup_arch_fast_hash(struct fast_hash_ops *ops)
{
}
#endif /* __ASM_GENERIC_HASH_H */
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
*/ */
#include <asm/types.h> #include <asm/types.h>
#include <asm/hash.h>
#include <linux/compiler.h> #include <linux/compiler.h>
/* 2^31 + 2^29 - 2^25 + 2^22 - 2^19 - 2^16 + 1 */ /* 2^31 + 2^29 - 2^25 + 2^22 - 2^19 - 2^16 + 1 */
...@@ -84,38 +83,4 @@ static inline u32 hash32_ptr(const void *ptr) ...@@ -84,38 +83,4 @@ static inline u32 hash32_ptr(const void *ptr)
return (u32)val; return (u32)val;
} }
struct fast_hash_ops {
u32 (*hash)(const void *data, u32 len, u32 seed);
u32 (*hash2)(const u32 *data, u32 len, u32 seed);
};
/**
* arch_fast_hash - Caclulates a hash over a given buffer that can have
* arbitrary size. This function will eventually use an
* architecture-optimized hashing implementation if
* available, and trades off distribution for speed.
*
* @data: buffer to hash
* @len: length of buffer in bytes
* @seed: start seed
*
* Returns 32bit hash.
*/
extern u32 arch_fast_hash(const void *data, u32 len, u32 seed);
/**
* arch_fast_hash2 - Caclulates a hash over a given buffer that has a
* size that is of a multiple of 32bit words. This
* function will eventually use an architecture-
* optimized hashing implementation if available,
* and trades off distribution for speed.
*
* @data: buffer to hash (must be 32bit padded)
* @len: number of 32bit words
* @seed: start seed
*
* Returns 32bit hash.
*/
extern u32 arch_fast_hash2(const u32 *data, u32 len, u32 seed);
#endif /* _LINUX_HASH_H */ #endif /* _LINUX_HASH_H */
...@@ -26,7 +26,7 @@ obj-y += bcd.o div64.o sort.o parser.o halfmd4.o debug_locks.o random32.o \ ...@@ -26,7 +26,7 @@ obj-y += bcd.o div64.o sort.o parser.o halfmd4.o debug_locks.o random32.o \
bust_spinlocks.o hexdump.o kasprintf.o bitmap.o scatterlist.o \ bust_spinlocks.o hexdump.o kasprintf.o bitmap.o scatterlist.o \
gcd.o lcm.o list_sort.o uuid.o flex_array.o iovec.o clz_ctz.o \ gcd.o lcm.o list_sort.o uuid.o flex_array.o iovec.o clz_ctz.o \
bsearch.o find_last_bit.o find_next_bit.o llist.o memweight.o kfifo.o \ bsearch.o find_last_bit.o find_next_bit.o llist.o memweight.o kfifo.o \
percpu-refcount.o percpu_ida.o hash.o rhashtable.o reciprocal_div.o percpu-refcount.o percpu_ida.o rhashtable.o reciprocal_div.o
obj-y += string_helpers.o obj-y += string_helpers.o
obj-$(CONFIG_TEST_STRING_HELPERS) += test-string_helpers.o obj-$(CONFIG_TEST_STRING_HELPERS) += test-string_helpers.o
obj-y += kstrtox.o obj-y += kstrtox.o
......
/* General purpose hashing library
*
* That's a start of a kernel hashing library, which can be extended
* with further algorithms in future. arch_fast_hash{2,}() will
* eventually resolve to an architecture optimized implementation.
*
* Copyright 2013 Francesco Fusco <ffusco@redhat.com>
* Copyright 2013 Daniel Borkmann <dborkman@redhat.com>
* Copyright 2013 Thomas Graf <tgraf@redhat.com>
* Licensed under the GNU General Public License, version 2.0 (GPLv2)
*/
#include <linux/jhash.h>
#include <linux/hash.h>
#include <linux/cache.h>
static struct fast_hash_ops arch_hash_ops __read_mostly = {
.hash = jhash,
.hash2 = jhash2,
};
u32 arch_fast_hash(const void *data, u32 len, u32 seed)
{
return arch_hash_ops.hash(data, len, seed);
}
EXPORT_SYMBOL_GPL(arch_fast_hash);
u32 arch_fast_hash2(const u32 *data, u32 len, u32 seed)
{
return arch_hash_ops.hash2(data, len, seed);
}
EXPORT_SYMBOL_GPL(arch_fast_hash2);
static int __init hashlib_init(void)
{
setup_arch_fast_hash(&arch_hash_ops);
return 0;
}
early_initcall(hashlib_init);
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/vmalloc.h> #include <linux/vmalloc.h>
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/hash.h> #include <linux/jhash.h>
#include <linux/random.h> #include <linux/random.h>
#include <linux/rhashtable.h> #include <linux/rhashtable.h>
...@@ -524,7 +524,7 @@ static size_t rounded_hashtable_size(struct rhashtable_params *params) ...@@ -524,7 +524,7 @@ static size_t rounded_hashtable_size(struct rhashtable_params *params)
* .head_offset = offsetof(struct test_obj, node), * .head_offset = offsetof(struct test_obj, node),
* .key_offset = offsetof(struct test_obj, key), * .key_offset = offsetof(struct test_obj, key),
* .key_len = sizeof(int), * .key_len = sizeof(int),
* .hashfn = arch_fast_hash, * .hashfn = jhash,
* #ifdef CONFIG_PROVE_LOCKING * #ifdef CONFIG_PROVE_LOCKING
* .mutex_is_held = &my_mutex_is_held, * .mutex_is_held = &my_mutex_is_held,
* #endif * #endif
...@@ -545,7 +545,7 @@ static size_t rounded_hashtable_size(struct rhashtable_params *params) ...@@ -545,7 +545,7 @@ static size_t rounded_hashtable_size(struct rhashtable_params *params)
* *
* struct rhashtable_params params = { * struct rhashtable_params params = {
* .head_offset = offsetof(struct test_obj, node), * .head_offset = offsetof(struct test_obj, node),
* .hashfn = arch_fast_hash, * .hashfn = jhash,
* .obj_hashfn = my_hash_fn, * .obj_hashfn = my_hash_fn,
* #ifdef CONFIG_PROVE_LOCKING * #ifdef CONFIG_PROVE_LOCKING
* .mutex_is_held = &my_mutex_is_held, * .mutex_is_held = &my_mutex_is_held,
...@@ -778,7 +778,7 @@ static int __init test_rht_init(void) ...@@ -778,7 +778,7 @@ static int __init test_rht_init(void)
.head_offset = offsetof(struct test_obj, node), .head_offset = offsetof(struct test_obj, node),
.key_offset = offsetof(struct test_obj, value), .key_offset = offsetof(struct test_obj, value),
.key_len = sizeof(int), .key_len = sizeof(int),
.hashfn = arch_fast_hash, .hashfn = jhash,
#ifdef CONFIG_PROVE_LOCKING #ifdef CONFIG_PROVE_LOCKING
.mutex_is_held = &test_mutex_is_held, .mutex_is_held = &test_mutex_is_held,
#endif #endif
......
...@@ -3129,7 +3129,7 @@ static int __init netlink_proto_init(void) ...@@ -3129,7 +3129,7 @@ static int __init netlink_proto_init(void)
.head_offset = offsetof(struct netlink_sock, node), .head_offset = offsetof(struct netlink_sock, node),
.key_offset = offsetof(struct netlink_sock, portid), .key_offset = offsetof(struct netlink_sock, portid),
.key_len = sizeof(u32), /* portid */ .key_len = sizeof(u32), /* portid */
.hashfn = arch_fast_hash, .hashfn = jhash,
.max_shift = 16, /* 64K */ .max_shift = 16, /* 64K */
.grow_decision = rht_grow_above_75, .grow_decision = rht_grow_above_75,
.shrink_decision = rht_shrink_below_30, .shrink_decision = rht_shrink_below_30,
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include <linux/if_vlan.h> #include <linux/if_vlan.h>
#include <net/llc_pdu.h> #include <net/llc_pdu.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/hash.h> #include <linux/jhash.h>
#include <linux/jiffies.h> #include <linux/jiffies.h>
#include <linux/llc.h> #include <linux/llc.h>
#include <linux/module.h> #include <linux/module.h>
...@@ -366,7 +366,7 @@ static u32 flow_hash(const struct sw_flow_key *key, int key_start, ...@@ -366,7 +366,7 @@ static u32 flow_hash(const struct sw_flow_key *key, int key_start,
/* Make sure number of hash bytes are multiple of u32. */ /* Make sure number of hash bytes are multiple of u32. */
BUILD_BUG_ON(sizeof(long) % sizeof(u32)); BUILD_BUG_ON(sizeof(long) % sizeof(u32));
return arch_fast_hash2(hash_key, hash_u32s, 0); return jhash2(hash_key, hash_u32s, 0);
} }
static int flow_key_start(const struct sw_flow_key *key) static int flow_key_start(const struct sw_flow_key *key)
......
#ifndef __ASM_GENERIC_HASH_H
#define __ASM_GENERIC_HASH_H
/* Stub */
#endif /* __ASM_GENERIC_HASH_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment