From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ot1-f48.google.com (mail-ot1-f48.google.com [209.85.210.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 0F8B4346A14 for ; Tue, 4 Nov 2025 22:45:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.48 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762296308; cv=none; b=Em21qZLr9g4v9LwX2sYmanSMI0y9mddl1dNtCkvVrttehnJSBCOGUcovhG6EiBw1pgvk2MyEEzL5iyRDrSRbf6vvPtIZ2nrZd0yzFfqEdp4gcfZxFDu0C3YLvoLEMsqeH3Nx7KTxJXomk35CZpiVbqk7GV1tDEwMbZsnESvPJd0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762296308; c=relaxed/simple; bh=OnQwrnQwwUqEblqMRbXwbgusXkiUsVAwoIi0re25Rj0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bB6AyRUEejqMCRhCJ66acI8Re49LuguYD2FPf+L+lye37T/9rFjyMskLV0i2jjzpN4IYVNrX4KOEwf8FtNHvgeMoqmJClEpfQ4j13XURzMA24NBpjL23PTDtSYkO2tm6FEPRGgVRdGP4iKzj+uKn+ThGgqpgkpNlPVpZ8hOqbrM= 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=n6fua2qd; arc=none smtp.client-ip=209.85.210.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="n6fua2qd" Received: by mail-ot1-f48.google.com with SMTP id 46e09a7af769-7c6ce4f65f7so463311a34.0 for ; Tue, 04 Nov 2025 14:45:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=davidwei-uk.20230601.gappssmtp.com; s=20230601; t=1762296305; x=1762901105; 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=zl5AueX9y69Syh0VRS3pOT1pG6hKOR/QkhQ5Z2KXFk0=; b=n6fua2qdPMePrSMETl+0pyKhGQtzDbZAhBhhUzOoO3PxhhkOAWeT7vfv8pOGHxWNZ+ gX+3yNWiKldPknFpMEk88M+y4uXEXidqOOf+qBcXj8V4nI/BLjga7S7jw85CTkySgInX 7xPO6e50SWHnUznT0uhadKJd+AEaaXMhRoY4TvGrBSowvt7FErFW9qhKxfMThwAo1YX6 z2KPSgr34iKBsAdTe6MuJfvPxqKVk0z0OU58tns8IH3q3RYVbFokugFvT8L3Nbnd+psH hIuz18lA0OoM0D8N+TwpZVN3DlYViJL38WV2Fz7htcXE/ETd3/6XURzzA8evqYPM0Ldd xMlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762296305; x=1762901105; 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=zl5AueX9y69Syh0VRS3pOT1pG6hKOR/QkhQ5Z2KXFk0=; b=jUiVZ7gjc0C+lEhHqr2pZeF672taAhTOABhKGL8dw3NPWL+n7Rqa088uvaMgTXrJEy GLqpJKLXtnMdoHMvNuk6gMbgEobOTlooMhSLDtw90/osllh/ubxfFdapRe+DzEpXRTxB ZLOhN3fKw8PsmSI5QiwN+sJkmTV+8A4hsVhLsHJ+jW2wlTOJRNT+QVjFgiQlAem8n6A8 E8lMFzsvBlKTL4LTeiHJSLFJI0UcCR7xGH4mRGvQ6nNO8scPqntbqVk3XO4qFl2iMnjl W+ALC79LKDNcwQJHlf+k+Xy/50xKg5O+nkbWw2NgDPpTgL0P+pWibnJ1BHugfDFxel4P 5oOQ== X-Forwarded-Encrypted: i=1; AJvYcCWiMU6+91+pa2fRtwK87WUmZuribkUoUk2Mr81oKvGHPnDdSZ1YdKKDDVmfbkdW98M07v1/HEQ=@vger.kernel.org X-Gm-Message-State: AOJu0YzigAp7Y+CdKDjOJm9/ugR0q8XbK+tSKMRhIgV2JVnWz7M6+ju2 VazM8vvZq4XP2qX0n+Ad+T0gwGGyY9Ed+L1f8A2RKoM3zDoe8Gk5sV7N9LPS6ZLcMwMkZt2gZGP +yVqh X-Gm-Gg: ASbGnct19NBqcwkVVnJXbvKs5S4K1KcWo7Hgh2mEbV2FbmhCgQ6cw9YEC6+dxPryr// blojr7GBfXdhexTzxX4bdhSWR7VhEX1uhF+tpMRRMbBqlZVtEzA6f4h9vkARx+cVbrtLAOFRtV0 UhYwkpiFxNIEVedewW53htV4SlnmosJJCxGz9lBQfEOBpchROWonkK/bUQT0ylxk8xw5uAjsixd Rh2g/CXkR9LrNYKmQJRDG1n/m8yodwXkmUdsC09PWIYfEsN+2BY8xwyi5EK0Ex2umIojowDN2ND HwFK3KZatkUSMJnbmTsix59gaqSJe1Ygwk7PM+XrwwLSFQPgfr4o7BpjkTRIz/ij5xqlRFkFUGx zGJy/PrTlGLVil02vWek3rs27SptQEo2uuN76H8KWa7mE5IbkBMzQbD1m7LR4qPOm+uTnKLdMI4 mTCLfwytZVVWJ0bBX5b3jCjVq8fUqa X-Google-Smtp-Source: AGHT+IE/DBRm5OHGWWjbYLKj6mdBAxyGMMh2zA8n7j+rXhr6B7ohAUBtqlksw8SOgxmuDEfolKE1eg== X-Received: by 2002:a05:6830:314e:b0:7c5:3da7:e03d with SMTP id 46e09a7af769-7c6d13cf146mr540976a34.7.1762296305095; Tue, 04 Nov 2025 14:45:05 -0800 (PST) Received: from localhost ([2a03:2880:12ff:3::]) by smtp.gmail.com with ESMTPSA id 006d021491bc7-656ad07ec83sm1194655eaf.7.2025.11.04.14.45.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Nov 2025 14:45:04 -0800 (PST) From: David Wei To: io-uring@vger.kernel.org, netdev@vger.kernel.org Cc: Jens Axboe , Pavel Begunkov Subject: [PATCH v1 4/7] io_uring/zcrx: add io_zcrx_ifq arg to io_zcrx_free_area() Date: Tue, 4 Nov 2025 14:44:55 -0800 Message-ID: <20251104224458.1683606-5-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: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Add io_zcrx_ifq arg to io_zcrx_free_area(). A QOL change to reduce line widths. Signed-off-by: David Wei --- io_uring/zcrx.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/io_uring/zcrx.c b/io_uring/zcrx.c index 30d3a7b3c407..5c90404283ff 100644 --- a/io_uring/zcrx.c +++ b/io_uring/zcrx.c @@ -383,9 +383,10 @@ static void io_free_rbuf_ring(struct io_zcrx_ifq *ifq) ifq->rqes = NULL; } -static void io_zcrx_free_area(struct io_zcrx_area *area) +static void io_zcrx_free_area(struct io_zcrx_ifq *ifq, + struct io_zcrx_area *area) { - io_zcrx_unmap_area(area->ifq, area); + io_zcrx_unmap_area(ifq, area); io_release_area_mem(&area->mem); if (area->mem.account_pages) @@ -464,7 +465,7 @@ static int io_zcrx_create_area(struct io_zcrx_ifq *ifq, return 0; err: if (area) - io_zcrx_free_area(area); + io_zcrx_free_area(ifq, area); return ret; } @@ -523,7 +524,7 @@ static void io_zcrx_ifq_free(struct io_zcrx_ifq *ifq) io_close_queue(ifq); if (ifq->area) - io_zcrx_free_area(ifq->area); + io_zcrx_free_area(ifq, ifq->area); if (ifq->dev) put_device(ifq->dev); -- 2.47.3