From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej1-f43.google.com (mail-ej1-f43.google.com [209.85.218.43]) (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 BFB8738423A for ; Sat, 11 Jul 2026 09:12:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.43 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783761159; cv=none; b=nAnZeFVUp3dYFu6ZLWJgIUSQBVTtCyJcWKFRXYcyrDoc4PRHRU1lDPmZUZTJmFgNNpXmnZLPYiUkIp6MknfeR/Mcj4hZZn/h27eAWlkpL2I44NOSm4YrA+PO/RLLB6LxA1dcvJYHAK/+Diur7BDIhquC4wla1yAtYqQzPkHCN9w= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783761159; c=relaxed/simple; bh=V2IGT/K8yGUqp1JXHxJ3f4qnE8XDEMisHjgGH09AwF4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aBSuhsyGCo1/66uYhA3y8R+cON4yw92sb7VuShI777NlBJ2SLr06GnchcowQWW6R8oMKTzwPjdf8KnxB4JwVg9Jer+xQIa6qclObQ5dARgTenjasUVsaH2diPtLjoBlgXRVaMxB7nPh8udyOCM5WOvGrr/R49SrltQpluZAyUQ8= 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=Kng2+QtY; arc=none smtp.client-ip=209.85.218.43 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="Kng2+QtY" Received: by mail-ej1-f43.google.com with SMTP id a640c23a62f3a-c15f6de6cdfso239522466b.0 for ; Sat, 11 Jul 2026 02:12:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783761156; x=1784365956; 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:content-type; bh=edaLm3WR+Fb5O6dJt/wBHgk0B8eZBQJTOHLXheg92Oc=; b=Kng2+QtYuG4K3cx+pH9kAMX7Z8FU28+XqhmBdCq5m2cWllV2WH8Om4PrqsVDBlxJtr 2WV5eUcphanHm9zC2WjWr82Cj2sC/UKECK4a5+5hP6OKhWRllofmG2kfEb2XRXyX7ho0 9MaZ+rVHsUzbibScFpKHF6nApPzO4qOHe6I2Lz0yVuWu6uU9meKW4+6tn2hoceHuXzTc zfsOXuOpnBOQTaISW4jBk5x2/OYcvEvSbQvUmXH+k35VDzvJrr/czwfpP+HAASZ6XTXD TKvUCOpeiu/PbF1cL9uxewP+0DFOGGUdnRSIWVBe5gH+dZgSmHL+px16wou2pAJzWEUQ ooQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783761156; x=1784365956; 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:content-type; bh=edaLm3WR+Fb5O6dJt/wBHgk0B8eZBQJTOHLXheg92Oc=; b=IzIgo0cpAYz6TgNkfZMgIBq9U7/WW70nlcbpP4OSCT5dr7LgHWQIsBlqLEzFhXdonk 63syq5RYCBbX4t7UoHMzZ/nSjqjIPpjoQ1SCQ8NeuFajLEy3fo+kuGa+u6E620f0AB/b caZI33ulNsx/gl8WALleNQIW2Pwy1mCAiv4u9rXXBEiYDjpVJSij1OjhpkeGwl/MZqBy 5J8ziHHx8FKG032UEulLOKvfi2dO13ItPPia9CusAzFgofLSw6tfiufEqMqFuFojImF/ gYDNjHOOeagi90bHhDrVlwSw+sMEmtnaJPRcFfr+OFE9jUVr8b7OUojAFCFsD8BErtqz znzw== X-Forwarded-Encrypted: i=1; AHgh+RrQf5RlCW99VZclYgl994M6q+Eewthvl7lifyEYtiSJZTtZ5V+jiDwF3mNVhyobav+WRDqXPXs=@vger.kernel.org X-Gm-Message-State: AOJu0YxY3PY9/ezqh9NqLvg3omHYs3Tsqaustnm8YtyduwSmtrG95nj1 MHAnYmITHtSXGIq3EYXjUJBvr01LM6iBGHBJzRy2HoMABTG+e0+7grYB X-Gm-Gg: AfdE7clc/bVbWGpCXM0rLQaTkQ8MQcrQUL7l2bYHHjyOniYQMKsibgNv1BCzW3X/y9A TvQT3dbGSPPIEXYPtpkzbNSM2hcIXY30+9tUbZzofMtvSN+PVbuXhiUXvEqUAIC1f5wv1mxXOm3 QQ+uzCkhu3a8+Ma40gHuTzKpxDtXjI1vyBT4vKoxmvqdKgsKvILVyE4Ua5pY01SAu9TeZk5qKu3 KaGFl7ZvqJHdU7SIYkG0BNnLSd9STPveeAkOl0mQjVrz8yLAQx63sfWdKfS8a++LT6CsnnhisYg cIQBAmjCkZA+q4mZCR8oab7JeIo28N2VtKvZ+Qlg0mkJgzJw7+INBQJsghxESRRRcnJJCLFxKHA luZSEci7adm0uHMJmWMtRcUOKAjoEFTE/bLUPPBsPDxT7akKEnn6eNIt74h0GoghnnUxyZkrF67 JbH4yvePEMHGTHvW6UC08Yh91ohatnSvTBd4KgzgWxQkmxZR9pWw/n3Wl2s+KAbtF8aYo6D+HBA wA8J0+ulJghtMbmLVuQlSQWz5AGz0MDL1g//ITyse/mA6bL3EuVXLQm2A== X-Received: by 2002:a17:907:1804:b0:bec:929b:cee6 with SMTP id a640c23a62f3a-c161ea0f8e4mr83871266b.20.1783761156188; Sat, 11 Jul 2026 02:12:36 -0700 (PDT) Received: from 127.0.0.1localhost (82-132-221-54.dab.02.net. [82.132.221.54]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-69c60d47188sm681191a12.27.2026.07.11.02.12.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Jul 2026 02:12:34 -0700 (PDT) From: Pavel Begunkov To: io-uring@vger.kernel.org Cc: asml.silence@gmail.com, netdev@vger.kernel.org Subject: [PATCH review-only 10/17] io_uring/zcrx: unmap under netdev lock Date: Sat, 11 Jul 2026 10:11:33 +0100 Message-ID: X-Mailer: git-send-email 2.54.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 Make sure we unmap areas while closing a queue. Signed-off-by: Pavel Begunkov --- io_uring/zcrx.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/io_uring/zcrx.c b/io_uring/zcrx.c index 86e8046e98c4..4936d92f6339 100644 --- a/io_uring/zcrx.c +++ b/io_uring/zcrx.c @@ -311,6 +311,9 @@ static void io_zcrx_unmap_area(struct io_zcrx_ifq *ifq, { int i; + if (!area) + return; + guard(mutex)(&ifq->pp_lock); if (!area->is_mapped) return; @@ -438,7 +441,8 @@ static void io_free_rbuf_ring(struct io_zcrx_ifq *ifq) static void io_zcrx_free_area(struct io_zcrx_ifq *ifq, struct io_zcrx_area *area) { - io_zcrx_unmap_area(ifq, area); + if (WARN_ON_ONCE(area->is_mapped)) + return; io_release_area_mem(&area->mem); if (area->mem.account_pages) @@ -545,8 +549,10 @@ static int __zcrx_create_area(struct io_zcrx_ifq *ifq, if (!ret) return 0; err: - if (area) + if (area) { + io_zcrx_unmap_area(ifq, area); io_zcrx_free_area(ifq, area); + } return ret; } @@ -600,11 +606,12 @@ static void io_close_queue(struct io_zcrx_ifq *ifq) } if (netdev) { - if (ifq->if_rxq != -1) { - netdev_lock(netdev); + netdev_lock(netdev); + if (ifq->if_rxq != -1) netif_mp_close_rxq(netdev, ifq->if_rxq, &p); - netdev_unlock(netdev); - } + + io_zcrx_unmap_area(ifq, ifq->area); + netdev_unlock(netdev); netdev_put(netdev, &netdev_tracker); } ifq->if_rxq = -1; @@ -1389,8 +1396,7 @@ static void io_pp_uninstall(void *mp_priv, struct netdev_rx_queue *rxq) struct io_zcrx_ifq *ifq = mp_priv; io_zcrx_drop_netdev(ifq); - if (ifq->area) - io_zcrx_unmap_area(ifq, ifq->area); + io_zcrx_unmap_area(ifq, ifq->area); p->mp_ops = NULL; p->mp_priv = NULL; -- 2.54.0 From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ed1-f45.google.com (mail-ed1-f45.google.com [209.85.208.45]) (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 39C303B7B84 for ; Sat, 11 Jul 2026 10:41:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.45 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783766464; cv=none; b=nDJukM1O7naiwTg3ffGsvfuFvm3gZCC2esw5gfTgYTI0E15Am14l1l6xZD1HCNMhReguO9wutO4FUtRfjsJc7o+MoZAKaanGHRWpdNE5gV3hGQePBH5wQMH/4RDDBOVNEh+zNM0+0lLa0HFGBFjsnRzUrhkP7vcrOj9Ut9M1Sqc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783766464; c=relaxed/simple; bh=V2IGT/K8yGUqp1JXHxJ3f4qnE8XDEMisHjgGH09AwF4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Kv1r6bCk80Ke4589Iq2GcJm0Pptc60u7vrFgmCHaVAbVRC5t/NfrUsUIfYXSKIDSqX/71cIpUmZSTv6Su8ieTrGEkqjaltYfdWYYiYusWmSYziJ2TqRc87Cz/ZA5IbTggN24zVnRwVAMguD+mR8AWNpPqi1dSOac5+Y66qXvzsQ= 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=AttOGcVj; arc=none smtp.client-ip=209.85.208.45 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="AttOGcVj" Received: by mail-ed1-f45.google.com with SMTP id 4fb4d7f45d1cf-698beff7178so3136995a12.3 for ; Sat, 11 Jul 2026 03:41:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783766461; x=1784371261; 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:content-type; bh=edaLm3WR+Fb5O6dJt/wBHgk0B8eZBQJTOHLXheg92Oc=; b=AttOGcVj9vTk6BecAhg866vo7lhSLf45xap+HvsWQrW+sbIfspAFjKKkt9HRiWaKWe nI+MdyvXZM1A2wkeH4exUe+D4ttxP47wF0025X2NfQunpiALBt+KOhafkohAoGPPXoMY RqosBvVqNYU2AZ4AKdzX2CN1VqsEe+Jh9LgXPJR0QsPyuvtDIZCIZ/nyqWnQBtxK59Io dOzNdmrJ85ww7PZkPHObByw6nnOoIkGD+9KdOExmvBjcQDfYnavq547lEsBk+0bluTuQ 9XcS44zK3d5i1Q1SAPLHii413leJ0nAkjNxqhgHGi0hdLXlyt8MlmTUy4uSKgr3NMWmh vXfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783766461; x=1784371261; 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:content-type; bh=edaLm3WR+Fb5O6dJt/wBHgk0B8eZBQJTOHLXheg92Oc=; b=mL7uWiMWnoTOfzTsg/dE4UhzeeS46O8CVelXeNTfPMDTFksuproZWjMTVueKv1R2Y9 zckXrtU+DmRjW70zhXWzl705sliGhT7928MkwrLyFjUFbJRZqI/c0TXocvi4hSOrcP0Q wAW+HCQftd9s8yf6s6+c/w3wOY0lFup2b36nr/cxm0Vnots+KKykQsld8o51ut0QWVQk GnnlePk4uJaIr30D4eEpw8NxQoowrfH1UfcU8elBv26uXbxpZcH2/Dxy2eNC4v33HDEr A/jdOT/dwsXB+OcdyY8KrGCV/t4DtydPntFlgL8bEbH9aHFSV8B3L8RcYvgU2JmhKvh3 AS5Q== X-Forwarded-Encrypted: i=1; AHgh+RowW8A3ANsvSX262XJcU0BF5kXY7GcJN0HOpI+zRYCWYhh7n/1m6btDlwlZf7Xq8+mlwNE1Z14=@vger.kernel.org X-Gm-Message-State: AOJu0Ywqk6chRaydiz9ZDEndEnsVCbxdQjw9gfHgPq4BZDX/7hssMixu adGLpum99XVoFD7qePcEUtETY/BPYuK3pvn4hWesUgNx+HZ5RNJEoSjhZ+HC7w== X-Gm-Gg: AfdE7cmVG6GUMovXOJWGgtXCwAytAIaWMAbqc5fjugIN3hnYP7bpMruDyeD3Wc8LQjm nT/3xSyTStpyYeZttZ1TuPWAyiUXtMrj4LlmMxK8rY5TZE6OfelC7iHeYWwoiLqcP7HN2oVBO0y h5F9snwR6I93Xw1koZ7CeX6TEvodbqj1JrC2G3irDm8vd4Ioq8zOIRAqk3sdqsezBvTRS5YM7xd CdDdnZZfb8QJSgoTb5WdTmktQAxYIBnaj74s7nHJWq9ObcdKLR4hmL1VnYAOm1miR57ZMtRd8v7 IR0Wwd5JDvRghV367AUToGN5MzqB1rPf9Rfk0KjBiWqlRF+yqnYUUr5/0iGMbCYK0SKReo6tEEg Lp6cCQpdxVMBeCG7iGFROE6jW7vghaGa321H38rxQMChw7CDZ9xxvyNp9he+eOfabxL7cQaDGYl arN7r6lzUD0P0u9XVLIhAZfLqr96qCNuvzXpCYGTgLSD1rQCGd3UyzfQSvXhzWsoxfqnI8/n420 IfU3ClVMBlYct4KX7flUVGD0qC4g0PvVEOZ+dxVSZDxSGD86Q== X-Received: by 2002:a17:907:bac8:b0:c15:f6b6:18f4 with SMTP id a640c23a62f3a-c161ea5e6d2mr80976066b.24.1783766461630; Sat, 11 Jul 2026 03:41:01 -0700 (PDT) Received: from 127.0.0.1localhost (82-132-222-132.dab.02.net. [82.132.222.132]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-c15d5de95e6sm483041566b.39.2026.07.11.03.40.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Jul 2026 03:40:58 -0700 (PDT) From: Pavel Begunkov To: io-uring@vger.kernel.org Cc: asml.silence@gmail.com, netdev@vger.kernel.org Subject: [PATCH review-only 10/17] io_uring/zcrx: unmap under netdev lock Date: Sat, 11 Jul 2026 11:40:03 +0100 Message-ID: X-Mailer: git-send-email 2.54.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 Message-ID: <20260711104003.W0AMajeimE_cErCKgY7ge9EHrk-N4mKHJwgyvyTTAss@z> Make sure we unmap areas while closing a queue. Signed-off-by: Pavel Begunkov --- io_uring/zcrx.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/io_uring/zcrx.c b/io_uring/zcrx.c index 86e8046e98c4..4936d92f6339 100644 --- a/io_uring/zcrx.c +++ b/io_uring/zcrx.c @@ -311,6 +311,9 @@ static void io_zcrx_unmap_area(struct io_zcrx_ifq *ifq, { int i; + if (!area) + return; + guard(mutex)(&ifq->pp_lock); if (!area->is_mapped) return; @@ -438,7 +441,8 @@ static void io_free_rbuf_ring(struct io_zcrx_ifq *ifq) static void io_zcrx_free_area(struct io_zcrx_ifq *ifq, struct io_zcrx_area *area) { - io_zcrx_unmap_area(ifq, area); + if (WARN_ON_ONCE(area->is_mapped)) + return; io_release_area_mem(&area->mem); if (area->mem.account_pages) @@ -545,8 +549,10 @@ static int __zcrx_create_area(struct io_zcrx_ifq *ifq, if (!ret) return 0; err: - if (area) + if (area) { + io_zcrx_unmap_area(ifq, area); io_zcrx_free_area(ifq, area); + } return ret; } @@ -600,11 +606,12 @@ static void io_close_queue(struct io_zcrx_ifq *ifq) } if (netdev) { - if (ifq->if_rxq != -1) { - netdev_lock(netdev); + netdev_lock(netdev); + if (ifq->if_rxq != -1) netif_mp_close_rxq(netdev, ifq->if_rxq, &p); - netdev_unlock(netdev); - } + + io_zcrx_unmap_area(ifq, ifq->area); + netdev_unlock(netdev); netdev_put(netdev, &netdev_tracker); } ifq->if_rxq = -1; @@ -1389,8 +1396,7 @@ static void io_pp_uninstall(void *mp_priv, struct netdev_rx_queue *rxq) struct io_zcrx_ifq *ifq = mp_priv; io_zcrx_drop_netdev(ifq); - if (ifq->area) - io_zcrx_unmap_area(ifq, ifq->area); + io_zcrx_unmap_area(ifq, ifq->area); p->mp_ops = NULL; p->mp_priv = NULL; -- 2.54.0