Commit f468cf53 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'bitmap-for-6.19' of github.com:/norov/linux 

Pull bitmap updates from Yury Norov:

 - Runtime field_{get,prep}() (Geert)

 - Rust ID pool updates (Alice)

 - min_t() simplification (David)

 - __sw_hweightN kernel-doc fixes (Andy)

 - cpumask.h headers cleanup (Andy)

* tag 'bitmap-for-6.19' of github.com:/norov/linux: (32 commits)
  rust_binder: use bitmap for allocation of handles
  rust: id_pool: do not immediately acquire new ids
  rust: id_pool: do not supply starting capacity
  rust: id_pool: rename IdPool::new() to with_capacity()
  rust: bitmap: add BitmapVec::new_inline()
  rust: bitmap: add MAX_LEN and MAX_INLINE_LEN constants
  cpumask: Don't use "proxy" headers
  soc: renesas: Use bitfield helpers
  clk: renesas: Use bitfield helpers
  ALSA: usb-audio: Convert to common field_{get,prep}() helpers
  soc: renesas: rz-sysc: Convert to common field_get() helper
  pinctrl: ma35: Convert to common field_{get,prep}() helpers
  iio: mlx90614: Convert to common field_{get,prep}() helpers
  iio: dac: Convert to common field_prep() helper
  gpio: aspeed: Convert to common field_{get,prep}() helpers
  EDAC/ie31200: Convert to common field_get() helper
  crypto: qat - convert to common field_get() helper
  clk: at91: Convert to common field_{get,prep}() helpers
  bitfield: Add non-constant field_{prep,get}() helpers
  bitfield: Add less-checking __FIELD_{GET,PREP}()
  ...
parents 309e4903 5ba71195

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -4432,6 +4432,7 @@ F: arch/*/lib/bitops.c 
F:	include/asm-generic/bitops

F:	include/asm-generic/bitops.h

F:	include/linux/bitops.h

F:	lib/hweight.c

F:	lib/test_bitops.c

F:	tools/*/bitops*
































arch/x86/include/asm/cpumask.h



+2
−0






























Original line number
Diff line number
Diff line







@@ -2,6 +2,8 @@







#ifndef _ASM_X86_CPUMASK_H









#define _ASM_X86_CPUMASK_H









#ifndef __ASSEMBLER__



















#include <linux/compiler.h>









#include <linux/cpumask.h>



















extern void setup_cpu_local_masks(void);
































drivers/android/binder/process.rs



+47
−17






























Original line number
Diff line number
Diff line







@@ -19,6 +19,7 @@







    cred::Credential,









    error::Error,









    fs::file::{self, File},









    id_pool::IdPool,









    list::{List, ListArc, ListArcField, ListLinks},









    mm,









    prelude::*,








@@ -394,6 +395,8 @@ impl ListItem<{Self::LIST_NODE}> for NodeRefInfo {







struct ProcessNodeRefs {









    /// Used to look up nodes using the 32-bit id that this process knows it by.









    by_handle: RBTree<u32, ListArc<NodeRefInfo, { NodeRefInfo::LIST_PROC }>>,









    /// Used to quickly find unused ids in `by_handle`.









    handle_is_present: IdPool,









    /// Used to look up nodes without knowing their local 32-bit id. The usize is the address of









    /// the underlying `Node` struct as returned by `Node::global_id`.









    by_node: RBTree<usize, u32>,








@@ -408,6 +411,7 @@ impl ProcessNodeRefs {







    fn new() -> Self {









        Self {









            by_handle: RBTree::new(),









            handle_is_present: IdPool::new(),









            by_node: RBTree::new(),









            freeze_listeners: RBTree::new(),









        }








@@ -802,7 +806,7 @@ pub(crate) fn get_node(







    pub(crate) fn insert_or_update_handle(









        self: ArcBorrow<'_, Process>,









        node_ref: NodeRef,









        is_mananger: bool,









        is_manager: bool,









    ) -> Result<u32> {









        {









            let mut refs = self.node_refs.lock();








@@ -821,7 +825,33 @@ pub(crate) fn insert_or_update_handle(







        let reserve2 = RBTreeNodeReservation::new(GFP_KERNEL)?;









        let info = UniqueArc::new_uninit(GFP_KERNEL)?;



















        let mut refs = self.node_refs.lock();









        let mut refs_lock = self.node_refs.lock();









        let mut refs = &mut *refs_lock;



















        let (unused_id, by_handle_slot) = loop {









            // ID 0 may only be used by the manager.









            let start = if is_manager { 0 } else { 1 };



















            if let Some(res) = refs.handle_is_present.find_unused_id(start) {









                match refs.by_handle.entry(res.as_u32()) {









                    rbtree::Entry::Vacant(entry) => break (res, entry),









                    rbtree::Entry::Occupied(_) => {









                        pr_err!("Detected mismatch between handle_is_present and by_handle");









                        res.acquire();









                        kernel::warn_on!(true);









                        return Err(EINVAL);









                    }









                }









            }



















            let grow_request = refs.handle_is_present.grow_request().ok_or(ENOMEM)?;









            drop(refs_lock);









            let resizer = grow_request.realloc(GFP_KERNEL)?;









            refs_lock = self.node_refs.lock();









            refs = &mut *refs_lock;









            refs.handle_is_present.grow(resizer);









        };









        let handle = unused_id.as_u32();



















        // Do a lookup again as node may have been inserted before the lock was reacquired.









        if let Some(handle_ref) = refs.by_node.get(&node_ref.node.global_id()) {








@@ -831,20 +861,9 @@ pub(crate) fn insert_or_update_handle(







            return Ok(handle);









        }



















        // Find id.









        let mut target: u32 = if is_mananger { 0 } else { 1 };









        for handle in refs.by_handle.keys() {









            if *handle > target {









                break;









            }









            if *handle == target {









                target = target.checked_add(1).ok_or(ENOMEM)?;









            }









        }



















        let gid = node_ref.node.global_id();









        let (info_proc, info_node) = {









            let info_init = NodeRefInfo::new(node_ref, target, self.into());









            let info_init = NodeRefInfo::new(node_ref, handle, self.into());









            match info.pin_init_with(info_init) {









                Ok(info) => ListArc::pair_from_pin_unique(info),









                // error is infallible








@@ -865,9 +884,10 @@ pub(crate) fn insert_or_update_handle(







        // `info_node` into the right node's `refs` list.









        unsafe { info_proc.node_ref2().node.insert_node_info(info_node) };



















        refs.by_node.insert(reserve1.into_node(gid, target));









        refs.by_handle.insert(reserve2.into_node(target, info_proc));









        Ok(target)









        refs.by_node.insert(reserve1.into_node(gid, handle));









        by_handle_slot.insert(info_proc, reserve2);









        unused_id.acquire();









        Ok(handle)









    }



















    pub(crate) fn get_transaction_node(&self, handle: u32) -> BinderResult<NodeRef> {








@@ -932,6 +952,16 @@ pub(crate) fn update_ref(







                let id = info.node_ref().node.global_id();









                refs.by_handle.remove(&handle);









                refs.by_node.remove(&id);









                refs.handle_is_present.release_id(handle as usize);



















                if let Some(shrink) = refs.handle_is_present.shrink_request() {









                    drop(refs);









                    // This intentionally ignores allocation failures.









                    if let Ok(new_bitmap) = shrink.realloc(GFP_KERNEL) {









                        refs = self.node_refs.lock();









                        refs.handle_is_present.shrink(new_bitmap);









                    }









                }









            }









        } else {









            // All refs are cleared in process exit, so this warning is expected in that case.
































drivers/clk/at91/clk-peripheral.c



+1
−0






























Original line number
Diff line number
Diff line







@@ -3,6 +3,7 @@







 *  Copyright (C) 2013 Boris BREZILLON <b.brezillon@overkiz.com>









 */



















#include <linux/bitfield.h>









#include <linux/bitops.h>









#include <linux/clk-provider.h>









#include <linux/clkdev.h>
































drivers/clk/at91/pmc.h



+0
−3






























Original line number
Diff line number
Diff line







@@ -117,9 +117,6 @@ struct at91_clk_pms {







	unsigned int parent;









};



















#define field_get(_mask, _reg) (((_reg) & (_mask)) >> (ffs(_mask) - 1))









#define field_prep(_mask, _val) (((_val) << (ffs(_mask) - 1)) & (_mask))



















#define ndck(a, s) (a[s - 1].id + 1)









#define nck(a) (a[ARRAY_SIZE(a) - 1].id + 1)