Skip to content

Commit d4949b7

Browse files
shemmingerdavid-marchand
authored andcommitted
examples/fips_validation: remove use of PMD logtype
Replace PMD with USER1 since that is already used in main Fixes: 41d561c ("examples/fips_validation: add power on self test") Signed-off-by: Stephen Hemminger <[email protected]>
1 parent fa8a545 commit d4949b7

File tree

1 file changed

+22
-22
lines changed

1 file changed

+22
-22
lines changed

examples/fips_validation/fips_dev_self_test.c

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1032,15 +1032,15 @@ prepare_cipher_xform(uint8_t dev_id,
10321032

10331033
cap = rte_cryptodev_sym_capability_get(dev_id, &cap_idx);
10341034
if (!cap) {
1035-
RTE_LOG(ERR, PMD, "Failed to get capability for cdev %u\n",
1035+
RTE_LOG(ERR, USER1, "Failed to get capability for cdev %u\n",
10361036
dev_id);
10371037
return -EACCES;
10381038
}
10391039

10401040
if (rte_cryptodev_sym_capability_check_cipher(cap,
10411041
cipher_xform->key.length,
10421042
cipher_xform->iv.length) != 0) {
1043-
RTE_LOG(ERR, PMD, "PMD %s key length %u IV length %u\n",
1043+
RTE_LOG(ERR, USER1, "PMD %s key length %u IV length %u\n",
10441044
rte_cryptodev_name_get(dev_id),
10451045
cipher_xform->key.length,
10461046
cipher_xform->iv.length);
@@ -1088,15 +1088,15 @@ prepare_auth_xform(uint8_t dev_id,
10881088

10891089
cap = rte_cryptodev_sym_capability_get(dev_id, &cap_idx);
10901090
if (!cap) {
1091-
RTE_LOG(ERR, PMD, "Failed to get capability for cdev %u\n",
1091+
RTE_LOG(ERR, USER1, "Failed to get capability for cdev %u\n",
10921092
dev_id);
10931093
return -EACCES;
10941094
}
10951095

10961096
if (rte_cryptodev_sym_capability_check_auth(cap,
10971097
auth_xform->key.length,
10981098
auth_xform->digest_length, 0) != 0) {
1099-
RTE_LOG(ERR, PMD, "PMD %s key length %u Digest length %u\n",
1099+
RTE_LOG(ERR, USER1, "PMD %s key length %u Digest length %u\n",
11001100
rte_cryptodev_name_get(dev_id),
11011101
auth_xform->key.length,
11021102
auth_xform->digest_length);
@@ -1147,7 +1147,7 @@ prepare_aead_xform(uint8_t dev_id,
11471147

11481148
cap = rte_cryptodev_sym_capability_get(dev_id, &cap_idx);
11491149
if (!cap) {
1150-
RTE_LOG(ERR, PMD, "Failed to get capability for cdev %u\n",
1150+
RTE_LOG(ERR, USER1, "Failed to get capability for cdev %u\n",
11511151
dev_id);
11521152
return -EACCES;
11531153
}
@@ -1156,7 +1156,7 @@ prepare_aead_xform(uint8_t dev_id,
11561156
aead_xform->key.length,
11571157
aead_xform->digest_length, aead_xform->aad_length,
11581158
aead_xform->iv.length) != 0) {
1159-
RTE_LOG(ERR, PMD,
1159+
RTE_LOG(ERR, USER1,
11601160
"PMD %s key_len %u tag_len %u aad_len %u iv_len %u\n",
11611161
rte_cryptodev_name_get(dev_id),
11621162
aead_xform->key.length,
@@ -1195,7 +1195,7 @@ prepare_cipher_op(struct rte_crypto_op *op,
11951195

11961196
dst = (uint8_t *)rte_pktmbuf_append(mbuf, len);
11971197
if (!dst) {
1198-
RTE_LOG(ERR, PMD, "Error %i: MBUF too small\n", -ENOMEM);
1198+
RTE_LOG(ERR, USER1, "Error %i: MBUF too small\n", -ENOMEM);
11991199
return -ENOMEM;
12001200
}
12011201

@@ -1219,7 +1219,7 @@ prepare_auth_op(struct rte_crypto_op *op,
12191219
uint8_t *dst;
12201220

12211221
if (vec->input.len + vec->digest.len > RTE_MBUF_MAX_NB_SEGS) {
1222-
RTE_LOG(ERR, PMD, "Error %i: Test data too long (%u).\n",
1222+
RTE_LOG(ERR, USER1, "Error %i: Test data too long (%u).\n",
12231223
-ENOMEM, vec->input.len + vec->digest.len);
12241224
return -ENOMEM;
12251225
}
@@ -1229,7 +1229,7 @@ prepare_auth_op(struct rte_crypto_op *op,
12291229
dst = (uint8_t *)rte_pktmbuf_append(mbuf, vec->input.len +
12301230
vec->digest.len);
12311231
if (!dst) {
1232-
RTE_LOG(ERR, PMD, "Error %i: MBUF too small\n", -ENOMEM);
1232+
RTE_LOG(ERR, USER1, "Error %i: MBUF too small\n", -ENOMEM);
12331233
return -ENOMEM;
12341234
}
12351235

@@ -1274,15 +1274,15 @@ prepare_aead_op(struct rte_crypto_op *op,
12741274
memcpy(iv, vec->iv.data, vec->iv.len);
12751275

12761276
if (len + vec->digest.len > RTE_MBUF_MAX_NB_SEGS) {
1277-
RTE_LOG(ERR, PMD, "Error %i: Test data too long (%u).\n",
1277+
RTE_LOG(ERR, USER1, "Error %i: Test data too long (%u).\n",
12781278
-ENOMEM, len + vec->digest.len);
12791279
return -ENOMEM;
12801280
}
12811281

12821282
dst = (uint8_t *)rte_pktmbuf_append(mbuf, RTE_ALIGN_CEIL(len +
12831283
vec->digest.len, 16));
12841284
if (!dst) {
1285-
RTE_LOG(ERR, PMD, "Error %i: MBUF too small\n", -ENOMEM);
1285+
RTE_LOG(ERR, USER1, "Error %i: MBUF too small\n", -ENOMEM);
12861286
return -ENOMEM;
12871287
}
12881288

@@ -1303,7 +1303,7 @@ prepare_aead_op(struct rte_crypto_op *op,
13031303

13041304
dst = rte_malloc(NULL, len, 16);
13051305
if (!dst) {
1306-
RTE_LOG(ERR, PMD, "Error %i: Not enough memory\n", -ENOMEM);
1306+
RTE_LOG(ERR, USER1, "Error %i: Not enough memory\n", -ENOMEM);
13071307
return -ENOMEM;
13081308
}
13091309

@@ -1474,24 +1474,24 @@ run_single_test(uint8_t dev_id,
14741474
ret = test_ops->prepare_xform(dev_id, &xform, vec, dir, key,
14751475
negative_test);
14761476
if (ret < 0) {
1477-
RTE_LOG(ERR, PMD, "Error %i: Prepare Xform\n", ret);
1477+
RTE_LOG(ERR, USER1, "Error %i: Prepare Xform\n", ret);
14781478
return ret;
14791479
}
14801480

14811481
sess = rte_cryptodev_sym_session_create(dev_id, &xform, env->sess_pool);
14821482
if (!sess) {
1483-
RTE_LOG(ERR, PMD, "Error %i: Init session\n", ret);
1483+
RTE_LOG(ERR, USER1, "Error %i: Init session\n", ret);
14841484
return ret;
14851485
}
14861486

14871487
ret = test_ops->prepare_op(env->op, env->mbuf, sess, dir, vec);
14881488
if (ret < 0) {
1489-
RTE_LOG(ERR, PMD, "Error %i: Prepare op\n", ret);
1489+
RTE_LOG(ERR, USER1, "Error %i: Prepare op\n", ret);
14901490
return ret;
14911491
}
14921492

14931493
if (rte_cryptodev_enqueue_burst(dev_id, 0, &env->op, 1) < 1) {
1494-
RTE_LOG(ERR, PMD, "Error: Failed enqueue\n");
1494+
RTE_LOG(ERR, USER1, "Error: Failed enqueue\n");
14951495
return ret;
14961496
}
14971497

@@ -1622,7 +1622,7 @@ fips_dev_self_test(uint8_t dev_id,
16221622

16231623
ret = fips_dev_auto_test_init(dev_id, &env);
16241624
if (ret < 0) {
1625-
RTE_LOG(ERR, PMD, "Failed to init self-test for PMD %u\n",
1625+
RTE_LOG(ERR, USER1, "Failed to init self-test for PMD %u\n",
16261626
dev_id);
16271627
return ret;
16281628
}
@@ -1644,7 +1644,7 @@ fips_dev_self_test(uint8_t dev_id,
16441644
negative_test = 0;
16451645
}
16461646

1647-
RTE_LOG(INFO, PMD, "Testing (ID %u) %s %s%s...\n",
1647+
RTE_LOG(INFO, USER1, "Testing (ID %u) %s %s%s...\n",
16481648
i,
16491649
vec->name,
16501650
j == self_test_dir_enc_auth_gen ?
@@ -1658,18 +1658,18 @@ fips_dev_self_test(uint8_t dev_id,
16581658
if (!negative_test)
16591659
break;
16601660
ret = -1;
1661-
RTE_LOG(ERR, PMD, "PMD %u Failed test %s %s\n",
1661+
RTE_LOG(ERR, USER1, "PMD %u Failed test %s %s\n",
16621662
dev_id, vec->name,
16631663
j == self_test_dir_enc_auth_gen ?
16641664
"Encrypt" : "Decrypt");
16651665
goto error_exit;
16661666
case -EACCES:
1667-
RTE_LOG(ERR, PMD, "Not supported by %s. Skip\n",
1667+
RTE_LOG(ERR, USER1, "Not supported by %s. Skip\n",
16681668
rte_cryptodev_name_get(dev_id));
16691669
ret = 0;
16701670
break;
16711671
default:
1672-
RTE_LOG(ERR, PMD, "PMD %u Failed test %s %s\n",
1672+
RTE_LOG(ERR, USER1, "PMD %u Failed test %s %s\n",
16731673
dev_id, vec->name,
16741674
j == self_test_dir_enc_auth_gen ?
16751675
"Encrypt" : "Decrypt");
@@ -1682,7 +1682,7 @@ fips_dev_self_test(uint8_t dev_id,
16821682
fips_dev_auto_test_uninit(dev_id, &env);
16831683

16841684
if (ret == 0) {
1685-
RTE_LOG(INFO, PMD, "PMD %u finished self-test successfully\n",
1685+
RTE_LOG(INFO, USER1, "PMD %u finished self-test successfully\n",
16861686
dev_id);
16871687
}
16881688

0 commit comments

Comments
 (0)