From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id A8DDD42DEC; Thu, 6 Jul 2023 20:00:10 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4C57442FF2; Thu, 6 Jul 2023 19:59:48 +0200 (CEST) Received: from mail-oi1-f181.google.com (mail-oi1-f181.google.com [209.85.167.181]) by mails.dpdk.org (Postfix) with ESMTP id 826BC42FF8 for ; Thu, 6 Jul 2023 19:59:45 +0200 (CEST) Received: by mail-oi1-f181.google.com with SMTP id 5614622812f47-3a36b309524so961572b6e.3 for ; Thu, 06 Jul 2023 10:59:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1688666384; x=1691258384; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=rucvP5yxuNiVLQ0yHfEt7I2LvK/gRouxqlz9X3nrfj4=; b=LlBYPXOUxlIeKBIYD2jxBn6Ea0vfMDcjy1IVdHyfJkroGC/jojIBuPq1+WvnMnIcUc 4gFcbv+meZ0yoeqldeKfVQgr5z0ggh7wBSv962TVy2NoIaXCBv/ywPfSeOYQ4O6CCYsN bQt4jQL3irOjzwbgNHJknNyucJ/iiHx83kg5wjFTTehrXIFU/w7eJqjZWP+upiClQt87 BYwYyAJ646rWSZD1vSP7CGKq3xAanQZbvPcXocuHprnLTwlQh8TuFwtzWK7dbUMsmM4W r7dNEO6/+8AjZ+C7pjV29FKWnZDaatuOJTUUDq1Td/svaTgAfIbHnHVhp9DPWJVeUmcx coJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688666384; x=1691258384; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=rucvP5yxuNiVLQ0yHfEt7I2LvK/gRouxqlz9X3nrfj4=; b=jg5oBEv+APk+Ah+52ltf42eUV98NkBRFV+OxwLgQqC7KFfngOFpRsd6J9nwX+I2z9i ZiWnw6vCufS2iULW/09HR1lu2JBaN9Is/7u77HFPPtAUzFZhe67J248dqrDcYn9Dcbh+ u1xZLcqUsJ/YfGWqczfJWr+rDCbGn7nHdB3rsIsIRGMLa4/VMPkDf7JnmY9bgZ7kZ9Ux yYDD5DYvXJYt5scxHwh8HVNUgtxXd91A3YLsQ+YsZyDxLgFRnHU2rHiBY60HU0G11rNQ crWMj4M0fiuonxjDV/hveEyP+iMgDA6DvhdY6cGigTwX9yypDhIlBO8YT86mK0c7Un9q 3hwA== X-Gm-Message-State: ABy/qLahb4HBzPsRUY3bVExG8VSU4KcPAaRUSYJstkoEfT6UYlIpRcKL L0RA04iBKbBKj5tiicDMZpOGwvRrg3KxiGsa7J8= X-Google-Smtp-Source: APBJJlE3NaePwSwQNQbaiexpADnDWKBF/eAkNmfjVc43YsP6QSkbUqGebs0Dyq9oZtjDp7tiiYe0Vg== X-Received: by 2002:aca:916:0:b0:3a1:f0dc:def7 with SMTP id 22-20020aca0916000000b003a1f0dcdef7mr2374631oij.56.1688666384611; Thu, 06 Jul 2023 10:59:44 -0700 (PDT) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id nh8-20020a17090b364800b00256bbfbabcfsm76464pjb.48.2023.07.06.10.59.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Jul 2023 10:59:44 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Akhil Goyal , Fan Zhang Subject: [PATCH v3 04/14] test: cryptodev use rte_pktmbuf_mtod_offset Date: Thu, 6 Jul 2023 10:59:28 -0700 Message-Id: <20230706175938.62721-5-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230706175938.62721-1-stephen@networkplumber.org> References: <20230505174813.133894-1-stephen@networkplumber.org> <20230706175938.62721-1-stephen@networkplumber.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Based off patch generated by cocci/mtod-offset.cocci. With some cleanup to shorten lines by using conditional with omitted operand. Signed-off-by: Stephen Hemminger --- app/test/test_cryptodev.c | 66 +++++++++++++++++++++------------------ 1 file changed, 36 insertions(+), 30 deletions(-) diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c index fb2af40b99ee..5072b3b6ece5 100644 --- a/app/test/test_cryptodev.c +++ b/app/test/test_cryptodev.c @@ -3153,8 +3153,9 @@ test_snow3g_authentication(const struct snow3g_hash_test_data *tdata) ut_params->op); ut_params->obuf = ut_params->op->sym->m_src; TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf"); - ut_params->digest = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *) - + plaintext_pad_len; + ut_params->digest = rte_pktmbuf_mtod_offset(ut_params->obuf, + uint8_t *, + plaintext_pad_len); /* Validate obuf */ TEST_ASSERT_BUFFERS_ARE_EQUAL( @@ -3247,8 +3248,9 @@ test_snow3g_authentication_verify(const struct snow3g_hash_test_data *tdata) ut_params->op); TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf"); ut_params->obuf = ut_params->op->sym->m_src; - ut_params->digest = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *) - + plaintext_pad_len; + ut_params->digest = rte_pktmbuf_mtod_offset(ut_params->obuf, + uint8_t *, + plaintext_pad_len); /* Validate obuf */ if (ut_params->op->status == RTE_CRYPTO_OP_STATUS_SUCCESS) @@ -3337,8 +3339,9 @@ test_kasumi_authentication(const struct kasumi_hash_test_data *tdata) ut_params->obuf = ut_params->op->sym->m_src; TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf"); - ut_params->digest = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *) - + plaintext_pad_len; + ut_params->digest = rte_pktmbuf_mtod_offset(ut_params->obuf, + uint8_t *, + plaintext_pad_len); /* Validate obuf */ TEST_ASSERT_BUFFERS_ARE_EQUAL( @@ -3425,8 +3428,9 @@ test_kasumi_authentication_verify(const struct kasumi_hash_test_data *tdata) ut_params->op); TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf"); ut_params->obuf = ut_params->op->sym->m_src; - ut_params->digest = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *) - + plaintext_pad_len; + ut_params->digest = rte_pktmbuf_mtod_offset(ut_params->obuf, + uint8_t *, + plaintext_pad_len); /* Validate obuf */ if (ut_params->op->status == RTE_CRYPTO_OP_STATUS_SUCCESS) @@ -4879,8 +4883,9 @@ test_zuc_cipher_auth(const struct wireless_test_data *tdata) tdata->validDataLenInBits.len, "ZUC Ciphertext data not as expected"); - ut_params->digest = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *) - + plaintext_pad_len; + ut_params->digest = rte_pktmbuf_mtod_offset(ut_params->obuf, + uint8_t *, + plaintext_pad_len); /* Validate obuf */ TEST_ASSERT_BUFFERS_ARE_EQUAL( @@ -4994,8 +4999,9 @@ test_snow3g_cipher_auth(const struct snow3g_test_data *tdata) tdata->validDataLenInBits.len, "SNOW 3G Ciphertext data not as expected"); - ut_params->digest = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *) - + plaintext_pad_len; + ut_params->digest = rte_pktmbuf_mtod_offset(ut_params->obuf, + uint8_t *, + plaintext_pad_len); /* Validate obuf */ TEST_ASSERT_BUFFERS_ARE_EQUAL( @@ -5163,9 +5169,9 @@ test_snow3g_auth_cipher(const struct snow3g_test_data *tdata, debug_hexdump(stdout, "ciphertext expected:", tdata->ciphertext.data, tdata->ciphertext.len >> 3); - ut_params->digest = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *) - + (tdata->digest.offset_bytes == 0 ? - plaintext_pad_len : tdata->digest.offset_bytes); + ut_params->digest = rte_pktmbuf_mtod_offset(ut_params->obuf, + uint8_t *, + tdata->digest.offset_bytes ? : plaintext_pad_len); debug_hexdump(stdout, "digest:", ut_params->digest, tdata->digest.len); @@ -5577,10 +5583,9 @@ test_kasumi_auth_cipher(const struct kasumi_test_data *tdata, debug_hexdump(stdout, "ciphertext expected:", tdata->ciphertext.data, tdata->ciphertext.len >> 3); - ut_params->digest = rte_pktmbuf_mtod( - ut_params->obuf, uint8_t *) + - (tdata->digest.offset_bytes == 0 ? - plaintext_pad_len : tdata->digest.offset_bytes); + ut_params->digest = rte_pktmbuf_mtod_offset(ut_params->obuf, + uint8_t *, + tdata->digest.offset_bytes ? : plaintext_pad_len); debug_hexdump(stdout, "digest:", ut_params->digest, tdata->digest.len); @@ -5924,8 +5929,9 @@ test_kasumi_cipher_auth(const struct kasumi_test_data *tdata) ciphertext = rte_pktmbuf_mtod_offset(ut_params->obuf, uint8_t *, tdata->validCipherOffsetInBits.len >> 3); - ut_params->digest = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *) - + plaintext_pad_len; + ut_params->digest = rte_pktmbuf_mtod_offset(ut_params->obuf, + uint8_t *, + plaintext_pad_len); const uint8_t *reference_ciphertext = tdata->ciphertext.data + (tdata->validCipherOffsetInBits.len >> 3); @@ -6344,8 +6350,9 @@ test_zuc_authentication(const struct wireless_test_data *tdata, ut_params->op); TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf"); ut_params->obuf = ut_params->op->sym->m_src; - ut_params->digest = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *) - + plaintext_pad_len; + ut_params->digest = rte_pktmbuf_mtod_offset(ut_params->obuf, + uint8_t *, + plaintext_pad_len); if (auth_op != RTE_CRYPTO_AUTH_OP_VERIFY) { /* Validate obuf */ @@ -6531,10 +6538,9 @@ test_zuc_auth_cipher(const struct wireless_test_data *tdata, debug_hexdump(stdout, "ciphertext expected:", tdata->ciphertext.data, tdata->ciphertext.len >> 3); - ut_params->digest = rte_pktmbuf_mtod( - ut_params->obuf, uint8_t *) + - (tdata->digest.offset_bytes == 0 ? - plaintext_pad_len : tdata->digest.offset_bytes); + ut_params->digest = rte_pktmbuf_mtod_offset(ut_params->obuf, + uint8_t *, + tdata->digest.offset_bytes ? : plaintext_pad_len); debug_hexdump(stdout, "digest:", ut_params->digest, tdata->digest.len); @@ -7959,9 +7965,9 @@ test_mixed_auth_cipher(const struct mixed_cipher_auth_test_data *tdata, tdata->ciphertext.data, tdata->ciphertext.len_bits >> 3); - ut_params->digest = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *) - + (tdata->digest_enc.offset == 0 ? - plaintext_pad_len : tdata->digest_enc.offset); + ut_params->digest = rte_pktmbuf_mtod_offset(ut_params->obuf, + uint8_t *, + tdata->digest_enc.offset ? : plaintext_pad_len); debug_hexdump(stdout, "digest:", ut_params->digest, tdata->digest_enc.len); -- 2.39.2