Skip to content

Commit

Permalink
net/af_packet: log system error messages
Browse files Browse the repository at this point in the history 
Print system error to make easier diagnosis of errors with af_packet.

Signed-off-by: Krzysztof Kanas <kkanas@marvell.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
  • Loading branch information
Krzysztof Kanas authored and Ferruh Yigit committed Jul 23, 2019
1 parent 9c7fd48 commit 89178d6
Showing 1 changed file with 21 additions and 19 deletions.
40 changes: 21 additions & 19 deletions drivers/net/af_packet/rte_eth_af_packet.c
View file
Expand Up @@ -14,13 +14,15 @@
#include <rte_kvargs.h>
#include <rte_bus_vdev.h>

#include <errno.h>
#include <linux/if_ether.h>
#include <linux/if_packet.h>
#include <arpa/inet.h>
#include <net/if.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/ioctl.h>
#include <string.h>
#include <sys/mman.h>
#include <unistd.h>
#include <poll.h>
Expand Down Expand Up @@ -103,6 +105,10 @@ static int af_packet_logtype;
rte_log(RTE_LOG_ ## level, af_packet_logtype, \
"%s(): " fmt "\n", __func__, ##args)

#define PMD_LOG_ERRNO(level, fmt, args...) \
rte_log(RTE_LOG_ ## level, af_packet_logtype, \
"%s(): " fmt ":%s\n", __func__, ##args, strerror(errno))

static uint16_t
eth_af_packet_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
{
Expand Down Expand Up @@ -603,9 +609,7 @@ rte_pmd_init_internals(struct rte_vdev_device *dev,
return -1;
}
if (ioctl(sockfd, SIOCGIFINDEX, &ifr) == -1) {
PMD_LOG(ERR,
"%s: ioctl failed (SIOCGIFINDEX)",
name);
PMD_LOG_ERRNO(ERR, "%s: ioctl failed (SIOCGIFINDEX)", name);
return -1;
}
(*internals)->if_name = strdup(pair->value);
Expand All @@ -614,9 +618,7 @@ rte_pmd_init_internals(struct rte_vdev_device *dev,
(*internals)->if_index = ifr.ifr_ifindex;

if (ioctl(sockfd, SIOCGIFHWADDR, &ifr) == -1) {
PMD_LOG(ERR,
"%s: ioctl failed (SIOCGIFHWADDR)",
name);
PMD_LOG_ERRNO(ERR, "%s: ioctl failed (SIOCGIFHWADDR)", name);
return -1;
}
memcpy(&(*internals)->eth_addr, ifr.ifr_hwaddr.sa_data, ETH_ALEN);
Expand All @@ -638,17 +640,17 @@ rte_pmd_init_internals(struct rte_vdev_device *dev,
/* Open an AF_PACKET socket for this queue... */
qsockfd = socket(AF_PACKET, SOCK_RAW, htons(ETH_P_ALL));
if (qsockfd == -1) {
PMD_LOG(ERR,
PMD_LOG_ERRNO(ERR,
"%s: could not open AF_PACKET socket",
name);
name);
return -1;
}

tpver = TPACKET_V2;
rc = setsockopt(qsockfd, SOL_PACKET, PACKET_VERSION,
&tpver, sizeof(tpver));
if (rc == -1) {
PMD_LOG(ERR,
PMD_LOG_ERRNO(ERR,
"%s: could not set PACKET_VERSION on AF_PACKET socket for %s",
name, pair->value);
goto error;
Expand All @@ -658,7 +660,7 @@ rte_pmd_init_internals(struct rte_vdev_device *dev,
rc = setsockopt(qsockfd, SOL_PACKET, PACKET_LOSS,
&discard, sizeof(discard));
if (rc == -1) {
PMD_LOG(ERR,
PMD_LOG_ERRNO(ERR,
"%s: could not set PACKET_LOSS on AF_PACKET socket for %s",
name, pair->value);
goto error;
Expand All @@ -668,7 +670,7 @@ rte_pmd_init_internals(struct rte_vdev_device *dev,
rc = setsockopt(qsockfd, SOL_PACKET, PACKET_QDISC_BYPASS,
&qdisc_bypass, sizeof(qdisc_bypass));
if (rc == -1) {
PMD_LOG(ERR,
PMD_LOG_ERRNO(ERR,
"%s: could not set PACKET_QDISC_BYPASS on AF_PACKET socket for %s",
name, pair->value);
goto error;
Expand All @@ -679,15 +681,15 @@ rte_pmd_init_internals(struct rte_vdev_device *dev,

rc = setsockopt(qsockfd, SOL_PACKET, PACKET_RX_RING, req, sizeof(*req));
if (rc == -1) {
PMD_LOG(ERR,
PMD_LOG_ERRNO(ERR,
"%s: could not set PACKET_RX_RING on AF_PACKET socket for %s",
name, pair->value);
goto error;
}

rc = setsockopt(qsockfd, SOL_PACKET, PACKET_TX_RING, req, sizeof(*req));
if (rc == -1) {
PMD_LOG(ERR,
PMD_LOG_ERRNO(ERR,
"%s: could not set PACKET_TX_RING on AF_PACKET "
"socket for %s", name, pair->value);
goto error;
Expand All @@ -700,7 +702,7 @@ rte_pmd_init_internals(struct rte_vdev_device *dev,
PROT_READ | PROT_WRITE, MAP_SHARED | MAP_LOCKED,
qsockfd, 0);
if (rx_queue->map == MAP_FAILED) {
PMD_LOG(ERR,
PMD_LOG_ERRNO(ERR,
"%s: call to mmap failed on AF_PACKET socket for %s",
name, pair->value);
goto error;
Expand Down Expand Up @@ -737,19 +739,19 @@ rte_pmd_init_internals(struct rte_vdev_device *dev,

rc = bind(qsockfd, (const struct sockaddr*)&sockaddr, sizeof(sockaddr));
if (rc == -1) {
PMD_LOG(ERR,
PMD_LOG_ERRNO(ERR,
"%s: could not bind AF_PACKET socket to %s",
name, pair->value);
name, pair->value);
goto error;
}

#if defined(PACKET_FANOUT)
rc = setsockopt(qsockfd, SOL_PACKET, PACKET_FANOUT,
&fanout_arg, sizeof(fanout_arg));
if (rc == -1) {
PMD_LOG(ERR,
"%s: could not set PACKET_FANOUT on AF_PACKET socket "
"for %s", name, pair->value);
PMD_LOG_ERRNO(ERR,
"%s: could not set PACKET_FANOUT on AF_PACKET socket for %s",
name, pair->value);
goto error;
}
#endif
Expand Down

0 comments on commit 89178d6

Please sign in to comment.