From nobody Tue Apr 7 19:40:38 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1773299774; cv=none; d=zohomail.com; s=zohoarc; b=P+B4hUmHJuc17EmkgCn5iGCZxQd+kLMQu93e5XoHy7i9RO03ogDYtT4O9WZGMQGPsh2RhwLQTWEQwKN3Ez71GvHOj3y+PrrzTCdAbMU4koGcNsAx33e/Ff7ZwDV/b51tqLxmaq8cf/YDZbxuMiNLEKi8MgXycbFtcmVCLm+TYbk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773299774; h=Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=yE5EXIHdVZ99o8ilpweRUBgvHp9JQoVeZq5rHLllXU8=; b=mviL0qTsQGcWJbGh/BHPaf1L3lbSN36TU1VY+p75km+WBybfEfzZPnsSNA2jM9DFEkC/WsAp4GhgLIu/mFqcVVbh7yIG96qGIyODorR9BVHAmDEAXBcy+AsitNrlerL3aDd8B4EQKqPHCbCn5q0V/BNg1ypPupdi8yl2U+nuJmw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773299774400668.5045886681343; Thu, 12 Mar 2026 00:16:14 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w0aGQ-0004mV-6Y; Thu, 12 Mar 2026 03:15:22 -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 1w0aGO-0004go-Bk for qemu-devel@nongnu.org; Thu, 12 Mar 2026 03:15:20 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w0aGM-00006W-Dh for qemu-devel@nongnu.org; Thu, 12 Mar 2026 03:15:20 -0400 Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-191-0LdE4Yq_M2eHULldj3rA_Q-1; Thu, 12 Mar 2026 03:15:13 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 4A666180047F; Thu, 12 Mar 2026 07:15:12 +0000 (UTC) Received: from S2.redhat.com (unknown [10.72.112.170]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id CFC4719540C2; Thu, 12 Mar 2026 07:15:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1773299717; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yE5EXIHdVZ99o8ilpweRUBgvHp9JQoVeZq5rHLllXU8=; b=I0ap4H82xyz6GgZIp/xg91urdAPYVI2/MVGE7oj/h4y/0X3IbniD/ZG1glP3QJYr7xwtQa 2j0GJTJrHbIdRomQ8+FJCwjzC+N9/yQ6iREVneiaijYSJ6OM4Z7eik9ULgMtahvyfUTBlv oUfkf13twK6IBHsdVLOGopHxu4i50Gw= X-MC-Unique: 0LdE4Yq_M2eHULldj3rA_Q-1 X-Mimecast-MFC-AGG-ID: 0LdE4Yq_M2eHULldj3rA_Q_1773299712 From: Cindy Lu To: lulu@redhat.com, mst@redhat.com, jasowang@redhat.com, zhangckid@gmail.com, lizhijian@fujitsu.com, jmarcin@redhat.com, qemu-devel@nongnu.org Subject: [RFC v2 5/9] net/filter-redirector: route chardev and AF_PACKET receive paths Date: Thu, 12 Mar 2026 15:09:33 +0800 Message-ID: <20260312071415.1836655-6-lulu@redhat.com> In-Reply-To: <20260312071415.1836655-1-lulu@redhat.com> References: <20260312071415.1836655-1-lulu@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=lulu@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -3 X-Spam_score: -0.4 X-Spam_bar: / X-Spam_report: (-0.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.819, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.903, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1773299777173158500 Content-Type: text/plain; charset="utf-8" Packets captured from AF_PACKET now either go to the chardev outdev or into the filter chain, and both paths update the new netdev statistics. Use the same routing from redirector_rs_finalize() so replay traffic and normal receive handling share one dispatch policy. Signed-off-by: Cindy Lu --- net/filter-mirror.c | 107 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 101 insertions(+), 6 deletions(-) diff --git a/net/filter-mirror.c b/net/filter-mirror.c index e57fbc94b8..1ff58e1d27 100644 --- a/net/filter-mirror.c +++ b/net/filter-mirror.c @@ -305,6 +305,81 @@ static void redirector_chr_event(void *opaque, QEMUChr= Event event) } } =20 +static void filter_redirector_recv_from_chardev(NetFilterState *nf, + const uint8_t *buf, + int len) +{ + MirrorState *s =3D FILTER_REDIRECTOR(nf); + bool inject_netdev =3D filter_redirector_use_inject_netdev(nf); + ssize_t ret; + struct iovec iov =3D { + .iov_base =3D (void *)buf, + .iov_len =3D len, + }; + + if (len <=3D 0) { + return; + } + + /* chardev indev */ + s->indev_packets++; + s->indev_bytes +=3D len; + + if (inject_netdev) { + ret =3D filter_redirector_send_netdev_iov(s, &iov, 1); + if (ret < 0) { + error_report("filter redirector send failed(%s)", strerror(-re= t)); + } + return; + } + + if (s->outdev) { + ret =3D filter_redirector_send_chardev_iov(s, &iov, 1); + if (ret < 0) { + error_report("filter redirector send failed(%s)", strerror(-re= t)); + } else if (ret > 0) { + s->outdev_packets++; + s->outdev_bytes +=3D ret; + } + return; + } + + redirector_to_filter(nf, buf, len); +} + +static bool filter_redirector_recv_from_netdev(NetFilterState *nf, + const uint8_t *b= uf, + int len) +{ + MirrorState *s =3D FILTER_REDIRECTOR(nf); + ssize_t ret; + struct iovec iov =3D { + .iov_base =3D (void *)buf, + .iov_len =3D len, + }; + + if (len <=3D 0) { + return false; + } + + if (s->outdev) { + ret =3D filter_redirector_send_chardev_iov(s, &iov, 1); + if (ret > 0) { + s->outdev_packets++; + s->outdev_bytes +=3D ret; + } + } else { + redirector_to_filter(nf, buf, len); + return true; + } + + if (ret < 0) { + error_report("filter redirector send failed(%s)", strerror(-ret)); + return false; + } + return true; +} + static void filter_redirector_netdev_read(void *opaque) { NetFilterState *nf =3D opaque; @@ -329,7 +404,9 @@ static void filter_redirector_netdev_read(void *opaque) continue; } =20 - redirector_to_filter(nf, s->in_netbuf, len); + s->netdev_rx_packets++; + s->netdev_rx_bytes +=3D len; + filter_redirector_recv_from_netdev(nf, s->in_netbuf, len); } =20 if (len < 0 && errno !=3D EAGAIN && errno !=3D EWOULDBLOCK && @@ -369,21 +446,34 @@ static ssize_t filter_redirector_receive_iov(NetFilte= rState *nf, NetPacketSent *sent_cb) { MirrorState *s =3D FILTER_REDIRECTOR(nf); + bool capture_netdev =3D filter_redirector_use_capture_netdev(nf); + bool inject_netdev =3D filter_redirector_use_inject_netdev(nf); int ret; =20 - if (qemu_chr_fe_backend_connected(&s->chr_out)) { - ret =3D filter_send(s, iov, iovcnt); + if (s->indev || inject_netdev) { + return 0; + } + + if (capture_netdev || s->outdev) { + if (capture_netdev) { + return 0; + } + + ret =3D filter_redirector_send_chardev_iov(s, iov, iovcnt); if (ret < 0) { error_report("filter redirector send failed(%s)", strerror(-re= t)); } else if (ret > 0) { - /* Update outdev statistics on successful send */ s->outdev_packets++; s->outdev_bytes +=3D ret; } - return iov_size(iov, iovcnt); - } else { + /* + * Without an active AF_PACKET capture socket, outdev mirroring is= a + * sideband copy only and must not consume the guest-bound packet. + */ return 0; } + + return 0; } =20 static void filter_mirror_cleanup(NetFilterState *nf) @@ -444,6 +534,11 @@ static void redirector_rs_finalize(SocketReadState *rs) MirrorState *s =3D container_of(rs, MirrorState, rs); NetFilterState *nf =3D NETFILTER(s); =20 + if (s->outdev || filter_redirector_use_inject_netdev(nf)) { + filter_redirector_recv_from_chardev(nf, rs->buf, rs->packet_len); + return; + } + /* Update indev statistics */ s->indev_packets++; s->indev_bytes +=3D rs->packet_len; --=20 2.52.0