[6.12.y,55/60] drm/panic: allow verbose version check

Message ID	20250307225008.779961-56-ojeda@kernel.org
State	New
Headers	show Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 152EE20CCCD; Fri, 7 Mar 2025 22:53:05 +0000 (UTC) From: Miguel Ojeda <ojeda@kernel.org> To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Sasha Levin <sashal@kernel.org>, stable@vger.kernel.org Cc: Danilo Krummrich <dakr@kernel.org>, Alice Ryhl <aliceryhl@google.com>, Alyssa Ross <hi@alyssa.is>, NoisyCoil <noisycoil@disroot.org>, patches@lists.linux.dev, Miguel Ojeda <ojeda@kernel.org> Subject: [PATCH 6.12.y 55/60] drm/panic: allow verbose version check Date: Fri, 7 Mar 2025 23:50:02 +0100 Message-ID: <20250307225008.779961-56-ojeda@kernel.org> In-Reply-To: <20250307225008.779961-1-ojeda@kernel.org> References: <20250307225008.779961-1-ojeda@kernel.org> Precedence: bulk MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit
Series	`alloc`, `#[expect]` and "Custom FFI" \| expand [6.12.y,00/60] `alloc`, `#[expect]` and "Custom FFI" [6.12.y,01/60] rust: workqueue: remove unneeded ``#[allow(clippy::new_ret_no_self)]` [6.12.y,02/60] rust: sort global Rust flags [6.12.y,03/60] rust: types: avoid repetition in `{As,From}Bytes` impls [6.12.y,04/60] rust: enable `clippy::undocumented_unsafe_blocks` lint [6.12.y,05/60] rust: enable `clippy::unnecessary_safety_comment` lint [6.12.y,06/60] rust: enable `clippy::unnecessary_safety_doc` lint [6.12.y,07/60] rust: enable `clippy::ignored_unit_patterns` lint [6.12.y,08/60] rust: enable `rustdoc::unescaped_backticks` lint [6.12.y,09/60] rust: init: remove unneeded `#[allow(clippy::disallowed_names)]` [6.12.y,10/60] rust: sync: remove unneeded `#[allow(clippy::non_send_fields_in_send_ty)]` [6.12.y,11/60] rust: introduce `.clippy.toml` [6.12.y,12/60] rust: replace `clippy::dbg_macro` with `disallowed_macros` [6.12.y,13/60] rust: provide proper code documentation titles [6.12.y,14/60] rust: enable Clippy's `check-private-items` [6.12.y,15/60] Documentation: rust: add coding guidelines on lints [6.12.y,16/60] rust: start using the `#[expect(...)]` attribute [6.12.y,17/60] Documentation: rust: discuss `#[expect(...)]` in the guidelines [6.12.y,18/60] rust: error: make conversion functions public [6.12.y,19/60] rust: error: optimize error type to use nonzero [6.12.y,20/60] rust: alloc: add `Allocator` trait [6.12.y,21/60] rust: alloc: separate `aligned_size` from `krealloc_aligned` [6.12.y,22/60] rust: alloc: rename `KernelAllocator` to `Kmalloc` [6.12.y,23/60] rust: alloc: implement `ReallocFunc` [6.12.y,24/60] rust: alloc: make `allocator` module public [6.12.y,25/60] rust: alloc: implement `Allocator` for `Kmalloc` [6.12.y,26/60] rust: alloc: add module `allocator_test` [6.12.y,27/60] rust: alloc: implement `Vmalloc` allocator [6.12.y,28/60] rust: alloc: implement `KVmalloc` allocator [6.12.y,29/60] rust: alloc: add __GFP_NOWARN to `Flags` [6.12.y,30/60] rust: alloc: implement kernel `Box` [6.12.y,31/60] rust: treewide: switch to our kernel `Box` type [6.12.y,32/60] rust: alloc: remove extension of std's `Box` [6.12.y,33/60] rust: alloc: add `Box` to prelude [6.12.y,34/60] rust: alloc: introduce `ArrayLayout` [6.12.y,35/60] rust: alloc: implement kernel `Vec` type [6.12.y,36/60] rust: alloc: implement `IntoIterator` for `Vec` [6.12.y,37/60] rust: alloc: implement `collect` for `IntoIter` [6.12.y,38/60] rust: treewide: switch to the kernel `Vec` type [6.12.y,39/60] rust: alloc: remove `VecExt` extension [6.12.y,40/60] rust: alloc: add `Vec` to prelude [6.12.y,41/60] rust: error: use `core::alloc::LayoutError` [6.12.y,42/60] rust: error: check for config `test` in `Error::name` [6.12.y,43/60] rust: alloc: implement `contains` for `Flags` [6.12.y,44/60] rust: alloc: implement `Cmalloc` in module allocator_test [6.12.y,45/60] rust: str: test: replace `alloc::format` [6.12.y,46/60] rust: alloc: update module comment of alloc.rs [6.12.y,47/60] kbuild: rust: remove the `alloc` crate and `GlobalAlloc` [6.12.y,48/60] MAINTAINERS: add entry for the Rust `alloc` module [6.12.y,49/60] drm/panic: avoid reimplementing Iterator::find [6.12.y,50/60] drm/panic: remove unnecessary borrow in alignment_pattern [6.12.y,51/60] drm/panic: prefer eliding lifetimes [6.12.y,52/60] drm/panic: remove redundant field when assigning value [6.12.y,53/60] drm/panic: correctly indent continuation of line in list item [6.12.y,54/60] drm/panic: allow verbose boolean for clarity [6.12.y,55/60] drm/panic: allow verbose version check [6.12.y,56/60] rust: kbuild: expand rusttest target for macros [6.12.y,57/60] rust: fix size_t in bindgen prototypes of C builtins [6.12.y,58/60] rust: map `__kernel_size_t` and friends also to usize/isize [6.12.y,59/60] rust: use custom FFI integer types [6.12.y,60/60] rust: alloc: Fix `ArrayLayout` allocations

Message ID

20250307225008.779961-56-ojeda@kernel.org

State

New

Headers

From: Miguel Ojeda <ojeda@kernel.org>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Sasha Levin <sashal@kernel.org>,
	stable@vger.kernel.org
Cc: Danilo Krummrich <dakr@kernel.org>,
	Alice Ryhl <aliceryhl@google.com>,
	Alyssa Ross <hi@alyssa.is>,
	NoisyCoil <noisycoil@disroot.org>,
	patches@lists.linux.dev,
	Miguel Ojeda <ojeda@kernel.org>
Subject: [PATCH 6.12.y 55/60] drm/panic: allow verbose version check
Date: Fri,  7 Mar 2025 23:50:02 +0100
Message-ID: <20250307225008.779961-56-ojeda@kernel.org>
In-Reply-To: <20250307225008.779961-1-ojeda@kernel.org>
References: <20250307225008.779961-1-ojeda@kernel.org>
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Series

`alloc`, `#[expect]` and "Custom FFI" | expand

Commit Message

Miguel Ojeda March 7, 2025, 10:50 p.m. UTC

From: Thomas Böhler <witcher@wiredspace.de>

commit 06b919e3fedf4798a1f0f60e0b67caa192f724a7 upstream.

Clippy warns about a reimplementation of `RangeInclusive::contains`:

    error: manual `!RangeInclusive::contains` implementation
       --> drivers/gpu/drm/drm_panic_qr.rs:986:8
        |
    986 |     if version < 1 || version > 40 {
        |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: use: `!(1..=40).contains(&version)`
        |
        = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#manual_range_contains
        = note: `-D clippy::manual-range-contains` implied by `-D warnings`
        = help: to override `-D warnings` add `#[allow(clippy::manual_range_contains)]`

Ignore this and keep the current implementation as that makes it easier
to read.

Fixes: cb5164ac43d0 ("drm/panic: Add a QR code panic screen")
Reported-by: Miguel Ojeda <ojeda@kernel.org>
Link: https://github.com/Rust-for-Linux/linux/issues/1123
Signed-off-by: Thomas Böhler <witcher@wiredspace.de>
Reviewed-by: Jocelyn Falempe <jfalempe@redhat.com>
Link: https://lore.kernel.org/r/20241019084048.22336-8-witcher@wiredspace.de
Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
---
 drivers/gpu/drm/drm_panic_qr.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/gpu/drm/drm_panic_qr.rs b/drivers/gpu/drm/drm_panic_qr.rs
index 4671a4fb99da..ef2d490965ba 100644
--- a/drivers/gpu/drm/drm_panic_qr.rs
+++ b/drivers/gpu/drm/drm_panic_qr.rs
@@ -982,6 +982,7 @@  fn draw_all(&mut self, data: impl Iterator<Item = u8>) {
 /// * If `url_len` = 0, only removes 3 bytes for 1 binary segment.
 #[no_mangle]
 pub extern "C" fn drm_panic_qr_max_data_size(version: u8, url_len: usize) -> usize {
+    #[expect(clippy::manual_range_contains)]
     if version < 1 || version > 40 {
         return 0;
     }

[6.12.y,55/60] drm/panic: allow verbose version check

Commit Message

Patch