Changes in 4.9.147 signal: Introduce COMPAT_SIGMINSTKSZ for use in compat_sys_sigaltstack lib/interval_tree_test.c: make test options module parameters lib/interval_tree_test.c: allow full tree search lib/rbtree_test.c: make input module parameters lib/rbtree-test: lower default params lib/interval_tree_test.c: allow users to limit scope of endpoint timer/debug: Change /proc/timer_list from 0444 to 0400 pinctrl: sunxi: a83t: Fix IRQ offset typo for PH11 aio: fix spectre gadget in lookup_ioctx MMC: OMAP: fix broken MMC on OMAP15XX/OMAP5910/OMAP310 ARM: mmp/mmp2: fix cpu_is_mmp2() on mmp2-dt tracing: Fix memory leak in set_trigger_filter() tracing: Fix memory leak of instance function hash filters powerpc/msi: Fix NULL pointer access in teardown code Revert "drm/rockchip: Allow driver to be shutdown on reboot/kexec" drm/i915/execlists: Apply a full mb before execution for Braswell mac80211: don't WARN on bad WMM parameters from buggy APs mac80211: Fix condition validating WMM IE IB/hfi1: Remove race conditions in user_sdma send path locking: Remove smp_read_barrier_depends() from queued_spin_lock_slowpath() locking/qspinlock: Ensure node is initialised before updating prev->next locking/qspinlock: Bound spinning on pending->locked transition in slowpath locking/qspinlock: Merge 'struct __qspinlock' into 'struct qspinlock' locking/qspinlock: Remove unbounded cmpxchg() loop from locking slowpath locking/qspinlock: Remove duplicate clear_pending() function from PV code locking/qspinlock: Kill cmpxchg() loop when claiming lock from head of queue locking/qspinlock: Re-order code locking/qspinlock/x86: Increase _Q_PENDING_LOOPS upper bound locking/qspinlock, x86: Provide liveness guarantee locking/qspinlock: Fix build for anonymous union in older GCC compilers mac80211_hwsim: fix module init error paths for netlink scsi: libiscsi: Fix NULL pointer dereference in iscsi_eh_session_reset scsi: vmw_pscsi: Rearrange code to avoid multiple calls to free_irq during unload x86/earlyprintk/efi: Fix infinite loop on some screen widths drm/msm: Grab a vblank reference when waiting for commit_done ARC: io.h: Implement reads{x}()/writes{x}() bonding: fix 802.3ad state sent to partner when unbinding slave nfs: don't dirty kernel pages read by direct-io SUNRPC: Fix a potential race in xprt_connect() sbus: char: add of_node_put() drivers/sbus/char: add of_node_put() drivers/tty: add missing of_node_put() ide: pmac: add of_node_put() clk: mvebu: Off by one bugs in cp110_of_clk_get() clk: mmp: Off by one in mmp_clk_add() Input: omap-keypad - fix keyboard debounce configuration libata: whitelist all SAMSUNG MZ7KM* solid-state disks mv88e6060: disable hardware level MAC learning net/mlx4_en: Fix build break when CONFIG_INET is off bpf: check pending signals while verifying programs ARM: 8814/1: mm: improve/fix ARM v7_dma_inv_range() unaligned address handling ARM: 8815/1: V7M: align v7m_dma_inv_range() with v7 counterpart ethernet: fman: fix wrong of_node_put() in probe function drm/ast: Fix connector leak during driver unload cifs: In Kconfig CONFIG_CIFS_POSIX needs depends on legacy (insecure cifs) vhost/vsock: fix reset orphans race with close timeout i2c: axxia: properly handle master timeout i2c: scmi: Fix probe error on devices with an empty SMB0001 ACPI device node nvmet-rdma: fix response use after free rtc: snvs: add a missing write sync rtc: snvs: Add timeouts to avoid kernel lockups Linux 4.9.147 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
272 lines
6.0 KiB
C
272 lines
6.0 KiB
C
#include <linux/module.h>
|
|
#include <linux/moduleparam.h>
|
|
#include <linux/rbtree_augmented.h>
|
|
#include <linux/random.h>
|
|
#include <linux/slab.h>
|
|
#include <asm/timex.h>
|
|
|
|
#define __param(type, name, init, msg) \
|
|
static type name = init; \
|
|
module_param(name, type, 0444); \
|
|
MODULE_PARM_DESC(name, msg);
|
|
|
|
__param(int, nnodes, 100, "Number of nodes in the rb-tree");
|
|
__param(int, perf_loops, 1000, "Number of iterations modifying the rb-tree");
|
|
__param(int, check_loops, 100, "Number of iterations modifying and verifying the rb-tree");
|
|
|
|
struct test_node {
|
|
u32 key;
|
|
struct rb_node rb;
|
|
|
|
/* following fields used for testing augmented rbtree functionality */
|
|
u32 val;
|
|
u32 augmented;
|
|
};
|
|
|
|
static struct rb_root root = RB_ROOT;
|
|
static struct test_node *nodes = NULL;
|
|
|
|
static struct rnd_state rnd;
|
|
|
|
static void insert(struct test_node *node, struct rb_root *root)
|
|
{
|
|
struct rb_node **new = &root->rb_node, *parent = NULL;
|
|
u32 key = node->key;
|
|
|
|
while (*new) {
|
|
parent = *new;
|
|
if (key < rb_entry(parent, struct test_node, rb)->key)
|
|
new = &parent->rb_left;
|
|
else
|
|
new = &parent->rb_right;
|
|
}
|
|
|
|
rb_link_node(&node->rb, parent, new);
|
|
rb_insert_color(&node->rb, root);
|
|
}
|
|
|
|
static inline void erase(struct test_node *node, struct rb_root *root)
|
|
{
|
|
rb_erase(&node->rb, root);
|
|
}
|
|
|
|
static inline u32 augment_recompute(struct test_node *node)
|
|
{
|
|
u32 max = node->val, child_augmented;
|
|
if (node->rb.rb_left) {
|
|
child_augmented = rb_entry(node->rb.rb_left, struct test_node,
|
|
rb)->augmented;
|
|
if (max < child_augmented)
|
|
max = child_augmented;
|
|
}
|
|
if (node->rb.rb_right) {
|
|
child_augmented = rb_entry(node->rb.rb_right, struct test_node,
|
|
rb)->augmented;
|
|
if (max < child_augmented)
|
|
max = child_augmented;
|
|
}
|
|
return max;
|
|
}
|
|
|
|
RB_DECLARE_CALLBACKS(static, augment_callbacks, struct test_node, rb,
|
|
u32, augmented, augment_recompute)
|
|
|
|
static void insert_augmented(struct test_node *node, struct rb_root *root)
|
|
{
|
|
struct rb_node **new = &root->rb_node, *rb_parent = NULL;
|
|
u32 key = node->key;
|
|
u32 val = node->val;
|
|
struct test_node *parent;
|
|
|
|
while (*new) {
|
|
rb_parent = *new;
|
|
parent = rb_entry(rb_parent, struct test_node, rb);
|
|
if (parent->augmented < val)
|
|
parent->augmented = val;
|
|
if (key < parent->key)
|
|
new = &parent->rb.rb_left;
|
|
else
|
|
new = &parent->rb.rb_right;
|
|
}
|
|
|
|
node->augmented = val;
|
|
rb_link_node(&node->rb, rb_parent, new);
|
|
rb_insert_augmented(&node->rb, root, &augment_callbacks);
|
|
}
|
|
|
|
static void erase_augmented(struct test_node *node, struct rb_root *root)
|
|
{
|
|
rb_erase_augmented(&node->rb, root, &augment_callbacks);
|
|
}
|
|
|
|
static void init(void)
|
|
{
|
|
int i;
|
|
for (i = 0; i < nnodes; i++) {
|
|
nodes[i].key = prandom_u32_state(&rnd);
|
|
nodes[i].val = prandom_u32_state(&rnd);
|
|
}
|
|
}
|
|
|
|
static bool is_red(struct rb_node *rb)
|
|
{
|
|
return !(rb->__rb_parent_color & 1);
|
|
}
|
|
|
|
static int black_path_count(struct rb_node *rb)
|
|
{
|
|
int count;
|
|
for (count = 0; rb; rb = rb_parent(rb))
|
|
count += !is_red(rb);
|
|
return count;
|
|
}
|
|
|
|
static void check_postorder_foreach(int nr_nodes)
|
|
{
|
|
struct test_node *cur, *n;
|
|
int count = 0;
|
|
rbtree_postorder_for_each_entry_safe(cur, n, &root, rb)
|
|
count++;
|
|
|
|
WARN_ON_ONCE(count != nr_nodes);
|
|
}
|
|
|
|
static void check_postorder(int nr_nodes)
|
|
{
|
|
struct rb_node *rb;
|
|
int count = 0;
|
|
for (rb = rb_first_postorder(&root); rb; rb = rb_next_postorder(rb))
|
|
count++;
|
|
|
|
WARN_ON_ONCE(count != nr_nodes);
|
|
}
|
|
|
|
static void check(int nr_nodes)
|
|
{
|
|
struct rb_node *rb;
|
|
int count = 0, blacks = 0;
|
|
u32 prev_key = 0;
|
|
|
|
for (rb = rb_first(&root); rb; rb = rb_next(rb)) {
|
|
struct test_node *node = rb_entry(rb, struct test_node, rb);
|
|
WARN_ON_ONCE(node->key < prev_key);
|
|
WARN_ON_ONCE(is_red(rb) &&
|
|
(!rb_parent(rb) || is_red(rb_parent(rb))));
|
|
if (!count)
|
|
blacks = black_path_count(rb);
|
|
else
|
|
WARN_ON_ONCE((!rb->rb_left || !rb->rb_right) &&
|
|
blacks != black_path_count(rb));
|
|
prev_key = node->key;
|
|
count++;
|
|
}
|
|
|
|
WARN_ON_ONCE(count != nr_nodes);
|
|
WARN_ON_ONCE(count < (1 << black_path_count(rb_last(&root))) - 1);
|
|
|
|
check_postorder(nr_nodes);
|
|
check_postorder_foreach(nr_nodes);
|
|
}
|
|
|
|
static void check_augmented(int nr_nodes)
|
|
{
|
|
struct rb_node *rb;
|
|
|
|
check(nr_nodes);
|
|
for (rb = rb_first(&root); rb; rb = rb_next(rb)) {
|
|
struct test_node *node = rb_entry(rb, struct test_node, rb);
|
|
WARN_ON_ONCE(node->augmented != augment_recompute(node));
|
|
}
|
|
}
|
|
|
|
static int __init rbtree_test_init(void)
|
|
{
|
|
int i, j;
|
|
cycles_t time1, time2, time;
|
|
|
|
nodes = kmalloc(nnodes * sizeof(*nodes), GFP_KERNEL);
|
|
if (!nodes)
|
|
return -ENOMEM;
|
|
|
|
printk(KERN_ALERT "rbtree testing");
|
|
|
|
prandom_seed_state(&rnd, 3141592653589793238ULL);
|
|
init();
|
|
|
|
time1 = get_cycles();
|
|
|
|
for (i = 0; i < perf_loops; i++) {
|
|
for (j = 0; j < nnodes; j++)
|
|
insert(nodes + j, &root);
|
|
for (j = 0; j < nnodes; j++)
|
|
erase(nodes + j, &root);
|
|
}
|
|
|
|
time2 = get_cycles();
|
|
time = time2 - time1;
|
|
|
|
time = div_u64(time, perf_loops);
|
|
printk(" -> %llu cycles\n", (unsigned long long)time);
|
|
|
|
for (i = 0; i < check_loops; i++) {
|
|
init();
|
|
for (j = 0; j < nnodes; j++) {
|
|
check(j);
|
|
insert(nodes + j, &root);
|
|
}
|
|
for (j = 0; j < nnodes; j++) {
|
|
check(nnodes - j);
|
|
erase(nodes + j, &root);
|
|
}
|
|
check(0);
|
|
}
|
|
|
|
printk(KERN_ALERT "augmented rbtree testing");
|
|
|
|
init();
|
|
|
|
time1 = get_cycles();
|
|
|
|
for (i = 0; i < perf_loops; i++) {
|
|
for (j = 0; j < nnodes; j++)
|
|
insert_augmented(nodes + j, &root);
|
|
for (j = 0; j < nnodes; j++)
|
|
erase_augmented(nodes + j, &root);
|
|
}
|
|
|
|
time2 = get_cycles();
|
|
time = time2 - time1;
|
|
|
|
time = div_u64(time, perf_loops);
|
|
printk(" -> %llu cycles\n", (unsigned long long)time);
|
|
|
|
for (i = 0; i < check_loops; i++) {
|
|
init();
|
|
for (j = 0; j < nnodes; j++) {
|
|
check_augmented(j);
|
|
insert_augmented(nodes + j, &root);
|
|
}
|
|
for (j = 0; j < nnodes; j++) {
|
|
check_augmented(nnodes - j);
|
|
erase_augmented(nodes + j, &root);
|
|
}
|
|
check_augmented(0);
|
|
}
|
|
|
|
kfree(nodes);
|
|
|
|
return -EAGAIN; /* Fail will directly unload the module */
|
|
}
|
|
|
|
static void __exit rbtree_test_exit(void)
|
|
{
|
|
printk(KERN_ALERT "test exit\n");
|
|
}
|
|
|
|
module_init(rbtree_test_init)
|
|
module_exit(rbtree_test_exit)
|
|
|
|
MODULE_LICENSE("GPL");
|
|
MODULE_AUTHOR("Michel Lespinasse");
|
|
MODULE_DESCRIPTION("Red Black Tree test");
|