test/mem: disable ASan when accessing unallocated memory

[dpdk.git] / lib / eal / common / eal_common_interrupts.c

diff --git a/lib/eal/common/eal_common_interrupts.c b/lib/eal/common/eal_common_interrupts.c
index 875e819..97b64fe 100644 (file)
--- a/lib/eal/common/eal_common_interrupts.c
+++ b/lib/eal/common/eal_common_interrupts.c
@@ -10,6 +10,8 @@
 #include <rte_log.h>
 #include <rte_malloc.h>
 
+#include "eal_interrupts.h"
+
 /* Macros to check for valid interrupt handle */
 #define CHECK_VALID_INTR_HANDLE(intr_handle) do { \
        if (intr_handle == NULL) { \
@@ -51,10 +53,46 @@ struct rte_intr_handle *rte_intr_instance_alloc(uint32_t flags)
                return NULL;
        }
 
+       if (uses_rte_memory) {
+               intr_handle->efds = rte_zmalloc(NULL,
+                       RTE_MAX_RXTX_INTR_VEC_ID * sizeof(int), 0);
+       } else {
+               intr_handle->efds = calloc(RTE_MAX_RXTX_INTR_VEC_ID,
+                       sizeof(int));
+       }
+       if (intr_handle->efds == NULL) {
+               RTE_LOG(ERR, EAL, "Fail to allocate event fd list\n");
+               rte_errno = ENOMEM;
+               goto fail;
+       }
+
+       if (uses_rte_memory) {
+               intr_handle->elist = rte_zmalloc(NULL,
+                       RTE_MAX_RXTX_INTR_VEC_ID * sizeof(struct rte_epoll_event),
+                       0);
+       } else {
+               intr_handle->elist = calloc(RTE_MAX_RXTX_INTR_VEC_ID,
+                       sizeof(struct rte_epoll_event));
+       }
+       if (intr_handle->elist == NULL) {
+               RTE_LOG(ERR, EAL, "fail to allocate event fd list\n");
+               rte_errno = ENOMEM;
+               goto fail;
+       }
+
        intr_handle->alloc_flags = flags;
        intr_handle->nb_intr = RTE_MAX_RXTX_INTR_VEC_ID;
 
        return intr_handle;
+fail:
+       if (uses_rte_memory) {
+               rte_free(intr_handle->efds);
+               rte_free(intr_handle);
+       } else {
+               free(intr_handle->efds);
+               free(intr_handle);
+       }
+       return NULL;
 }
 
 struct rte_intr_handle *rte_intr_instance_dup(const struct rte_intr_handle *src)
@@ -70,7 +108,7 @@ struct rte_intr_handle *rte_intr_instance_dup(const struct rte_intr_handle *src)
        intr_handle = rte_intr_instance_alloc(src->alloc_flags);
        if (intr_handle != NULL) {
                intr_handle->fd = src->fd;
-               intr_handle->vfio_dev_fd = src->vfio_dev_fd;
+               intr_handle->dev_fd = src->dev_fd;
                intr_handle->type = src->type;
                intr_handle->max_intr = src->max_intr;
                intr_handle->nb_efd = src->nb_efd;
@@ -82,14 +120,69 @@ struct rte_intr_handle *rte_intr_instance_dup(const struct rte_intr_handle *src)
        return intr_handle;
 }
 
+int rte_intr_event_list_update(struct rte_intr_handle *intr_handle, int size)
+{
+       struct rte_epoll_event *tmp_elist;
+       bool uses_rte_memory;
+       int *tmp_efds;
+
+       CHECK_VALID_INTR_HANDLE(intr_handle);
+
+       if (size == 0) {
+               RTE_LOG(DEBUG, EAL, "Size can't be zero\n");
+               rte_errno = EINVAL;
+               goto fail;
+       }
+
+       uses_rte_memory =
+               RTE_INTR_INSTANCE_USES_RTE_MEMORY(intr_handle->alloc_flags);
+       if (uses_rte_memory) {
+               tmp_efds = rte_realloc(intr_handle->efds, size * sizeof(int),
+                       0);
+       } else {
+               tmp_efds = realloc(intr_handle->efds, size * sizeof(int));
+       }
+       if (tmp_efds == NULL) {
+               RTE_LOG(ERR, EAL, "Failed to realloc the efds list\n");
+               rte_errno = ENOMEM;
+               goto fail;
+       }
+       intr_handle->efds = tmp_efds;
+
+       if (uses_rte_memory) {
+               tmp_elist = rte_realloc(intr_handle->elist,
+                       size * sizeof(struct rte_epoll_event), 0);
+       } else {
+               tmp_elist = realloc(intr_handle->elist,
+                       size * sizeof(struct rte_epoll_event));
+       }
+       if (tmp_elist == NULL) {
+               RTE_LOG(ERR, EAL, "Failed to realloc the event list\n");
+               rte_errno = ENOMEM;
+               goto fail;
+       }
+       intr_handle->elist = tmp_elist;
+
+       intr_handle->nb_intr = size;
+
+       return 0;
+fail:
+       return -rte_errno;
+}
+
 void rte_intr_instance_free(struct rte_intr_handle *intr_handle)
 {
        if (intr_handle == NULL)
                return;
-       if (RTE_INTR_INSTANCE_USES_RTE_MEMORY(intr_handle->alloc_flags))
+       if (RTE_INTR_INSTANCE_USES_RTE_MEMORY(intr_handle->alloc_flags)) {
+               rte_free(intr_handle->efds);
+               rte_free(intr_handle->elist);
                rte_free(intr_handle);
-       else
+       } else {
+               free(intr_handle->efds);
+               free(intr_handle->elist);
                free(intr_handle);
+       }
 }
 
 int rte_intr_fd_set(struct rte_intr_handle *intr_handle, int fd)
@@ -138,7 +231,7 @@ int rte_intr_dev_fd_set(struct rte_intr_handle *intr_handle, int fd)
 {
        CHECK_VALID_INTR_HANDLE(intr_handle);
 
-       intr_handle->vfio_dev_fd = fd;
+       intr_handle->dev_fd = fd;
 
        return 0;
 fail:
@@ -149,7 +242,7 @@ int rte_intr_dev_fd_get(const struct rte_intr_handle *intr_handle)
 {
        CHECK_VALID_INTR_HANDLE(intr_handle);
 
-       return intr_handle->vfio_dev_fd;
+       return intr_handle->dev_fd;
 fail:
        return -1;
 }