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 AED9D5A004F
for <passt-dev@passt.top>; Wed, 12 Jun 2024 18:00:33 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
s=mimecast20190719; t=1718208032;
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=SYmWis1k4ifxZPAaasfynG7udqUA5jjAr3XeHnN07Lc=;
b=NzNm1Pb5ObYeOgPDND+yifFjXk+X6mKe7zKXgvj24HU0KC0ABvJadgTDdlsVfSisjTaKgx
Phrx2Sngv0eme59rVZSwLDLz3DevoAMiCwwDkrDzKc94Qu3OcIm0dWS7k5JivSL/r+uYE4
QiHGTXOfFoBYd/U3Th0MP3XeJ0NKpug=
Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com
[209.85.218.71]) by relay.mimecast.com with ESMTP with STARTTLS
(version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id
us-mta-246-7TnXA-5uNACnvwmYSo48pA-1; Wed, 12 Jun 2024 12:00:30 -0400
X-MC-Unique: 7TnXA-5uNACnvwmYSo48pA-1
Received: by mail-ej1-f71.google.com with SMTP id a640c23a62f3a-a6f0f7d6eaaso121345366b.1
for <passt-dev@passt.top>; Wed, 12 Jun 2024 09:00:30 -0700 (PDT)
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1718208029; x=1718812829;
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=SYmWis1k4ifxZPAaasfynG7udqUA5jjAr3XeHnN07Lc=;
b=iGDeJmiwVCDcmuVe2JOLSigvxUYtMbU8Da5fCOz1mS3Au8c5v/2rrftMsPfbSoWCu4
6oAxeSwk+90k1PjUNc9z1RKMfELxOf8QCiG5dHQvob2zWtvTfJa7lVdqr9hR69d6vFJY
RRvQTQI+TbMefeOOosyRcuJTC65lkfsdyXpLaZEar2PwmLD6MsrBqztsTaTUnW1Kj6TM
H1D1kESVUUzrx5KkXjo65C68SPDzjY9vcKFEeC9yuETGWJ1X6G4fpJis9eWoWHWr2ppH
5vnA8xwvjlStJje00GQxvWoXCGFtFLjZ9BKOORRH8Nmf4YFWtH1qD0YKWaiTUGJf4QTI
CNDQ==
X-Gm-Message-State: AOJu0YyTC4l/ZMH1gfPQXQhc+BXCrB9qUJdBAwEmsC8zjgzcx0GQPYay
kfEwke9g5EvJndwDhjrblY3z5d+qCQk9DTEQvwocyrykSzbcHSSkwwbkrSs3jqv1fuFGkgL0AUC
ooQCXlCAh8JA7LJH3efR6noI4X+FbL30JGTwQfSDhhs/5dVrTq16PTPsOfw==
X-Received: by 2002:a17:907:6d11:b0:a6f:3b3b:b7cb with SMTP id a640c23a62f3a-a6f523eae18mr8498766b.7.1718208029103;
Wed, 12 Jun 2024 09:00:29 -0700 (PDT)
X-Google-Smtp-Source: AGHT+IEhV2i4GPZqrqhDc3CPIzxMRDHsjd1zGCXstubS0cVpH8apxEF7BShBxL7G9djOFHUHFT/ASw==
X-Received: by 2002:a17:907:6d11:b0:a6f:3b3b:b7cb with SMTP id a640c23a62f3a-a6f523eae18mr8496066b.7.1718208028655;
Wed, 12 Jun 2024 09:00:28 -0700 (PDT)
Received: from ?IPV6:2a01:e0a:e10:ef90:8e19:3414:44f0:befd? ([2a01:e0a:e10:ef90:8e19:3414:44f0:befd])
by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a6ef4581827sm697988366b.215.2024.06.12.09.00.28
(version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
Wed, 12 Jun 2024 09:00:28 -0700 (PDT)
Message-ID: <09f2fb3a-ac3a-48fd-8a98-2cc349c52923@redhat.com>
Date: Wed, 12 Jun 2024 18:00:27 +0200
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH v6 3/8] tap: refactor packets handling functions
To: Stefano Brivio <sbrivio@redhat.com>
References: <20240612154734.1044883-1-lvivier@redhat.com>
<20240612154734.1044883-4-lvivier@redhat.com>
<20240612175231.029a4344@elisabeth>
From: Laurent Vivier <lvivier@redhat.com>
Autocrypt: addr=lvivier@redhat.com; keydata=
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
In-Reply-To: <20240612175231.029a4344@elisabeth>
X-Mimecast-Spam-Score: 0
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: JUJFY33MQ37VQGVSIMCH5O5OPR4G5Q2G
X-Message-ID-Hash: JUJFY33MQ37VQGVSIMCH5O5OPR4G5Q2G
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 <passt-dev.passt.top>
Archived-At: <https://archives.passt.top/passt-dev/09f2fb3a-ac3a-48fd-8a98-2cc349c52923@redhat.com/>
Archived-At: <https://passt.top/hyperkitty/list/passt-dev@passt.top/message/JUJFY33MQ37VQGVSIMCH5O5OPR4G5Q2G/>
List-Archive: <https://archives.passt.top/passt-dev/>
List-Archive: <https://passt.top/hyperkitty/list/passt-dev@passt.top/>
List-Help: <mailto:passt-dev-request@passt.top?subject=help>
List-Owner: <mailto:passt-dev-owner@passt.top>
List-Post: <mailto:passt-dev@passt.top>
List-Subscribe: <mailto:passt-dev-join@passt.top>
List-Unsubscribe: <mailto:passt-dev-leave@passt.top>
On 12/06/2024 17:52, Stefano Brivio wrote:
> On Wed, 12 Jun 2024 17:47:29 +0200
> Laurent Vivier <lvivier@redhat.com> wrote:
>
>> Consolidate pool_tap4() and pool_tap6() into tap_flush_pools(),
>> and tap4_handler() and tap6_handler() into tap_handler().
>> Create a generic tap_add_packet() to consolidate packet
>> addition logic and reduce code duplication.
>>
>> The purpose is to ease the export of these functions to use
>> them with the vhost-user backend.
>>
>> Signed-off-by: Laurent Vivier <lvivier@redhat.com>
>> ---
>>
>> Notes:
>> v6:
>> - rename tap_handler_all() to tap_handler()
>> - rename packet_add_all_do() to tap_add_packet
>> and remove func and line.
>
> Oops, they're still in the comment to the function. I can drop that on
> merge.
yes, please, and also the comment of tap_flush_pools()
Thanks,
Laurent >
>> - rename pool_flush_all() to tap_flush_pools()
>>
>> v5:
>> - update commit message and function comments
>>
>> tap.c | 112 +++++++++++++++++++++++++++++++++-------------------------
>> tap.h | 3 ++
>> 2 files changed, 66 insertions(+), 49 deletions(-)
>>
>> diff --git a/tap.c b/tap.c
>> index 26084b486519..ec3a0d68ea2f 100644
>> --- a/tap.c
>> +++ b/tap.c
>> @@ -921,6 +921,60 @@ append:
>> return in->count;
>> }
>>
>> +/**
>> + * pool_flush() - Flush both IPv4 and IPv6 packet pools
>> + */
>> +void tap_flush_pools(void)
>> +{
>> + pool_flush(pool_tap4);
>> + pool_flush(pool_tap6);
>> +}
>> +
>> +/**
>> + * tap_handler() - IPv4/IPv6 and ARP packet handler for tap file descriptor
>> + * @c: Execution context
>> + * @now: Current timestamp
>> + */
>> +void tap_handler(struct ctx *c, const struct timespec *now)
>> +{
>> + tap4_handler(c, pool_tap4, now);
>> + tap6_handler(c, pool_tap6, now);
>> +}
>> +
>> +/**
>> + * tap_add_packet() - Queue/capture packet, update notion of guest MAC address
>> + * @c: Execution context
>> + * @l2len: Total L2 packet length
>> + * @p: Packet buffer
>> + * @func: For tracing: name of calling function, NULL means no trace()
>> + * @line: For tracing: caller line of function call
>> + */
>> +void tap_add_packet(struct ctx *c, ssize_t l2len, char *p)
>> +{
>> + const struct ethhdr *eh;
>> +
>> + pcap(p, l2len);
>> +
>> + 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, l2len, p);
>> + break;
>> + case ETH_P_IPV6:
>> + packet_add(pool_tap6, l2len, p);
>> + break;
>> + default:
>> + break;
>> + }
>> +}
>> +
>> /**
>> * tap_sock_reset() - Handle closing or failure of connect AF_UNIX socket
>> * @c: Execution context
>> @@ -947,7 +1001,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;
>>
>> @@ -960,8 +1013,7 @@ redo:
>> p = pkt_buf;
>> rem = 0;
>>
>> - pool_flush(pool_tap4);
>> - pool_flush(pool_tap6);
>> + tap_flush_pools();
>>
>> n = recv(c->fd_tap, p, TAP_BUF_FILL, MSG_DONTWAIT);
>> if (n < 0) {
>> @@ -988,38 +1040,18 @@ redo:
>> /* Complete the partial read above before discarding a malformed
>> * frame, otherwise the stream will be inconsistent.
>> */
>> - if (l2len < (ssize_t)sizeof(*eh) ||
>> + if (l2len < (ssize_t)sizeof(struct ethhdr) ||
>> l2len > (ssize_t)ETH_MAX_MTU)
>> goto next;
>>
>> - pcap(p, l2len);
>> -
>> - 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, l2len, p);
>> - break;
>> - case ETH_P_IPV6:
>> - packet_add(pool_tap6, l2len, p);
>> - break;
>> - default:
>> - break;
>> - }
>> + tap_add_packet(c, l2len, p);
>>
>> next:
>> p += l2len;
>> n -= l2len;
>> }
>>
>> - tap4_handler(c, pool_tap4, now);
>> - tap6_handler(c, pool_tap6, now);
>> + tap_handler(c, now);
>>
>> /* We can't use EPOLLET otherwise. */
>> if (rem)
>> @@ -1044,35 +1076,18 @@ void tap_handler_pasta(struct ctx *c, uint32_t events,
>> redo:
>> n = 0;
>>
>> - pool_flush(pool_tap4);
>> - pool_flush(pool_tap6);
>> + tap_flush_pools();
>> 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;
>> - }
>> + tap_add_packet(c, len, pkt_buf + n);
>>
>> if ((n += len) == TAP_BUF_BYTES)
>> break;
>> @@ -1083,8 +1098,7 @@ restart:
>>
>> ret = errno;
>>
>> - tap4_handler(c, pool_tap4, now);
>> - tap6_handler(c, pool_tap6, now);
>> + tap_handler(c, now);
>>
>> if (len > 0 || ret == EAGAIN)
>> return;
>> diff --git a/tap.h b/tap.h
>> index 2285a87093f9..d496bd0e4b99 100644
>> --- a/tap.h
>> +++ b/tap.h
>> @@ -70,5 +70,8 @@ void tap_handler_passt(struct ctx *c, uint32_t events,
>> const struct timespec *now);
>> int tap_sock_unix_open(char *sock_path);
>> void tap_sock_init(struct ctx *c);
>> +void tap_flush_pools(void);
>> +void tap_handler(struct ctx *c, const struct timespec *now);
>> +void tap_add_packet(struct ctx *c, ssize_t l2len, char *p);
>>
>> #endif /* TAP_H */
>