From: Laurent Vivier <lvivier@redhat.com>
To: passt-dev@passt.top
Cc: Laurent Vivier <lvivier@redhat.com>
Subject: [PATCH v4 27/28] packet: remove unused parameter from PACKET_POOL_DECL()
Date: Wed, 16 Apr 2025 17:26:04 +0200 [thread overview]
Message-ID: <20250416152605.3947623-28-lvivier@redhat.com> (raw)
In-Reply-To: <20250416152605.3947623-1-lvivier@redhat.com>
_buf is not used in the macro. Remove it.
Remove it also from PACKET_POOL_NOINIT() as it was needed
for PACKET_POOL_DECL().
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
---
packet.h | 6 +++---
tap.c | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/packet.h b/packet.h
index ce910699b4d7..bbea04eac455 100644
--- a/packet.h
+++ b/packet.h
@@ -44,7 +44,7 @@ void pool_flush(struct pool *p);
#define packet_data(p, idx, data) \
packet_data_do(p, idx, data, __func__, __LINE__)
-#define PACKET_POOL_DECL(_name, _size, _buf) \
+#define PACKET_POOL_DECL(_name, _size) \
struct _name ## _t { \
char *buf; \
size_t buf_size; \
@@ -63,7 +63,7 @@ struct _name ## _t { \
#define PACKET_INIT(name, size, buf, buf_size) \
(struct name ## _t) PACKET_POOL_INIT_NOCAST(size, buf, buf_size)
-#define PACKET_POOL_NOINIT(name, size, buf) \
- PACKET_POOL_DECL(name, size, buf) name ## _storage; \
+#define PACKET_POOL_NOINIT(name, size) \
+ PACKET_POOL_DECL(name, size) name ## _storage; \
static struct pool *name = (struct pool *)&name ## _storage
#endif /* PACKET_H */
diff --git a/tap.c b/tap.c
index 3b5315cf541d..615609d4ded2 100644
--- a/tap.c
+++ b/tap.c
@@ -95,8 +95,8 @@ CHECK_FRAME_LEN(L2_MAX_LEN_VU);
ETH_HLEN + sizeof(struct ipv6hdr) + sizeof(struct udphdr))
/* IPv4 (plus ARP) and IPv6 message batches from tap/guest to IP handlers */
-static PACKET_POOL_NOINIT(pool_tap4, TAP_MSGS_IP4, pkt_buf);
-static PACKET_POOL_NOINIT(pool_tap6, TAP_MSGS_IP6, pkt_buf);
+static PACKET_POOL_NOINIT(pool_tap4, TAP_MSGS_IP4);
+static PACKET_POOL_NOINIT(pool_tap6, TAP_MSGS_IP6);
#define TAP_SEQS 128 /* Different L4 tuples in one batch */
#define FRAGMENT_MSG_RATE 10 /* # seconds between fragment warnings */
@@ -553,7 +553,7 @@ void eth_update_mac(struct ethhdr *eh,
memcpy(eh->h_source, eth_s, sizeof(eh->h_source));
}
-PACKET_POOL_DECL(pool_l4, UIO_MAXIOV, pkt_buf);
+PACKET_POOL_DECL(pool_l4, UIO_MAXIOV);
/**
* struct l4_seq4_t - Message sequence for one protocol handler call, IPv4
--
@@ -95,8 +95,8 @@ CHECK_FRAME_LEN(L2_MAX_LEN_VU);
ETH_HLEN + sizeof(struct ipv6hdr) + sizeof(struct udphdr))
/* IPv4 (plus ARP) and IPv6 message batches from tap/guest to IP handlers */
-static PACKET_POOL_NOINIT(pool_tap4, TAP_MSGS_IP4, pkt_buf);
-static PACKET_POOL_NOINIT(pool_tap6, TAP_MSGS_IP6, pkt_buf);
+static PACKET_POOL_NOINIT(pool_tap4, TAP_MSGS_IP4);
+static PACKET_POOL_NOINIT(pool_tap6, TAP_MSGS_IP6);
#define TAP_SEQS 128 /* Different L4 tuples in one batch */
#define FRAGMENT_MSG_RATE 10 /* # seconds between fragment warnings */
@@ -553,7 +553,7 @@ void eth_update_mac(struct ethhdr *eh,
memcpy(eh->h_source, eth_s, sizeof(eh->h_source));
}
-PACKET_POOL_DECL(pool_l4, UIO_MAXIOV, pkt_buf);
+PACKET_POOL_DECL(pool_l4, UIO_MAXIOV);
/**
* struct l4_seq4_t - Message sequence for one protocol handler call, IPv4
--
2.49.0
next prev parent reply other threads:[~2025-04-16 15:26 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-16 15:25 [PATCH v4 00/28] Introduce discontiguous frames management Laurent Vivier
2025-04-16 15:25 ` [PATCH v4 01/28] arp: Don't mix incoming and outgoing buffers Laurent Vivier
2025-04-16 15:25 ` [PATCH v4 02/28] iov: Introduce iov_slice(), iov_tail_slice() and iov_tail_drop() Laurent Vivier
2025-04-16 15:25 ` [PATCH v4 03/28] iov: Update IOV_REMOVE_HEADER() and IOV_PEEK_HEADER() Laurent Vivier
2025-04-16 15:25 ` [PATCH v4 04/28] tap: Use iov_tail with tap_add_packet() Laurent Vivier
2025-04-16 15:25 ` [PATCH v4 05/28] packet: Use iov_tail with packet_add() Laurent Vivier
2025-04-16 15:25 ` [PATCH v4 06/28] packet: Add packet_data() Laurent Vivier
2025-04-16 15:25 ` [PATCH v4 07/28] arp: Convert to iov_tail Laurent Vivier
2025-04-16 15:25 ` [PATCH v4 08/28] ndp: " Laurent Vivier
2025-04-16 15:25 ` [PATCH v4 09/28] icmp: " Laurent Vivier
2025-04-16 15:25 ` [PATCH v4 10/28] udp: " Laurent Vivier
2025-04-16 15:25 ` [PATCH v4 11/28] tcp: Convert tcp_tap_handler() to use iov_tail Laurent Vivier
2025-04-16 15:25 ` [PATCH v4 12/28] tcp: Convert tcp_data_from_tap() " Laurent Vivier
2025-04-16 15:25 ` [PATCH v4 13/28] dhcpv6: move offset initialization out of dhcpv6_opt() Laurent Vivier
2025-04-16 15:25 ` [PATCH v4 14/28] dhcpv6: Extract sending of NotOnLink status Laurent Vivier
2025-04-16 15:25 ` [PATCH v4 15/28] dhcpv6: Convert to iov_tail Laurent Vivier
2025-04-16 15:25 ` [PATCH v4 16/28] dhcpv6: Use iov_tail in dhcpv6_opt() Laurent Vivier
2025-04-16 15:25 ` [PATCH v4 17/28] dhcp: Convert to iov_tail Laurent Vivier
2025-04-16 15:25 ` [PATCH v4 18/28] ip: Use iov_tail in ipv6_l4hdr() Laurent Vivier
2025-04-16 15:25 ` [PATCH v4 19/28] tap: Convert tap4_handler() to iov_tail Laurent Vivier
2025-04-16 15:25 ` [PATCH v4 20/28] tap: Convert tap6_handler() " Laurent Vivier
2025-04-16 15:25 ` [PATCH v4 21/28] arp: use iov_tail rather than pool Laurent Vivier
2025-04-16 15:25 ` [PATCH v4 22/28] dhcp: " Laurent Vivier
2025-04-16 15:26 ` [PATCH v4 23/28] dhcpv6: " Laurent Vivier
2025-04-16 15:26 ` [PATCH v4 24/28] icmp: " Laurent Vivier
2025-04-16 15:26 ` [PATCH v4 25/28] ndp: " Laurent Vivier
2025-04-16 15:26 ` [PATCH v4 26/28] packet: remove PACKET_POOL() and PACKET_POOL_P() Laurent Vivier
2025-04-16 15:26 ` Laurent Vivier [this message]
2025-04-16 15:26 ` [PATCH v4 28/28] packet: add memory regions information into pool Laurent Vivier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250416152605.3947623-28-lvivier@redhat.com \
--to=lvivier@redhat.com \
--cc=passt-dev@passt.top \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://passt.top/passt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for IMAP folder(s).