From nobody Sun Apr 12 07:21:17 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=1770966709; cv=none; d=zohomail.com; s=zohoarc; b=lgxYUI0rrJ4zhyyxtz6sOxujk9bp4vG0PiT0pWtZ0b9ZU65QzFrwduMy75ZkBHUzR3HF7Wterlgmmdo1rFaqUGH4WgFRSe6Z0duH9QeGVU23blct42cOkHkQPE2PnV9jmFql83Sotd17IT1NVwYsv80ZWbYu4oKuQaeckUYu4eE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1770966709; 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=JAZphhdyLWX/lOPr43JYhLTuyzZzE7b582uHiu2GZm8=; b=nEt7Py04Xl5+Mt3hmJfWjlLxeZFtE+TPEc1dnq+uyn2zRvEvzAjG7pUZBSR5gYyC0ue2Yph6gz+dbVhfqwsWPDGosVCoRF7XxpFRWFuq38RbnyU3PwDjoUX3ttyGICZskxLrkFrvAe4NdNv0on1y+cenkonWHZ8pNRbTrRVarvo= 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 1770966709336634.4431242688427; Thu, 12 Feb 2026 23:11:49 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vqnKZ-0002bY-99; Fri, 13 Feb 2026 02:11:11 -0500 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 1vqnKY-0002bO-4o for qemu-devel@nongnu.org; Fri, 13 Feb 2026 02:11:10 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vqnKV-0005cG-L0 for qemu-devel@nongnu.org; Fri, 13 Feb 2026 02:11:09 -0500 Received: from mx-prod-mc-08.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-562-gw1XUclDP4uce-TG4dpkpQ-1; Fri, 13 Feb 2026 02:11:03 -0500 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id EAF4818003F6; Fri, 13 Feb 2026 07:11:01 +0000 (UTC) Received: from S2.redhat.com (unknown [10.72.112.33]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id AEE9530001B9; Fri, 13 Feb 2026 07:10:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1770966666; 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=JAZphhdyLWX/lOPr43JYhLTuyzZzE7b582uHiu2GZm8=; b=bu3aU2VIVokHY4a8AaNgSFiCa6xMV18+CqEpDirVaQCZ3mltXSE2O7L4Quo8YyIZA6WBpm zO4r8lxr9qIFJ6p12QbnmkH4FQGO1OakGisZQ7Nwl7XxCRmWdRd2EOxgdUyFKgT1RRY6Ov hLJm+eNkrSbdbu9wiDMVn3tfVJA/Ick= X-MC-Unique: gw1XUclDP4uce-TG4dpkpQ-1 X-Mimecast-MFC-AGG-ID: gw1XUclDP4uce-TG4dpkpQ_1770966662 From: Cindy Lu To: lulu@redhat.com, mst@redhat.com, jasowang@redhat.com, zhangckid@gmail.com, lizhijian@fujitsu.com, qemu-devel@nongnu.org Subject: [RFC 3/5] net/filter-redirector: Add AF_PACKET sockets initialization Date: Fri, 13 Feb 2026 15:08:03 +0800 Message-ID: <20260213071042.3733239-4-lulu@redhat.com> In-Reply-To: <20260213071042.3733239-1-lulu@redhat.com> References: <20260213071042.3733239-1-lulu@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 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.133.124; envelope-from=lulu@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_H2=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-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: 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: 1770966712302158500 Content-Type: text/plain; charset="utf-8" Implement the initialization logic for AF_PACKET based netdev endpoints in filter-redirector: 1. filter_redirector_netdev_setup(): Creates and binds AF_PACKET sockets to the specified TAP interface. For in_netdev, the socket is used to receive packets; for out_netdev, it is used to send. 2. filter_redirector_netdev_read(): Async handler for reading packets from the in_netdev AF_PACKET socket. Packets are forwarded through the redirector chain. 3. Updated cleanup to properly close AF_PACKET sockets and free associated buffers. 4. Modified allow_send_when_stopped logic to consider both chardev and netdev output endpoints, and to only enable when the redirector is active (status=3Don). 5. VM state change handler now manages the AF_PACKET read handler activation based on VM running state and enable_when_stopped. Signed-off-by: Cindy Lu --- net/filter-mirror.c | 241 ++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 224 insertions(+), 17 deletions(-) diff --git a/net/filter-mirror.c b/net/filter-mirror.c index 37035f3892..f8001612ec 100644 --- a/net/filter-mirror.c +++ b/net/filter-mirror.c @@ -26,6 +26,13 @@ #include "qemu/sockets.h" #include "block/aio-wait.h" #include "system/runstate.h" +#include "net/tap.h" +#include "net/tap_int.h" + +#include +#include +#include +#include =20 typedef struct MirrorState MirrorState; DECLARE_INSTANCE_CHECKER(MirrorState, FILTER_MIRROR, @@ -42,6 +49,10 @@ struct MirrorState { char *outdev; char *in_netdev; char *out_netdev; + NetClientState *out_net; + int in_netfd; + uint8_t *in_netbuf; + int out_netfd; CharFrontend chr_in; CharFrontend chr_out; SocketReadState rs; @@ -172,6 +183,17 @@ static int redirector_chr_can_read(void *opaque) return REDIRECTOR_MAX_LEN; } =20 +static bool filter_redirector_input_active(NetFilterState *nf, bool enable) +{ + MirrorState *s =3D FILTER_REDIRECTOR(nf); + + if (!enable) { + return false; + } + + return runstate_is_running() || s->enable_when_stopped; +} + static void redirector_chr_read(void *opaque, const uint8_t *buf, int size) { NetFilterState *nf =3D opaque; @@ -208,6 +230,40 @@ static void redirector_chr_event(void *opaque, QEMUChr= Event event) } } =20 +static void filter_redirector_netdev_read(void *opaque) +{ + NetFilterState *nf =3D opaque; + MirrorState *s =3D FILTER_REDIRECTOR(nf); + struct sockaddr_ll sll; + socklen_t sll_len; + ssize_t len; + + if (!s->in_netbuf || s->in_netfd < 0) { + return; + } + + for (;;) { + sll_len =3D sizeof(sll); + len =3D recvfrom(s->in_netfd, s->in_netbuf, REDIRECTOR_MAX_LEN, 0, + (struct sockaddr *)&sll, &sll_len); + if (len <=3D 0) { + break; + } + + if (sll.sll_pkttype !=3D PACKET_OUTGOING) { + continue; + } + + redirector_to_filter(nf, s->in_netbuf, len); + } + + if (len < 0 && errno !=3D EAGAIN && errno !=3D EWOULDBLOCK && + errno !=3D EINTR) { + error_report("filter redirector read in_netdev failed(%s)", + strerror(errno)); + } +} + static ssize_t filter_mirror_receive_iov(NetFilterState *nf, NetClientState *sender, unsigned flags, @@ -268,7 +324,19 @@ static void filter_redirector_cleanup(NetFilterState *= nf) =20 qemu_chr_fe_deinit(&s->chr_in, false); qemu_chr_fe_deinit(&s->chr_out, false); - qemu_del_vm_change_state_handler(s->vmsentry); + if (s->vmsentry) { + qemu_del_vm_change_state_handler(s->vmsentry); + s->vmsentry =3D NULL; + } + if (s->in_netfd >=3D 0) { + qemu_set_fd_handler(s->in_netfd, NULL, NULL, NULL); + close(s->in_netfd); + s->in_netfd =3D -1; + } + if (s->out_netfd >=3D 0) { + close(s->out_netfd); + s->out_netfd =3D -1; + } =20 if (nf->netdev) { nf->netdev->allow_send_when_stopped =3D 0; @@ -320,13 +388,13 @@ filter_redirector_refresh_allow_send_when_stopped(Net= FilterState *nf) =20 /* * Allow sending when stopped if enable_when_stopped is set and we have - * an outdev. This must be independent of nf->on (status) so that pack= ets - * can still flow through the filter chain to other filters even when = this - * redirector is disabled. Otherwise, tap_send() will disable read_poll - * when qemu_can_send_packet() returns false, preventing further packet - * processing. + * a redirector output endpoint and the redirector is enabled. + * Keeping this active while redirector status=3Doff can unexpectedly + * drain packets in migration stop windows and perturb vhost ring stat= e. */ - nc->allow_send_when_stopped =3D (s->enable_when_stopped && s->outdev); + nc->allow_send_when_stopped =3D (nf->on && + s->enable_when_stopped && + (s->outdev || s->out_netdev)); } =20 static void filter_redirector_vm_state_change(void *opaque, bool running, @@ -335,8 +403,16 @@ static void filter_redirector_vm_state_change(void *op= aque, bool running, NetFilterState *nf =3D opaque; MirrorState *s =3D FILTER_REDIRECTOR(nf); NetClientState *nc =3D nf->netdev; + bool active =3D filter_redirector_input_active(nf, nf->on); + + if (s->in_netfd >=3D 0) { + qemu_set_fd_handler(s->in_netfd, + active ? filter_redirector_netdev_read : NULL, + NULL, + active ? nf : NULL); + } =20 - if (!running && s->enable_when_stopped && nc->info->read_poll) { + if (!running && nc && s->enable_when_stopped && nc->info->read_poll) { nc->info->read_poll(nc, true); } } @@ -362,21 +438,127 @@ static void filter_redirector_maybe_enable_read_poll= (NetFilterState *nf) } } =20 +static bool filter_redirector_netdev_setup(MirrorState *s, Error **errp) +{ + struct sockaddr_ll sll =3D { 0 }; + char ifname[IFNAMSIZ] =3D { 0 }; + int ifindex; + int fd; + NetClientState *nc; + + if (s->in_netdev) { + int tapfd; + nc =3D qemu_find_netdev(s->in_netdev); + if (!nc) { + error_setg(errp, "in_netdev '%s' not found", s->in_netdev); + return false; + } + + if (nc->info->type !=3D NET_CLIENT_DRIVER_TAP) { + error_setg(errp, "in_netdev '%s' must be a TAP netdev", + s->in_netdev); + return false; + } + + tapfd =3D tap_get_fd(nc); + if (tapfd < 0 || tap_fd_get_ifname(tapfd, ifname) !=3D 0) { + error_setg(errp, "failed to resolve TAP ifname for in_netdev '= %s'", + s->in_netdev); + return false; + } + } else if (s->out_netdev) { + nc =3D qemu_find_netdev(s->out_netdev); + if (!nc) { + error_setg(errp, "out_netdev '%s' not found", s->out_netdev); + return false; + } + /* + * out_netdev always uses AF_PACKET. For TAP netdev we resolve the + * interface name from tap fd; for non-TAP netdev we interpret + * out_netdev string as host interface name. + */ + if (nc->info->type =3D=3D NET_CLIENT_DRIVER_TAP) { + int tapfd =3D tap_get_fd(nc); + + if (tapfd < 0 || tap_fd_get_ifname(tapfd, ifname) !=3D 0) { + error_setg(errp, + "failed to resolve TAP ifname for out_netdev '%= s'", + s->out_netdev); + return false; + } + } else { + snprintf(ifname, sizeof(ifname), "%s", s->out_netdev); + } + } + + ifindex =3D if_nametoindex(ifname); + if (!ifindex) { + error_setg_errno(errp, errno, + "failed to resolve ifindex for '%s'", ifname); + return false; + } + + fd =3D qemu_socket(AF_PACKET, SOCK_RAW | SOCK_NONBLOCK, htons(ETH_P_AL= L)); + if (fd < 0) { + error_setg_errno(errp, errno, "failed to create AF_PACKET socket"); + return false; + } + + sll.sll_family =3D AF_PACKET; + sll.sll_ifindex =3D ifindex; + sll.sll_protocol =3D htons(ETH_P_ALL); + if (bind(fd, (struct sockaddr *)&sll, sizeof(sll)) < 0) { + error_setg_errno(errp, errno, + "failed to bind AF_PACKET socket for ifname '%s'", + ifname); + close(fd); + return false; + } + + if (s->in_netdev) { + s->in_netfd =3D fd; + g_free(s->in_netbuf); + s->in_netbuf =3D g_malloc(REDIRECTOR_MAX_LEN); + } else { + s->out_netfd =3D fd; + s->out_net =3D nc; + } + return true; +} + static void filter_redirector_setup(NetFilterState *nf, Error **errp) { MirrorState *s =3D FILTER_REDIRECTOR(nf); Chardev *chr; =20 - if (!s->indev && !s->outdev) { - error_setg(errp, "filter redirector needs 'indev' or " - "'outdev' at least one property set"); + if (!s->indev && !s->outdev && !s->in_netdev && !s->out_netdev) { + error_setg(errp, "filter redirector needs at least one of " + "'indev', 'outdev', 'in_netdev', or 'out_netdev'"); + return; + } + + if (s->indev && s->in_netdev) { + error_setg(errp, "'indev' and 'in_netdev' cannot both be set " + "for filter redirector"); + return; + } + + if (s->outdev && s->out_netdev) { + error_setg(errp, "'outdev' and 'out_netdev' cannot both be set " + "for filter redirector"); + return; + } + + if (s->in_netdev && s->out_netdev) { + error_setg(errp, "'in_netdev' and 'out_netdev' cannot both be set " + "for filter redirector"); + return; + } + + if (s->indev && s->outdev && !strcmp(s->indev, s->outdev)) { + error_setg(errp, "'indev' and 'outdev' could not be same " + "for filter redirector"); return; - } else if (s->indev && s->outdev) { - if (!strcmp(s->indev, s->outdev)) { - error_setg(errp, "'indev' and 'outdev' could not be same " - "for filter redirector"); - return; - } } =20 net_socket_rs_init(&s->rs, redirector_rs_finalize, s->vnet_hdr); @@ -412,9 +594,23 @@ static void filter_redirector_setup(NetFilterState *nf= , Error **errp) } } =20 + if (s->out_netdev || s->in_netdev) { + if (!filter_redirector_netdev_setup(s, errp)) { + return; + } + } + s->vmsentry =3D qemu_add_vm_change_state_handler( filter_redirector_vm_state_change, nf); =20 + if (s->in_netfd >=3D 0) { + bool active =3D filter_redirector_input_active(nf, nf->on); + + qemu_set_fd_handler(s->in_netfd, + active ? filter_redirector_netdev_read : NULL, + NULL, + active ? nf : NULL); + } filter_redirector_maybe_enable_read_poll(nf); =20 filter_redirector_refresh_allow_send_when_stopped(nf); @@ -423,6 +619,7 @@ static void filter_redirector_setup(NetFilterState *nf,= Error **errp) static void filter_redirector_status_changed(NetFilterState *nf, Error **e= rrp) { MirrorState *s =3D FILTER_REDIRECTOR(nf); + bool active =3D filter_redirector_input_active(nf, nf->on); =20 if (s->indev) { if (nf->on) { @@ -435,6 +632,13 @@ static void filter_redirector_status_changed(NetFilter= State *nf, Error **errp) } } =20 + if (s->in_netfd >=3D 0) { + qemu_set_fd_handler(s->in_netfd, + active ? filter_redirector_netdev_read : NULL, + NULL, + active ? nf : NULL); + } + if (nf->on) { filter_redirector_maybe_enable_read_poll(nf); } @@ -665,6 +869,8 @@ static void filter_redirector_init(Object *obj) MirrorState *s =3D FILTER_REDIRECTOR(obj); =20 s->vnet_hdr =3D false; + s->in_netfd =3D -1; + s->out_netfd =3D -1; } =20 static void filter_mirror_fini(Object *obj) @@ -682,6 +888,7 @@ static void filter_redirector_fini(Object *obj) g_free(s->outdev); g_free(s->in_netdev); g_free(s->out_netdev); + g_free(s->in_netbuf); } =20 static const TypeInfo filter_redirector_info =3D { --=20 2.52.0