From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: passt.top; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: passt.top; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=ORladrQX; dkim-atps=neutral Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by passt.top (Postfix) with ESMTPS id 628165A026F for ; Fri, 17 Oct 2025 14:21:42 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1760703700; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=Jfz2v5q01Seq/DZHIY6i1z4R0SkFSsIiOANCyYFZjtU=; b=ORladrQX0H59avTzineCZ+GPd9txqV9NKhZBmolLWNHAOE9eL2whkBYsYvKlDi+LpE3xQn kdrjemEe1c9FV4Tw0vweOUEvtERJ7ybrAkbIgqMY4tVJO3fk1cK4Jxfb+4bMG/QckhJzBF EanDH4gOzW9xGB/+q6IvEbIuiqhWn1c= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-608-2xCG8d7sNXahWUB7xmN-1g-1; Fri, 17 Oct 2025 08:21:39 -0400 X-MC-Unique: 2xCG8d7sNXahWUB7xmN-1g-1 X-Mimecast-MFC-AGG-ID: 2xCG8d7sNXahWUB7xmN-1g_1760703697 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-46e39567579so11249635e9.0 for ; Fri, 17 Oct 2025 05:21:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760703697; x=1761308497; h=content-transfer-encoding:in-reply-to:autocrypt:from :content-language:references:cc:to:subject:user-agent:mime-version :date:message-id:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=Jfz2v5q01Seq/DZHIY6i1z4R0SkFSsIiOANCyYFZjtU=; b=bz5SeRU7JzvkKkqjYVONTIPEsTDkRkbBlhC2lSNFsBYBYA+gwK3Dh/NkbsSY1jCD8A 617NXYnvs7eCPUb56TiTMwPuUfXJrD/XpGOmClh2sx7yVvXWCZABUvER0a9rDgFeL429 HFH+QJZ25SjxklQkuBiQS0Vgs08KmcxsXlcf5HmZ+dkm7DUYx4axwuWfzJz2hJ4HjL7m dcQKi8NcusfHpCgtb8XLUmVR+3pGR4FrebXjoUk58FGsZ6NgW7Z+1Yc7K7AMylY8pYLz 9PEH0Cv+ydo6JJS4ScK47Upl4Gp6zqEVkbw1BVdU+xNDqc5dlHFO9JAA/iE6vDrxXPae LTvA== X-Gm-Message-State: AOJu0Yy0yr5rAVyajau5fM0Aj3qhwEZOeo2kBJqLHXBvCK1pcNDVm469 sX9UMRKBQRIgIX4LItig5V7eBw0MrUmOYL6d2+Ymd3pUKkS3e65LuCw2isB3XZ83Z6QO675fl00 Ms5J/bEfaiqLzZX61pxtPMMickIjr1+OC7nCBE+0+TPCmmaBvsuVgSQ== X-Gm-Gg: ASbGncsvSvOh/KA10/2h/q6G5gDGPO/i4H8IZVYctOZhqsouRBSElJ+RMWZb/dj7D2h PNGY6f6p5/8whcOp3o1ELi0iNK9U7HssQmDkzhDgOQMBDaPLXqQIl+lJU4XjghGjRP0BeZLAeiW RimZV822s03GklJBG8JYHsjRtHJzwGytTvTo379E3/kqgEmLjkT9pxiSxX+hLV3/vGCTAjVWI/c kF09JiHqnfYX6FihZlNWZ8kStz4/NoDw0jNeozPCnqO3LzY3TdBB6HihffcgGmSV+7yiy7UPyDU yZF1F8WUnSP7joSx8u/DApgqqZ4HSE1jC/BTjl4uq0r7WJMgokFNkS5hPVdRQGU57UkmgQJYCTb RUkxMr9wKv0BQIUt1KGm2TvXnD4MvDRtfmJ9y/A== X-Received: by 2002:a05:600c:6385:b0:458:a7fa:211d with SMTP id 5b1f17b1804b1-47117912365mr27164995e9.29.1760703697353; Fri, 17 Oct 2025 05:21:37 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGZKErf56kd90nJDgNieZuEtVlYLOSXg/1PwFdw8Dsq/M9Xa3qQZZqXnZdj8QjJ7r40j16DZw== X-Received: by 2002:a05:600c:6385:b0:458:a7fa:211d with SMTP id 5b1f17b1804b1-47117912365mr27164755e9.29.1760703696870; Fri, 17 Oct 2025 05:21:36 -0700 (PDT) Received: from ?IPV6:2a01:e0a:e10:ef90:343a:68f:2e91:95c? ([2a01:e0a:e10:ef90:343a:68f:2e91:95c]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4270539be07sm5291428f8f.3.2025.10.17.05.21.35 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 17 Oct 2025 05:21:36 -0700 (PDT) Message-ID: Date: Fri, 17 Oct 2025 14:21:35 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v4 2/7] epoll_ctl: Extract epoll operations To: Stefano Brivio References: <20251017103129.229412-1-lvivier@redhat.com> <20251017103129.229412-3-lvivier@redhat.com> <20251017134832.70b0e58d@elisabeth> From: Laurent Vivier Autocrypt: addr=lvivier@redhat.com; keydata= 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 In-Reply-To: <20251017134832.70b0e58d@elisabeth> X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: oCxmd_AQUTRjSl68SVq8pLyan4mQ-zpuLgpIQvqHmxo_1760703697 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Message-ID-Hash: NCBP5X3HM4KU7ZVZWM5PBGD2WKHFESCH X-Message-ID-Hash: NCBP5X3HM4KU7ZVZWM5PBGD2WKHFESCH X-MailFrom: lvivier@redhat.com 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: passt-dev@passt.top 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: On 17/10/2025 13:48, Stefano Brivio wrote: > I was reviewing v3 but I can seamlessly move on to v4, just two things > here: > > On Fri, 17 Oct 2025 12:31:24 +0200 > Laurent Vivier wrote: > >> Centralize epoll_add() and epoll_del() helper functions into new >> epoll_ctl.c/h files. >> >> This also moves the union epoll_ref definition from passt.h to >> epoll_ctl.h where it's more logically placed. >> >> The new epoll_add() helper simplifies adding file descriptors to epoll >> by taking an epoll_ref and events, handling error reporting >> consistently across all call sites. >> >> Signed-off-by: Laurent Vivier >> --- >> Makefile | 22 +++++++++++----------- >> epoll_ctl.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ >> epoll_ctl.h | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ >> icmp.c | 4 +--- >> passt.c | 2 +- >> passt.h | 34 ---------------------------------- >> pasta.c | 7 +++---- >> repair.c | 14 +++++--------- >> tap.c | 13 ++++--------- >> tcp.c | 2 +- >> tcp_splice.c | 2 +- >> udp.c | 2 +- >> udp_flow.c | 1 + >> util.c | 22 +++------------------- >> util.h | 4 +++- >> vhost_user.c | 8 ++------ >> vu_common.c | 2 +- >> 17 files changed, 134 insertions(+), 101 deletions(-) >> create mode 100644 epoll_ctl.c >> create mode 100644 epoll_ctl.h >> >> diff --git a/Makefile b/Makefile >> index 3328f8324140..91e037b8fd3c 100644 >> --- a/Makefile >> +++ b/Makefile >> @@ -37,23 +37,23 @@ FLAGS += -DPAGE_SIZE=$(shell getconf PAGE_SIZE) >> FLAGS += -DVERSION=\"$(VERSION)\" >> FLAGS += -DDUAL_STACK_SOCKETS=$(DUAL_STACK_SOCKETS) >> >> -PASST_SRCS = arch.c arp.c checksum.c conf.c dhcp.c dhcpv6.c flow.c fwd.c \ >> - icmp.c igmp.c inany.c iov.c ip.c isolation.c lineread.c log.c mld.c \ >> - ndp.c netlink.c migrate.c packet.c passt.c pasta.c pcap.c pif.c \ >> - repair.c tap.c tcp.c tcp_buf.c tcp_splice.c tcp_vu.c udp.c udp_flow.c \ >> - udp_vu.c util.c vhost_user.c virtio.c vu_common.c >> +PASST_SRCS = arch.c arp.c checksum.c conf.c dhcp.c dhcpv6.c epoll_ctl.c \ >> + flow.c fwd.c icmp.c igmp.c inany.c iov.c ip.c isolation.c lineread.c \ >> + log.c mld.c ndp.c netlink.c migrate.c packet.c passt.c pasta.c pcap.c \ >> + pif.c repair.c tap.c tcp.c tcp_buf.c tcp_splice.c tcp_vu.c udp.c \ >> + udp_flow.c udp_vu.c util.c vhost_user.c virtio.c vu_common.c >> QRAP_SRCS = qrap.c >> PASST_REPAIR_SRCS = passt-repair.c >> SRCS = $(PASST_SRCS) $(QRAP_SRCS) $(PASST_REPAIR_SRCS) >> >> MANPAGES = passt.1 pasta.1 qrap.1 passt-repair.1 >> >> -PASST_HEADERS = arch.h arp.h checksum.h conf.h dhcp.h dhcpv6.h flow.h fwd.h \ >> - flow_table.h icmp.h icmp_flow.h inany.h iov.h ip.h isolation.h \ >> - lineread.h log.h migrate.h ndp.h netlink.h packet.h passt.h pasta.h \ >> - pcap.h pif.h repair.h siphash.h tap.h tcp.h tcp_buf.h tcp_conn.h \ >> - tcp_internal.h tcp_splice.h tcp_vu.h udp.h udp_flow.h udp_internal.h \ >> - udp_vu.h util.h vhost_user.h virtio.h vu_common.h >> +PASST_HEADERS = arch.h arp.h checksum.h conf.h dhcp.h dhcpv6.h epoll_ctl.h \ >> + flow.h fwd.h flow_table.h icmp.h icmp_flow.h inany.h iov.h ip.h \ >> + isolation.h lineread.h log.h migrate.h ndp.h netlink.h packet.h \ >> + passt.h pasta.h pcap.h pif.h repair.h siphash.h tap.h tcp.h tcp_buf.h \ >> + tcp_conn.h tcp_internal.h tcp_splice.h tcp_vu.h udp.h udp_flow.h \ >> + udp_internal.h udp_vu.h util.h vhost_user.h virtio.h vu_common.h >> HEADERS = $(PASST_HEADERS) seccomp.h >> >> C := \#include \nint main(){int a=getrandom(0, 0, 0);} >> diff --git a/epoll_ctl.c b/epoll_ctl.c >> new file mode 100644 >> index 000000000000..7a520560aeb9 >> --- /dev/null >> +++ b/epoll_ctl.c >> @@ -0,0 +1,45 @@ >> +// SPDX-License-Identifier: GPL-2.0-or-later >> +/* epoll_ctl.c - epoll manipulation helpers >> + * >> + * Copyright Red Hat >> + * Author: Laurent Vivier >> + */ >> + >> +#include >> + >> +#include "epoll_ctl.h" >> + >> +/** >> + * epoll_add() - Add a file descriptor to an epollfd >> + * @epollfd: epoll file descriptor to add to >> + * @events: epoll events >> + * @ref: epoll reference for the file descriptor (includes fd and metadata) >> + * >> + * Return: 0 on success, negative errno on failure >> + */ >> +int epoll_add(int epollfd, uint32_t events, union epoll_ref *ref) >> +{ >> + struct epoll_event ev; >> + int ret; >> + >> + ev.events = events; >> + ev.data.u64 = ref->u64; >> + >> + ret = epoll_ctl(epollfd, EPOLL_CTL_ADD, ref->fd, &ev); >> + if (ret == -1) { >> + ret = -errno; >> + err("Failed to add fd to epoll: %s", strerror_(-ret)); >> + } >> + >> + return ret; >> +} >> + >> +/** >> + * epoll_del() - Remove a file descriptor from an epollfd >> + * @epollfd: epoll file descriptor to remove from >> + * @fd: File descriptor to remove >> + */ >> +void epoll_del(int epollfd, int fd) >> +{ >> + epoll_ctl(epollfd, EPOLL_CTL_DEL, fd, NULL); >> +} >> diff --git a/epoll_ctl.h b/epoll_ctl.h >> new file mode 100644 >> index 000000000000..cf92b0f63f26 >> --- /dev/null >> +++ b/epoll_ctl.h >> @@ -0,0 +1,51 @@ >> +/* SPDX-License-Identifier: GPL-2.0-or-later >> + * Copyright Red Hat >> + * Author: Laurent Vivier >> + */ >> + >> +#ifndef EPOLL_CTL_H >> +#define EPOLL_CTL_H >> + >> +#include >> + >> +#include "util.h" >> +#include "passt.h" >> +#include "epoll_type.h" >> +#include "flow.h" >> +#include "tcp.h" >> +#include "udp.h" >> + >> +/** >> + * union epoll_ref - Breakdown of reference for epoll fd bookkeeping >> + * @type: Type of fd (tells us what to do with events) >> + * @fd: File descriptor number (implies < 2^24 total descriptors) >> + * @flow: Index of the flow this fd is linked to >> + * @tcp_listen: TCP-specific reference part for listening sockets >> + * @udp: UDP-specific reference part >> + * @data: Data handled by protocol handlers >> + * @nsdir_fd: netns dirfd for fallback timer checking if namespace is gone >> + * @queue: vhost-user queue index for this fd >> + * @u64: Opaque reference for epoll_ctl() and epoll_wait() >> + */ >> +union epoll_ref { >> + struct { >> + enum epoll_type type:8; >> + int32_t fd:FD_REF_BITS; > > Same comment as for v3, quoting: > > --- > Do the definitions of FD_REF_BITS and FD_REF_MAX really belong to > util.h? It would be clearer to have them here. I didn't check all the > possible places where you would need to include this header though. > --- > I didn't move them from util.h because it's not only used by epoll but also by tcp_tap_conn. So for me it was a generic definition and that fits with util.h. But I can move it if you prefer. Thanks, Laurent