From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D4C4AC8303D for ; Fri, 4 Jul 2025 13:06:30 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uXg73-0004fV-0B; Fri, 04 Jul 2025 09:05:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uXg70-0004eX-Do for qemu-devel@nongnu.org; Fri, 04 Jul 2025 09:05:54 -0400 Received: from www62.your-server.de ([213.133.104.62]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uXg6y-0001k0-EO for qemu-devel@nongnu.org; Fri, 04 Jul 2025 09:05:54 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=iogearbox.net; s=default2302; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID; bh=S7mjKg0cgqyBzygVo3NxPkaYElnsmHV4umJ/AKWjE0w=; b=PeF4/9asf0IdsCOGEO58cXMfbn vIQsTL8s3v5mVgi8nn1SFqj1Ri9J2mt7BSughlKwuTmtPTDI7fe9oNsxTcs1wXlXZBeAoXRK+LOS8 efLgkCmy/YzAGyhnwuJBgdWTBxFPsCcIt0drmFuAebgkAkIfxvz/OWbSgw/HYHDOk59R+kW0FgVJ8 f2oMnm9xVG3PZ1rw5mYukUz6eXWQxdfMa87ygvo+iUXuwcZhbnPqTYHLzHlo92m0Qc43nqYq9Btwj Fv5+zKfVVKwc38Ll3i3dMmI0NgXNq9ByQWwELIrHTZCq4Cq8HpNaR17GDjEjlJ/roAZAybveL5ZtW yRjnHXdQ==; Received: from localhost ([127.0.0.1]) by www62.your-server.de with esmtpsa (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.96.2) (envelope-from ) id 1uXg6f-000G8L-0G; Fri, 04 Jul 2025 15:05:33 +0200 To: qemu-devel@nongnu.org Cc: daniel@iogearbox.net, Ilya Maximets , Jason Wang , Anton Protopopov Subject: [PATCH v4 2/3] net/af-xdp: Fix up cleanup path upon failure in queue creation Date: Fri, 4 Jul 2025 15:05:30 +0200 Message-ID: <20250704130531.144325-2-daniel@iogearbox.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250704130531.144325-1-daniel@iogearbox.net> References: <20250704130531.144325-1-daniel@iogearbox.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Virus-Scanned: Clear (ClamAV 1.0.7/27689/Fri Jul 4 10:42:55 2025) Received-SPF: pass client-ip=213.133.104.62; envelope-from=daniel@iogearbox.net; helo=www62.your-server.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.218, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Daniel Borkmann From: Daniel Borkmann via Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org While testing, it turned out that upon error in the queue creation loop, we never trigger the af_xdp_cleanup() handler. This is because we pass errp instead of a local err pointer into the various AF_XDP setup functions instead of a scheme like: bool fn(..., Error **errp) { Error *err = NULL; foo(arg, &err); if (err) { handle the error... error_propagate(errp, err); return false; } ... } With a conversion into the above format, the af_xdp_cleanup() handler is called as expected. Note the error_propagate() handles a NULL err internally. Fixes: cb039ef3d9e3 ("net: add initial support for AF_XDP network backend") Signed-off-by: Daniel Borkmann Cc: Ilya Maximets Cc: Jason Wang Cc: Anton Protopopov --- net/af-xdp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/af-xdp.c b/net/af-xdp.c index c5d3b6a953..29c5ad16cd 100644 --- a/net/af-xdp.c +++ b/net/af-xdp.c @@ -482,9 +482,8 @@ int net_init_af_xdp(const Netdev *netdev, pstrcpy(s->ifname, sizeof(s->ifname), opts->ifname); s->ifindex = ifindex; - if (af_xdp_umem_create(s, sock_fds ? sock_fds[i] : -1, errp) - || af_xdp_socket_create(s, opts, errp)) { - error_propagate(errp, err); + if (af_xdp_umem_create(s, sock_fds ? sock_fds[i] : -1, &err) || + af_xdp_socket_create(s, opts, &err)) { goto err; } } @@ -506,6 +505,7 @@ int net_init_af_xdp(const Netdev *netdev, err: if (nc0) { qemu_del_net_client(nc0); + error_propagate(errp, err); } return -1; -- 2.43.0