Changes in 4.9.298 Bluetooth: bfusb: fix division by zero in send path USB: core: Fix bug in resuming hub's handling of wakeup requests USB: Fix "slab-out-of-bounds Write" bug in usb_hcd_poll_rh_status mfd: intel-lpss: Fix too early PM enablement in the ACPI ->probe() can: gs_usb: fix use of uninitialized variable, detach device on reception of invalid USB data can: gs_usb: gs_can_start_xmit(): zero-initialize hf->{flags,reserved} random: fix data race on crng_node_pool random: fix data race on crng init time staging: wlan-ng: Avoid bitwise vs logical OR warning in hfa384x_usb_throttlefn() drm/i915: Avoid bitwise vs logical OR warning in snb_wm_latency_quirk() media: uvcvideo: fix division by zero at stream start rtlwifi: rtl8192cu: Fix WARNING when calling local_irq_restore() with interrupts enabled HID: uhid: Fix worker destroying device without any protection HID: wacom: Avoid using stale array indicies to read contact count nfc: llcp: fix NULL error pointer dereference on sendmsg() after failed bind() rtc: cmos: take rtc_lock while reading from CMOS media: flexcop-usb: fix control-message timeouts media: mceusb: fix control-message timeouts media: em28xx: fix control-message timeouts media: cpia2: fix control-message timeouts media: s2255: fix control-message timeouts media: dib0700: fix undefined behavior in tuner shutdown media: redrat3: fix control-message timeouts media: pvrusb2: fix control-message timeouts media: stk1160: fix control-message timeouts can: softing_cs: softingcs_probe(): fix memleak on registration failure PCI: Add function 1 DMA alias quirk for Marvell 88SE9125 SATA controller shmem: fix a race between shmem_unused_huge_shrink and shmem_evict_inode Bluetooth: cmtp: fix possible panic when cmtp_init_sockets() fails wcn36xx: Indicate beacon not connection loss on MISSED_BEACON_IND Bluetooth: stop proccessing malicious adv data media: dmxdev: fix UAF when dvb_register_device() fails crypto: qce - fix uaf on qce_ahash_register_one tty: serial: atmel: Check return code of dmaengine_submit() tty: serial: atmel: Call dma_async_issue_pending() netfilter: bridge: add support for pppoe filtering arm64: dts: qcom: msm8916: fix MMC controller aliases drm/amdgpu: Fix a NULL pointer dereference in amdgpu_connector_lcd_native_mode() drm/radeon/radeon_kms: Fix a NULL pointer dereference in radeon_driver_open_kms() serial: amba-pl011: do not request memory region twice floppy: Fix hang in watchdog when disk is ejected media: dib8000: Fix a memleak in dib8000_init() media: saa7146: mxb: Fix a NULL pointer dereference in mxb_attach() media: si2157: Fix "warm" tuner state detection media: msi001: fix possible null-ptr-deref in msi001_probe() usb: ftdi-elan: fix memory leak on device disconnect pcmcia: rsrc_nonstatic: Fix a NULL pointer dereference in __nonstatic_find_io_region() pcmcia: rsrc_nonstatic: Fix a NULL pointer dereference in nonstatic_find_mem_region() ppp: ensure minimum packet size in ppp_write() fsl/fman: Check for null pointer after calling devm_ioremap spi: spi-meson-spifc: Add missing pm_runtime_disable() in meson_spifc_probe can: softing: softing_startstop(): fix set but not used variable warning can: xilinx_can: xcan_probe(): check for error irq pcmcia: fix setting of kthread task states net: mcs7830: handle usb read errors properly ext4: avoid trim error on fs with small groups ALSA: jack: Add missing rwsem around snd_ctl_remove() calls ALSA: PCM: Add missing rwsem around snd_ctl_remove() calls ALSA: hda: Add missing rwsem around snd_ctl_remove() calls RDMA/hns: Validate the pkey index powerpc/prom_init: Fix improper check of prom_getprop() ALSA: oss: fix compile error when OSS_DEBUG is enabled char/mwave: Adjust io port register size scsi: ufs: Fix race conditions related to driver data RDMA/core: Let ib_find_gid() continue search even after empty entry dmaengine: pxa/mmp: stop referencing config->slave_id ASoC: samsung: idma: Check of ioremap return value misc: lattice-ecp3-config: Fix task hung when firmware load failed mips: lantiq: add support for clk_set_parent() mips: bcm63xx: add support for clk_set_parent() RDMA/cxgb4: Set queue pair state when being queried Bluetooth: Fix debugfs entry leak in hci_register_dev() fs: dlm: filter user dlm messages for kernel locks ar5523: Fix null-ptr-deref with unexpected WDCMSG_TARGET_START reply usb: gadget: f_fs: Use stream_open() for endpoint files HID: apple: Do not reset quirks when the Fn key is not found media: b2c2: Add missing check in flexcop_pci_isr: gpiolib: acpi: Do not set the IRQ type if the IRQ is already in use HSI: core: Fix return freed object in hsi_new_client mwifiex: Fix skb_over_panic in mwifiex_usb_recv() floppy: Add max size check for user space request media: saa7146: hexium_orion: Fix a NULL pointer dereference in hexium_attach() media: m920x: don't use stack on USB reads iwlwifi: mvm: synchronize with FW after multicast commands ath10k: Fix tx hanging net: bonding: debug: avoid printing debug logs when bond is not notifying peers media: igorplugusb: receiver overflow should be reported media: saa7146: hexium_gemini: Fix a NULL pointer dereference in hexium_attach() usb: hub: Add delay for SuperSpeed hub resume to let links transit to U0 ath9k: Fix out-of-bound memcpy in ath9k_hif_usb_rx_stream um: registers: Rename function names to avoid conflicts and build problems jffs2: GC deadlock reading a page that is used in jffs2_write_begin() ACPICA: Utilities: Avoid deleting the same object twice in a row ACPICA: Executer: Fix the REFCLASS_REFOF case in acpi_ex_opcode_1A_0T_1R() btrfs: remove BUG_ON() in find_parent_nodes() btrfs: remove BUG_ON(!eie) in find_parent_nodes net: mdio: Demote probed message to debug print dm btree: add a defensive bounds check to insert_at() dm space map common: add bounds check to sm_ll_lookup_bitmap() serial: pl010: Drop CR register reset on set_termios serial: core: Keep mctrl register state and cached copy in sync parisc: Avoid calling faulthandler_disabled() twice powerpc/6xx: add missing of_node_put powerpc/powernv: add missing of_node_put powerpc/cell: add missing of_node_put powerpc/btext: add missing of_node_put i2c: i801: Don't silently correct invalid transfer size powerpc/smp: Move setup_profiling_timer() under CONFIG_PROFILING i2c: mpc: Correct I2C reset procedure w1: Misuse of get_user()/put_user() reported by sparse ALSA: seq: Set upper limit of processed events i2c: designware-pci: Fix to change data types of hcnt and lcnt parameters MIPS: Octeon: Fix build errors using clang scsi: sr: Don't use GFP_DMA ASoC: mediatek: mt8173: fix device_node leak power: bq25890: Enable continuous conversion for ADC at charging ubifs: Error path in ubifs_remount_rw() seems to wrongly free write buffers iwlwifi: mvm: Increase the scan timeout guard to 30 seconds ext4: set csum seed in tmp inode while migrating to extents ext4: Fix BUG_ON in ext4_bread when write quota data ext4: don't use the orphan list when migrating an inode fuse: fix bad inode fuse: fix live lock in fuse_iget() drm/radeon: fix error handling in radeon_driver_open_kms RDMA/hns: Modify the mapping attribute of doorbell to device RDMA/rxe: Fix a typo in opcode name powerpc/fsl/dts: Enable WA for erratum A-009885 on fman3l MDIO buses net/fsl: xgmac_mdio: Fix incorrect iounmap when removing module parisc: pdc_stable: Fix memory leak in pdcs_register_pathentries af_unix: annote lockless accesses to unix_tot_inflight & gc_in_progress net: axienet: Wait for PhyRstCmplt after core reset net: axienet: fix number of TX ring slots for available check netns: add schedule point in ops_exit_list() libcxgb: Don't accidentally set RTO_ONLINK in cxgb_find_route() dmaengine: at_xdmac: Don't start transactions at tx_submit level dmaengine: at_xdmac: Print debug message after realeasing the lock dmaengine: at_xdmac: Fix lld view setting dmaengine: at_xdmac: Fix at_xdmac_lld struct definition net_sched: restore "mpu xxx" handling bcmgenet: add WOL IRQ check scripts/dtc: dtx_diff: remove broken example from help text lib82596: Fix IRQ check in sni_82596_probe Revert "gup: document and work around "COW can break either way" issue" gup: document and work around "COW can break either way" issue drm/ttm/nouveau: don't call tt destroy callback on alloc failure. gianfar: simplify FCS handling and fix memory leak gianfar: fix jumbo packets+napi+rx overrun crash cipso,calipso: resolve a number of problems with the DOI refcounts rbtree: cache leftmost node internally lib/timerqueue: Rely on rbtree semantics for next timer mm: add follow_pte_pmd() KVM: do not assume PTE is writable after follow_pfn KVM: Use kvm_pfn_t for local PFN variable in hva_to_pfn_remapped() KVM: do not allow mapping valid but non-reference-counted pages Linux 4.9.298 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: Ifcea82a702a0906d9090c89785363c2d5423f652
290 lines
8.6 KiB
C
290 lines
8.6 KiB
C
/*
|
|
Red Black Trees
|
|
(C) 1999 Andrea Arcangeli <andrea@suse.de>
|
|
(C) 2002 David Woodhouse <dwmw2@infradead.org>
|
|
(C) 2012 Michel Lespinasse <walken@google.com>
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
|
|
linux/include/linux/rbtree_augmented.h
|
|
*/
|
|
|
|
#ifndef _LINUX_RBTREE_AUGMENTED_H
|
|
#define _LINUX_RBTREE_AUGMENTED_H
|
|
|
|
#include <linux/compiler.h>
|
|
#include <linux/rbtree.h>
|
|
|
|
/*
|
|
* Please note - only struct rb_augment_callbacks and the prototypes for
|
|
* rb_insert_augmented() and rb_erase_augmented() are intended to be public.
|
|
* The rest are implementation details you are not expected to depend on.
|
|
*
|
|
* See Documentation/rbtree.txt for documentation and samples.
|
|
*/
|
|
|
|
struct rb_augment_callbacks {
|
|
void (*propagate)(struct rb_node *node, struct rb_node *stop);
|
|
void (*copy)(struct rb_node *old, struct rb_node *new);
|
|
void (*rotate)(struct rb_node *old, struct rb_node *new);
|
|
};
|
|
|
|
extern void __rb_insert_augmented(struct rb_node *node,
|
|
struct rb_root *root,
|
|
bool newleft, struct rb_node **leftmost,
|
|
void (*augment_rotate)(struct rb_node *old, struct rb_node *new));
|
|
/*
|
|
* Fixup the rbtree and update the augmented information when rebalancing.
|
|
*
|
|
* On insertion, the user must update the augmented information on the path
|
|
* leading to the inserted node, then call rb_link_node() as usual and
|
|
* rb_augment_inserted() instead of the usual rb_insert_color() call.
|
|
* If rb_augment_inserted() rebalances the rbtree, it will callback into
|
|
* a user provided function to update the augmented information on the
|
|
* affected subtrees.
|
|
*/
|
|
static inline void
|
|
rb_insert_augmented(struct rb_node *node, struct rb_root *root,
|
|
const struct rb_augment_callbacks *augment)
|
|
{
|
|
__rb_insert_augmented(node, root, false, NULL, augment->rotate);
|
|
}
|
|
|
|
static inline void
|
|
rb_insert_augmented_cached(struct rb_node *node,
|
|
struct rb_root_cached *root, bool newleft,
|
|
const struct rb_augment_callbacks *augment)
|
|
{
|
|
__rb_insert_augmented(node, &root->rb_root,
|
|
newleft, &root->rb_leftmost, augment->rotate);
|
|
}
|
|
|
|
#define RB_DECLARE_CALLBACKS(rbstatic, rbname, rbstruct, rbfield, \
|
|
rbtype, rbaugmented, rbcompute) \
|
|
static inline void \
|
|
rbname ## _propagate(struct rb_node *rb, struct rb_node *stop) \
|
|
{ \
|
|
while (rb != stop) { \
|
|
rbstruct *node = rb_entry(rb, rbstruct, rbfield); \
|
|
rbtype augmented = rbcompute(node); \
|
|
if (node->rbaugmented == augmented) \
|
|
break; \
|
|
node->rbaugmented = augmented; \
|
|
rb = rb_parent(&node->rbfield); \
|
|
} \
|
|
} \
|
|
static inline void \
|
|
rbname ## _copy(struct rb_node *rb_old, struct rb_node *rb_new) \
|
|
{ \
|
|
rbstruct *old = rb_entry(rb_old, rbstruct, rbfield); \
|
|
rbstruct *new = rb_entry(rb_new, rbstruct, rbfield); \
|
|
new->rbaugmented = old->rbaugmented; \
|
|
} \
|
|
static void \
|
|
rbname ## _rotate(struct rb_node *rb_old, struct rb_node *rb_new) \
|
|
{ \
|
|
rbstruct *old = rb_entry(rb_old, rbstruct, rbfield); \
|
|
rbstruct *new = rb_entry(rb_new, rbstruct, rbfield); \
|
|
new->rbaugmented = old->rbaugmented; \
|
|
old->rbaugmented = rbcompute(old); \
|
|
} \
|
|
rbstatic const struct rb_augment_callbacks rbname = { \
|
|
rbname ## _propagate, rbname ## _copy, rbname ## _rotate \
|
|
};
|
|
|
|
|
|
#define RB_RED 0
|
|
#define RB_BLACK 1
|
|
|
|
#define __rb_parent(pc) ((struct rb_node *)(pc & ~3))
|
|
|
|
#define __rb_color(pc) ((pc) & 1)
|
|
#define __rb_is_black(pc) __rb_color(pc)
|
|
#define __rb_is_red(pc) (!__rb_color(pc))
|
|
#define rb_color(rb) __rb_color((rb)->__rb_parent_color)
|
|
#define rb_is_red(rb) __rb_is_red((rb)->__rb_parent_color)
|
|
#define rb_is_black(rb) __rb_is_black((rb)->__rb_parent_color)
|
|
|
|
static inline void rb_set_parent(struct rb_node *rb, struct rb_node *p)
|
|
{
|
|
rb->__rb_parent_color = rb_color(rb) | (unsigned long)p;
|
|
}
|
|
|
|
static inline void rb_set_parent_color(struct rb_node *rb,
|
|
struct rb_node *p, int color)
|
|
{
|
|
rb->__rb_parent_color = (unsigned long)p | color;
|
|
}
|
|
|
|
static inline void
|
|
__rb_change_child(struct rb_node *old, struct rb_node *new,
|
|
struct rb_node *parent, struct rb_root *root)
|
|
{
|
|
if (parent) {
|
|
if (parent->rb_left == old)
|
|
WRITE_ONCE(parent->rb_left, new);
|
|
else
|
|
WRITE_ONCE(parent->rb_right, new);
|
|
} else
|
|
WRITE_ONCE(root->rb_node, new);
|
|
}
|
|
|
|
static inline void
|
|
__rb_change_child_rcu(struct rb_node *old, struct rb_node *new,
|
|
struct rb_node *parent, struct rb_root *root)
|
|
{
|
|
if (parent) {
|
|
if (parent->rb_left == old)
|
|
rcu_assign_pointer(parent->rb_left, new);
|
|
else
|
|
rcu_assign_pointer(parent->rb_right, new);
|
|
} else
|
|
rcu_assign_pointer(root->rb_node, new);
|
|
}
|
|
|
|
extern void __rb_erase_color(struct rb_node *parent, struct rb_root *root,
|
|
void (*augment_rotate)(struct rb_node *old, struct rb_node *new));
|
|
|
|
static __always_inline struct rb_node *
|
|
__rb_erase_augmented(struct rb_node *node, struct rb_root *root,
|
|
struct rb_node **leftmost,
|
|
const struct rb_augment_callbacks *augment)
|
|
{
|
|
struct rb_node *child = node->rb_right;
|
|
struct rb_node *tmp = node->rb_left;
|
|
struct rb_node *parent, *rebalance;
|
|
unsigned long pc;
|
|
|
|
if (leftmost && node == *leftmost)
|
|
*leftmost = rb_next(node);
|
|
|
|
if (!tmp) {
|
|
/*
|
|
* Case 1: node to erase has no more than 1 child (easy!)
|
|
*
|
|
* Note that if there is one child it must be red due to 5)
|
|
* and node must be black due to 4). We adjust colors locally
|
|
* so as to bypass __rb_erase_color() later on.
|
|
*/
|
|
pc = node->__rb_parent_color;
|
|
parent = __rb_parent(pc);
|
|
__rb_change_child(node, child, parent, root);
|
|
if (child) {
|
|
child->__rb_parent_color = pc;
|
|
rebalance = NULL;
|
|
} else
|
|
rebalance = __rb_is_black(pc) ? parent : NULL;
|
|
tmp = parent;
|
|
} else if (!child) {
|
|
/* Still case 1, but this time the child is node->rb_left */
|
|
tmp->__rb_parent_color = pc = node->__rb_parent_color;
|
|
parent = __rb_parent(pc);
|
|
__rb_change_child(node, tmp, parent, root);
|
|
rebalance = NULL;
|
|
tmp = parent;
|
|
} else {
|
|
struct rb_node *successor = child, *child2;
|
|
|
|
tmp = child->rb_left;
|
|
if (!tmp) {
|
|
/*
|
|
* Case 2: node's successor is its right child
|
|
*
|
|
* (n) (s)
|
|
* / \ / \
|
|
* (x) (s) -> (x) (c)
|
|
* \
|
|
* (c)
|
|
*/
|
|
parent = successor;
|
|
child2 = successor->rb_right;
|
|
|
|
augment->copy(node, successor);
|
|
} else {
|
|
/*
|
|
* Case 3: node's successor is leftmost under
|
|
* node's right child subtree
|
|
*
|
|
* (n) (s)
|
|
* / \ / \
|
|
* (x) (y) -> (x) (y)
|
|
* / /
|
|
* (p) (p)
|
|
* / /
|
|
* (s) (c)
|
|
* \
|
|
* (c)
|
|
*/
|
|
do {
|
|
parent = successor;
|
|
successor = tmp;
|
|
tmp = tmp->rb_left;
|
|
} while (tmp);
|
|
child2 = successor->rb_right;
|
|
WRITE_ONCE(parent->rb_left, child2);
|
|
WRITE_ONCE(successor->rb_right, child);
|
|
rb_set_parent(child, successor);
|
|
|
|
augment->copy(node, successor);
|
|
augment->propagate(parent, successor);
|
|
}
|
|
|
|
tmp = node->rb_left;
|
|
WRITE_ONCE(successor->rb_left, tmp);
|
|
rb_set_parent(tmp, successor);
|
|
|
|
pc = node->__rb_parent_color;
|
|
tmp = __rb_parent(pc);
|
|
__rb_change_child(node, successor, tmp, root);
|
|
|
|
if (child2) {
|
|
successor->__rb_parent_color = pc;
|
|
rb_set_parent_color(child2, parent, RB_BLACK);
|
|
rebalance = NULL;
|
|
} else {
|
|
unsigned long pc2 = successor->__rb_parent_color;
|
|
successor->__rb_parent_color = pc;
|
|
rebalance = __rb_is_black(pc2) ? parent : NULL;
|
|
}
|
|
tmp = successor;
|
|
}
|
|
|
|
augment->propagate(tmp, NULL);
|
|
return rebalance;
|
|
}
|
|
|
|
static __always_inline void
|
|
rb_erase_augmented(struct rb_node *node, struct rb_root *root,
|
|
const struct rb_augment_callbacks *augment)
|
|
{
|
|
struct rb_node *rebalance = __rb_erase_augmented(node, root,
|
|
NULL, augment);
|
|
if (rebalance)
|
|
__rb_erase_color(rebalance, root, augment->rotate);
|
|
}
|
|
|
|
static __always_inline void
|
|
rb_erase_augmented_cached(struct rb_node *node, struct rb_root_cached *root,
|
|
const struct rb_augment_callbacks *augment)
|
|
{
|
|
struct rb_node *rebalance = __rb_erase_augmented(node, &root->rb_root,
|
|
&root->rb_leftmost,
|
|
augment);
|
|
if (rebalance)
|
|
__rb_erase_color(rebalance, &root->rb_root, augment->rotate);
|
|
}
|
|
|
|
#endif /* _LINUX_RBTREE_AUGMENTED_H */
|