From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) (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 5100A395AC0 for ; Tue, 12 May 2026 10:25:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.47 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778581528; cv=none; b=P//CKC1bJ/ReyePIqcM8ZkHc+lEy3uZ8bOw9WGst6ga7syXPZUu0W2RO/i4TYnRdU8AbWjgZQLMNn8+I/xInMYZlSiqTUS5Xz17aU9AKXTbuGNxU/TC7JZgNyqMOaZMxPMvmP/O4DBrjCLu3MmV3gI926nEsJz+7h5oz3ArQKvA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778581528; c=relaxed/simple; bh=sBOTTT/hZwbHIngdOqOniPski00+V5/fid9M3+WPdUc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=f+xO5PgVNCMqCnqS/0j11OfPPPPk3i7qywa/aTV2DBlMn5BLBLkUitmKn7aosM8J3PIUnLv86/0qeclqqpwkyVPhzlHzJsrdOmp4s8l3kOGwh4+AvTarWRCuceXAF/rVxl3qTN3iacR4cZWe0/VNC0f5vsT1AOdVct8/jzagWRA= 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=JSzOdNwh; arc=none smtp.client-ip=209.85.128.47 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="JSzOdNwh" Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-488a88aeec9so59617525e9.2 for ; Tue, 12 May 2026 03:25:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778581526; x=1779186326; 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=Edr+ytgwsmK9YysqqZ45HcW/A2JY308WqKVGXyYCiys=; b=JSzOdNwhxryTgGzl+knueXrRGfqA+lxpNMmok+0+puBz0HmF9NkqtIWOJFBn/rc5pw cJIxz14LV6v1qx4t/aFG9qi2UbpVgr6TvpvW6gFQ4rAWt6YceVGwP4KsLIaNK8wiauZp M4SJqkw2qNcTbZ2tgM68b5UseXhDZ1j5Y/P62ZeeyyeLY0xY6VAFDpl9Hn/ewqL6rzG1 mZrrv74Eb5wCDa62PlddiDqpMlFjLyooX/G5mceWZZXRWdEZoTCIy1fyNpIH8yxbcW17 M4ah+/Q/YcchFJFh7NusxOfDtHrBFjD9Ijk2s0A9LHWqJG4CRvB5zX/qpL+DHsbyOgRL x32g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778581526; x=1779186326; 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=Edr+ytgwsmK9YysqqZ45HcW/A2JY308WqKVGXyYCiys=; b=BeYJJIGK4+tKhB47Fv2eBZ3WqsY+G5z/3C5sRpWde9yIyJSFpj95mbepEzXEt1eqZB WBkYyzztJMPpRvBxnvsPuWnmHqIHElT2NV4yYpaClznisASa32FfIWjRKvMqcbGsIpij 4bIRuyqAZ5e1WIgcfNbBfxh8ALC5/ArjsByI/jbJUWMdhTRtA9dsyX59h92vVqZtlbvC SL/xqI1t0z5PoXBZvJn1RstK/zoKzy9S7IsqMqte5nxp9916Jd6UuPl0jHeHaelUbqrV t/rddHyL7Y8W+JwDULS6Rb0i4rVc8RZ8/liH4VQG4EfMu1UXexAOhV3OFFW0IOd01P34 zyhg== X-Forwarded-Encrypted: i=1; AFNElJ8p/daGAktOmjzv3j8P9QgV7RkKvSqjavycDuH/Jnj+k/2bYMVrPwpfnXGEgOntbujqPS8z78Y=@vger.kernel.org X-Gm-Message-State: AOJu0YwF0WO+CPeragFw/XxbQmUiz8MPAAhRjCYipMlinNVwX2K4QBDZ rcy6mPT77h9PM1WcKmKEgl7RZk4BXy84R/0nXdajBGbUejT/H0u/Yx6dR0wbVQ== X-Gm-Gg: Acq92OGgl3Tx59NxMBv/oSCIhtP9ZMes9Iyn0g2vVKfi9vZ/8/vEzQuGjd9nlQmlpMI R5gd0oj7K+waKUwXmt5+BQiKWGeMSoUpXv3h9vIY9WZzBvYa8cTX4AQ88iQVGnmlO4M57mdpZ10 +899fHSlEWacMAnzn1J6A9+/fpSTTS8WddbDoTZOKDphdzRGFcjSouu8NQJNguIcjJUPNwYotON 8YIXT6ZAYPHkVV4M3jkc2jDwhPDSlu8KLm63qUrThMOVk6eDqbVEU6VqWU0DUDP/mdr2XVrnDis YY6+q97JjNDRcKNlYEroGUEO81C8U/M7/JJlzh6aXYBvwHyAqP65E+akg7sGaWbc7SBkNDayDZd bDrvjxugEcao47/EKf7gJ4FOSfQ5C/jnvfbZL71KkwBHe4N3qdOBTuMOHR3ykT5vd/c8Tx73LJK M0avExs9Zl3WDb3O/mqZPeD0c7TzjwNbAbR3MBymi42bxBIQfRlbrPmk1GcvthhLXWhEX33cGtM uODpgRDKA== X-Received: by 2002:a05:600c:4509:b0:48a:56d5:16f2 with SMTP id 5b1f17b1804b1-48e706b3cadmr212454415e9.7.1778581525830; Tue, 12 May 2026 03:25:25 -0700 (PDT) Received: from 127.net ([2620:10d:c092:600::1:8c90]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e9052c9fesm74352255e9.1.2026.05.12.03.25.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 May 2026 03:25:25 -0700 (PDT) From: Pavel Begunkov To: io-uring@vger.kernel.org Cc: asml.silence@gmail.com, netdev@vger.kernel.org Subject: [RFC 1/6] io_uring/zcrx: remove extra ifq close Date: Tue, 12 May 2026 11:25:01 +0100 Message-ID: <3adec4b4bfb3b82232eda6152bb07f9cf86e0391.1778581283.git.asml.silence@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit By the time io_zcrx_ifq_free() is called the interface queue should already be closed, so io_close_queue() will be a no-op. Remove the call and add a couple of warnings. Signed-off-by: Pavel Begunkov --- io_uring/zcrx.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/io_uring/zcrx.c b/io_uring/zcrx.c index 7b93c87b8371..3478040f2197 100644 --- a/io_uring/zcrx.c +++ b/io_uring/zcrx.c @@ -576,7 +576,10 @@ static void io_close_queue(struct io_zcrx_ifq *ifq) static void io_zcrx_ifq_free(struct io_zcrx_ifq *ifq) { - io_close_queue(ifq); + if (WARN_ON_ONCE(ifq->if_rxq != -1)) + return; + if (WARN_ON_ONCE(ifq->netdev != NULL)) + return; if (ifq->area) io_zcrx_free_area(ifq, ifq->area); -- 2.53.0