mirror of
https://github.com/ntop/n2n.git
synced 2024-09-19 16:41:11 +02:00
added (de-)compression to benchmark tool (#446)
* moved calls to decode functions into the decryption block * adjusted output * added (de)compression to benchmark * added pearson hashing to benchmark Co-authored-by: Logan007 <you@example.com>
This commit is contained in:
Logan oos Even
GitHub
parent
8dfffd9fbe
commit
2f220fd924
|
|
@ -18,6 +18,13 @@
|
|||
|
||||
#include "n2n.h"
|
||||
|
||||
#define DURATION 3 // test duration per algorithm
|
||||
|
||||
|
||||
/* heap allocation for compression as per lzo example doc */
|
||||
#define HEAP_ALLOC(var,size) lzo_align_t __LZO_MMODEL var [ ((size) + (sizeof(lzo_align_t) - 1)) / sizeof(lzo_align_t) ]
|
||||
static HEAP_ALLOC(wrkmem, LZO1X_1_MEM_COMPRESS);
|
||||
|
||||
|
||||
uint8_t PKT_CONTENT[]={
|
||||
0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15, 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,
|
||||
|
|
@ -40,8 +47,15 @@ uint8_t PKT_CONTENT[]={
|
|||
/* Prototypes */
|
||||
static ssize_t do_encode_packet( uint8_t * pktbuf, size_t bufsize, const n2n_community_t c );
|
||||
static void run_transop_benchmark(const char *op_name, n2n_trans_op_t *op_fn, n2n_edge_conf_t *conf, uint8_t *pktbuf);
|
||||
static void init_compression_for_benchmark(void);
|
||||
static void deinit_compression_for_benchmark(void);
|
||||
static void run_compression_benchmark(void);
|
||||
static void run_hashing_benchmark(void);
|
||||
|
||||
|
||||
static int perform_decryption = 0;
|
||||
|
||||
|
||||
static void usage() {
|
||||
fprintf(stderr, "Usage: benchmark [-d]\n"
|
||||
" -d\t\tEnable decryption. Default: only encryption is performed\n");
|
||||
|
|
@ -76,19 +90,27 @@ int main(int argc, char * argv[]) {
|
|||
strncpy((char*)conf.community_name, "abc123def456", sizeof(conf.community_name));
|
||||
conf.encrypt_key = "SoMEVer!S$cUREPassWORD";
|
||||
|
||||
pearson_hash_init();
|
||||
|
||||
/* Init transopts */
|
||||
n2n_transop_null_init(&conf, &transop_null);
|
||||
n2n_transop_tf_init(&conf, &transop_tf);
|
||||
n2n_transop_aes_init(&conf, &transop_aes);
|
||||
n2n_transop_cc20_init(&conf, &transop_cc20);
|
||||
n2n_transop_speck_init(&conf, &transop_speck);
|
||||
|
||||
|
||||
/* Run the tests */
|
||||
run_transop_benchmark("transop_null", &transop_null, &conf, pktbuf);
|
||||
run_transop_benchmark("transop_tf", &transop_tf, &conf, pktbuf);
|
||||
run_transop_benchmark("transop_aes", &transop_aes, &conf, pktbuf);
|
||||
run_transop_benchmark("transop_cc20", &transop_cc20, &conf, pktbuf);
|
||||
run_transop_benchmark("transop_speck", &transop_speck, &conf, pktbuf);
|
||||
run_transop_benchmark("null", &transop_null, &conf, pktbuf);
|
||||
run_transop_benchmark("tf", &transop_tf, &conf, pktbuf);
|
||||
run_transop_benchmark("aes", &transop_aes, &conf, pktbuf);
|
||||
run_transop_benchmark("cc20", &transop_cc20, &conf, pktbuf);
|
||||
run_transop_benchmark("speck", &transop_speck, &conf, pktbuf);
|
||||
|
||||
/* Also for compression (init moved here for ciphers get run before in case of lzo init error) */
|
||||
init_compression_for_benchmark();
|
||||
run_compression_benchmark();
|
||||
|
||||
run_hashing_benchmark();
|
||||
|
||||
/* Cleanup */
|
||||
transop_null.deinit(&transop_null);
|
||||
|
|
@ -97,14 +119,193 @@ int main(int argc, char * argv[]) {
|
|||
transop_cc20.deinit(&transop_cc20);
|
||||
transop_speck.deinit(&transop_speck);
|
||||
|
||||
deinit_compression_for_benchmark();
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
// --- compression benchmark --------------------------------------------------------------
|
||||
|
||||
|
||||
static void init_compression_for_benchmark(void) {
|
||||
|
||||
if(lzo_init() != LZO_E_OK) {
|
||||
traceEvent(TRACE_ERROR, "LZO compression init error");
|
||||
exit(1);
|
||||
}
|
||||
|
||||
#ifdef N2N_HAVE_ZSTD
|
||||
// zstd does not require initialization. if it were required, this would be a good place
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
static void deinit_compression_for_benchmark(void) {
|
||||
|
||||
// lzo1x does not require de-initialization. if it were required, this would be a good place
|
||||
|
||||
#ifdef N2N_HAVE_ZSTD
|
||||
// zstd does not require de-initialization. if it were required, this would be a good place
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
static void run_compression_benchmark() {
|
||||
const int target_sec = DURATION;
|
||||
struct timeval t1;
|
||||
struct timeval t2;
|
||||
ssize_t nw;
|
||||
ssize_t target_usec = target_sec * 1e6;
|
||||
ssize_t tdiff; // microseconds
|
||||
size_t num_packets;
|
||||
float mpps;
|
||||
uint8_t compression_buffer[N2N_PKT_BUF_SIZE]; // size allows enough of a reserve required for compression
|
||||
lzo_uint compression_len = N2N_PKT_BUF_SIZE;
|
||||
uint8_t deflation_buffer[N2N_PKT_BUF_SIZE];
|
||||
int64_t deflated_len;
|
||||
|
||||
tdiff = 0;
|
||||
num_packets = 0;
|
||||
|
||||
printf("%s\t{%s}\tfor %us\t(%u bytes)", perform_decryption ? "decompr" : "compr",
|
||||
"lzo1x", target_sec, (unsigned int)sizeof(PKT_CONTENT));
|
||||
fflush(stdout);
|
||||
|
||||
// always do compression once to determine compressed size
|
||||
compression_len = N2N_PKT_BUF_SIZE;
|
||||
if(!lzo1x_1_compress(PKT_CONTENT, sizeof(PKT_CONTENT), compression_buffer, &compression_len, wrkmem) == LZO_E_OK) {
|
||||
traceEvent(TRACE_ERROR, "\nLZO compression error");
|
||||
exit(1);
|
||||
}
|
||||
nw = compression_len;
|
||||
|
||||
gettimeofday( &t1, NULL );
|
||||
|
||||
while(tdiff < target_usec) {
|
||||
if(perform_decryption) { // decompression
|
||||
deflated_len = N2N_PKT_BUF_SIZE;
|
||||
|
||||
lzo1x_decompress (compression_buffer, compression_len, deflation_buffer, (lzo_uint*)&deflated_len, NULL);
|
||||
|
||||
if(memcmp(deflation_buffer, PKT_CONTENT, sizeof(PKT_CONTENT)) != 0) {
|
||||
traceEvent(TRACE_ERROR, "\nPayload LZO decompression failed!");
|
||||
}
|
||||
} else { // compression
|
||||
if(!lzo1x_1_compress(PKT_CONTENT, sizeof(PKT_CONTENT), compression_buffer, &compression_len, wrkmem) == LZO_E_OK) {
|
||||
traceEvent(TRACE_ERROR, "\nLZO compression error");
|
||||
exit(1);
|
||||
}
|
||||
}
|
||||
|
||||
gettimeofday( &t2, NULL );
|
||||
|
||||
tdiff = ((t2.tv_sec - t1.tv_sec) * 1000000) + (t2.tv_usec - t1.tv_usec);
|
||||
num_packets++;
|
||||
}
|
||||
|
||||
mpps = num_packets / (tdiff / 1e6) / 1e6;
|
||||
|
||||
printf(" %s (%u bytes)\t%12u packets\t%8.1f Kpps\t%8.1f MB/s\n", perform_decryption ? "<---" : "--->",
|
||||
(unsigned int)nw, (unsigned int)num_packets, mpps * 1e3, mpps * sizeof(PKT_CONTENT));
|
||||
|
||||
#ifdef N2N_HAVE_ZSTD
|
||||
tdiff = 0;
|
||||
num_packets = 0;
|
||||
|
||||
printf("%s\t{%s}\tfor %us\t(%u bytes)", perform_decryption ? "decompr" : "compr",
|
||||
"zstd", target_sec, (unsigned int)sizeof(PKT_CONTENT));
|
||||
fflush(stdout);
|
||||
|
||||
// always do compression once to determine compressed size
|
||||
compression_len = N2N_PKT_BUF_SIZE;
|
||||
compression_len = ZSTD_compress(compression_buffer, compression_len, PKT_CONTENT, sizeof(PKT_CONTENT), ZSTD_COMPRESSION_LEVEL) ;
|
||||
if(ZSTD_isError(compression_len)) {
|
||||
traceEvent(TRACE_ERROR, "\nZSTD compression error");
|
||||
exit(1);
|
||||
}
|
||||
nw = compression_len;
|
||||
|
||||
gettimeofday( &t1, NULL );
|
||||
|
||||
while(tdiff < target_usec) {
|
||||
if(perform_decryption) { // decompression
|
||||
deflated_len = N2N_PKT_BUF_SIZE;
|
||||
|
||||
deflated_len = (int32_t)ZSTD_decompress (deflation_buffer, deflated_len, compression_buffer, compression_len);
|
||||
if(ZSTD_isError(deflated_len)) {
|
||||
traceEvent (TRACE_ERROR, "\nPayload decompression failed with zstd error '%s'.",
|
||||
ZSTD_getErrorName(deflated_len));
|
||||
exit(1);
|
||||
}
|
||||
|
||||
if(memcmp(deflation_buffer, PKT_CONTENT, sizeof(PKT_CONTENT)) != 0) {
|
||||
traceEvent(TRACE_ERROR, "\nPayload ZSTD decompression failed!");
|
||||
}
|
||||
} else { // compression
|
||||
compression_len = N2N_PKT_BUF_SIZE;
|
||||
compression_len = ZSTD_compress(compression_buffer, compression_len, PKT_CONTENT, sizeof(PKT_CONTENT), ZSTD_COMPRESSION_LEVEL) ;
|
||||
if(ZSTD_isError(compression_len)) {
|
||||
traceEvent(TRACE_ERROR, "\nZSTD compression error");
|
||||
exit(1);
|
||||
}
|
||||
}
|
||||
|
||||
gettimeofday( &t2, NULL );
|
||||
|
||||
tdiff = ((t2.tv_sec - t1.tv_sec) * 1000000) + (t2.tv_usec - t1.tv_usec);
|
||||
num_packets++;
|
||||
}
|
||||
|
||||
mpps = num_packets / (tdiff / 1e6) / 1e6;
|
||||
|
||||
printf(" %s (%u bytes)\t%12u packets\t%8.1f Kpps\t%8.1f MB/s\n", perform_decryption ? "<---" : "--->",
|
||||
(unsigned int)nw, (unsigned int)num_packets, mpps * 1e3, mpps * sizeof(PKT_CONTENT));
|
||||
#endif
|
||||
}
|
||||
|
||||
// --- hashing benchmark ------------------------------------------------------------------
|
||||
|
||||
static void run_hashing_benchmark(void) {
|
||||
const int target_sec = DURATION;
|
||||
struct timeval t1;
|
||||
struct timeval t2;
|
||||
ssize_t nw;
|
||||
ssize_t target_usec = target_sec * 1e6;
|
||||
ssize_t tdiff = 0; // microseconds
|
||||
size_t num_packets = 0;
|
||||
|
||||
uint32_t hash;
|
||||
|
||||
printf("%s\t(%s)\tfor %us\t(%u bytes)", "hash",
|
||||
"prs32", target_sec, (unsigned int)sizeof(PKT_CONTENT));
|
||||
fflush(stdout);
|
||||
|
||||
gettimeofday( &t1, NULL );
|
||||
nw = 4;
|
||||
|
||||
while(tdiff < target_usec) {
|
||||
|
||||
hash = pearson_hash_32 (PKT_CONTENT, sizeof(PKT_CONTENT));
|
||||
hash++; // clever compiler finds out that we do no use the variable
|
||||
|
||||
gettimeofday( &t2, NULL );
|
||||
tdiff = ((t2.tv_sec - t1.tv_sec) * 1000000) + (t2.tv_usec - t1.tv_usec);
|
||||
num_packets++;
|
||||
}
|
||||
|
||||
float mpps = num_packets / (tdiff / 1e6) / 1e6;
|
||||
|
||||
printf(" ---> (%u bytes)\t%12u packets\t%8.1f Kpps\t%8.1f MB/s\n",
|
||||
(unsigned int)nw, (unsigned int)num_packets, mpps * 1e3, mpps * sizeof(PKT_CONTENT));
|
||||
}
|
||||
|
||||
// --- cipher benchmark -------------------------------------------------------------------
|
||||
|
||||
static void run_transop_benchmark(const char *op_name, n2n_trans_op_t *op_fn, n2n_edge_conf_t *conf, uint8_t *pktbuf) {
|
||||
n2n_common_t cmn;
|
||||
n2n_PACKET_t pkt;
|
||||
n2n_mac_t mac_buf;
|
||||
const int target_sec = 3;
|
||||
const int target_sec = DURATION;
|
||||
struct timeval t1;
|
||||
struct timeval t2;
|
||||
size_t idx;
|
||||
|
|
@ -114,7 +315,7 @@ static void run_transop_benchmark(const char *op_name, n2n_trans_op_t *op_fn, n2
|
|||
ssize_t tdiff = 0; // microseconds
|
||||
size_t num_packets = 0;
|
||||
|
||||
printf("Run %s[%s] for %us (%u bytes):", perform_decryption ? "enc/dec" : "enc",
|
||||
printf("%s\t[%s]\tfor %us\t(%u bytes)", perform_decryption ? "enc/dec" : "enc",
|
||||
op_name, target_sec, (unsigned int)sizeof(PKT_CONTENT));
|
||||
fflush(stdout);
|
||||
|
||||
|
|
@ -128,13 +329,13 @@ static void run_transop_benchmark(const char *op_name, n2n_trans_op_t *op_fn, n2
|
|||
pktbuf+nw, N2N_PKT_BUF_SIZE-nw,
|
||||
PKT_CONTENT, sizeof(PKT_CONTENT), mac_buf);
|
||||
|
||||
idx=0;
|
||||
rem=nw;
|
||||
|
||||
decode_common( &cmn, pktbuf, &rem, &idx);
|
||||
decode_PACKET( &pkt, &cmn, pktbuf, &rem, &idx );
|
||||
|
||||
if(perform_decryption) {
|
||||
idx=0;
|
||||
rem=nw;
|
||||
|
||||
decode_common( &cmn, pktbuf, &rem, &idx);
|
||||
decode_PACKET( &pkt, &cmn, pktbuf, &rem, &idx );
|
||||
|
||||
uint8_t decodebuf[N2N_PKT_BUF_SIZE];
|
||||
|
||||
op_fn->rev(op_fn, decodebuf, N2N_PKT_BUF_SIZE, pktbuf+idx, rem, 0);
|
||||
|
|
@ -150,10 +351,11 @@ static void run_transop_benchmark(const char *op_name, n2n_trans_op_t *op_fn, n2
|
|||
|
||||
float mpps = num_packets / (tdiff / 1e6) / 1e6;
|
||||
|
||||
printf("\t%12u packets\t%8.1f Kpps\t%8.1f MB/s\n",
|
||||
(unsigned int)num_packets, mpps * 1e3, mpps * sizeof(PKT_CONTENT));
|
||||
printf(" %s--> (%u bytes)\t%12u packets\t%8.1f Kpps\t%8.1f MB/s\n", perform_decryption ? "<" : "-",
|
||||
(unsigned int)nw, (unsigned int)num_packets, mpps * 1e3, mpps * sizeof(PKT_CONTENT));
|
||||
}
|
||||
|
||||
|
||||
static ssize_t do_encode_packet( uint8_t * pktbuf, size_t bufsize, const n2n_community_t c )
|
||||
{
|
||||
n2n_mac_t destMac={0,1,2,3,4,5};
|
||||
|
|
@ -177,7 +379,6 @@ static ssize_t do_encode_packet( uint8_t * pktbuf, size_t bufsize, const n2n_com
|
|||
idx=0;
|
||||
encode_PACKET( pktbuf, &idx, &cmn, &pkt );
|
||||
traceEvent( TRACE_DEBUG, "encoded PACKET header of size=%u", (unsigned int)idx );
|
||||
|
||||
|
||||
return idx;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user