Add temporarly function definitions to odp_packet_io_internal.h instead of odp_packet_socket.h to obtain pktio_entry_t definition
Signed-off-by: Nicolas Morey-Chaisemartin <[email protected]> --- .../linux-generic/include/odp_packet_io_internal.h | 4 +++ platform/linux-generic/include/odp_packet_socket.h | 5 ++++ platform/linux-generic/odp_packet_io.c | 30 ++++++++++------------ platform/linux-generic/odp_packet_socket.c | 27 +++++++++++++++++++ platform/linux-generic/odp_packet_socket_mmap.c | 7 +++++ 5 files changed, 57 insertions(+), 16 deletions(-) diff --git a/platform/linux-generic/include/odp_packet_io_internal.h b/platform/linux-generic/include/odp_packet_io_internal.h index e156d0e..5aa9f10 100644 --- a/platform/linux-generic/include/odp_packet_io_internal.h +++ b/platform/linux-generic/include/odp_packet_io_internal.h @@ -99,6 +99,10 @@ int mac_addr_get_loopback(pktio_entry_t *pktio_entry, void *mac_addr); int promisc_mode_set_loopback(pktio_entry_t *pktio_entry, odp_bool_t enable); int promisc_mode_get_loopback(pktio_entry_t *pktio_entry); +int mtu_get_sock_mmsg(pktio_entry_t *pktio_entry); + +int mtu_get_sock_mmap(pktio_entry_t *pktio_entry); + #ifdef __cplusplus } #endif diff --git a/platform/linux-generic/include/odp_packet_socket.h b/platform/linux-generic/include/odp_packet_socket.h index c3921e6..9ce5db2 100644 --- a/platform/linux-generic/include/odp_packet_socket.h +++ b/platform/linux-generic/include/odp_packet_socket.h @@ -98,6 +98,11 @@ ethaddrs_equal(unsigned char mac_a[], unsigned char mac_b[]) } /** + * Read the MTU from a packet socket + */ +int mtu_get_fd(int fd, const char *name); + +/** * Open & configure a raw packet socket */ int setup_pkt_sock(pkt_sock_t * const pkt_sock, const char *netdev, diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index 5696e12..05d4a71 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -687,8 +687,6 @@ static int sockfd_from_pktio_entry(pktio_entry_t *entry) int odp_pktio_mtu(odp_pktio_t id) { pktio_entry_t *entry; - int sockfd; - struct ifreq ifr; int ret; entry = get_pktio_entry(id); @@ -705,23 +703,23 @@ int odp_pktio_mtu(odp_pktio_t id) return -1; } - if (entry->s.type == ODP_PKTIO_TYPE_LOOPBACK) { - unlock_entry(entry); - return mtu_get_loopback(entry); - } - - sockfd = sockfd_from_pktio_entry(entry); - snprintf(ifr.ifr_name, IF_NAMESIZE, "%s", entry->s.name); - - ret = ioctl(sockfd, SIOCGIFMTU, &ifr); - if (ret < 0) { - ODP_DBG("ioctl SIOCGIFMTU error\n"); - unlock_entry(entry); - return -1; + switch (entry->s.type) { + case ODP_PKTIO_TYPE_LOOPBACK: + ret = mtu_get_loopback(entry); + break; + case ODP_PKTIO_TYPE_SOCKET_BASIC: + case ODP_PKTIO_TYPE_SOCKET_MMSG: + ret = mtu_get_sock_mmsg(entry); + break; + case ODP_PKTIO_TYPE_SOCKET_MMAP: + ret = mtu_get_sock_mmap(entry); + break; + default: + ODP_ABORT("Wrong socket type %d\n", entry->s.type); } unlock_entry(entry); - return ifr.ifr_mtu; + return ret; } int odp_pktio_promisc_mode_set(odp_pktio_t id, odp_bool_t enable) diff --git a/platform/linux-generic/odp_packet_socket.c b/platform/linux-generic/odp_packet_socket.c index 5a3a064..8faf7a4 100644 --- a/platform/linux-generic/odp_packet_socket.c +++ b/platform/linux-generic/odp_packet_socket.c @@ -35,6 +35,7 @@ #include <odp.h> #include <odp_packet_socket.h> #include <odp_packet_internal.h> +#include <odp_packet_io_internal.h> #include <odp_align_internal.h> #include <odp_debug_internal.h> #include <odp/hints.h> @@ -86,6 +87,24 @@ int sendmmsg(int fd, struct mmsghdr *vmessages, unsigned int vlen, int flags) #define ETHBUF_ALIGN(buf_ptr) ((uint8_t *)ODP_ALIGN_ROUNDUP_PTR((buf_ptr), \ sizeof(uint32_t)) + ETHBUF_OFFSET) +/* + * ODP_PACKET_SOCKET_BASIC: + * ODP_PACKET_SOCKET_MMSG: + * ODP_PACKET_SOCKET_MMAP: + */ +int mtu_get_fd(int fd, const char *name) +{ + struct ifreq ifr; + int ret; + + snprintf(ifr.ifr_name, IF_NAMESIZE, "%s", name); + ret = ioctl(fd, SIOCGIFMTU, &ifr); + if (ret < 0) { + ODP_DBG("ioctl SIOCGIFMTU error\n"); + return -1; + } + return ifr.ifr_mtu; +} /* * ODP_PACKET_SOCKET_BASIC: @@ -383,3 +402,11 @@ int send_pkt_sock_mmsg(pkt_sock_t *const pkt_sock, return len; } +/* + * ODP_PACKET_SOCKET_BASIC: + * ODP_PACKET_SOCKET_MMSG: + */ +int mtu_get_sock_mmsg(pktio_entry_t *pktio_entry) +{ + return mtu_get_fd(pktio_entry->s.pkt_sock.sockfd, pktio_entry->s.name); +} diff --git a/platform/linux-generic/odp_packet_socket_mmap.c b/platform/linux-generic/odp_packet_socket_mmap.c index b9c2ee4..7f35ce0 100644 --- a/platform/linux-generic/odp_packet_socket_mmap.c +++ b/platform/linux-generic/odp_packet_socket_mmap.c @@ -25,6 +25,7 @@ #include <odp.h> #include <odp_packet_socket.h> #include <odp_packet_internal.h> +#include <odp_packet_io_internal.h> #include <odp_debug_internal.h> #include <odp/hints.h> @@ -489,3 +490,9 @@ int send_pkt_sock_mmap(pkt_sock_mmap_t *const pkt_sock, return pkt_mmap_v2_tx(pkt_sock->tx_ring.sock, &pkt_sock->tx_ring, pkt_table, len); } + +int mtu_get_sock_mmap(pktio_entry_t *pktio_entry) +{ + return mtu_get_fd(pktio_entry->s.pkt_sock_mmap.sockfd, + pktio_entry->s.name); +} -- 2.4.2.3.g8277175 _______________________________________________ lng-odp mailing list [email protected] https://lists.linaro.org/mailman/listinfo/lng-odp
