From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f175.google.com (mail-pf1-f175.google.com [209.85.210.175]) (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 54A672D878D for ; Fri, 6 Mar 2026 00:33:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.175 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772757204; cv=none; b=M/3CLEPR5rGpOadmRLVHVZ4xI4F8aXfp8seYhXLM4oBGiM5f01YoknQSab/bJuOYiNICa8yaa4inKtXy6gUvLIFIvPtMCWvu6hUAYRPrRU0+qoCHkZ/VyT/kE3ygnXSaQ96Pb87HxHemsxIGEadN3XBUgdatv/c7HchMwkP1N90= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772757204; c=relaxed/simple; bh=YOKLjYb3aosVgKUH+3EKnfo2DuR5P/YMNSMFB5BVVSE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Ww4wYYkGQSV8c3I49CyJs286+gxjNUi3Jxjqj1WJuQk0BFGC81HlS2db4zM2BRUD2PRNwFxCzkPDSvkwfWajWRExOpe/jRtXu7yqn+2l5AuyX9MlwJdy00G3R9RfLQ5kj9DdY2c47e8DMcWDn2azN1sWWMew86w71mKE6rlbYWI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Y9oVmiFG; arc=none smtp.client-ip=209.85.210.175 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Y9oVmiFG" Received: by mail-pf1-f175.google.com with SMTP id d2e1a72fcca58-8297e0b27e5so1198538b3a.1 for ; Thu, 05 Mar 2026 16:33:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1772757200; x=1773362000; darn=vger.kernel.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=35rUcLF1fMo1V5tT79EtOKmiA1OjiL0xPdfdOliHziY=; b=Y9oVmiFGxV0ymT/VSsB/VMim8vuXVh+od0ZzwQS44jZaiJwV/tEuRnoy2rVAPmHzzX Jf/274p3dqEOLxtdUARzgL58qSpEQuuFGZRC166EOsRT0mF9m9kc9ZSUqTtWeXexquEE 84IAuXjmlUVSzK18VNMPKjDqnksaGOJsTjz9n8UjQ2ke/vskk3R2kzNi/qwuDFGxmrcP hhMAP8Th3jt/lSFssJ6N8LgTMkHJgA4Z3IKFsayt3f291PzaKqE5xlqTklCaSReF2ToX 3lztRyWSSn3B80KJ9nDQwkT9dkJs97eK3WkXYGiuiXkrlgE5GigeKR11q/+81OG6yqEj aQ5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772757200; x=1773362000; 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=35rUcLF1fMo1V5tT79EtOKmiA1OjiL0xPdfdOliHziY=; b=Hvubi5kCcfAsoCVg2Xq+iIkTztwYuyBGXGU5E9jVRXLZWEc5S6wPAduSjxQiCQ+iKQ oRSfX3p62BcPk7dVHqm/X033Atgjs0QlTUJKpGpusWux5supEEEQuK8nNpE580n5lg6M VhgkABzTQHm0uP/8ZliQCrAWj1C+snS4M+rSbFi4JT+0zG3wEAm1cI+lFgkIWo05Dj8V GhCyaH7Hgkqc3QNK8sw/2cA3YpG5+QoaCoOdY5oocQuSOwLDjOiqEKbUvnM4FcaCteYb kJmBg90yQOacukM/F+JoBh0k6+M9PJksBqMqHLdfFnTRlCwjY2MrwAAnib2w8VrkAp5A QCiQ== X-Forwarded-Encrypted: i=1; AJvYcCXQfA5DlIWLNGRmFuKh+WXPlFLZkeURnjNb5pAtckWho56xHUhck+lA9oZ+/1WofYAlYrWpmfFD6g==@vger.kernel.org X-Gm-Message-State: AOJu0Yz5MzWEqM3r3R9Gj+HNysNDtBUUBHccGTUl292XH1nT02U2sFtm iEHwFwBvhOK4DAhDZojKsqxOx0okykVC2/fBi5LV40wtSHHJo0YTvwgd X-Gm-Gg: ATEYQzzGB1YNKnHei7j+18EcwpNdBJyWfRFuRM8yF3c4I4OhDoFvz/VwCKknuiaQUye rg+tIarKWQ9FafAT9YJ11obDr4HoipG0PkfQ1+irDMaLHyVv3nTrb/yRN0lPAXcjGYvABoqSlq/ jnIWsIcOTcPmhSZrJX8FprkjMT1x7b0ceBMr7rJ12cx5C0d7jgKkSM14/OaJD5pKy56a0n+GOiD zKiGJEZEJ4Kvq577bpAMGPCaFg1IP/244y68tcZspIXtjDs3aPejQDN6jVSRSxzi5ZqRxn5rQte PjLNv35alYg/c6L0ZJHH3PNT5nJMwNOd5o/WXFh/a/qn+HyAAZwxq4bfsf08fCD5EWUYN5ymVvB 1ax41D7pwPTbjJyoSQy6Spc+XjItNU7i7KiV0A4jVsJVgM5z0SaHghZOfGveJ77CYmfUdqg283j lZbNBmAPVoUobTCFbNUw== X-Received: by 2002:a05:6300:670e:b0:394:f972:43cc with SMTP id adf61e73a8af0-398590d65d4mr358716637.71.1772757200514; Thu, 05 Mar 2026 16:33:20 -0800 (PST) Received: from localhost ([2a03:2880:ff:55::]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c7377062904sm5600331a12.30.2026.03.05.16.33.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Mar 2026 16:33:20 -0800 (PST) From: Joanne Koong To: axboe@kernel.dk Cc: hch@infradead.org, asml.silence@gmail.com, bernd@bsbernd.com, csander@purestorage.com, krisman@suse.de, linux-fsdevel@vger.kernel.org, io-uring@vger.kernel.org Subject: [PATCH v3 8/8] io_uring/cmd: set selected buffer index in __io_uring_cmd_done() Date: Thu, 5 Mar 2026 16:32:24 -0800 Message-ID: <20260306003224.3620942-9-joannelkoong@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260306003224.3620942-1-joannelkoong@gmail.com> References: <20260306003224.3620942-1-joannelkoong@gmail.com> Precedence: bulk X-Mailing-List: io-uring@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit When uring_cmd operations select a buffer, the completion queue entry should indicate which buffer was selected. Set IORING_CQE_F_BUFFER on the completed entry and encode the buffer index if a buffer was selected. This change is needed in order to relay to userspace which selected buffer contains the data. Signed-off-by: Joanne Koong --- io_uring/uring_cmd.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/io_uring/uring_cmd.c b/io_uring/uring_cmd.c index ee7b49f47cb5..6d38df1a812d 100644 --- a/io_uring/uring_cmd.c +++ b/io_uring/uring_cmd.c @@ -151,6 +151,7 @@ void __io_uring_cmd_done(struct io_uring_cmd *ioucmd, s32 ret, u64 res2, unsigned issue_flags, bool is_cqe32) { struct io_kiocb *req = cmd_to_io_kiocb(ioucmd); + u32 cflags = 0; if (WARN_ON_ONCE(req->flags & REQ_F_APOLL_MULTISHOT)) return; @@ -160,7 +161,10 @@ void __io_uring_cmd_done(struct io_uring_cmd *ioucmd, s32 ret, u64 res2, if (ret < 0) req_set_fail(req); - io_req_set_res(req, ret, 0); + if (req->flags & (REQ_F_BUFFER_SELECTED | REQ_F_BUFFER_RING)) + cflags |= IORING_CQE_F_BUFFER | + (req->buf_index << IORING_CQE_BUFFER_SHIFT); + io_req_set_res(req, ret, cflags); if (is_cqe32) { if (req->ctx->flags & IORING_SETUP_CQE_MIXED) req->cqe.flags |= IORING_CQE_F_32; -- 2.47.3