From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-oa1-f48.google.com (mail-oa1-f48.google.com [209.85.160.48]) (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 25FD8346E5C for ; Tue, 4 Nov 2025 22:45:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.48 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762296309; cv=none; b=P+Kzc4FgbYqWWY7BM8oL3W1atxHmladpE5cANuCs1bTG4b77eXlPAAgNHH3ptYhrOJIizZbU+AKVBFFFIMGOFvdNejc89oQRzmoYm1Lwl2VGwdH1hkOCQTSWZzOtCjm8r579y+CobdC0xzXGU2yXTi1Uuyu0NB1xPd23azrGMWM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762296309; c=relaxed/simple; bh=4X7yplVhodWhw/RkySGYlwrpw581slqzwJbYHW/2BNg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sGXVVKPek/lkizNNgQYn2zQspPmFUV6Vs24GVfyLd+OBHKIk8Csbfr8PxflDlN8MkF5g0csFcFILINHOm8tAgY3+9MU1m3/rzJZMm2w2LrzV/ZriAawL657Nc5SYcl6VltaWzHZKnf2DlZ36rQ3IJ+cuwC+TDxyIgXHi7ro8+fk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=davidwei.uk; spf=none smtp.mailfrom=davidwei.uk; dkim=pass (2048-bit key) header.d=davidwei-uk.20230601.gappssmtp.com header.i=@davidwei-uk.20230601.gappssmtp.com header.b=Eo/37XsH; arc=none smtp.client-ip=209.85.160.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=davidwei.uk Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=davidwei.uk Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=davidwei-uk.20230601.gappssmtp.com header.i=@davidwei-uk.20230601.gappssmtp.com header.b="Eo/37XsH" Received: by mail-oa1-f48.google.com with SMTP id 586e51a60fabf-3e12fd71984so492526fac.2 for ; Tue, 04 Nov 2025 14:45:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=davidwei-uk.20230601.gappssmtp.com; s=20230601; t=1762296307; x=1762901107; 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=EDyf8hnr6ftwJRjPNQhZsT5EFe6u4EruQiaSCRXzIjY=; b=Eo/37XsHK5J5ysJOoEwDhBnDdmZ7ogaIE1rOdnEJY2fjaDHHgUNcR0yHXrihIpTF+j 0sD46t6JYQM0GyGYUpjDtXMrtIaioxZSABr9gxVSPOGVulhceWkzkvhzSPXe+MGzYXuK 3VrjUwnteckoQ14Jxfk+X67JIqNKhnGahpkVX2e+xg4W8iSNkosTWW9eLFMvEYffjMvb 5PdxeMMlp9nQNrv5JBhIrL2Y4EaJSYS+Qad5nLNMkTYdNagtBEVvM4RfwISZzs9wBIKY LvdLKDcYQ0T6cNfi1LUEP1GzfuVIPP2XqsYk45wXTePHOIcd8B1cxHubgutFC30WbUYJ yMsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762296307; x=1762901107; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=EDyf8hnr6ftwJRjPNQhZsT5EFe6u4EruQiaSCRXzIjY=; b=n0IILbs0J17TLRJZO9HSnKd6+YrCgI8wpIUpMIyeZdQDEKx2LOxHAEYJaTYTwoo+S+ jIl+L8ChyU8mBNBT9LxQkEqGzWikRZB8IyChOg1k+NhQcIBU4LjsAFuncln9zTA0NWwv UaQV1/fKyrka7qcP3qT/BXumxrej6HNv6LI3u76A+bcFp1WuKaDehrOE7reYsKc/R1oj QOLci3rrYkO/3scjAdRNG0Y6diu9qjnVnv/Y14FOVgQTwIuZxDWIJhLtf5ZhCs1V3qtU 7gCwYRjLPM6es/SdBgpxFIdm+18UtQEeF2Chs29DRsakJgRY8/dsJBSRPdFQG7xwdv7F ZDCA== X-Gm-Message-State: AOJu0YxI4vvwtrmz6A6XwUYKq9ygkI070xlb0d3GZbW/Unz5zq0y7kA3 dXWg3+SuOUYRzN83EprHXGpHtgVcppkXuUYuqbS/rvkAEMczXDjZZWR25tLBAauxbH52W6439Wi eFEQt X-Gm-Gg: ASbGncsxoJ42fkI0oaah5eaEKKdTqBxeOB2U5RdaI+a/oV1CJI1ORCk+N7qvDhNWqmL 3I1hlMy7dQ8jbXHjT6uwE5IdphUtlVm57rQPrhDs5sSQ+9njpC4abL8Xi6+NqWWr91IdOIQnyJY w+NUWALOlouIPr2lwuWfpzkgiF09vvtxuMnaSabjPDku44Mh3l8pbKRe6Nd2C99MVJvOyuhNyd+ i8TDHNLHmE7JcBMIMLzjlF3zSKZ1rLUFJi78hGLod6+/M5G6cNQcuGvDUztNB7fA70QA3VV9LAh lw5CJXBurAh3/jsIvEV4BcOPKPFokr/MnPfDyAsnsuo3JqQ66CDJTm3DYkwrbwGHhN/fijieHDH bwTx3dwuxM/7+CRFeMnn68Sv3J9wBNRZoLEquxHCEtvpnJh7Htk25b8cpsYJYpUwEoXFSFh2SJb C//DiZsivBxD5W/w42vqj85OGI+g== X-Google-Smtp-Source: AGHT+IFQSqaGPHWpsUZTQR/Haimsxfq1Vc8pRkwG1js8sfSP4eGZqe+B24MQF2JC/TsLZmIB2ZBFtQ== X-Received: by 2002:a05:6870:23a1:b0:3cd:a995:6c6 with SMTP id 586e51a60fabf-3e19977e68dmr438499fac.13.1762296307095; Tue, 04 Nov 2025 14:45:07 -0800 (PST) Received: from localhost ([2a03:2880:12ff::]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-7c6c2448b02sm1419678a34.5.2025.11.04.14.45.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Nov 2025 14:45:06 -0800 (PST) From: David Wei To: io-uring@vger.kernel.org, netdev@vger.kernel.org Cc: Jens Axboe , Pavel Begunkov Subject: [PATCH v1 6/7] io_uring/zcrx: move io_unregister_zcrx_ifqs() down Date: Tue, 4 Nov 2025 14:44:57 -0800 Message-ID: <20251104224458.1683606-7-dw@davidwei.uk> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251104224458.1683606-1-dw@davidwei.uk> References: <20251104224458.1683606-1-dw@davidwei.uk> Precedence: bulk X-Mailing-List: io-uring@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit In preparation for removing the ref on ctx->refs held by an ifq and removing io_shutdown_zcrx_ifqs(), move io_unregister_zcrx_ifqs() down such that it can call io_zcrx_scrub(). Signed-off-by: David Wei --- io_uring/zcrx.c | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/io_uring/zcrx.c b/io_uring/zcrx.c index 774efbce8cb6..b3f3d55d2f63 100644 --- a/io_uring/zcrx.c +++ b/io_uring/zcrx.c @@ -662,28 +662,6 @@ int io_register_zcrx_ifq(struct io_ring_ctx *ctx, return ret; } -void io_unregister_zcrx_ifqs(struct io_ring_ctx *ctx) -{ - struct io_zcrx_ifq *ifq; - - lockdep_assert_held(&ctx->uring_lock); - - while (1) { - scoped_guard(mutex, &ctx->mmap_lock) { - unsigned long id = 0; - - ifq = xa_find(&ctx->zcrx_ctxs, &id, ULONG_MAX, XA_PRESENT); - if (ifq) - xa_erase(&ctx->zcrx_ctxs, id); - } - if (!ifq) - break; - io_zcrx_ifq_free(ifq); - } - - xa_destroy(&ctx->zcrx_ctxs); -} - static struct net_iov *__io_zcrx_get_free_niov(struct io_zcrx_area *area) { unsigned niov_idx; @@ -749,6 +727,28 @@ void io_shutdown_zcrx_ifqs(struct io_ring_ctx *ctx) } } +void io_unregister_zcrx_ifqs(struct io_ring_ctx *ctx) +{ + struct io_zcrx_ifq *ifq; + + lockdep_assert_held(&ctx->uring_lock); + + while (1) { + scoped_guard(mutex, &ctx->mmap_lock) { + unsigned long id = 0; + + ifq = xa_find(&ctx->zcrx_ctxs, &id, ULONG_MAX, XA_PRESENT); + if (ifq) + xa_erase(&ctx->zcrx_ctxs, id); + } + if (!ifq) + break; + io_zcrx_ifq_free(ifq); + } + + xa_destroy(&ctx->zcrx_ctxs); +} + static inline u32 io_zcrx_rqring_entries(struct io_zcrx_ifq *ifq) { u32 entries; -- 2.47.3