net, lib: kill arch_fast_hash library bits
As there are now no remaining users of arch_fast_hash(), lets kill it entirely. This basically reverts commit71ae8aac3e("lib: introduce arch optimized hash library") and follow-up work, that is f.e., commit237217546d("lib: hash: follow-up fixups for arch hash"), commite3fec2f74f("lib: Add missing arch generic-y entries for asm-generic/hash.h") and last but not least commit6a02652df5("perf tools: Fix include for non x86 architectures"). Cc: Francesco Fusco <fusco@ntop.org> Cc: Thomas Graf <tgraf@suug.ch> Cc: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: Daniel Borkmann <dborkman@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Daniel Borkmann
David S. Miller
parent
87545899b5
commit
0cb6c969ed
|
|
@ -3,7 +3,6 @@
|
|||
generic-y += clkdev.h
|
||||
generic-y += cputime.h
|
||||
generic-y += exec.h
|
||||
generic-y += hash.h
|
||||
generic-y += irq_work.h
|
||||
generic-y += mcs_spinlock.h
|
||||
generic-y += preempt.h
|
||||
|
|
|
|||
|
|
@ -12,7 +12,6 @@ generic-y += fb.h
|
|||
generic-y += fcntl.h
|
||||
generic-y += ftrace.h
|
||||
generic-y += hardirq.h
|
||||
generic-y += hash.h
|
||||
generic-y += hw_irq.h
|
||||
generic-y += ioctl.h
|
||||
generic-y += ioctls.h
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@ generic-y += current.h
|
|||
generic-y += emergency-restart.h
|
||||
generic-y += errno.h
|
||||
generic-y += exec.h
|
||||
generic-y += hash.h
|
||||
generic-y += ioctl.h
|
||||
generic-y += ipcbuf.h
|
||||
generic-y += irq_regs.h
|
||||
|
|
|
|||
|
|
@ -14,7 +14,6 @@ generic-y += early_ioremap.h
|
|||
generic-y += emergency-restart.h
|
||||
generic-y += errno.h
|
||||
generic-y += ftrace.h
|
||||
generic-y += hash.h
|
||||
generic-y += hw_irq.h
|
||||
generic-y += ioctl.h
|
||||
generic-y += ioctls.h
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@ generic-y += div64.h
|
|||
generic-y += emergency-restart.h
|
||||
generic-y += exec.h
|
||||
generic-y += futex.h
|
||||
generic-y += hash.h
|
||||
generic-y += irq_regs.h
|
||||
generic-y += irq_work.h
|
||||
generic-y += local.h
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@ generic-y += emergency-restart.h
|
|||
generic-y += errno.h
|
||||
generic-y += fb.h
|
||||
generic-y += futex.h
|
||||
generic-y += hash.h
|
||||
generic-y += hw_irq.h
|
||||
generic-y += ioctl.h
|
||||
generic-y += ipcbuf.h
|
||||
|
|
|
|||
|
|
@ -15,7 +15,6 @@ generic-y += exec.h
|
|||
generic-y += fb.h
|
||||
generic-y += fcntl.h
|
||||
generic-y += futex.h
|
||||
generic-y += hash.h
|
||||
generic-y += hw_irq.h
|
||||
generic-y += io.h
|
||||
generic-y += ioctl.h
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@ generic-y += barrier.h
|
|||
generic-y += clkdev.h
|
||||
generic-y += cputime.h
|
||||
generic-y += exec.h
|
||||
generic-y += hash.h
|
||||
generic-y += irq_work.h
|
||||
generic-y += kvm_para.h
|
||||
generic-y += linkage.h
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
generic-y += clkdev.h
|
||||
generic-y += cputime.h
|
||||
generic-y += exec.h
|
||||
generic-y += hash.h
|
||||
generic-y += irq_work.h
|
||||
generic-y += mcs_spinlock.h
|
||||
generic-y += preempt.h
|
||||
|
|
|
|||
|
|
@ -16,7 +16,6 @@ generic-y += fb.h
|
|||
generic-y += fcntl.h
|
||||
generic-y += ftrace.h
|
||||
generic-y += hardirq.h
|
||||
generic-y += hash.h
|
||||
generic-y += hw_irq.h
|
||||
generic-y += ioctl.h
|
||||
generic-y += ioctls.h
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
|
||||
generic-y += clkdev.h
|
||||
generic-y += exec.h
|
||||
generic-y += hash.h
|
||||
generic-y += irq_work.h
|
||||
generic-y += kvm_para.h
|
||||
generic-y += mcs_spinlock.h
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
generic-y += clkdev.h
|
||||
generic-y += cputime.h
|
||||
generic-y += exec.h
|
||||
generic-y += hash.h
|
||||
generic-y += irq_work.h
|
||||
generic-y += mcs_spinlock.h
|
||||
generic-y += module.h
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@ generic-y += device.h
|
|||
generic-y += emergency-restart.h
|
||||
generic-y += errno.h
|
||||
generic-y += exec.h
|
||||
generic-y += hash.h
|
||||
generic-y += hw_irq.h
|
||||
generic-y += ioctl.h
|
||||
generic-y += ipcbuf.h
|
||||
|
|
|
|||
|
|
@ -13,7 +13,6 @@ generic-y += fb.h
|
|||
generic-y += fcntl.h
|
||||
generic-y += futex.h
|
||||
generic-y += hardirq.h
|
||||
generic-y += hash.h
|
||||
generic-y += hw_irq.h
|
||||
generic-y += ioctl.h
|
||||
generic-y += ioctls.h
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@ generic-y += clkdev.h
|
|||
generic-y += cputime.h
|
||||
generic-y += device.h
|
||||
generic-y += exec.h
|
||||
generic-y += hash.h
|
||||
generic-y += irq_work.h
|
||||
generic-y += mcs_spinlock.h
|
||||
generic-y += preempt.h
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@ generic-y += cputime.h
|
|||
generic-y += current.h
|
||||
generic-y += dma-contiguous.h
|
||||
generic-y += emergency-restart.h
|
||||
generic-y += hash.h
|
||||
generic-y += irq_work.h
|
||||
generic-y += local64.h
|
||||
generic-y += mcs_spinlock.h
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@ generic-y += barrier.h
|
|||
generic-y += clkdev.h
|
||||
generic-y += cputime.h
|
||||
generic-y += exec.h
|
||||
generic-y += hash.h
|
||||
generic-y += irq_work.h
|
||||
generic-y += mcs_spinlock.h
|
||||
generic-y += preempt.h
|
||||
|
|
|
|||
|
|
@ -25,7 +25,6 @@ generic-y += fcntl.h
|
|||
generic-y += ftrace.h
|
||||
generic-y += futex.h
|
||||
generic-y += hardirq.h
|
||||
generic-y += hash.h
|
||||
generic-y += hw_irq.h
|
||||
generic-y += ioctl.h
|
||||
generic-y += ioctls.h
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@ generic-y += device.h
|
|||
generic-y += div64.h
|
||||
generic-y += emergency-restart.h
|
||||
generic-y += exec.h
|
||||
generic-y += hash.h
|
||||
generic-y += hw_irq.h
|
||||
generic-y += irq_regs.h
|
||||
generic-y += irq_work.h
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
|
||||
generic-y += clkdev.h
|
||||
generic-y += hash.h
|
||||
generic-y += irq_work.h
|
||||
generic-y += mcs_spinlock.h
|
||||
generic-y += preempt.h
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
|
||||
|
||||
generic-y += clkdev.h
|
||||
generic-y += hash.h
|
||||
generic-y += irq_work.h
|
||||
generic-y += mcs_spinlock.h
|
||||
generic-y += preempt.h
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@ header-y +=
|
|||
generic-y += barrier.h
|
||||
generic-y += clkdev.h
|
||||
generic-y += cputime.h
|
||||
generic-y += hash.h
|
||||
generic-y += irq_work.h
|
||||
generic-y += mcs_spinlock.h
|
||||
generic-y += preempt.h
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@ generic-y += emergency-restart.h
|
|||
generic-y += errno.h
|
||||
generic-y += exec.h
|
||||
generic-y += fcntl.h
|
||||
generic-y += hash.h
|
||||
generic-y += ioctl.h
|
||||
generic-y += ipcbuf.h
|
||||
generic-y += irq_regs.h
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@ generic-y += cputime.h
|
|||
generic-y += div64.h
|
||||
generic-y += emergency-restart.h
|
||||
generic-y += exec.h
|
||||
generic-y += hash.h
|
||||
generic-y += irq_regs.h
|
||||
generic-y += irq_work.h
|
||||
generic-y += linkage.h
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@ generic-y += errno.h
|
|||
generic-y += exec.h
|
||||
generic-y += fb.h
|
||||
generic-y += fcntl.h
|
||||
generic-y += hash.h
|
||||
generic-y += hw_irq.h
|
||||
generic-y += ioctl.h
|
||||
generic-y += ioctls.h
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@ generic-y += exec.h
|
|||
generic-y += ftrace.h
|
||||
generic-y += futex.h
|
||||
generic-y += hardirq.h
|
||||
generic-y += hash.h
|
||||
generic-y += hw_irq.h
|
||||
generic-y += io.h
|
||||
generic-y += irq_regs.h
|
||||
|
|
|
|||
|
|
@ -16,7 +16,6 @@ generic-y += fcntl.h
|
|||
generic-y += ftrace.h
|
||||
generic-y += futex.h
|
||||
generic-y += hardirq.h
|
||||
generic-y += hash.h
|
||||
generic-y += hw_irq.h
|
||||
generic-y += ioctl.h
|
||||
generic-y += ioctls.h
|
||||
|
|
|
|||
|
|
@ -1,7 +0,0 @@
|
|||
#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
|
|||
lib-$(CONFIG_RWSEM_XCHGADD_ALGORITHM) += rwsem.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)
|
||||
obj-y += atomic64_32.o
|
||||
|
|
|
|||
|
|
@ -1,92 +0,0 @@
|
|||
/*
|
||||
* 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
|
|||
generic-y += exec.h
|
||||
generic-y += fcntl.h
|
||||
generic-y += hardirq.h
|
||||
generic-y += hash.h
|
||||
generic-y += ioctl.h
|
||||
generic-y += irq_regs.h
|
||||
generic-y += irq_work.h
|
||||
|
|
|
|||
|
|
@ -1,9 +0,0 @@
|
|||
#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 @@
|
|||
*/
|
||||
|
||||
#include <asm/types.h>
|
||||
#include <asm/hash.h>
|
||||
#include <linux/compiler.h>
|
||||
|
||||
/* 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)
|
|||
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 */
|
||||
|
|
|
|||
|
|
@ -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 \
|
||||
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 \
|
||||
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-$(CONFIG_TEST_STRING_HELPERS) += test-string_helpers.o
|
||||
obj-y += kstrtox.o
|
||||
|
|
|
|||
39
lib/hash.c
39
lib/hash.c
|
|
@ -1,39 +0,0 @@
|
|||
/* 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);
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
#ifndef __ASM_GENERIC_HASH_H
|
||||
#define __ASM_GENERIC_HASH_H
|
||||
|
||||
/* Stub */
|
||||
|
||||
#endif /* __ASM_GENERIC_HASH_H */
|
||||
Loading…
Reference in New Issue