From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: passt.top; dmarc=none (p=none dis=none) header.from=gibson.dropbear.id.au Authentication-Results: passt.top; dkim=pass (2048-bit key; secure) header.d=gibson.dropbear.id.au header.i=@gibson.dropbear.id.au header.a=rsa-sha256 header.s=202502 header.b=Js+3lpex; dkim-atps=neutral Received: from mail.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by passt.top (Postfix) with ESMTPS id 8F9955A0622 for ; Tue, 25 Mar 2025 04:00:29 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=202502; t=1742871612; bh=y6HZjDzE1kpNHlGYppOxyIMzd49FPh/sdsZ16M6u/Pc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Js+3lpexy8nS28hWPmpR84Mjy5FxFRslvQZCKRRhGUSsNtUjXPJl1+bHRuNu2kDsk wtxSsMOd45/rdifI/B104D2hl67bqNMrqe/z6qeGuHfo4pw9QGcp25mfPRPE/4Lhtv 5OPHqyCF4PkA5mlwDW0h+D/+jO7FrQ4xjSECCysHFE6WDY4AzPguSOHBdobNZfiB46 Wx4nzjoWu20IWwEtlnBDtIQQDwSAw5Wsw4OW5CJiXOvXHSe+EUaLNbNTWtuIkL35pB nn9RZlAiGis4hXtN5p0800CRK/OPI7Ovt9arFliK/KE839aLNcp/b1zwapcapqq4nY qmyuAGF5kv5JQ== Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4ZMF5m3xVyz4xM4; Tue, 25 Mar 2025 14:00:12 +1100 (AEDT) From: David Gibson To: passt-dev@passt.top, Stefano Brivio Subject: [PATCH 3/4] udp_vu: Factor things out of udp_vu_reply_sock_data() loop Date: Tue, 25 Mar 2025 14:00:09 +1100 Message-ID: <20250325030010.970144-4-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250325030010.970144-1-david@gibson.dropbear.id.au> References: <20250325030010.970144-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: ZATFK3M77NHPT3A6JYB46RCG6JB24IKD X-Message-ID-Hash: ZATFK3M77NHPT3A6JYB46RCG6JB24IKD X-MailFrom: dgibson@gandalf.ozlabs.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: David Gibson X-Mailman-Version: 3.3.8 Precedence: list List-Id: Development discussion and patches for passt Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: At the start of every cycle of the loop in udp_vu_reply_sock_data() we: - ASSERT that uflow is not NULL - Check if the target pif is PIF_TAP - Initialize the v6 boolean However, all of these depend only on the flow, which doesn't change across the loop. This is probably a duplication from udp_vu_listen_sock_data(), where the flow can be different for each packet. For the reply socket case, however, factor that logic out of the loop. Signed-off-by: David Gibson --- udp_vu.c | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/udp_vu.c b/udp_vu.c index 698667f6..6e1823a9 100644 --- a/udp_vu.c +++ b/udp_vu.c @@ -281,30 +281,28 @@ void udp_vu_reply_sock_data(const struct ctx *c, union epoll_ref ref, { flow_sidx_t tosidx = flow_sidx_opposite(ref.flowside); const struct flowside *toside = flowside_at_sidx(tosidx); + bool v6 = !(inany_v4(&toside->eaddr) && inany_v4(&toside->oaddr)); struct udp_flow *uflow = udp_at_sidx(ref.flowside); int from_s = uflow->s[ref.flowside.sidei]; struct vu_dev *vdev = c->vdev; struct vu_virtq *vq = &vdev->vq[VHOST_USER_RX_QUEUE]; + uint8_t topif = pif_at_sidx(tosidx); int i; - for (i = 0; i < UDP_MAX_FRAMES; i++) { - uint8_t topif = pif_at_sidx(tosidx); - ssize_t dlen; - int iov_used; - bool v6; - - ASSERT(uflow); + ASSERT(uflow); - if (topif != PIF_TAP) { - uint8_t frompif = pif_at_sidx(ref.flowside); + if (topif != PIF_TAP) { + uint8_t frompif = pif_at_sidx(ref.flowside); - flow_err(uflow, - "No support for forwarding UDP from %s to %s", - pif_name(frompif), pif_name(topif)); - continue; - } + flow_err(uflow, + "No support for forwarding UDP from %s to %s", + pif_name(frompif), pif_name(topif)); + return; + } - v6 = !(inany_v4(&toside->eaddr) && inany_v4(&toside->oaddr)); + for (i = 0; i < UDP_MAX_FRAMES; i++) { + ssize_t dlen; + int iov_used; iov_used = udp_vu_sock_recv(c, from_s, v6, &dlen); if (iov_used <= 0) -- 2.49.0