mirror of https://github.com/OISF/suricata
dpdk: replace global with per-thread mempools
It turned out that having global (interface-specific) mempool that is shared by the threads of the interface is slower than having individual mempools per queue for each interface. The commit brings this change and should be user-invisible, the config setting remains still as a number of objects of all mempools summed (of that interface). Ticket: 7382pull/12888/head
Lukas Sismis
2 years ago
committed by
Victor Julien
parent
5e2974458d
commit
cb997a64dc
@ -0,0 +1,68 @@
|
||||
/* Copyright (C) 2025 Open Information Security Foundation
|
||||
*
|
||||
* You can copy, redistribute or modify this Program under the terms of
|
||||
* the GNU General Public License version 2 as published by the Free
|
||||
* Software Foundation.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* version 2 along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
||||
* 02110-1301, USA.
|
||||
*/
|
||||
|
||||
/**
|
||||
* \file
|
||||
*
|
||||
* \author Lukas Sismis <lukas.sismis@oisf.net>
|
||||
*/
|
||||
|
||||
#include "suricata-common.h"
|
||||
#include "util-debug.h"
|
||||
#include "util-dpdk-common.h"
|
||||
|
||||
#ifdef HAVE_DPDK
|
||||
|
||||
int DPDKDeviceResourcesInit(DPDKDeviceResources **dpdk_vars, uint16_t mp_cnt)
|
||||
{
|
||||
SCEnter();
|
||||
*dpdk_vars = SCCalloc(1, sizeof(*dpdk_vars[0]));
|
||||
if (*dpdk_vars == NULL) {
|
||||
SCLogError("failed to allocate memory for packet mempools structure");
|
||||
SCReturnInt(-ENOMEM);
|
||||
}
|
||||
|
||||
(*dpdk_vars)->pkt_mp = SCCalloc(mp_cnt, sizeof((*dpdk_vars)->pkt_mp[0]));
|
||||
if ((*dpdk_vars)->pkt_mp == NULL) {
|
||||
SCLogError("failed to allocate memory for packet mempools");
|
||||
SCReturnInt(-ENOMEM);
|
||||
}
|
||||
(*dpdk_vars)->pkt_mp_capa = mp_cnt;
|
||||
(*dpdk_vars)->pkt_mp_cnt = 0;
|
||||
|
||||
SCReturnInt(0);
|
||||
}
|
||||
|
||||
void DPDKDeviceResourcesDeinit(DPDKDeviceResources *dpdk_vars)
|
||||
{
|
||||
if (dpdk_vars != NULL) {
|
||||
if (dpdk_vars->pkt_mp != NULL) {
|
||||
for (int j = 0; j < dpdk_vars->pkt_mp_capa; j++) {
|
||||
if (dpdk_vars->pkt_mp[j] != NULL) {
|
||||
rte_mempool_free(dpdk_vars->pkt_mp[j]);
|
||||
}
|
||||
}
|
||||
SCFree(dpdk_vars->pkt_mp);
|
||||
dpdk_vars->pkt_mp_capa = 0;
|
||||
dpdk_vars->pkt_mp_cnt = 0;
|
||||
dpdk_vars->pkt_mp = NULL;
|
||||
}
|
||||
SCFree(dpdk_vars);
|
||||
}
|
||||
}
|
||||
|
||||
#endif /* HAVE_DPDK */
|
||||
@ -0,0 +1,127 @@
|
||||
/* Copyright (C) 2025 Open Information Security Foundation
|
||||
*
|
||||
* You can copy, redistribute or modify this Program under the terms of
|
||||
* the GNU General Public License version 2 as published by the Free
|
||||
* Software Foundation.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* version 2 along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
||||
* 02110-1301, USA.
|
||||
*/
|
||||
|
||||
/**
|
||||
* \file
|
||||
*
|
||||
* \author Lukas Sismis <lsismis@oisf.net>
|
||||
*/
|
||||
|
||||
#ifndef UTIL_DPDK_COMMON_H
|
||||
#define UTIL_DPDK_COMMON_H
|
||||
|
||||
#ifdef HAVE_DPDK
|
||||
|
||||
#include <rte_eal.h>
|
||||
#include <rte_ethdev.h>
|
||||
#ifdef HAVE_DPDK_BOND
|
||||
#include <rte_eth_bond.h>
|
||||
#endif
|
||||
#include <rte_launch.h>
|
||||
#include <rte_lcore.h>
|
||||
#include <rte_log.h>
|
||||
#include <rte_mempool.h>
|
||||
#include <rte_mbuf.h>
|
||||
#include <rte_flow.h>
|
||||
#include <rte_version.h>
|
||||
|
||||
#if RTE_VERSION < RTE_VERSION_NUM(22, 0, 0, 0)
|
||||
#define RTE_ETH_MQ_RX_RSS ETH_MQ_RX_RSS
|
||||
#endif
|
||||
|
||||
#if RTE_VERSION < RTE_VERSION_NUM(21, 11, 0, 0)
|
||||
#define RTE_ETH_TX_OFFLOAD_MBUF_FAST_FREE DEV_TX_OFFLOAD_MBUF_FAST_FREE
|
||||
|
||||
#define RTE_ETH_RX_OFFLOAD_CHECKSUM DEV_RX_OFFLOAD_CHECKSUM
|
||||
|
||||
#define RTE_ETH_RX_OFFLOAD_VLAN_STRIP DEV_RX_OFFLOAD_VLAN_STRIP
|
||||
#define RTE_ETH_RX_OFFLOAD_IPV4_CKSUM DEV_RX_OFFLOAD_IPV4_CKSUM
|
||||
#define RTE_ETH_RX_OFFLOAD_UDP_CKSUM DEV_RX_OFFLOAD_UDP_CKSUM
|
||||
#define RTE_ETH_RX_OFFLOAD_TCP_CKSUM DEV_RX_OFFLOAD_TCP_CKSUM
|
||||
#define RTE_ETH_RX_OFFLOAD_TCP_LRO DEV_RX_OFFLOAD_TCP_LRO
|
||||
#define RTE_ETH_RX_OFFLOAD_QINQ_STRIP DEV_RX_OFFLOAD_QINQ_STRIP
|
||||
#define RTE_ETH_RX_OFFLOAD_OUTER_IPV4_CKSUM DEV_RX_OFFLOAD_OUTER_IPV4_CKSUM
|
||||
#define RTE_ETH_RX_OFFLOAD_MACSEC_STRIP DEV_RX_OFFLOAD_MACSEC_STRIP
|
||||
#define RTE_ETH_RX_OFFLOAD_HEADER_SPLIT DEV_RX_OFFLOAD_HEADER_SPLIT
|
||||
#define RTE_ETH_RX_OFFLOAD_VLAN_FILTER DEV_RX_OFFLOAD_VLAN_FILTER
|
||||
#define RTE_ETH_RX_OFFLOAD_VLAN_EXTEND DEV_RX_OFFLOAD_VLAN_EXTEND
|
||||
#define RTE_ETH_RX_OFFLOAD_SCATTER DEV_RX_OFFLOAD_SCATTER
|
||||
#define RTE_ETH_RX_OFFLOAD_TIMESTAMP DEV_RX_OFFLOAD_TIMESTAMP
|
||||
#define RTE_ETH_RX_OFFLOAD_SECURITY DEV_RX_OFFLOAD_SECURITY
|
||||
#define RTE_ETH_RX_OFFLOAD_KEEP_CRC DEV_RX_OFFLOAD_KEEP_CRC
|
||||
#define RTE_ETH_RX_OFFLOAD_SCTP_CKSUM DEV_RX_OFFLOAD_SCTP_CKSUM
|
||||
#define RTE_ETH_RX_OFFLOAD_OUTER_UDP_CKSUM DEV_RX_OFFLOAD_OUTER_UDP_CKSUM
|
||||
#define RTE_ETH_RX_OFFLOAD_RSS_HASH DEV_RX_OFFLOAD_RSS_HASH
|
||||
|
||||
#define RTE_ETH_MQ_TX_NONE ETH_MQ_TX_NONE
|
||||
|
||||
#define RTE_ETH_MQ_RX_NONE ETH_MQ_RX_NONE
|
||||
|
||||
#define RTE_ETH_RSS_IP ETH_RSS_IP
|
||||
#define RTE_ETH_RSS_UDP ETH_RSS_UDP
|
||||
#define RTE_ETH_RSS_TCP ETH_RSS_TCP
|
||||
#define RTE_ETH_RSS_SCTP ETH_RSS_SCTP
|
||||
#define RTE_ETH_RSS_TUNNEL ETH_RSS_TUNNEL
|
||||
|
||||
#define RTE_ETH_RSS_L3_SRC_ONLY ETH_RSS_L3_SRC_ONLY
|
||||
#define RTE_ETH_RSS_L3_DST_ONLY ETH_RSS_L3_DST_ONLY
|
||||
#define RTE_ETH_RSS_L4_SRC_ONLY ETH_RSS_L4_SRC_ONLY
|
||||
#define RTE_ETH_RSS_L4_DST_ONLY ETH_RSS_L4_DST_ONLY
|
||||
|
||||
#define RTE_ETH_RSS_IPV4 ETH_RSS_IPV4
|
||||
#define RTE_ETH_RSS_FRAG_IPV4 ETH_RSS_FRAG_IPV4
|
||||
#define RTE_ETH_RSS_NONFRAG_IPV4_TCP ETH_RSS_NONFRAG_IPV4_TCP
|
||||
#define RTE_ETH_RSS_NONFRAG_IPV4_UDP ETH_RSS_NONFRAG_IPV4_UDP
|
||||
#define RTE_ETH_RSS_NONFRAG_IPV4_SCTP ETH_RSS_NONFRAG_IPV4_SCTP
|
||||
#define RTE_ETH_RSS_NONFRAG_IPV4_OTHER ETH_RSS_NONFRAG_IPV4_OTHER
|
||||
#define RTE_ETH_RSS_IPV6 ETH_RSS_IPV6
|
||||
#define RTE_ETH_RSS_FRAG_IPV6 ETH_RSS_FRAG_IPV6
|
||||
#define RTE_ETH_RSS_NONFRAG_IPV6_TCP ETH_RSS_NONFRAG_IPV6_TCP
|
||||
#define RTE_ETH_RSS_NONFRAG_IPV6_UDP ETH_RSS_NONFRAG_IPV6_UDP
|
||||
#define RTE_ETH_RSS_NONFRAG_IPV6_SCTP ETH_RSS_NONFRAG_IPV6_SCTP
|
||||
#define RTE_ETH_RSS_NONFRAG_IPV6_OTHER ETH_RSS_NONFRAG_IPV6_OTHER
|
||||
#define RTE_ETH_RSS_L2_PAYLOAD ETH_RSS_L2_PAYLOAD
|
||||
#define RTE_ETH_RSS_IPV6_EX ETH_RSS_IPV6_EX
|
||||
#define RTE_ETH_RSS_IPV6_TCP_EX ETH_RSS_IPV6_TCP_EX
|
||||
#define RTE_ETH_RSS_IPV6_UDP_EX ETH_RSS_IPV6_UDP_EX
|
||||
#define RTE_ETH_RSS_PORT ETH_RSS_PORT
|
||||
#define RTE_ETH_RSS_VXLAN ETH_RSS_VXLAN
|
||||
#define RTE_ETH_RSS_NVGRE ETH_RSS_NVGRE
|
||||
#define RTE_ETH_RSS_GTPU ETH_RSS_GTPU
|
||||
|
||||
#define RTE_MBUF_F_RX_IP_CKSUM_MASK PKT_RX_IP_CKSUM_MASK
|
||||
#define RTE_MBUF_F_RX_IP_CKSUM_NONE PKT_RX_IP_CKSUM_NONE
|
||||
#define RTE_MBUF_F_RX_IP_CKSUM_GOOD PKT_RX_IP_CKSUM_GOOD
|
||||
#define RTE_MBUF_F_RX_IP_CKSUM_BAD PKT_RX_IP_CKSUM_BAD
|
||||
|
||||
#define RTE_MBUF_F_RX_L4_CKSUM_MASK PKT_RX_L4_CKSUM_MASK
|
||||
#define RTE_MBUF_F_RX_L4_CKSUM_GOOD PKT_RX_L4_CKSUM_GOOD
|
||||
#define RTE_MBUF_F_RX_L4_CKSUM_BAD PKT_RX_L4_CKSUM_BAD
|
||||
#endif
|
||||
|
||||
typedef struct {
|
||||
struct rte_mempool **pkt_mp;
|
||||
uint16_t pkt_mp_cnt;
|
||||
uint16_t pkt_mp_capa;
|
||||
} DPDKDeviceResources;
|
||||
|
||||
int DPDKDeviceResourcesInit(DPDKDeviceResources **dpdk_vars, uint16_t mp_cnt);
|
||||
void DPDKDeviceResourcesDeinit(DPDKDeviceResources *dpdk_vars);
|
||||
|
||||
#endif /* HAVE_DPDK */
|
||||
|
||||
#endif /* UTIL_DPDK_COMMON_H */
|
||||
Loading…
Reference in New Issue