From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3F705E9A03B for ; Thu, 19 Feb 2026 01:44:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=CUz10elldwZxLQFWq4Cian3B5sXmfA0qWI2X4aUf25A=; b=hci9IPOgUsqCB7OBGJrl088RjT WgJr4WrV2Fz2TMgxlX8rnwakKndPeQqoBdejeSrIRtwxXC2+WMqge9GzqUN5JnFW1rWMm1EJbyVda E9k2qsYqdYcHUKXB420NkHpYi/0h1XB4PwBYAvaMSfda/i3s+KXVy+WTXm1PYERF/nmSIApvzVoGD CQ6/n0RRb8HtQunG/jGnmmAddcbp2KyXnZ1us3rffO6eoBw/wzpjrBAz8rz7/5sMWHpA+jPRBfnEH TtohRk/9dq1Y5B4nvo+UW++T7MngbgBCWeLJ6Yjh7pDXibuCg1LEut7Jpfixwk/RxQ5naqJWz5vWc mebcVlmw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1vst54-0000000AhbV-11Qn; Thu, 19 Feb 2026 01:43:50 +0000 Received: from mail-qv1-xf61.google.com ([2607:f8b0:4864:20::f61]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1vst50-0000000AhZX-0nhd for linux-nvme@lists.infradead.org; Thu, 19 Feb 2026 01:43:48 +0000 Received: by mail-qv1-xf61.google.com with SMTP id 6a1803df08f44-89470513c62so1046006d6.1 for ; Wed, 18 Feb 2026 17:43:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1771465425; x=1772070225; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=CUz10elldwZxLQFWq4Cian3B5sXmfA0qWI2X4aUf25A=; b=UcfgU0iGl0yFEKtHYWTmv0a34lW3wx8gS3W+McOT31xipHk8t6yKTxCb7GtVd7zpJ6 Epz0a7rETM4tEnXRTcSofZUcuBC1Lx7e6V04Q7IKU/wok10+M4EhZYJLW5qbwmy387ve q/AA0JphMyOZrIxwszrONOR8hcUriHDBjK53g5o0TpCAhm0N4Z+GgOhL/0h3QBL9OSJG uagyATrfUu/sPrm4U+KpdtixOEsW+uyvlIFbqGIRTqnkJzuydpM4RsPZBmMyPRDLr/xQ sCVPy3BBZjlb1MfSdtKOrUKiBoWADubk2nxbX4RPqVYRbZe3c5SrMr6I8RzMF/sKygR1 W8Xg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771465425; x=1772070225; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=CUz10elldwZxLQFWq4Cian3B5sXmfA0qWI2X4aUf25A=; b=o29V/h37A9/I8y2tRf1WhIY2DOIUJ59Iuf6DNiMhkY79jfo9/1DCZXquSQtC8dg5TT 5cw0yuVWlWnRzAIKyq0oyjpuybDZEI5hIvsDLSL05slld6Ta9dXWz+WoebvWxC+EMQzW XW6WgwElbj6hPXOr+Xnj75D/mobQ6/qX1XmF/5c0ms9qJntLVoy57jLtVjfTUwEizTYg KJn7bWwTHL2vkR39hE8kkIvvrrDK1WqyOyJNl8tVPHU7Uh5USqh1U6reNPXsaE2Rg6VQ OY+r4BdlJnA9c91ICrbZLiboBPGUmPVa/4RgZnRQHa7MIiqqNpK8LlFt6ICcsGEcivS+ yW5A== X-Forwarded-Encrypted: i=1; AJvYcCWUGAiFQRlV5gMDbFc1UURJ2c1jjpvG2WxEtzBCle8IjvSIRRvA7tCOk4PBJlzsuXhFym682OQIsiiA@lists.infradead.org X-Gm-Message-State: AOJu0YyRy2N1IgU07yW0cSYB0iXYrk81ZqkwppUVFvWeV88uyAibJt8I MfPTaFkgAVlK46BIQgXJeUQyl9gsV51QQ5EJO85vM+Estw7kEs7/po+rxFuEWf8Bb7wvDTWAyJq Uzy4Ge5VvEuMvdWFXEKDccDR4/v1ebKOXLaAQ X-Gm-Gg: AZuq6aJnVh/WCaYA+TYqvTwTiApEwjMruv1g6sapdccdPEvTV1ay/rbNm9u+R4fZpDZ VJYBiigfxS6v8esWtSrEciffZX1x1N2Nc+oNWtL8iP/rFBaCrEPDPykmXlFvpNYfNVzLNfmdH9B FlFYhK1Pg3/X2LEPUXMtjW+P0jCg33zr9O6A8r7mrfDp4m9kANlpDY+8NIlXFqcWSHJr1hGKxb0 /f6Djpsqkh280Ty7nwALLBcBUt/8c1ruozDXN2wROTGbiSsfWM++lH/UBCkpGtfstuobeMNB+eV olh6I3TTNwiYo8eCC2M8BugrZyrZ67ueIrpbYeS/HVECtAKvwx3IZ4AbOhH2HEILKyyFdklhmhr cRMNLZslieNciKv9sZhDIHbA8SeUCHuGkwhqj4r1o+d8gJIibtwsSaw== X-Received: by 2002:a05:6214:4f05:b0:897:12e:8e8b with SMTP id 6a1803df08f44-897347e287emr204249686d6.7.1771465424836; Wed, 18 Feb 2026 17:43:44 -0800 (PST) Received: from c7-smtp-2023.dev.purestorage.com ([208.88.159.128]) by smtp-relay.gmail.com with ESMTPS id 6a1803df08f44-8971cd37a80sm27810226d6.19.2026.02.18.17.43.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Feb 2026 17:43:44 -0800 (PST) X-Relaying-Domain: purestorage.com Received: from dev-csander.dev.purestorage.com (dev-csander.dev.purestorage.com [10.112.29.101]) by c7-smtp-2023.dev.purestorage.com (Postfix) with ESMTP id AEB22342224; Wed, 18 Feb 2026 18:43:43 -0700 (MST) Received: by dev-csander.dev.purestorage.com (Postfix, from userid 1557716354) id A9B98E41D2F; Wed, 18 Feb 2026 18:43:43 -0700 (MST) From: Caleb Sander Mateos To: Jens Axboe , Christoph Hellwig , Keith Busch , Sagi Grimberg Cc: io-uring@vger.kernel.org, linux-nvme@lists.infradead.org, linux-kernel@vger.kernel.org, Caleb Sander Mateos Subject: [PATCH v2 2/4] io_uring: remove iopoll_queue from struct io_issue_def Date: Wed, 18 Feb 2026 18:43:33 -0700 Message-ID: <20260219014335.9061-3-csander@purestorage.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20260219014335.9061-1-csander@purestorage.com> References: <20260219014335.9061-1-csander@purestorage.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260218_174346_237775_F77D3DF4 X-CRM114-Status: GOOD ( 18.02 ) X-BeenThere: linux-nvme@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-nvme" Errors-To: linux-nvme-bounces+linux-nvme=archiver.kernel.org@lists.infradead.org The opcode iopoll_queue flag is now redundant with REQ_F_IOPOLL. Only io_{read,write}{,_fixed}() and io_uring_cmd() set the REQ_F_IOPOLL flag, and the opcodes with these ->issue() implementations are precisely the ones that set iopoll_queue. So don't bother checking the iopoll_queue flag in io_issue_sqe(). Remove the unused flag from struct io_issue_def. Signed-off-by: Caleb Sander Mateos --- io_uring/io_uring.c | 3 +-- io_uring/opdef.c | 10 ---------- io_uring/opdef.h | 2 -- 3 files changed, 1 insertion(+), 14 deletions(-) diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c index 43059f6e10e0..2be46e11e1a7 100644 --- a/io_uring/io_uring.c +++ b/io_uring/io_uring.c @@ -1415,12 +1415,11 @@ static int io_issue_sqe(struct io_kiocb *req, unsigned int issue_flags) } if (ret == IOU_ISSUE_SKIP_COMPLETE) { ret = 0; - /* If the op doesn't have a file, we're not polling for it */ - if ((req->flags & REQ_F_IOPOLL) && def->iopoll_queue) + if (req->flags & REQ_F_IOPOLL) io_iopoll_req_issued(req, issue_flags); } return ret; } diff --git a/io_uring/opdef.c b/io_uring/opdef.c index 91a23baf415e..4b3fb19b0cde 100644 --- a/io_uring/opdef.c +++ b/io_uring/opdef.c @@ -65,11 +65,10 @@ const struct io_issue_def io_issue_defs[] = { .buffer_select = 1, .plug = 1, .audit_skip = 1, .ioprio = 1, .iopoll = 1, - .iopoll_queue = 1, .vectored = 1, .async_size = sizeof(struct io_async_rw), .prep = io_prep_readv, .issue = io_read, }, @@ -80,11 +79,10 @@ const struct io_issue_def io_issue_defs[] = { .pollout = 1, .plug = 1, .audit_skip = 1, .ioprio = 1, .iopoll = 1, - .iopoll_queue = 1, .vectored = 1, .async_size = sizeof(struct io_async_rw), .prep = io_prep_writev, .issue = io_write, }, @@ -100,11 +98,10 @@ const struct io_issue_def io_issue_defs[] = { .pollin = 1, .plug = 1, .audit_skip = 1, .ioprio = 1, .iopoll = 1, - .iopoll_queue = 1, .async_size = sizeof(struct io_async_rw), .prep = io_prep_read_fixed, .issue = io_read_fixed, }, [IORING_OP_WRITE_FIXED] = { @@ -114,11 +111,10 @@ const struct io_issue_def io_issue_defs[] = { .pollout = 1, .plug = 1, .audit_skip = 1, .ioprio = 1, .iopoll = 1, - .iopoll_queue = 1, .async_size = sizeof(struct io_async_rw), .prep = io_prep_write_fixed, .issue = io_write_fixed, }, [IORING_OP_POLL_ADD] = { @@ -248,11 +244,10 @@ const struct io_issue_def io_issue_defs[] = { .buffer_select = 1, .plug = 1, .audit_skip = 1, .ioprio = 1, .iopoll = 1, - .iopoll_queue = 1, .async_size = sizeof(struct io_async_rw), .prep = io_prep_read, .issue = io_read, }, [IORING_OP_WRITE] = { @@ -262,11 +257,10 @@ const struct io_issue_def io_issue_defs[] = { .pollout = 1, .plug = 1, .audit_skip = 1, .ioprio = 1, .iopoll = 1, - .iopoll_queue = 1, .async_size = sizeof(struct io_async_rw), .prep = io_prep_write, .issue = io_write, }, [IORING_OP_FADVISE] = { @@ -421,11 +415,10 @@ const struct io_issue_def io_issue_defs[] = { [IORING_OP_URING_CMD] = { .buffer_select = 1, .needs_file = 1, .plug = 1, .iopoll = 1, - .iopoll_queue = 1, .async_size = sizeof(struct io_async_cmd), .prep = io_uring_cmd_prep, .issue = io_uring_cmd, }, [IORING_OP_SEND_ZC] = { @@ -554,11 +547,10 @@ const struct io_issue_def io_issue_defs[] = { .pollin = 1, .plug = 1, .audit_skip = 1, .ioprio = 1, .iopoll = 1, - .iopoll_queue = 1, .vectored = 1, .async_size = sizeof(struct io_async_rw), .prep = io_prep_readv_fixed, .issue = io_read, }, @@ -569,11 +561,10 @@ const struct io_issue_def io_issue_defs[] = { .pollout = 1, .plug = 1, .audit_skip = 1, .ioprio = 1, .iopoll = 1, - .iopoll_queue = 1, .vectored = 1, .async_size = sizeof(struct io_async_rw), .prep = io_prep_writev_fixed, .issue = io_write, }, @@ -591,11 +582,10 @@ const struct io_issue_def io_issue_defs[] = { [IORING_OP_URING_CMD128] = { .buffer_select = 1, .needs_file = 1, .plug = 1, .iopoll = 1, - .iopoll_queue = 1, .is_128 = 1, .async_size = sizeof(struct io_async_cmd), .prep = io_uring_cmd_prep, .issue = io_uring_cmd, }, diff --git a/io_uring/opdef.h b/io_uring/opdef.h index faf3955dce8b..667f981e63b0 100644 --- a/io_uring/opdef.h +++ b/io_uring/opdef.h @@ -23,12 +23,10 @@ struct io_issue_def { unsigned pollin : 1; unsigned pollout : 1; unsigned poll_exclusive : 1; /* skip auditing */ unsigned audit_skip : 1; - /* have to be put into the iopoll list */ - unsigned iopoll_queue : 1; /* vectored opcode, set if 1) vectored, and 2) handler needs to know */ unsigned vectored : 1; /* set to 1 if this opcode uses 128b sqes in a mixed sq */ unsigned is_128 : 1; -- 2.45.2