mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Alice Ryhl <aliceryhl@google.com>
To: Danilo Krummrich <dakr@kernel.org>
Cc: Matthew Maurer <mmaurer@google.com>,
	rust-for-linux@vger.kernel.org,  linux-kernel@vger.kernel.org,
	Alice Ryhl <aliceryhl@google.com>
Subject: [PATCH v4 5/7] rust: alloc: add Vec::retain
Date: Tue, 29 Apr 2025 14:44:25 +0000	[thread overview]
Message-ID: <20250429-vec-methods-v4-5-dad4436ff82d@google.com> (raw)
In-Reply-To: <20250429-vec-methods-v4-0-dad4436ff82d@google.com>

This adds a common Vec method called `retain` that removes all elements
that don't match a certain condition. Rust Binder uses it to find all
processes that match a given pid.

The stdlib retain method takes &T rather than &mut T and has a separate
retain_mut for the &mut T case. However, this is considered an API
mistake that can't be fixed now due to backwards compatibility. There's
no reason for us to repeat that mistake.

Signed-off-by: Alice Ryhl <aliceryhl@google.com>
---
 rust/kernel/alloc/kvec.rs | 72 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 72 insertions(+)

diff --git a/rust/kernel/alloc/kvec.rs b/rust/kernel/alloc/kvec.rs
index 72bc743ec88bf7b91a0a1ffd9f830cfe4f983ffd..357f5a37c7b1d15b709a10c162292841eed0e376 100644
--- a/rust/kernel/alloc/kvec.rs
+++ b/rust/kernel/alloc/kvec.rs
@@ -608,6 +608,29 @@ pub fn drain_all(&mut self) -> DrainAll<'_, T> {
             elements: elems.iter_mut(),
         }
     }
+
+    /// Removes all elements that don't match the provided closure.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// let mut v = kernel::kvec![1, 2, 3, 4]?;
+    /// v.retain(|i| *i % 2 == 0);
+    /// assert_eq!(v, [2, 4]);
+    /// # Ok::<(), Error>(())
+    /// ```
+    pub fn retain(&mut self, mut f: impl FnMut(&mut T) -> bool) {
+        let mut num_kept = 0;
+        let mut next_to_check = 0;
+        while let Some(to_check) = self.get_mut(next_to_check) {
+            if f(to_check) {
+                self.swap(num_kept, next_to_check);
+                num_kept += 1;
+            }
+            next_to_check += 1;
+        }
+        self.truncate(num_kept);
+    }
 }
 
 impl<T: Clone, A: Allocator> Vec<T, A> {
@@ -1130,3 +1153,52 @@ fn drop(&mut self) {
         }
     }
 }
+
+#[macros::kunit_tests(rust_kvec_kunit)]
+mod tests {
+    use super::*;
+    use crate::prelude::*;
+
+    #[test]
+    fn test_kvec_retain() {
+        /// Verify correctness for one specific function.
+        #[expect(clippy::needless_range_loop)]
+        fn verify(c: &[bool]) {
+            let mut vec1: KVec<usize> = KVec::with_capacity(c.len(), GFP_KERNEL).unwrap();
+            let mut vec2: KVec<usize> = KVec::with_capacity(c.len(), GFP_KERNEL).unwrap();
+
+            for i in 0..c.len() {
+                vec1.push_within_capacity(i).unwrap();
+                if c[i] {
+                    vec2.push_within_capacity(i).unwrap();
+                }
+            }
+
+            vec1.retain(|i| c[*i]);
+
+            assert_eq!(vec1, vec2);
+        }
+
+        /// Add one to a binary integer represented as a boolean array.
+        fn add(value: &mut [bool]) {
+            let mut carry = true;
+            for v in value {
+                let new_v = carry != *v;
+                carry = carry && *v;
+                *v = new_v;
+            }
+        }
+
+        // This boolean array represents a function from index to boolean. We check that `retain`
+        // behaves correctly for all possible boolean arrays of every possible length less than
+        // ten.
+        let mut func = KVec::with_capacity(10, GFP_KERNEL).unwrap();
+        for len in 0..10 {
+            for _ in 0u32..1u32 << len {
+                verify(&func);
+                add(&mut func);
+            }
+            func.push_within_capacity(false).unwrap();
+        }
+    }
+}

-- 
2.49.0.901.g37484f566f-goog


  parent reply	other threads:[~2025-04-29 14:44 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-04-29 14:44 [PATCH v4 0/7] Additional methods for Vec Alice Ryhl
2025-04-29 14:44 ` [PATCH v4 1/7] rust: alloc: add Vec::clear Alice Ryhl
2025-04-29 14:44 ` [PATCH v4 2/7] rust: alloc: add Vec::pop Alice Ryhl
2025-04-29 14:44 ` [PATCH v4 3/7] rust: alloc: add Vec::push_within_capacity Alice Ryhl
2025-04-30 15:34   ` Danilo Krummrich
2025-05-01 11:03     ` Alice Ryhl
2025-05-01 11:34       ` Danilo Krummrich
2025-04-29 14:44 ` [PATCH v4 4/7] rust: alloc: add Vec::drain_all Alice Ryhl
2025-04-30 15:47   ` Danilo Krummrich
2025-04-29 14:44 ` Alice Ryhl [this message]
2025-04-30 16:26   ` [PATCH v4 5/7] rust: alloc: add Vec::retain Danilo Krummrich
2025-05-01 11:10     ` Alice Ryhl
2025-05-01 11:30       ` Danilo Krummrich
2025-05-01 14:24         ` Alice Ryhl
2025-05-02 21:58         ` Miguel Ojeda
2025-05-02 14:13     ` Miguel Ojeda
2025-04-29 14:44 ` [PATCH v4 6/7] rust: alloc: add Vec::remove Alice Ryhl
2025-04-30 16:28   ` Danilo Krummrich
2025-05-01 11:10     ` Alice Ryhl
2025-05-01 11:40       ` Danilo Krummrich
2025-05-01 14:25         ` Alice Ryhl
2025-04-29 14:44 ` [PATCH v4 7/7] rust: alloc: add Vec::insert_within_capacity Alice Ryhl
2025-04-29 15:30   ` Greg KH
2025-04-30 11:24     ` Alice Ryhl
2025-04-30 11:39       ` Greg KH
2025-04-30 12:15         ` Alice Ryhl
2025-04-30 12:36           ` Danilo Krummrich

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250429-vec-methods-v4-5-dad4436ff82d@google.com \
    --to=aliceryhl@google.com \
    --cc=dakr@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mmaurer@google.com \
    --cc=rust-for-linux@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

Powered by JetHome