From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) (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 E1281282F33 for ; Mon, 2 Mar 2026 22:15:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.44 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772489756; cv=none; b=fZ7RI+jyOQc7vdO5lSuZfcxFkds1fV/GceIssjCxF3Bbnh9Y+0OklBN5TX+NX+p6KWyH+PnuQRoZD43FNat50a2PKm5QzE4rp3tYmbAOcIEJyxBbzpzCON1aWkrSQSpKeedba37bRuy9PL0BbiiOjtJCnp28T5yQrWmWmJGyQI4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772489756; c=relaxed/simple; bh=YUz7XkOJSBI3WZbGiiZQlw/847UhILJigam52BcVlq8=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=CfVlMq/RovjWDw+PhR0VbZgZ9E9+U96eSu7Kaa6VQOfE7/tzLzOvmLJ6XdvtsDrBVK4XGomvNAQWLd9pQ/tYujyM4KV1a6NbgUBkHprGQ/1bkxC5Nw01PqubsjLHOy2hC8Y5XS/x28CDY5NcUIOj3m12Ycj2WIHWOlioMw7xx0I= 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=EnCf88kX; arc=none smtp.client-ip=209.85.128.44 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="EnCf88kX" Received: by mail-wm1-f44.google.com with SMTP id 5b1f17b1804b1-483bd7354efso66241215e9.2 for ; Mon, 02 Mar 2026 14:15:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1772489753; x=1773094553; 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=tjm/TIZUMwWxgmitP9S97CxYmmwICsTxtpvet48XIIw=; b=EnCf88kXZy7wtQwiUXFh3CvBPHA2VAIJo6XPd9L2v9WtVZKr1YbQec7ctEGncqdvr+ K4+uA7RZHSLLAu6NHqo4+Ph8rgGvTx8Tuw/gNEOh+ROsXpIN/AQYzJ4ofVzimNdKtl/8 FC3AMEcmFVrpTb82m3j0qcawpfJKMw2f41EPejTzmOvd7UK/skB7ibMDvFDrBhlW/DZY NfgiXaVJ4OeKir6hkqAPOohgaxsu7BXYFCJThqOZ5lwsCA2S6eDE/vhi5Kx2onOJREu5 YfmSdrD1Va7TPKrKfDf6O4maNJ7we7n+6KEt06UcbCeefIgvLYpR5HZl7sl4rTZAlwlb r8rw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772489753; x=1773094553; 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=tjm/TIZUMwWxgmitP9S97CxYmmwICsTxtpvet48XIIw=; b=tTowqktPivFgjo4NV12Bqa/SfEE720JuSTxMeKEuIt2WzJiP1X0GnbUEm4SFznujgL H45eJTuiVazX9saAjUGXPb5hwDKUnUd+wwV2sdXBu6xBqdg5lhshbYKofN0TZtUitJX9 YxGIrWmsmydPEd6ly4ut2sz4kP+WFQxqZUbDaDKD4pw11niUB8bF7iEXcgp82Kio3GVz 8HmBsRBM8McPhkB0/VRZ/E2dRrPaduHADLjVKGMaWT9HQXL1DkNDhUKxMZN8Gv7ig2YH 1TxT+J1siVFCyrPR7qdUtMyrKlrc/IMzzRbvSlSjwSkDtdspDf73o+3BkFCSKwrXAB9z gAqQ== X-Gm-Message-State: AOJu0YzvbCRG0tIur7CaZKUeZQGiUVDJdduQpNjwqBnYXOhd9SLZa2ia iKU15LjwEZK7f85z+auXZ1b9A02O8TJdpeHBX6GyvZOO2I9Ovj7LUg2zc32ArQ== X-Gm-Gg: ATEYQzzPJbLZQwdkutRNoqn1RIxFtu7FoiUOjtSIy3XSc53zg3n2PAFWRgrCPV/uxT5 66GC0jqBYDJDPQYXHq9TOTxFWe2M92EXLXhLEwW7YYjRE2g5CwjD56TH+6w3uBQXL83bm0TLFi9 dHQ4AYNL0FCU11hMNSc9pEaTdBaW2dpAty666rK0YhhaRttn8J9z3hd4brrdLwrSFpI85nalkdL rHJDDD0SZ/hHJUwls7MgzIMVY4vdqLgzdNEssh+kySBXykvHfvQsAz1B7vS4rbQVgyJ5+bRWBNF F6RSezKObYDoDQrpJ6kD6Ow7SK5sugSA0RCRtKw373gMsDPJIR5HPxpRn8vYPdou/Mame3i66ma /4P85u7C4EJtQBfGoG+shTHCt4TFF5NM1L5FQVpWFaY8elVvYtstQLRuAiGJY43Y17ktXSY4r8S xdLzaDvR4yn3kk1pGBcqcVDTd2YQN9en/VxatRTjiSITxB3ONNbNwCrnfu2ymzc8Nf981TaJBn4 mShiMljrOvTCo8N+brMwdzf9J9Xrg== X-Received: by 2002:a05:600c:5306:b0:483:6d42:25c6 with SMTP id 5b1f17b1804b1-483c9bc4210mr262615115e9.23.1772489752652; Mon, 02 Mar 2026 14:15:52 -0800 (PST) Received: from 127.mynet ([2a01:4b00:bd21:4f00:7cc6:d3ca:494:116c]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4399c60f764sm30736816f8f.3.2026.03.02.14.15.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Mar 2026 14:15:52 -0800 (PST) From: Pavel Begunkov To: io-uring@vger.kernel.org Cc: asml.silence@gmail.com, axboe@kernel.dk, netdev@vger.kernel.org, stable@vger.kernel.org, Sasha Levin Subject: [PATCH 1/1] io_uring/zcrx: fix post open error handling Date: Mon, 2 Mar 2026 22:15:43 +0000 Message-ID: X-Mailer: git-send-email 2.53.0 Precedence: bulk X-Mailing-List: io-uring@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit [ upstream commit 5d540e4508950c674d6feef1d95463d039bbf4f5 ] 5d540e4508950 ("io_uring/zcrx: fix post open error handling") fixes some post queue open problems. Instead of picking all dependencies for that patch just move post open error handling out of the way, so once a queue is open we can always report a success. Move copy_to_user earlier before open, and xa_store() should already never fail as the slot is explicitly pre-allocated. Signed-off-by: Pavel Begunkov --- io_uring/zcrx.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/io_uring/zcrx.c b/io_uring/zcrx.c index c524be7109c2..208d03443020 100644 --- a/io_uring/zcrx.c +++ b/io_uring/zcrx.c @@ -625,6 +625,14 @@ int io_register_zcrx_ifq(struct io_ring_ctx *ctx, if (ret) goto netdev_put_unlock; + reg.zcrx_id = id; + if (copy_to_user(arg, ®, sizeof(reg)) || + copy_to_user(u64_to_user_ptr(reg.region_ptr), &rd, sizeof(rd)) || + copy_to_user(u64_to_user_ptr(reg.area_ptr), &area, sizeof(area))) { + ret = -EFAULT; + goto netdev_put_unlock; + } + mp_param.mp_ops = &io_uring_pp_zc_ops; mp_param.mp_priv = ifq; ret = __net_mp_open_rxq(ifq->netdev, reg.if_rxq, &mp_param, NULL); @@ -633,21 +641,11 @@ int io_register_zcrx_ifq(struct io_ring_ctx *ctx, netdev_unlock(ifq->netdev); ifq->if_rxq = reg.if_rxq; - reg.zcrx_id = id; - scoped_guard(mutex, &ctx->mmap_lock) { /* publish ifq */ - ret = -ENOMEM; - if (xa_store(&ctx->zcrx_ctxs, id, ifq, GFP_KERNEL)) - goto err; + xa_store(&ctx->zcrx_ctxs, id, ifq, GFP_KERNEL); } - if (copy_to_user(arg, ®, sizeof(reg)) || - copy_to_user(u64_to_user_ptr(reg.region_ptr), &rd, sizeof(rd)) || - copy_to_user(u64_to_user_ptr(reg.area_ptr), &area, sizeof(area))) { - ret = -EFAULT; - goto err; - } return 0; netdev_put_unlock: netdev_put(ifq->netdev, &ifq->netdev_tracker); -- 2.53.0