[dpdk-dev,v9,3/5] net: add a helper for making RARP packet
Checks
Commit Message
Suggested-by: Maxime Coquelin <maxime.coquelin@redhat.com>
Signed-off-by: Xiao Wang <xiao.w.wang@intel.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
---
lib/librte_net/Makefile | 1 +
lib/librte_net/rte_arp.c | 42 ++++++++++++++++++++++++++++++++++++++
lib/librte_net/rte_arp.h | 14 +++++++++++++
lib/librte_net/rte_net_version.map | 6 ++++++
4 files changed, 63 insertions(+)
create mode 100644 lib/librte_net/rte_arp.c
Comments
09/01/2018 17:09, Xiao Wang:
> --- a/lib/librte_net/rte_arp.h
> +++ b/lib/librte_net/rte_arp.h
> @@ -76,6 +76,20 @@ struct arp_hdr {
> struct arp_ipv4 arp_data;
> } __attribute__((__packed__));
>
> +/**
> + * Make a RARP packet based on MAC addr.
> + *
> + * @param mbuf
> + * Pointer to the rte_mbuf structure
> + * @param mac
> + * Pointer to the MAC addr
> + *
> + * @return
> + * - 0 on success, negative on error
> + */
> +int
> +rte_net_make_rarp_packet(struct rte_mbuf *mbuf, const struct ether_addr *mac);
Please check how experimental state is advertised for other functions.
Usually we add a bold doxygen comment.
[...]
> --- a/lib/librte_net/rte_net_version.map
> +++ b/lib/librte_net/rte_net_version.map
> +EXPERIMENTAL {
> + global:
> +
> + rte_net_make_rarp_packet;
> +} DPDK_17.05;
>
When live migration is finished, the backup VM needs to proactively announce
its new location. DPDK vhost has implemented VHOST_USER_PROTOCOL_F_RARP to
generate a RARP packet to switch in dequeue path. Another method is to let
the guest proactively send out RARP packet using VIRTIO_NET_F_GUEST_ANNOUNCE
feature.
This patch set enables this feature in virtio pmd, to support VM running virtio
pmd be migrated without vhost supporting RARP generation.
v10:
- Add a bold doxygen comment for the experimental function.
v9:
- Introduce function with the experimental state.
v8:
- Add a helper in lib/librte_net to make rarp packet, it's used by
both vhost and virtio.
v7:
- Improve comment for state_lock.
- Rename spinlock variable 'sl' to 'lock'.
v6:
- Use rte_pktmbuf_alloc() instead of rte_mbuf_raw_alloc().
- Remove the 'len' parameter in calling virtio_send_command().
- Remove extra space between typo and var.
- Improve comment and alignment.
- Remove the unnecessary header file.
- A better usage of 'unlikely' indication.
v5:
- Remove txvq parameter in virtio_inject_pkts.
- Zero hw->special_buf after using it.
- Return the retval of tx_pkt_burst().
- Allocate a mbuf pointer on stack directly.
v4:
- Move spinlock lock/unlock into dev_pause/resume.
- Separate out a patch for packet injection.
v3:
- Remove Tx function code duplication, use a special pointer for rarp
injection.
- Rename function generate_rarp to virtio_notify_peers, replace
'virtnet_' with 'virtio_'.
- Add comment for state_lock.
- Typo fix and comment improvement.
v2:
- Use spaces instead of tabs between the code and comments.
- Remove unnecessary parentheses.
- Use rte_pktmbuf_mtod directly to get eth_hdr addr.
- Fix virtio_dev_pause return value check.
Xiao Wang (5):
net/virtio: make control queue thread-safe
net/virtio: add packet injection method
net: add a helper for making RARP packet
vhost: use lib API to make RARP packet
net/virtio: support GUEST ANNOUNCE
drivers/net/virtio/virtio_ethdev.c | 118 +++++++++++++++++++++++++++++++-
drivers/net/virtio/virtio_ethdev.h | 6 ++
drivers/net/virtio/virtio_pci.h | 7 ++
drivers/net/virtio/virtio_rxtx.c | 3 +-
drivers/net/virtio/virtio_rxtx.h | 1 +
drivers/net/virtio/virtio_rxtx_simple.c | 2 +-
drivers/net/virtio/virtqueue.h | 11 +++
lib/Makefile | 3 +-
lib/librte_net/Makefile | 1 +
lib/librte_net/rte_arp.c | 42 ++++++++++++
lib/librte_net/rte_arp.h | 17 +++++
lib/librte_net/rte_net_version.map | 6 ++
lib/librte_vhost/Makefile | 2 +-
lib/librte_vhost/virtio_net.c | 41 +----------
14 files changed, 213 insertions(+), 47 deletions(-)
create mode 100644 lib/librte_net/rte_arp.c
@@ -13,6 +13,7 @@ LIBABIVER := 1
SRCS-$(CONFIG_RTE_LIBRTE_NET) := rte_net.c
SRCS-$(CONFIG_RTE_LIBRTE_NET) += rte_net_crc.c
+SRCS-$(CONFIG_RTE_LIBRTE_NET) += rte_arp.c
# install includes
SYMLINK-$(CONFIG_RTE_LIBRTE_NET)-include := rte_ip.h rte_tcp.h rte_udp.h rte_esp.h
new file mode 100644
@@ -0,0 +1,42 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2018 Intel Corporation
+ */
+
+#include <arpa/inet.h>
+
+#include <rte_arp.h>
+
+#define RARP_PKT_SIZE 64
+int
+rte_net_make_rarp_packet(struct rte_mbuf *mbuf, const struct ether_addr *mac)
+{
+ struct ether_hdr *eth_hdr;
+ struct arp_hdr *rarp;
+
+ if (mbuf->buf_len < RARP_PKT_SIZE)
+ return -1;
+
+ /* Ethernet header. */
+ eth_hdr = rte_pktmbuf_mtod(mbuf, struct ether_hdr *);
+ memset(eth_hdr->d_addr.addr_bytes, 0xff, ETHER_ADDR_LEN);
+ ether_addr_copy(mac, ð_hdr->s_addr);
+ eth_hdr->ether_type = htons(ETHER_TYPE_RARP);
+
+ /* RARP header. */
+ rarp = (struct arp_hdr *)(eth_hdr + 1);
+ rarp->arp_hrd = htons(ARP_HRD_ETHER);
+ rarp->arp_pro = htons(ETHER_TYPE_IPv4);
+ rarp->arp_hln = ETHER_ADDR_LEN;
+ rarp->arp_pln = 4;
+ rarp->arp_op = htons(ARP_OP_REVREQUEST);
+
+ ether_addr_copy(mac, &rarp->arp_data.arp_sha);
+ ether_addr_copy(mac, &rarp->arp_data.arp_tha);
+ memset(&rarp->arp_data.arp_sip, 0x00, 4);
+ memset(&rarp->arp_data.arp_tip, 0x00, 4);
+
+ mbuf->data_len = RARP_PKT_SIZE;
+ mbuf->pkt_len = RARP_PKT_SIZE;
+
+ return 0;
+}
@@ -76,6 +76,20 @@ struct arp_hdr {
struct arp_ipv4 arp_data;
} __attribute__((__packed__));
+/**
+ * Make a RARP packet based on MAC addr.
+ *
+ * @param mbuf
+ * Pointer to the rte_mbuf structure
+ * @param mac
+ * Pointer to the MAC addr
+ *
+ * @return
+ * - 0 on success, negative on error
+ */
+int
+rte_net_make_rarp_packet(struct rte_mbuf *mbuf, const struct ether_addr *mac);
+
#ifdef __cplusplus
}
#endif
@@ -12,3 +12,9 @@ DPDK_17.05 {
rte_net_crc_set_alg;
} DPDK_16.11;
+
+EXPERIMENTAL {
+ global:
+
+ rte_net_make_rarp_packet;
+} DPDK_17.05;