Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions src/dp_vni.c
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,18 @@ bool dp_is_vni_route_table_available(uint32_t vni, int type)

static __rte_always_inline void dp_free_rib6(struct dp_vni_data *vni_data)
{
rte_rib6_free(vni_data->ipv6[DP_SOCKETID(vni_data->socket_id)]);
int socket_id = DP_SOCKETID(vni_data->socket_id);

rte_rib6_free(vni_data->ipv6[socket_id]);
vni_data->ipv6[socket_id] = NULL;
}

static __rte_always_inline void dp_free_rib(struct dp_vni_data *vni_data)
{
rte_rib_free(vni_data->ipv4[DP_SOCKETID(vni_data->socket_id)]);
int socket_id = DP_SOCKETID(vni_data->socket_id);

rte_rib_free(vni_data->ipv4[socket_id]);
vni_data->ipv4[socket_id] = NULL;
}

static void dp_free_vni_data(struct dp_ref *ref)
Expand Down Expand Up @@ -198,13 +204,13 @@ static int dp_reset_vni_data(uint32_t vni, struct dp_vni_data *vni_data)
int socket_id = DP_SOCKETID(vni_data->socket_id);

if (vni_data->ipv4[socket_id]) {
rte_rib_free(vni_data->ipv4[socket_id]);
dp_free_rib(vni_data);
if (DP_FAILED(dp_create_rib(vni, socket_id, vni_data)))

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if rte_rib_create fails, is it better to set both vni_data->vni and vni_data->socket_id to some invalid values? or simply set all fields of vni_data in the failure section inside dp_create_rib?

return DP_ERROR;
}

if (vni_data->ipv6[socket_id]) {
rte_rib6_free(vni_data->ipv6[socket_id]);
dp_free_rib6(vni_data);
if (DP_FAILED(dp_create_rib6(vni, socket_id, vni_data)))
return DP_ERROR;
}
Expand Down
Loading