From nobody Mon Dec 1 23:34:48 2025 Received: from mail-ot1-f99.google.com (mail-ot1-f99.google.com [209.85.210.99]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id ECC0C800 for ; Wed, 26 Nov 2025 00:59:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.99 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764118782; cv=none; b=joCaYafch2WmK+PhFlZXm18hLQrIKPONFqAggMuh2+k3VbbN2g+ev8SaMmpRUoYHTNMCBO8DN8BaBucz8oUKGHeH2v+zqqxQO4k+JuT5UUz7vxhbpeqUXBIXvB1qIqFrLDsepWTUdrZNby8oAXtQDlBS8Np1C4SesBCjja2VbIw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764118782; c=relaxed/simple; bh=4c0qhkut76rH7l84paJua3p+DLZ8r2/gCaXlajcUJcs=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=Q2y/HnmEfjtZcdy7DM/Va/1qfHUMNwzRv8DAmvQqEseVHNg3lQ+itzTw45CnjQ6s6Y+yOxjPz6y9gDykrTF7zH/GdFV7DnKbzw67yuJhitR88ezsvFVifSRAnMZ9+ZVHCKkPErnyw7qBVa6UDoRVlIm63u+SwinjGYsgvHgC86Q= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=purestorage.com; spf=fail smtp.mailfrom=purestorage.com; dkim=pass (2048-bit key) header.d=purestorage.com header.i=@purestorage.com header.b=VGsyTPFr; arc=none smtp.client-ip=209.85.210.99 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=purestorage.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=purestorage.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=purestorage.com header.i=@purestorage.com header.b="VGsyTPFr" Received: by mail-ot1-f99.google.com with SMTP id 46e09a7af769-7c6dca2455bso807126a34.3 for ; Tue, 25 Nov 2025 16:59:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1764118780; x=1764723580; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=g0nvyTrvg8vglRmTZSeQks2gzaJL5Z1i8rE/Cy2tXmM=; b=VGsyTPFr86BL+R6ecfAUxF1knMsOORMucmZTTf/3/wM301dQ9lzQo49JlWYj5UAxyG BeXmpj50jMpcwCri7Wu1+algUokvrrhTX7ewQ9Ec4OhvdkJsJ2ZcEQFiaktIvBbyKG4k txf94Te87/qgXEoxtvab2U38vMc4O9rJUnMTDjXN0F5k6C/9hI03QFBQhT2u4IvNQlsN DwVdWbS9oG4bAib+DHKa2oJOfZ3ML8kanHe2AHpLO9JV+13BW9yggHln+YpMLtlFi9SW LpA5gwkfBTIotV/w91Ppu+We1BL+4SEfyg6euZf/Cc8sUWlpY1g0/TE7xIGzOrjBAj3n yQYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764118780; x=1764723580; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=g0nvyTrvg8vglRmTZSeQks2gzaJL5Z1i8rE/Cy2tXmM=; b=fVeUmdgvt9/qJr6UjWBcNWJspmpuKFVEc99kamodRSdWIXghcAAci6qqYyYaY0DgKC wQxOnG5JBD5UxzTuJ3oOtXlihO3wzNE6Hql/d0N/e5cSmR8Zzp3CtCqa8nrgjxoEiLyO DmfAmFEDEAyqCUwBXICw1Rv1J7WZZJnOEbDyQcYA8QL9k3NpOeHZbEnYGSA1Cx184enO 7abEIxwgoiMHD9pZEtP2tDoraqW28q0GqVNgCeZV6KRy1cKHHI30sPVJNbV5CJGryvp7 sb9KL6lbMXMREkW0ynYP4lLx13EjdAxZ8OIn5RdQf+H0FpL4jv5oQFDJ+ArUK2Cljnml 9JJg== X-Forwarded-Encrypted: i=1; AJvYcCXzhY8y0QEGZwHtQ3K+T9Bo0z1T4xxLBfIYQ6qxXXKNgys2BacfiatS6getKbf1OrqoWodHQ/4Y5iRKXwM=@vger.kernel.org X-Gm-Message-State: AOJu0YxrbJCYyoWJnsDmqY6QVHocB/pC/OC37h8Nzu/xAAWx0ras7/8L kiy1wqb+P5kC1ZpEclOAWCE8nYX/0Nyvn2Ueb105Mdn5nzDIqf41TMsFwklg82DJQDkdQqk0t3R QTMkZpCF7Gr9UwohsIPeg1Addm78DPpJMJSzm X-Gm-Gg: ASbGncsh8GNoFTzswETyfYgtS4Q9ntjQQTF4+a8I64XGf5aIBNnyJSr14UJQV6hPHU6 Ak/FXvR6+uXDAyxpbk7sJbL7TX98YzIr2X5B1iPaKPTMLiOxSc7iYZ/kyDQyGf/+XaYGr71s4E9 fuIHpDafG5hLAsA37lx//iesNBfk0h/adpr282xr5nnv6LpuCp9pV5cOIzd2zcaSQ6RV1MvUOa/ rRzmcjdMk3S/5s/76ZFADqro/1IWsrAN4i4SSNEJi3Nty3vu5XXdaON1E1J3JIhHINoaLSAd2fW FXg1ro3N82hfyd2p3CHiCUInbVcj8bRGGWBaD/hkbrlsn6+LdDu/TmeZcO6VfGmoCz0ILebaV+Y JIu4ugqwaGowNiMxaV9Asi6Or+KfLA5hyghk36W9CSQ== X-Google-Smtp-Source: AGHT+IHsZVQzOnoQr8TpI8lhkZ2cuoLfRghEBbrsW7bjqM59P5BC496qIxZFJtjepMeRUZih49Qn2mIOONcS X-Received: by 2002:a05:6870:fba3:b0:3e8:4825:718 with SMTP id 586e51a60fabf-3ecbe585bb9mr4509945fac.5.1764118779991; Tue, 25 Nov 2025 16:59:39 -0800 (PST) Received: from c7-smtp-2023.dev.purestorage.com ([208.88.159.129]) by smtp-relay.gmail.com with ESMTPS id 586e51a60fabf-3ec9dcdceacsm1698271fac.18.2025.11.25.16.59.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Nov 2025 16:59:39 -0800 (PST) X-Relaying-Domain: purestorage.com Received: from dev-csander.dev.purestorage.com (unknown [IPv6:2620:125:9007:640:ffff::1199]) by c7-smtp-2023.dev.purestorage.com (Postfix) with ESMTP id DEB743400B6; Tue, 25 Nov 2025 17:59:38 -0700 (MST) Received: by dev-csander.dev.purestorage.com (Postfix, from userid 1557716354) id DA921E418D3; Tue, 25 Nov 2025 17:59:38 -0700 (MST) From: Caleb Sander Mateos To: Jens Axboe Cc: Caleb Sander Mateos , io-uring@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] io_uring/query: drop unused io_handle_query_entry() ctx arg Date: Tue, 25 Nov 2025 17:59:34 -0700 Message-ID: <20251126005936.3988966-1-csander@purestorage.com> X-Mailer: git-send-email 2.45.2 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" io_handle_query_entry() doesn't use its struct io_ring_ctx *ctx argument. So remove it from the function and its callers. Signed-off-by: Caleb Sander Mateos --- io_uring/query.c | 7 +++---- io_uring/query.h | 2 +- io_uring/register.c | 4 ++-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/io_uring/query.c b/io_uring/query.c index e61b6221f87f..abdd6f3e1223 100644 --- a/io_uring/query.c +++ b/io_uring/query.c @@ -51,12 +51,11 @@ static ssize_t io_query_scq(union io_query_data *data) e->hdr_size =3D sizeof(struct io_rings); e->hdr_alignment =3D SMP_CACHE_BYTES; return sizeof(*e); } =20 -static int io_handle_query_entry(struct io_ring_ctx *ctx, - union io_query_data *data, void __user *uhdr, +static int io_handle_query_entry(union io_query_data *data, void __user *u= hdr, u64 *next_entry) { struct io_uring_query_hdr hdr; size_t usize, res_size =3D 0; ssize_t ret =3D -EINVAL; @@ -105,11 +104,11 @@ static int io_handle_query_entry(struct io_ring_ctx *= ctx, return -EFAULT; *next_entry =3D hdr.next_entry; return 0; } =20 -int io_query(struct io_ring_ctx *ctx, void __user *arg, unsigned nr_args) +int io_query(void __user *arg, unsigned nr_args) { union io_query_data entry_buffer; void __user *uhdr =3D arg; int ret, nr =3D 0; =20 @@ -119,11 +118,11 @@ int io_query(struct io_ring_ctx *ctx, void __user *ar= g, unsigned nr_args) return -EINVAL; =20 while (uhdr) { u64 next_hdr; =20 - ret =3D io_handle_query_entry(ctx, &entry_buffer, uhdr, &next_hdr); + ret =3D io_handle_query_entry(&entry_buffer, uhdr, &next_hdr); if (ret) return ret; uhdr =3D u64_to_user_ptr(next_hdr); =20 /* Have some limit to avoid a potential cycle */ diff --git a/io_uring/query.h b/io_uring/query.h index 171d47ccaaba..b35eb52f0ea8 100644 --- a/io_uring/query.h +++ b/io_uring/query.h @@ -2,8 +2,8 @@ #ifndef IORING_QUERY_H #define IORING_QUERY_H =20 #include =20 -int io_query(struct io_ring_ctx *ctx, void __user *arg, unsigned nr_args); +int io_query(void __user *arg, unsigned nr_args); =20 #endif diff --git a/io_uring/register.c b/io_uring/register.c index db42f98562c4..62d39b3ff317 100644 --- a/io_uring/register.c +++ b/io_uring/register.c @@ -811,11 +811,11 @@ static int __io_uring_register(struct io_ring_ctx *ct= x, unsigned opcode, if (!arg || nr_args !=3D 1) break; ret =3D io_register_mem_region(ctx, arg); break; case IORING_REGISTER_QUERY: - ret =3D io_query(ctx, arg, nr_args); + ret =3D io_query(arg, nr_args); break; case IORING_REGISTER_ZCRX_CTRL: ret =3D io_zcrx_ctrl(ctx, arg, nr_args); break; default: @@ -886,11 +886,11 @@ static int io_uring_register_blind(unsigned int opcod= e, void __user *arg, { switch (opcode) { case IORING_REGISTER_SEND_MSG_RING: return io_uring_register_send_msg_ring(arg, nr_args); case IORING_REGISTER_QUERY: - return io_query(NULL, arg, nr_args); + return io_query(arg, nr_args); } return -EINVAL; } =20 SYSCALL_DEFINE4(io_uring_register, unsigned int, fd, unsigned int, opcode, --=20 2.45.2