From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ed1-f44.google.com (mail-ed1-f44.google.com [209.85.208.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 D0F34384250 for ; Sat, 11 Jul 2026 09:12:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.44 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783761163; cv=none; b=KCKCXXuvIOmL/rChExW2o5LpxcbuKbrWeUgDTc+edWFxxQt/Yg7VL3D20VuVnRa5SDlOOjyNtRZz2kZ7HK/JmRTtjVridCzPLTLEuGaHTp9cUW0kYg9SZnKuNZ0HFVnkt/dggKK21uW7MVKETJ2jeaEo3Jq81F33JSkH2J+ZA9E= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783761163; c=relaxed/simple; bh=xRgBAtDHyHxqdhOqR4G/l4hvNv+gzIXh7nRx0WknYxE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HIAXSzvpNCmrBzocfjD3dbWIsZG8yyskYpzE4fVR3z+a8gxlb8nMMy36rJoJ9Qty9WlBRNFgnOZEqy3RAUVwtT0IPL/ThjMVxmDxGYR61/++ssOKnVmcwpaNo0dzfqS1lN86BVympQIIXVf9LbetTh+fEoovheu/7M5eEHaMCUU= 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=Jya+j4G6; arc=none smtp.client-ip=209.85.208.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="Jya+j4G6" Received: by mail-ed1-f44.google.com with SMTP id 4fb4d7f45d1cf-6986578d8c0so2431022a12.1 for ; Sat, 11 Jul 2026 02:12:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783761160; x=1784365960; 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=40IOAR9jl4nV6USx07Om+oEnXzAVvYxe6ms1YH9xtlE=; b=Jya+j4G6CDP55OJGGSq2ZXwrjx1mjWfqnWtTlYGDez4vyQoQHbJOhh8KtDTh82+DlB uV04jZGOZ21m0g8ocXHmos2LpNndk1N7Z5pzG0DYtExLY5pEjTNT2Ud+HeBNXfyyUZlU QUb6XNYZoeJpaOINcEX8Bj2BJNGOUjklb9RezqhiZaIAFFUOedWOeSuMf1IzISXEySpT cxTtgnbtynv4/B27i98gNv/etgrzOBXMapchP/0Jrh1/9i1GVxtv9DLvRZwusp3kYZ9z Tz0JLw38ptyKlCdWUDllmCwLuHqZnbWBR540KSULVPWFGjzTsFHpwRNwklHE3QsFMxS8 +QRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783761160; x=1784365960; 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=40IOAR9jl4nV6USx07Om+oEnXzAVvYxe6ms1YH9xtlE=; b=Bd5o1k+VKLGTgAYYJkOXjk3fgj0otwM6umdXrGmOkkWIuXTGk0YpH+78HLe8TlPVLo 9KA5p5MocGy05tGaQnUdTFj80cVmlU7ZZRV7lkMu1MpTIhWi5bZcxKBNONiv4xBG3/+H aWzlnENzag602bOGLvJbvuDX6NyHhgmXNpd+fgxgXKqsc0900EiCV41Vf1u05LsGC1S0 ir98UVppGYdO3zJE3S011/IxEBDzY7YlEJYVJkZIGR/Aa90n1xyqkcXJ4ChNTWXzTivE CHnKHRBcqJOFxhCNHBlO4xaNaILHuWAyaOyO9rISW5+NeurCw5NFoY+jNBotxbG9Dy1m fwnA== X-Gm-Message-State: AOJu0YxZprBV72emJ70Nd5wMd3/TlltxpwnAXz/OrJV2JeAeFKKVkRHu jXimS/7CiQsxA7EVjIaNn00yd1aOhoEh5crEymgRdVrSzapatsfd02F+L/Ur5g== X-Gm-Gg: AfdE7ck9Uz2JHaxIg9IFnTHO0d1LnYSFCI99cfBjAsp0sNVwu2tbg0K3pF+bLSlgjM/ viyWyuGhdpNRKgVC7FxfDNGKdPmksiQM6spZqesmFb2GUPmXLpU1GWdKWckHOHpWiancRb3oEJs tMxpR6v9Dj1DnHS4KphaFtaWuYwmz1MuoxOaMDA36qMjeIcBi8kOieoKitIrT2kgw2PYuTwFSVS ldXaKQsa8T4omtK0wEMK1wdt9i7OWBGtsu37NzcXsfTl93Y5Elw3oUi9VZw/4PIi9Lqh8UzMs/R bM0qQRbQGNhrvptJh9wmYPIjhxqQ6OzxNtjNxqvdiWfBGn+ZagcE8sRfYaP1B6B0zY8Dxvwyxw+ vg63UxB49D0H2dm/2BtFzSTiVJ1N6XQqOYsrh1eVEmE380abXsPkOaxaQ73MHersyiZyAx+zE+M FofTMJPOxiDKqzB5EQoSsQBauNanF9wctlEeVSwMDHXTqccqFwqAKhRVcR9iC38R+5q1LardLO1 cCWnc9u0dkk5LdUFCurQYIC6FcFLIGSFUjud2rIr1+Xjr4= X-Received: by 2002:a05:6402:3224:b0:698:1504:e3e0 with SMTP id 4fb4d7f45d1cf-69c5f116b88mr975464a12.29.1783761160286; Sat, 11 Jul 2026 02:12:40 -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.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Jul 2026 02:12:39 -0700 (PDT) From: Pavel Begunkov To: io-uring@vger.kernel.org Cc: asml.silence@gmail.com, netdev@vger.kernel.org Subject: [PATCH review-only 12/17] io_uring/zcrx: move freelist lock to struct zcrx Date: Sat, 11 Jul 2026 10:11:35 +0100 Message-ID: X-Mailer: git-send-email 2.54.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: io-uring@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit freelist_lock, which protects slow path allocations, is currently stored in struct io_zcrx_area. Once we add support for multiple queues, we'll need a lock in the zcrx ctx, move it there. Signed-off-by: Pavel Begunkov --- io_uring/zcrx.c | 14 +++++++------- io_uring/zcrx.h | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/io_uring/zcrx.c b/io_uring/zcrx.c index 40cabf4384d1..81520bda230d 100644 --- a/io_uring/zcrx.c +++ b/io_uring/zcrx.c @@ -544,7 +544,6 @@ static int __zcrx_create_area(struct io_zcrx_ifq *ifq, /* we're only supporting one area per ifq for now */ area->area_id = 0; area_reg->rq_area_token = zcrx_area_id_to_token(area->area_id); - spin_lock_init(&area->freelist_lock); *res_area = area; return 0; err: @@ -585,6 +584,7 @@ static struct io_zcrx_ifq *io_zcrx_ifq_alloc(struct io_ring_ctx *ctx) ifq->if_rxq = -1; spin_lock_init(&ifq->ctx_lock); spin_lock_init(&ifq->rq.lock); + spin_lock_init(&ifq->alloc_lock); mutex_init(&ifq->pp_lock); refcount_set(&ifq->refs, 1); refcount_set(&ifq->user_refs, 1); @@ -659,8 +659,9 @@ static void io_put_zcrx_ifq(struct io_zcrx_ifq *ifq) static void io_zcrx_return_niov_freelist(struct net_iov *niov) { struct io_zcrx_area *area = io_zcrx_iov_to_area(niov); + struct io_zcrx_ifq *ifq = area->ifq; - guard(spinlock_bh)(&area->freelist_lock); + guard(spinlock_bh)(&ifq->alloc_lock); if (WARN_ON_ONCE(area->free_count >= area->nia.num_niovs)) return; area->freelist[area->free_count++] = net_iov_idx(niov); @@ -670,7 +671,7 @@ static struct net_iov *zcrx_get_free_niov(struct io_zcrx_area *area) { unsigned niov_idx; - lockdep_assert_held(&area->freelist_lock); + lockdep_assert_held(&area->ifq->alloc_lock); if (unlikely(!area->free_count)) return NULL; @@ -1262,7 +1263,7 @@ static unsigned io_zcrx_refill_slow(struct page_pool *pp, struct io_zcrx_ifq *if struct io_zcrx_area *area = ifq->area; unsigned allocated = 0; - guard(spinlock_bh)(&area->freelist_lock); + guard(spinlock_bh)(&ifq->alloc_lock); for (allocated = 0; allocated < to_alloc; allocated++) { struct net_iov *niov = zcrx_get_free_niov(area); @@ -1567,14 +1568,13 @@ static bool io_zcrx_queue_cqe(struct io_kiocb *req, struct net_iov *niov, static struct net_iov *io_alloc_fallback_niov(struct io_zcrx_ifq *ifq) { - struct io_zcrx_area *area = ifq->area; struct net_iov *niov = NULL; if (!ifq->kern_readable) return NULL; - scoped_guard(spinlock_bh, &area->freelist_lock) - niov = zcrx_get_free_niov(area); + scoped_guard(spinlock_bh, &ifq->alloc_lock) + niov = zcrx_get_free_niov(ifq->area); if (niov) page_pool_fragment_netmem(net_iov_to_netmem(niov), 1); diff --git a/io_uring/zcrx.h b/io_uring/zcrx.h index 0eb7ea35a9ff..302659669ba4 100644 --- a/io_uring/zcrx.h +++ b/io_uring/zcrx.h @@ -36,7 +36,6 @@ struct io_zcrx_area { u16 area_id; /* freelist */ - spinlock_t freelist_lock ____cacheline_aligned_in_smp; u32 free_count; u32 *freelist; @@ -65,6 +64,7 @@ struct io_zcrx_ifq { bool kern_readable; struct zcrx_rq rq ____cacheline_aligned_in_smp; + spinlock_t alloc_lock ____cacheline_aligned_in_smp; u32 if_rxq; struct device *dev; -- 2.54.0 From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej1-f46.google.com (mail-ej1-f46.google.com [209.85.218.46]) (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 341233BBA0B for ; Sat, 11 Jul 2026 10:41:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.46 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783766469; cv=none; b=SrsNmjhNXWDU/DHeaafjPPDLLx0rHd1xw0aVpuHP/4pW2aHJiwNs85hnw6epZ/XnkJJev3r+af/UwaX0h/JMBKQqXUjABA1Mn0fdwRhLR0w5ibIYZHvlzDwVMj/7mTaRgAkkp4qxgiMlDAyXZ20WWqGJo8oa46Ypse3KGFJCGkQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783766469; c=relaxed/simple; bh=xRgBAtDHyHxqdhOqR4G/l4hvNv+gzIXh7nRx0WknYxE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LIwtH+N+4GLlioUG5Cg46lPDyqvkUMMvYijkCmQf2bLdTn1dhdoKNfLQ59A7nV6fjFc4GQAXe0ZQk9leWFLsFNYrRbVJPl8v2VhgSiVrXzsKVtFLTtfZkpx9Ix+4j1VMhfmQSwy4M2sHnz8Y9yed3AkCy5JkLx6MXzdz96QT0fk= 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=KRcjGPBN; arc=none smtp.client-ip=209.85.218.46 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="KRcjGPBN" Received: by mail-ej1-f46.google.com with SMTP id a640c23a62f3a-c160420289bso191748466b.0 for ; Sat, 11 Jul 2026 03:41:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783766467; x=1784371267; 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=40IOAR9jl4nV6USx07Om+oEnXzAVvYxe6ms1YH9xtlE=; b=KRcjGPBNNQPRIbBq50rY0XVUSgEhmyMLiFM57o7BHl5jnCxi8+FdP/R/zRuszhdhLq FcNtqmlWcvuLgOxw4GoYsebYJ3W+p7NmkcC6XI21afUqYkcfyT+/yM6VJwuUDBN/Da0Y IhauYuSZ0FeEiEWW6XjA3eLvlzP1NAG9XJBILAn9cS+2hVeQwvVj9P9ciqBnOCOdG/E5 wWmEeImruBlQ5vnYUC/Aattg3x3KDh4ZNYxrtERuurZeqTpzUdwUJYD4oyxu0ObA2R9h FN1HSrCDFdxzXwv201vz+4EjHXybSxAhZPWR1mOMwbVQHtXKlEDcsfGotiZcyrmwgCFV 1Lug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783766467; x=1784371267; 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=40IOAR9jl4nV6USx07Om+oEnXzAVvYxe6ms1YH9xtlE=; b=PPGbUOM/vAz3FV0vysS547lLz0oBAMg8ubxuxCL0nCLFo7zAQDbDrSy+9Dc4KRtfqH OjVfdepH9jARlUiTqSVZ9Oxd+X6A/3iqT1FOmmSHdVbJTcDIcpTVZ+7pZrO15/enUF5V ygJOrJ1uk2ZTNr8JMgpwe2kFzDgCgxVSjMd5JS1xxx1eCZtFZjnCZzNLPjlag8QvLfkj DsgBzb9A8NCrC154flCFkNI05g3hij3t6JkLxGypUj5zzD9kT0I+0hyg9XB73FCIY50S Rhye/9A61JAe19xCIrF33oz3lkHKPaZ5sJs6Ggkih17tWUOY730IjcE/3pHNHxdVKEku nk2w== X-Gm-Message-State: AOJu0YybxSNUFppxFdhL2B4JbfYqPFHvLQvxMs35LegL/bVt/6WL7PRj WhvKF1F+voTekTamTV7baWTtchnJZRw12ZT0PQCr697KolYI6uFx5z/Zhq9oLg== X-Gm-Gg: AfdE7cmGT1hXNkYWVonwzwj6yGv8BELESGH2i5hEbGN+Wm9L2WhRUXZR4cEuTVVBOI/ htcNWpqx8fYlE1AEfIy7H/qk/2bkgkovh4s6tkegOa0hM8H48yICtv/C6GNvBS25YZlwPRKhC0n ajVYXkRVQPsxWzKmazj30Nmv+7YTxhbni6K7IwRE1seJziPvUR6A4/qw5u7FAbkx6ZBp48MJh89 CfWLqsVCdWSBA1tW05NLlSi9q1StA3FKDHFRCtC0oH7ka3UND5FKBzp6PS9tZiFrB70m0eJInyu OdB1Sm1Rd43i+kmcvhUKTdF+n9G+S8dTIpqhup2mAwCIxkgT0MXR7kYuu4rzh64P1xLVwMpiMnc tcHJF2Ow8AROoPJwR0ShJ1hqgyCutQWxfZMFe0Vk7TCR+u1QiIs/hbKiPzVFpRFBzvlRhyM7QPA 0u9Evv8ALIjVJ7O4D0ettFRhDGcTyZHxuzgfgAN5qm2TTeV5ESxcwWR7xfC2IcyA+mdCos3CNYq 7APMZ7mG53Qc12ofYvQpcMvwFd0P/aj+WLUggwjn0ER6CGFEg== X-Received: by 2002:a17:907:cf87:b0:c12:51d9:bb78 with SMTP id a640c23a62f3a-c161e9b313cmr100622266b.28.1783766466751; Sat, 11 Jul 2026 03:41:06 -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.41.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Jul 2026 03:41:05 -0700 (PDT) From: Pavel Begunkov To: io-uring@vger.kernel.org Cc: asml.silence@gmail.com, netdev@vger.kernel.org Subject: [PATCH review-only 12/17] io_uring/zcrx: move freelist lock to struct zcrx Date: Sat, 11 Jul 2026 11:40:05 +0100 Message-ID: X-Mailer: git-send-email 2.54.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: io-uring@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID: <20260711104005.yarGJjYAPyToiVsJ4rOjWMTMLbqBaeJru8rZyJFau3A@z> freelist_lock, which protects slow path allocations, is currently stored in struct io_zcrx_area. Once we add support for multiple queues, we'll need a lock in the zcrx ctx, move it there. Signed-off-by: Pavel Begunkov --- io_uring/zcrx.c | 14 +++++++------- io_uring/zcrx.h | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/io_uring/zcrx.c b/io_uring/zcrx.c index 40cabf4384d1..81520bda230d 100644 --- a/io_uring/zcrx.c +++ b/io_uring/zcrx.c @@ -544,7 +544,6 @@ static int __zcrx_create_area(struct io_zcrx_ifq *ifq, /* we're only supporting one area per ifq for now */ area->area_id = 0; area_reg->rq_area_token = zcrx_area_id_to_token(area->area_id); - spin_lock_init(&area->freelist_lock); *res_area = area; return 0; err: @@ -585,6 +584,7 @@ static struct io_zcrx_ifq *io_zcrx_ifq_alloc(struct io_ring_ctx *ctx) ifq->if_rxq = -1; spin_lock_init(&ifq->ctx_lock); spin_lock_init(&ifq->rq.lock); + spin_lock_init(&ifq->alloc_lock); mutex_init(&ifq->pp_lock); refcount_set(&ifq->refs, 1); refcount_set(&ifq->user_refs, 1); @@ -659,8 +659,9 @@ static void io_put_zcrx_ifq(struct io_zcrx_ifq *ifq) static void io_zcrx_return_niov_freelist(struct net_iov *niov) { struct io_zcrx_area *area = io_zcrx_iov_to_area(niov); + struct io_zcrx_ifq *ifq = area->ifq; - guard(spinlock_bh)(&area->freelist_lock); + guard(spinlock_bh)(&ifq->alloc_lock); if (WARN_ON_ONCE(area->free_count >= area->nia.num_niovs)) return; area->freelist[area->free_count++] = net_iov_idx(niov); @@ -670,7 +671,7 @@ static struct net_iov *zcrx_get_free_niov(struct io_zcrx_area *area) { unsigned niov_idx; - lockdep_assert_held(&area->freelist_lock); + lockdep_assert_held(&area->ifq->alloc_lock); if (unlikely(!area->free_count)) return NULL; @@ -1262,7 +1263,7 @@ static unsigned io_zcrx_refill_slow(struct page_pool *pp, struct io_zcrx_ifq *if struct io_zcrx_area *area = ifq->area; unsigned allocated = 0; - guard(spinlock_bh)(&area->freelist_lock); + guard(spinlock_bh)(&ifq->alloc_lock); for (allocated = 0; allocated < to_alloc; allocated++) { struct net_iov *niov = zcrx_get_free_niov(area); @@ -1567,14 +1568,13 @@ static bool io_zcrx_queue_cqe(struct io_kiocb *req, struct net_iov *niov, static struct net_iov *io_alloc_fallback_niov(struct io_zcrx_ifq *ifq) { - struct io_zcrx_area *area = ifq->area; struct net_iov *niov = NULL; if (!ifq->kern_readable) return NULL; - scoped_guard(spinlock_bh, &area->freelist_lock) - niov = zcrx_get_free_niov(area); + scoped_guard(spinlock_bh, &ifq->alloc_lock) + niov = zcrx_get_free_niov(ifq->area); if (niov) page_pool_fragment_netmem(net_iov_to_netmem(niov), 1); diff --git a/io_uring/zcrx.h b/io_uring/zcrx.h index 0eb7ea35a9ff..302659669ba4 100644 --- a/io_uring/zcrx.h +++ b/io_uring/zcrx.h @@ -36,7 +36,6 @@ struct io_zcrx_area { u16 area_id; /* freelist */ - spinlock_t freelist_lock ____cacheline_aligned_in_smp; u32 free_count; u32 *freelist; @@ -65,6 +64,7 @@ struct io_zcrx_ifq { bool kern_readable; struct zcrx_rq rq ____cacheline_aligned_in_smp; + spinlock_t alloc_lock ____cacheline_aligned_in_smp; u32 if_rxq; struct device *dev; -- 2.54.0