From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by passt.top (Postfix) with ESMTP id 7FC135A0274 for ; Mon, 12 Feb 2024 00:16:16 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1707693375; 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; bh=rernEuCTNGjCRvfjKy4F2J8JR6yPrfLO3AMayF51sNE=; b=Qr8jAIF5H9bnhxRcdM+CpF/4BlTrkZCmDH/41/f9aBe3KUZe0SG6kkdiAAYTHtYtlvtFQQ 5vYV8obIZj/A/XIWplRYOR1aBCIF8UkuC+/270ZqB6xJoA64Wc21030jarg6pXiOML5DFQ 3ZlYscz5rLFYnEyZQkz9zie6Y81ARBU= Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-104-1dv-FjQRPLu34gyUjXPOug-1; Sun, 11 Feb 2024 18:16:14 -0500 X-MC-Unique: 1dv-FjQRPLu34gyUjXPOug-1 Received: by mail-ej1-f69.google.com with SMTP id a640c23a62f3a-a3bca3322f8so120970766b.1 for ; Sun, 11 Feb 2024 15:16:13 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707693372; x=1708298172; h=content-transfer-encoding:mime-version:organization:references :in-reply-to:message-id:subject:cc:to:from:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=rernEuCTNGjCRvfjKy4F2J8JR6yPrfLO3AMayF51sNE=; b=aJ+YhYkNRIUxvGO+vlG1jnZ2k4c5ZwUalNf8q8r8ZApv7ArBesImJcvtmaro+yjpLv nvACg39l14wqrsQWlBgxJep3G8ipL/ZkzDhDRv02Y7o6TjFYeBHvzV2FHhNHFztamApQ g81v8e32TJNmc0ZAKumJYbNRka87XfFF2vLNqG4mGxO0cWII9oAkWwyqHqTjFDzSzR9j bbYfAA3u33sgdjS0s9kz0ZTLypx11cfrshGbeQnDuwKBWol7+o4jwCkEZK9E43EJoZhZ vr7vy/W/D28MtscB/7q5w7kSU6+jeFPoSfoGApUIVST9aK67yekuOxnwbCmsEpTGuza3 GDTQ== X-Gm-Message-State: AOJu0YwHnQKioCyPbYwgOqLrwrg18ffhbt3nCJNeV+CL26aFXmf9v+yz 0O3q23MWg7s0dbo/uLm4j5pyWOkY0f2QQWJ/ckJhNmx7ezLa1KVsCCJe6TrT6yeXQcVT8ebYN0n C0wrAlZ5QPT2akICYFwkCFtevKTRycJ7kVm9kecuh9P/1ySQGUBcPW1aKUJwqULMIoSLJnR/OHU 91g3a/lplQThM95Igp1nh/dIG66aBos6nPLV4= X-Received: by 2002:a17:906:b855:b0:a3c:1070:8054 with SMTP id ga21-20020a170906b85500b00a3c10708054mr3458084ejb.10.1707693371953; Sun, 11 Feb 2024 15:16:11 -0800 (PST) X-Google-Smtp-Source: AGHT+IE340ODceaO7twe0kIUhLTCJMHdfR6g7Sr9DavGgB+33scEvEhFEu0EH87+DuGTZ2Av/XGCEw== X-Received: by 2002:a17:906:b855:b0:a3c:1070:8054 with SMTP id ga21-20020a170906b85500b00a3c10708054mr3458076ejb.10.1707693371533; Sun, 11 Feb 2024 15:16:11 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCUaaydva3TKxWXaBvmdSXV0c5Aflo6W+5eFGOvx21vRiNhI1VpFRm74hm33n5Skz1L9dFR8lLnIhp3nmf48aBRQTQ== Received: from maya.cloud.tilaa.com (maya.cloud.tilaa.com. [164.138.29.33]) by smtp.gmail.com with ESMTPSA id z21-20020a170906271500b00a3756cb9370sm3307028ejc.91.2024.02.11.15.16.10 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 11 Feb 2024 15:16:10 -0800 (PST) Date: Mon, 12 Feb 2024 00:15:30 +0100 From: Stefano Brivio To: Laurent Vivier Subject: Re: [PATCH 13/24] tap: export pool_flush()/tapX_handler()/packet_add() Message-ID: <20240212001530.5bac9a6b@elisabeth> In-Reply-To: <20240202141151.3762941-14-lvivier@redhat.com> References: <20240202141151.3762941-1-lvivier@redhat.com> <20240202141151.3762941-14-lvivier@redhat.com> Organization: Red Hat X-Mailer: Claws Mail 4.1.1 (GTK 3.24.36; x86_64-pc-linux-gnu) MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Message-ID-Hash: EHM7E3WCAIQ7AFMC2FK3F5RBUGFDOSVB X-Message-ID-Hash: EHM7E3WCAIQ7AFMC2FK3F5RBUGFDOSVB X-MailFrom: sbrivio@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, Laurent Vivier 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 Fri, 2 Feb 2024 15:11:40 +0100 Laurent Vivier wrote: > From: Laurent Vivier > > Signed-off-by: Laurent Vivier > --- > tap.c | 98 +++++++++++++++++++++++++++++------------------------------ > tap.h | 7 +++++ > 2 files changed, 56 insertions(+), 49 deletions(-) I'm assuming that you need this patch to recycle those bits of "tap" functions for usage in vhost-user code... which shows they actually have little to do with tun/tap interfaces. But sure, we already have there stuff to deal with UNIX domain sockets, so "tap" is already somewhat inconsistent. If use "tap" for a (long) moment to denote "anything guest/container facing", then: > diff --git a/tap.c b/tap.c > index 29f389057ac1..5b1b61550c13 100644 > --- a/tap.c > +++ b/tap.c > @@ -911,6 +911,45 @@ append: > return in->count; > } > > +void pool_flush_all(void) I think that the "all" in pool_flush_all() doesn't really convey the message of "all pools", and tap_pools_flush() would describe this better. All these would need function comments, by the way. > +{ > + pool_flush(pool_tap4); > + pool_flush(pool_tap6); > +} > + > +void tap_handler_all(struct ctx *c, const struct timespec *now) Same here: something like tap_pools_handler() describes better the fact that this is not handling "everything", rather "tap pools". > +{ > + tap4_handler(c, pool_tap4, now); > + tap6_handler(c, pool_tap6, now); > +} > + > +void packet_add_all_do(struct ctx *c, ssize_t len, char *p, > + const char *func, int line) ...and this doesn't add "all the packets" -- it adds just one, to one pool! What about tap_pool_add()? About using packet_add_do() directly, and passing in 'line': I'm not sure there's a big advantage in having the line from tap_handler_passt() or another caller reported instead of having the point where packet_add() is actually called. There might also be an issue in this function (packet_add_all_do()) so one might want to start debugging there. > +{ > + const struct ethhdr *eh; > + > + pcap(p, len); > + > + eh = (struct ethhdr *)p; > + > + if (memcmp(c->mac_guest, eh->h_source, ETH_ALEN)) { > + memcpy(c->mac_guest, eh->h_source, ETH_ALEN); > + proto_update_l2_buf(c->mac_guest, NULL); > + } > + > + switch (ntohs(eh->h_proto)) { > + case ETH_P_ARP: > + case ETH_P_IP: > + packet_add_do(pool_tap4, len, p, func, line); > + break; > + case ETH_P_IPV6: > + packet_add_do(pool_tap6, len, p, func, line); > + break; > + default: > + break; > + } > +} > + > /** > * tap_sock_reset() - Handle closing or failure of connect AF_UNIX socket > * @c: Execution context > @@ -937,7 +976,6 @@ static void tap_sock_reset(struct ctx *c) > void tap_handler_passt(struct ctx *c, uint32_t events, > const struct timespec *now) > { > - const struct ethhdr *eh; > ssize_t n, rem; > char *p; > > @@ -950,8 +988,7 @@ redo: > p = pkt_buf; > rem = 0; > > - pool_flush(pool_tap4); > - pool_flush(pool_tap6); > + pool_flush_all(); > > n = recv(c->fd_tap, p, TAP_BUF_FILL, MSG_DONTWAIT); > if (n < 0) { > @@ -978,37 +1015,18 @@ redo: > /* Complete the partial read above before discarding a malformed > * frame, otherwise the stream will be inconsistent. > */ > - if (len < (ssize_t)sizeof(*eh) || len > (ssize_t)ETH_MAX_MTU) > + if (len < (ssize_t)sizeof(struct ethhdr) || > + len > (ssize_t)ETH_MAX_MTU) > goto next; > > - pcap(p, len); > - > - eh = (struct ethhdr *)p; > - > - if (memcmp(c->mac_guest, eh->h_source, ETH_ALEN)) { > - memcpy(c->mac_guest, eh->h_source, ETH_ALEN); > - proto_update_l2_buf(c->mac_guest, NULL); > - } > - > - switch (ntohs(eh->h_proto)) { > - case ETH_P_ARP: > - case ETH_P_IP: > - packet_add(pool_tap4, len, p); > - break; > - case ETH_P_IPV6: > - packet_add(pool_tap6, len, p); > - break; > - default: > - break; > - } > + packet_add_all(c, len, p); > > next: > p += len; > n -= len; > } > > - tap4_handler(c, pool_tap4, now); > - tap6_handler(c, pool_tap6, now); > + tap_handler_all(c, now); > > /* We can't use EPOLLET otherwise. */ > if (rem) > @@ -1033,35 +1051,18 @@ void tap_handler_pasta(struct ctx *c, uint32_t events, > redo: > n = 0; > > - pool_flush(pool_tap4); > - pool_flush(pool_tap6); > + pool_flush_all(); > restart: > while ((len = read(c->fd_tap, pkt_buf + n, TAP_BUF_BYTES - n)) > 0) { > - const struct ethhdr *eh = (struct ethhdr *)(pkt_buf + n); > > - if (len < (ssize_t)sizeof(*eh) || len > (ssize_t)ETH_MAX_MTU) { > + if (len < (ssize_t)sizeof(struct ethhdr) || > + len > (ssize_t)ETH_MAX_MTU) { > n += len; > continue; > } > > - pcap(pkt_buf + n, len); > > - if (memcmp(c->mac_guest, eh->h_source, ETH_ALEN)) { > - memcpy(c->mac_guest, eh->h_source, ETH_ALEN); > - proto_update_l2_buf(c->mac_guest, NULL); > - } > - > - switch (ntohs(eh->h_proto)) { > - case ETH_P_ARP: > - case ETH_P_IP: > - packet_add(pool_tap4, len, pkt_buf + n); > - break; > - case ETH_P_IPV6: > - packet_add(pool_tap6, len, pkt_buf + n); > - break; > - default: > - break; > - } > + packet_add_all(c, len, pkt_buf + n); > > if ((n += len) == TAP_BUF_BYTES) > break; > @@ -1072,8 +1073,7 @@ restart: > > ret = errno; > > - tap4_handler(c, pool_tap4, now); > - tap6_handler(c, pool_tap6, now); > + tap_handler_all(c, now); > > if (len > 0 || ret == EAGAIN) > return; > diff --git a/tap.h b/tap.h > index 437b9aa2b43f..7157ef37ee6e 100644 > --- a/tap.h > +++ b/tap.h > @@ -82,5 +82,12 @@ void tap_handler_pasta(struct ctx *c, uint32_t events, > void tap_handler_passt(struct ctx *c, uint32_t events, > const struct timespec *now); > void tap_sock_init(struct ctx *c); > +void pool_flush_all(void); > +void tap_handler_all(struct ctx *c, const struct timespec *now); > + > +void packet_add_do(struct pool *p, size_t len, const char *start, > + const char *func, int line); > +#define packet_add_all(p, len, start) \ > + packet_add_all_do(p, len, start, __func__, __LINE__) > > #endif /* TAP_H */ -- Stefano