Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/126925/?format=api
{ "id": 126925, "url": "http://patches.dpdk.org/api/patches/126925/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20230517161603.117728-2-stephen@networkplumber.org/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20230517161603.117728-2-stephen@networkplumber.org>", "list_archive_url": "https://inbox.dpdk.org/dev/20230517161603.117728-2-stephen@networkplumber.org", "date": "2023-05-17T16:15:44", "name": "[01/20] mbuf: replace term sanity check", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "7cb3757ee31dccc7459daae40c54a5efbf95edc0", "submitter": { "id": 27, "url": "http://patches.dpdk.org/api/people/27/?format=api", "name": "Stephen Hemminger", "email": "stephen@networkplumber.org" }, "delegate": { "id": 1, "url": "http://patches.dpdk.org/api/users/1/?format=api", "username": "tmonjalo", "first_name": "Thomas", "last_name": "Monjalon", "email": "thomas@monjalon.net" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20230517161603.117728-2-stephen@networkplumber.org/mbox/", "series": [ { "id": 28034, "url": "http://patches.dpdk.org/api/series/28034/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=28034", "date": "2023-05-17T16:15:43", "name": "Replace use of term sanity-check", "version": 1, "mbox": "http://patches.dpdk.org/series/28034/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/126925/comments/", "check": "warning", "checks": "http://patches.dpdk.org/api/patches/126925/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id E82DF42B2C;\n\tWed, 17 May 2023 18:16:17 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id E28C242D29;\n\tWed, 17 May 2023 18:16:09 +0200 (CEST)", "from mail-pf1-f169.google.com (mail-pf1-f169.google.com\n [209.85.210.169])\n by mails.dpdk.org (Postfix) with ESMTP id 891FE406B7\n for <dev@dpdk.org>; Wed, 17 May 2023 18:16:08 +0200 (CEST)", "by mail-pf1-f169.google.com with SMTP id\n d2e1a72fcca58-64354231003so143308b3a.0\n for <dev@dpdk.org>; Wed, 17 May 2023 09:16:08 -0700 (PDT)", "from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218])\n by smtp.gmail.com with ESMTPSA id\n h5-20020a62b405000000b0063f33e216dasm15793009pfn.96.2023.05.17.09.16.06\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Wed, 17 May 2023 09:16:06 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1684340167;\n x=1686932167;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:from:to:cc:subject:date\n :message-id:reply-to;\n bh=x28BgXhxXlzUC6u61ZFSHQ/XLofM5ks0SWUjiEZpX38=;\n b=jJf55Q3zL3lV7MM+HoI7sBI10ahNJYcinCIjMKBEQIAn0ADc7ojfuo21NGxMlht7T7\n R8Nl7UtLCR0YSaaD1n74lSQ5HRcIgdvuhXIZfh6QkOyZDRKQSCdVqLPD+xXAWBCU+Q5Q\n HbzSXtF1kngL7UccYZ2wug7a4yl1klQbwbgILATXIs9A2+6nDNJsZcHPNFffuHX7Fct8\n qjg4E5vk/dzVyt2uSpddSwAhlJnT4JC+IlK4wFoOfRSu9txKPoYgvQ3+ghBh/i/uIAVI\n JEeTv2jnfxKnPdc9iMrp1mF9+BEKkcR6ZNN1S14SfeMCC+/2GzoLv5CKZJKlCdYwsTqb\n 3V7Q==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20221208; t=1684340167; x=1686932167;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc\n :subject:date:message-id:reply-to;\n bh=x28BgXhxXlzUC6u61ZFSHQ/XLofM5ks0SWUjiEZpX38=;\n b=J1cnX21LwEPMmpnMI/58CPCp2ZElLBZzn3a5nTLIzCvbsV2AmTkVGvFU0kec3t+Nma\n 3tm1mEbRvf87bsP+/U5/2bSP+nZ1t8/Q5XmNPwDwajP3x+DMjibeITOJJtoSa2rgswVl\n uK+8AJBvsHZIV0wHnkRdKWUbldPlsFLCqfOt0FzwwGnIYjFsBGWPDUDMu3pWgHdyICcM\n HCCgo+8ZJpESYf1KzmfEKZy+lmVMIWoah8M7+SDZJzzefIauJDmOe0dBL0fyI2ZF1An2\n zMCwo9Z9XwT4PWkn3qAx/nu8s2Zo+tU/CfKoKooTow9vpMNF0LZ0n5Nz9DhfirOS+r3x\n L/Aw==", "X-Gm-Message-State": "AC+VfDx5DLMQqXc48v7q1f/EvH3YDR/HjY42dTgccKAKgb+F75l5mBRK\n 20iTmj0KWijwifgI4azTIB4obEXWTzVEBgMfetdW6g==", "X-Google-Smtp-Source": "\n ACHHUZ4IXr+CTZQhCSU/SNfi0Np+c8v/hNgeEZLs1sbJ4yYgTMUDA6bZLXIUq9I8Cw6Y6kBwuPQuIQ==", "X-Received": "by 2002:a05:6a20:3c9e:b0:104:873:c3be with SMTP id\n b30-20020a056a203c9e00b001040873c3bemr3323067pzj.12.1684340167051;\n Wed, 17 May 2023 09:16:07 -0700 (PDT)", "From": "Stephen Hemminger <stephen@networkplumber.org>", "To": "dev@dpdk.org", "Cc": "Stephen Hemminger <stephen@networkplumber.org>,\n Olivier Matz <olivier.matz@6wind.com>,\n Steven Webster <steven.webster@windriver.com>,\n Matt Peters <matt.peters@windriver.com>,\n Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>", "Subject": "[PATCH 01/20] mbuf: replace term sanity check", "Date": "Wed, 17 May 2023 09:15:44 -0700", "Message-Id": "<20230517161603.117728-2-stephen@networkplumber.org>", "X-Mailer": "git-send-email 2.39.2", "In-Reply-To": "<20230517161603.117728-1-stephen@networkplumber.org>", "References": "<20230517161603.117728-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 <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org" }, "content": "The term sanity check is on the Tier 2 list of words\nthat should be replaced.\n\nSigned-off-by: Stephen Hemminger <stephen@networkplumber.org>\n---\n app/test/test_mbuf.c | 30 ++++++-------\n doc/guides/prog_guide/mbuf_lib.rst | 4 +-\n drivers/net/avp/avp_ethdev.c | 18 ++++----\n drivers/net/sfc/sfc_ef100_rx.c | 6 +--\n drivers/net/sfc/sfc_ef10_essb_rx.c | 4 +-\n drivers/net/sfc/sfc_ef10_rx.c | 4 +-\n drivers/net/sfc/sfc_rx.c | 2 +-\n examples/ipv4_multicast/main.c | 2 +-\n lib/mbuf/rte_mbuf.c | 16 +++----\n lib/mbuf/rte_mbuf.h | 71 ++++++++++++++++--------------\n lib/mbuf/version.map | 2 +-\n 11 files changed, 83 insertions(+), 76 deletions(-)", "diff": "diff --git a/app/test/test_mbuf.c b/app/test/test_mbuf.c\nindex 8d8d3b9386ce..db9bb3caeea2 100644\n--- a/app/test/test_mbuf.c\n+++ b/app/test/test_mbuf.c\n@@ -261,8 +261,8 @@ test_one_pktmbuf(struct rte_mempool *pktmbuf_pool)\n \t\tGOTO_FAIL(\"Buffer should be continuous\");\n \tmemset(hdr, 0x55, MBUF_TEST_HDR2_LEN);\n \n-\trte_mbuf_sanity_check(m, 1);\n-\trte_mbuf_sanity_check(m, 0);\n+\trte_mbuf_validate(m, 1);\n+\trte_mbuf_validate(m, 0);\n \trte_pktmbuf_dump(stdout, m, 0);\n \n \t/* this prepend should fail */\n@@ -1161,7 +1161,7 @@ test_refcnt_mbuf(void)\n \n #ifdef RTE_EXEC_ENV_WINDOWS\n static int\n-test_failing_mbuf_sanity_check(struct rte_mempool *pktmbuf_pool)\n+test_failing_mbuf_validate(struct rte_mempool *pktmbuf_pool)\n {\n \tRTE_SET_USED(pktmbuf_pool);\n \treturn TEST_SKIPPED;\n@@ -1188,7 +1188,7 @@ verify_mbuf_check_panics(struct rte_mbuf *buf)\n \t\t/* No need to generate a coredump when panicking. */\n \t\trl.rlim_cur = rl.rlim_max = 0;\n \t\tsetrlimit(RLIMIT_CORE, &rl);\n-\t\trte_mbuf_sanity_check(buf, 1); /* should panic */\n+\t\trte_mbuf_validate(buf, 1); /* should panic */\n \t\texit(0); /* return normally if it doesn't panic */\n \t} else if (pid < 0) {\n \t\tprintf(\"Fork Failed\\n\");\n@@ -1202,12 +1202,12 @@ verify_mbuf_check_panics(struct rte_mbuf *buf)\n }\n \n static int\n-test_failing_mbuf_sanity_check(struct rte_mempool *pktmbuf_pool)\n+test_failing_mbuf_validate(struct rte_mempool *pktmbuf_pool)\n {\n \tstruct rte_mbuf *buf;\n \tstruct rte_mbuf badbuf;\n \n-\tprintf(\"Checking rte_mbuf_sanity_check for failure conditions\\n\");\n+\tprintf(\"Checking rte_mbuf_validate for failure conditions\\n\");\n \n \t/* get a good mbuf to use to make copies */\n \tbuf = rte_pktmbuf_alloc(pktmbuf_pool);\n@@ -1729,7 +1729,7 @@ test_mbuf_validate_tx_offload(const char *test_name,\n \t\tGOTO_FAIL(\"%s: mbuf allocation failed!\\n\", __func__);\n \tif (rte_pktmbuf_pkt_len(m) != 0)\n \t\tGOTO_FAIL(\"%s: Bad packet length\\n\", __func__);\n-\trte_mbuf_sanity_check(m, 0);\n+\trte_mbuf_validate(m, 0);\n \tm->ol_flags = ol_flags;\n \tm->tso_segsz = segsize;\n \tret = rte_validate_tx_offload(m);\n@@ -1936,7 +1936,7 @@ test_pktmbuf_read(struct rte_mempool *pktmbuf_pool)\n \t\tGOTO_FAIL(\"%s: mbuf allocation failed!\\n\", __func__);\n \tif (rte_pktmbuf_pkt_len(m) != 0)\n \t\tGOTO_FAIL(\"%s: Bad packet length\\n\", __func__);\n-\trte_mbuf_sanity_check(m, 0);\n+\trte_mbuf_validate(m, 0);\n \n \tdata = rte_pktmbuf_append(m, MBUF_TEST_DATA_LEN2);\n \tif (data == NULL)\n@@ -1985,7 +1985,7 @@ test_pktmbuf_read_from_offset(struct rte_mempool *pktmbuf_pool)\n \n \tif (rte_pktmbuf_pkt_len(m) != 0)\n \t\tGOTO_FAIL(\"%s: Bad packet length\\n\", __func__);\n-\trte_mbuf_sanity_check(m, 0);\n+\trte_mbuf_validate(m, 0);\n \n \t/* prepend an ethernet header */\n \thdr = (struct ether_hdr *)rte_pktmbuf_prepend(m, hdr_len);\n@@ -2130,7 +2130,7 @@ create_packet(struct rte_mempool *pktmbuf_pool,\n \t\t\tGOTO_FAIL(\"%s: mbuf allocation failed!\\n\", __func__);\n \t\tif (rte_pktmbuf_pkt_len(pkt_seg) != 0)\n \t\t\tGOTO_FAIL(\"%s: Bad packet length\\n\", __func__);\n-\t\trte_mbuf_sanity_check(pkt_seg, 0);\n+\t\trte_mbuf_validate(pkt_seg, 0);\n \t\t/* Add header only for the first segment */\n \t\tif (test_data->flags == MBUF_HEADER && seg == 0) {\n \t\t\thdr_len = sizeof(struct rte_ether_hdr);\n@@ -2342,7 +2342,7 @@ test_pktmbuf_ext_shinfo_init_helper(struct rte_mempool *pktmbuf_pool)\n \t\tGOTO_FAIL(\"%s: mbuf allocation failed!\\n\", __func__);\n \tif (rte_pktmbuf_pkt_len(m) != 0)\n \t\tGOTO_FAIL(\"%s: Bad packet length\\n\", __func__);\n-\trte_mbuf_sanity_check(m, 0);\n+\trte_mbuf_validate(m, 0);\n \n \text_buf_addr = rte_malloc(\"External buffer\", buf_len,\n \t\t\tRTE_CACHE_LINE_SIZE);\n@@ -2506,8 +2506,8 @@ test_pktmbuf_ext_pinned_buffer(struct rte_mempool *std_pool)\n \t\tGOTO_FAIL(\"%s: test_pktmbuf_copy(pinned) failed\\n\",\n \t\t\t __func__);\n \n-\tif (test_failing_mbuf_sanity_check(pinned_pool) < 0)\n-\t\tGOTO_FAIL(\"%s: test_failing_mbuf_sanity_check(pinned)\"\n+\tif (test_failing_mbuf_validate(pinned_pool) < 0)\n+\t\tGOTO_FAIL(\"%s: test_failing_mbuf_validate(pinned)\"\n \t\t\t \" failed\\n\", __func__);\n \n \tif (test_mbuf_linearize_check(pinned_pool) < 0)\n@@ -2881,8 +2881,8 @@ test_mbuf(void)\n \t\tgoto err;\n \t}\n \n-\tif (test_failing_mbuf_sanity_check(pktmbuf_pool) < 0) {\n-\t\tprintf(\"test_failing_mbuf_sanity_check() failed\\n\");\n+\tif (test_failing_mbuf_validate(pktmbuf_pool) < 0) {\n+\t\tprintf(\"test_failing_mbuf_validate() failed\\n\");\n \t\tgoto err;\n \t}\n \ndiff --git a/doc/guides/prog_guide/mbuf_lib.rst b/doc/guides/prog_guide/mbuf_lib.rst\nindex 049357c75563..0accb51a98c7 100644\n--- a/doc/guides/prog_guide/mbuf_lib.rst\n+++ b/doc/guides/prog_guide/mbuf_lib.rst\n@@ -266,8 +266,8 @@ can be found in several of the sample applications, for example, the IPv4 Multic\n Debug\n -----\n \n-In debug mode, the functions of the mbuf library perform sanity checks before any operation (such as, buffer corruption,\n-bad type, and so on).\n+In debug mode, the functions of the mbuf library perform consistency checks\n+before any operation (such as, buffer corruption, bad type, and so on).\n \n Use Cases\n ---------\ndiff --git a/drivers/net/avp/avp_ethdev.c b/drivers/net/avp/avp_ethdev.c\nindex b2a08f563542..627b362555e8 100644\n--- a/drivers/net/avp/avp_ethdev.c\n+++ b/drivers/net/avp/avp_ethdev.c\n@@ -1231,7 +1231,7 @@ _avp_mac_filter(struct avp_dev *avp, struct rte_mbuf *m)\n \n #ifdef RTE_LIBRTE_AVP_DEBUG_BUFFERS\n static inline void\n-__avp_dev_buffer_sanity_check(struct avp_dev *avp, struct rte_avp_desc *buf)\n+__avp_dev_buffer_check(struct avp_dev *avp, struct rte_avp_desc *buf)\n {\n \tstruct rte_avp_desc *first_buf;\n \tstruct rte_avp_desc *pkt_buf;\n@@ -1272,12 +1272,12 @@ __avp_dev_buffer_sanity_check(struct avp_dev *avp, struct rte_avp_desc *buf)\n \t\t\t first_buf->pkt_len, pkt_len);\n }\n \n-#define avp_dev_buffer_sanity_check(a, b) \\\n-\t__avp_dev_buffer_sanity_check((a), (b))\n+#define avp_dev_buffer_check(a, b) \\\n+\t__avp_dev_buffer_check((a), (b))\n \n #else /* RTE_LIBRTE_AVP_DEBUG_BUFFERS */\n \n-#define avp_dev_buffer_sanity_check(a, b) do {} while (0)\n+#define avp_dev_buffer_check(a, b) do {} while (0)\n \n #endif\n \n@@ -1302,7 +1302,7 @@ avp_dev_copy_from_buffers(struct avp_dev *avp,\n \tvoid *pkt_data;\n \tunsigned int i;\n \n-\tavp_dev_buffer_sanity_check(avp, buf);\n+\tavp_dev_buffer_check(avp, buf);\n \n \t/* setup the first source buffer */\n \tpkt_buf = avp_dev_translate_buffer(avp, buf);\n@@ -1370,7 +1370,7 @@ avp_dev_copy_from_buffers(struct avp_dev *avp,\n \trte_pktmbuf_pkt_len(m) = total_length;\n \tm->vlan_tci = vlan_tci;\n \n-\t__rte_mbuf_sanity_check(m, 1);\n+\t__rte_mbuf_validate(m, 1);\n \n \treturn m;\n }\n@@ -1614,7 +1614,7 @@ avp_dev_copy_to_buffers(struct avp_dev *avp,\n \tchar *pkt_data;\n \tunsigned int i;\n \n-\t__rte_mbuf_sanity_check(mbuf, 1);\n+\t__rte_mbuf_validate(mbuf, 1);\n \n \tm = mbuf;\n \tsrc_offset = 0;\n@@ -1680,7 +1680,7 @@ avp_dev_copy_to_buffers(struct avp_dev *avp,\n \t\tfirst_buf->vlan_tci = mbuf->vlan_tci;\n \t}\n \n-\tavp_dev_buffer_sanity_check(avp, buffers[0]);\n+\tavp_dev_buffer_check(avp, buffers[0]);\n \n \treturn total_length;\n }\n@@ -1798,7 +1798,7 @@ avp_xmit_scattered_pkts(void *tx_queue,\n \n #ifdef RTE_LIBRTE_AVP_DEBUG_BUFFERS\n \tfor (i = 0; i < nb_pkts; i++)\n-\t\tavp_dev_buffer_sanity_check(avp, tx_bufs[i]);\n+\t\tavp_dev_buffer_check(avp, tx_bufs[i]);\n #endif\n \n \t/* send the packets */\ndiff --git a/drivers/net/sfc/sfc_ef100_rx.c b/drivers/net/sfc/sfc_ef100_rx.c\nindex 16cd8524d32f..fe8920b12590 100644\n--- a/drivers/net/sfc/sfc_ef100_rx.c\n+++ b/drivers/net/sfc/sfc_ef100_rx.c\n@@ -178,7 +178,7 @@ sfc_ef100_rx_qrefill(struct sfc_ef100_rxq *rxq)\n \t\t\tstruct sfc_ef100_rx_sw_desc *rxd;\n \t\t\trte_iova_t dma_addr;\n \n-\t\t\t__rte_mbuf_raw_sanity_check(m);\n+\t\t\t__rte_mbuf_raw_validate(m);\n \n \t\t\tdma_addr = rte_mbuf_data_iova_default(m);\n \t\t\tif (rxq->flags & SFC_EF100_RXQ_NIC_DMA_MAP) {\n@@ -541,7 +541,7 @@ sfc_ef100_rx_process_ready_pkts(struct sfc_ef100_rxq *rxq,\n \t\trxq->ready_pkts--;\n \n \t\tpkt = sfc_ef100_rx_next_mbuf(rxq);\n-\t\t__rte_mbuf_raw_sanity_check(pkt);\n+\t\t__rte_mbuf_raw_validate(pkt);\n \n \t\tRTE_BUILD_BUG_ON(sizeof(pkt->rearm_data[0]) !=\n \t\t\t\t sizeof(rxq->rearm_data));\n@@ -565,7 +565,7 @@ sfc_ef100_rx_process_ready_pkts(struct sfc_ef100_rxq *rxq,\n \t\t\tstruct rte_mbuf *seg;\n \n \t\t\tseg = sfc_ef100_rx_next_mbuf(rxq);\n-\t\t\t__rte_mbuf_raw_sanity_check(seg);\n+\t\t\t__rte_mbuf_raw_validate(seg);\n \n \t\t\tseg->data_off = RTE_PKTMBUF_HEADROOM;\n \ndiff --git a/drivers/net/sfc/sfc_ef10_essb_rx.c b/drivers/net/sfc/sfc_ef10_essb_rx.c\nindex 78bd430363b1..de80be462a0f 100644\n--- a/drivers/net/sfc/sfc_ef10_essb_rx.c\n+++ b/drivers/net/sfc/sfc_ef10_essb_rx.c\n@@ -125,7 +125,7 @@ sfc_ef10_essb_next_mbuf(const struct sfc_ef10_essb_rxq *rxq,\n \tstruct rte_mbuf *m;\n \n \tm = (struct rte_mbuf *)((uintptr_t)mbuf + rxq->buf_stride);\n-\t__rte_mbuf_raw_sanity_check(m);\n+\t__rte_mbuf_raw_validate(m);\n \treturn m;\n }\n \n@@ -136,7 +136,7 @@ sfc_ef10_essb_mbuf_by_index(const struct sfc_ef10_essb_rxq *rxq,\n \tstruct rte_mbuf *m;\n \n \tm = (struct rte_mbuf *)((uintptr_t)mbuf + idx * rxq->buf_stride);\n-\t__rte_mbuf_raw_sanity_check(m);\n+\t__rte_mbuf_raw_validate(m);\n \treturn m;\n }\n \ndiff --git a/drivers/net/sfc/sfc_ef10_rx.c b/drivers/net/sfc/sfc_ef10_rx.c\nindex 7be224c9c412..f6c2345d2b74 100644\n--- a/drivers/net/sfc/sfc_ef10_rx.c\n+++ b/drivers/net/sfc/sfc_ef10_rx.c\n@@ -148,7 +148,7 @@ sfc_ef10_rx_qrefill(struct sfc_ef10_rxq *rxq)\n \t\t\tstruct sfc_ef10_rx_sw_desc *rxd;\n \t\t\trte_iova_t phys_addr;\n \n-\t\t\t__rte_mbuf_raw_sanity_check(m);\n+\t\t\t__rte_mbuf_raw_validate(m);\n \n \t\t\tSFC_ASSERT((id & ~ptr_mask) == 0);\n \t\t\trxd = &rxq->sw_ring[id];\n@@ -297,7 +297,7 @@ sfc_ef10_rx_process_event(struct sfc_ef10_rxq *rxq, efx_qword_t rx_ev,\n \t\trxd = &rxq->sw_ring[pending++ & ptr_mask];\n \t\tm = rxd->mbuf;\n \n-\t\t__rte_mbuf_raw_sanity_check(m);\n+\t\t__rte_mbuf_raw_validate(m);\n \n \t\tm->data_off = RTE_PKTMBUF_HEADROOM;\n \t\trte_pktmbuf_data_len(m) = seg_len;\ndiff --git a/drivers/net/sfc/sfc_rx.c b/drivers/net/sfc/sfc_rx.c\nindex 5ea98187c3b4..d9f99a9d583d 100644\n--- a/drivers/net/sfc/sfc_rx.c\n+++ b/drivers/net/sfc/sfc_rx.c\n@@ -120,7 +120,7 @@ sfc_efx_rx_qrefill(struct sfc_efx_rxq *rxq)\n \t\t ++i, id = (id + 1) & rxq->ptr_mask) {\n \t\t\tm = objs[i];\n \n-\t\t\t__rte_mbuf_raw_sanity_check(m);\n+\t\t\t__rte_mbuf_raw_validate(m);\n \n \t\t\trxd = &rxq->sw_desc[id];\n \t\t\trxd->mbuf = m;\ndiff --git a/examples/ipv4_multicast/main.c b/examples/ipv4_multicast/main.c\nindex 6d0a8501eff5..4be74e7af55a 100644\n--- a/examples/ipv4_multicast/main.c\n+++ b/examples/ipv4_multicast/main.c\n@@ -258,7 +258,7 @@ mcast_out_pkt(struct rte_mbuf *pkt, int use_clone)\n \thdr->pkt_len = (uint16_t)(hdr->data_len + pkt->pkt_len);\n \thdr->nb_segs = pkt->nb_segs + 1;\n \n-\t__rte_mbuf_sanity_check(hdr, 1);\n+\t__rte_mbuf_validate(hdr, 1);\n \treturn hdr;\n }\n /* >8 End of mcast_out_kt. */\ndiff --git a/lib/mbuf/rte_mbuf.c b/lib/mbuf/rte_mbuf.c\nindex 686e797c80c4..6afa9de98d4e 100644\n--- a/lib/mbuf/rte_mbuf.c\n+++ b/lib/mbuf/rte_mbuf.c\n@@ -363,9 +363,9 @@ rte_pktmbuf_pool_create_extbuf(const char *name, unsigned int n,\n \treturn mp;\n }\n \n-/* do some sanity checks on a mbuf: panic if it fails */\n+/* do some checks on a mbuf: panic if it fails */\n void\n-rte_mbuf_sanity_check(const struct rte_mbuf *m, int is_header)\n+rte_mbuf_validate(const struct rte_mbuf *m, int is_header)\n {\n \tconst char *reason;\n \n@@ -492,7 +492,7 @@ void rte_pktmbuf_free_bulk(struct rte_mbuf **mbufs, unsigned int count)\n \t\tif (unlikely(m == NULL))\n \t\t\tcontinue;\n \n-\t\t__rte_mbuf_sanity_check(m, 1);\n+\t\t__rte_mbuf_validate(m, 1);\n \n \t\tdo {\n \t\t\tm_next = m->next;\n@@ -542,7 +542,7 @@ rte_pktmbuf_clone(struct rte_mbuf *md, struct rte_mempool *mp)\n \t\treturn NULL;\n \t}\n \n-\t__rte_mbuf_sanity_check(mc, 1);\n+\t__rte_mbuf_validate(mc, 1);\n \treturn mc;\n }\n \n@@ -592,7 +592,7 @@ rte_pktmbuf_copy(const struct rte_mbuf *m, struct rte_mempool *mp,\n \tstruct rte_mbuf *mc, *m_last, **prev;\n \n \t/* garbage in check */\n-\t__rte_mbuf_sanity_check(m, 1);\n+\t__rte_mbuf_validate(m, 1);\n \n \t/* check for request to copy at offset past end of mbuf */\n \tif (unlikely(off >= m->pkt_len))\n@@ -656,7 +656,7 @@ rte_pktmbuf_copy(const struct rte_mbuf *m, struct rte_mempool *mp,\n \t}\n \n \t/* garbage out check */\n-\t__rte_mbuf_sanity_check(mc, 1);\n+\t__rte_mbuf_validate(mc, 1);\n \treturn mc;\n }\n \n@@ -667,7 +667,7 @@ rte_pktmbuf_dump(FILE *f, const struct rte_mbuf *m, unsigned dump_len)\n \tunsigned int len;\n \tunsigned int nb_segs;\n \n-\t__rte_mbuf_sanity_check(m, 1);\n+\t__rte_mbuf_validate(m, 1);\n \n \tfprintf(f, \"dump mbuf at %p, iova=%#\" PRIx64 \", buf_len=%u\\n\", m, rte_mbuf_iova_get(m),\n \t\tm->buf_len);\n@@ -685,7 +685,7 @@ rte_pktmbuf_dump(FILE *f, const struct rte_mbuf *m, unsigned dump_len)\n \tnb_segs = m->nb_segs;\n \n \twhile (m && nb_segs != 0) {\n-\t\t__rte_mbuf_sanity_check(m, 0);\n+\t\t__rte_mbuf_validate(m, 0);\n \n \t\tfprintf(f, \" segment at %p, data=%p, len=%u, off=%u, refcnt=%u\\n\",\n \t\t\tm, rte_pktmbuf_mtod(m, void *),\ndiff --git a/lib/mbuf/rte_mbuf.h b/lib/mbuf/rte_mbuf.h\nindex 913c459b1cc6..919545b775a1 100644\n--- a/lib/mbuf/rte_mbuf.h\n+++ b/lib/mbuf/rte_mbuf.h\n@@ -339,13 +339,13 @@ rte_pktmbuf_priv_flags(struct rte_mempool *mp)\n \n #ifdef RTE_LIBRTE_MBUF_DEBUG\n \n-/** check mbuf type in debug mode */\n-#define __rte_mbuf_sanity_check(m, is_h) rte_mbuf_sanity_check(m, is_h)\n+/** do mbuf type in debug mode */\n+#define __rte_mbuf_validate(m, is_h) rte_mbuf_validate(m, is_h)\n \n #else /* RTE_LIBRTE_MBUF_DEBUG */\n \n-/** check mbuf type in debug mode */\n-#define __rte_mbuf_sanity_check(m, is_h) do { } while (0)\n+/** ignore mbuf checks if not in debug mode */\n+#define __rte_mbuf_validate(m, is_h) do { } while (0)\n \n #endif /* RTE_LIBRTE_MBUF_DEBUG */\n \n@@ -514,7 +514,7 @@ rte_mbuf_ext_refcnt_update(struct rte_mbuf_ext_shared_info *shinfo,\n \n \n /**\n- * Sanity checks on an mbuf.\n+ * Consistency checks on an mbuf.\n *\n * Check the consistency of the given mbuf. The function will cause a\n * panic if corruption is detected.\n@@ -526,12 +526,19 @@ rte_mbuf_ext_refcnt_update(struct rte_mbuf_ext_shared_info *shinfo,\n * of a packet (in this case, some fields like nb_segs are not checked)\n */\n void\n-rte_mbuf_sanity_check(const struct rte_mbuf *m, int is_header);\n+rte_mbuf_validate(const struct rte_mbuf *m, int is_header);\n+\n+/* Older deprecated name for rte_mbuf_validate() */\n+static inline __rte_deprecated\n+void rte_mbuf_sanity_check(const struct rte_mbuf *m, int is_header)\n+{\n+\trte_mbuf_validate(m, is_header);\n+}\n \n /**\n- * Sanity checks on a mbuf.\n+ * Do consistency checks on a mbuf.\n *\n- * Almost like rte_mbuf_sanity_check(), but this function gives the reason\n+ * Almost like rte_mbuf_validate(), but this function gives the reason\n * if corruption is detected rather than panic.\n *\n * @param m\n@@ -551,7 +558,7 @@ int rte_mbuf_check(const struct rte_mbuf *m, int is_header,\n \t\t const char **reason);\n \n /**\n- * Sanity checks on a reinitialized mbuf in debug mode.\n+ * Do checks on a reinitialized mbuf in debug mode.\n *\n * Check the consistency of the given reinitialized mbuf.\n * The function will cause a panic if corruption is detected.\n@@ -563,16 +570,16 @@ int rte_mbuf_check(const struct rte_mbuf *m, int is_header,\n * The mbuf to be checked.\n */\n static __rte_always_inline void\n-__rte_mbuf_raw_sanity_check(__rte_unused const struct rte_mbuf *m)\n+__rte_mbuf_raw_validate(__rte_unused const struct rte_mbuf *m)\n {\n \tRTE_ASSERT(rte_mbuf_refcnt_read(m) == 1);\n \tRTE_ASSERT(m->next == NULL);\n \tRTE_ASSERT(m->nb_segs == 1);\n-\t__rte_mbuf_sanity_check(m, 0);\n+\t__rte_mbuf_validate(m, 0);\n }\n \n /** For backwards compatibility. */\n-#define MBUF_RAW_ALLOC_CHECK(m) __rte_mbuf_raw_sanity_check(m)\n+#define MBUF_RAW_ALLOC_CHECK(m) __rte_mbuf_raw_validate(m)\n \n /**\n * Allocate an uninitialized mbuf from mempool *mp*.\n@@ -599,7 +606,7 @@ static inline struct rte_mbuf *rte_mbuf_raw_alloc(struct rte_mempool *mp)\n \n \tif (rte_mempool_get(mp, (void **)&m) < 0)\n \t\treturn NULL;\n-\t__rte_mbuf_raw_sanity_check(m);\n+\t__rte_mbuf_raw_validate(m);\n \treturn m;\n }\n \n@@ -622,7 +629,7 @@ rte_mbuf_raw_free(struct rte_mbuf *m)\n {\n \tRTE_ASSERT(!RTE_MBUF_CLONED(m) &&\n \t\t (!RTE_MBUF_HAS_EXTBUF(m) || RTE_MBUF_HAS_PINNED_EXTBUF(m)));\n-\t__rte_mbuf_raw_sanity_check(m);\n+\t__rte_mbuf_raw_validate(m);\n \trte_mempool_put(m->pool, m);\n }\n \n@@ -886,7 +893,7 @@ static inline void rte_pktmbuf_reset(struct rte_mbuf *m)\n \trte_pktmbuf_reset_headroom(m);\n \n \tm->data_len = 0;\n-\t__rte_mbuf_sanity_check(m, 1);\n+\t__rte_mbuf_validate(m, 1);\n }\n \n /**\n@@ -942,22 +949,22 @@ static inline int rte_pktmbuf_alloc_bulk(struct rte_mempool *pool,\n \tswitch (count % 4) {\n \tcase 0:\n \t\twhile (idx != count) {\n-\t\t\t__rte_mbuf_raw_sanity_check(mbufs[idx]);\n+\t\t\t__rte_mbuf_raw_validate(mbufs[idx]);\n \t\t\trte_pktmbuf_reset(mbufs[idx]);\n \t\t\tidx++;\n \t\t\t/* fall-through */\n \tcase 3:\n-\t\t\t__rte_mbuf_raw_sanity_check(mbufs[idx]);\n+\t\t\t__rte_mbuf_raw_validate(mbufs[idx]);\n \t\t\trte_pktmbuf_reset(mbufs[idx]);\n \t\t\tidx++;\n \t\t\t/* fall-through */\n \tcase 2:\n-\t\t\t__rte_mbuf_raw_sanity_check(mbufs[idx]);\n+\t\t\t__rte_mbuf_raw_validate(mbufs[idx]);\n \t\t\trte_pktmbuf_reset(mbufs[idx]);\n \t\t\tidx++;\n \t\t\t/* fall-through */\n \tcase 1:\n-\t\t\t__rte_mbuf_raw_sanity_check(mbufs[idx]);\n+\t\t\t__rte_mbuf_raw_validate(mbufs[idx]);\n \t\t\trte_pktmbuf_reset(mbufs[idx]);\n \t\t\tidx++;\n \t\t\t/* fall-through */\n@@ -1185,8 +1192,8 @@ static inline void rte_pktmbuf_attach(struct rte_mbuf *mi, struct rte_mbuf *m)\n \tmi->pkt_len = mi->data_len;\n \tmi->nb_segs = 1;\n \n-\t__rte_mbuf_sanity_check(mi, 1);\n-\t__rte_mbuf_sanity_check(m, 0);\n+\t__rte_mbuf_validate(mi, 1);\n+\t__rte_mbuf_validate(m, 0);\n }\n \n /**\n@@ -1341,7 +1348,7 @@ static inline int __rte_pktmbuf_pinned_extbuf_decref(struct rte_mbuf *m)\n static __rte_always_inline struct rte_mbuf *\n rte_pktmbuf_prefree_seg(struct rte_mbuf *m)\n {\n-\t__rte_mbuf_sanity_check(m, 0);\n+\t__rte_mbuf_validate(m, 0);\n \n \tif (likely(rte_mbuf_refcnt_read(m) == 1)) {\n \n@@ -1412,7 +1419,7 @@ static inline void rte_pktmbuf_free(struct rte_mbuf *m)\n \tstruct rte_mbuf *m_next;\n \n \tif (m != NULL)\n-\t\t__rte_mbuf_sanity_check(m, 1);\n+\t\t__rte_mbuf_validate(m, 1);\n \n \twhile (m != NULL) {\n \t\tm_next = m->next;\n@@ -1493,7 +1500,7 @@ rte_pktmbuf_copy(const struct rte_mbuf *m, struct rte_mempool *mp,\n */\n static inline void rte_pktmbuf_refcnt_update(struct rte_mbuf *m, int16_t v)\n {\n-\t__rte_mbuf_sanity_check(m, 1);\n+\t__rte_mbuf_validate(m, 1);\n \n \tdo {\n \t\trte_mbuf_refcnt_update(m, v);\n@@ -1510,7 +1517,7 @@ static inline void rte_pktmbuf_refcnt_update(struct rte_mbuf *m, int16_t v)\n */\n static inline uint16_t rte_pktmbuf_headroom(const struct rte_mbuf *m)\n {\n-\t__rte_mbuf_sanity_check(m, 0);\n+\t__rte_mbuf_validate(m, 0);\n \treturn m->data_off;\n }\n \n@@ -1524,7 +1531,7 @@ static inline uint16_t rte_pktmbuf_headroom(const struct rte_mbuf *m)\n */\n static inline uint16_t rte_pktmbuf_tailroom(const struct rte_mbuf *m)\n {\n-\t__rte_mbuf_sanity_check(m, 0);\n+\t__rte_mbuf_validate(m, 0);\n \treturn (uint16_t)(m->buf_len - rte_pktmbuf_headroom(m) -\n \t\t\t m->data_len);\n }\n@@ -1539,7 +1546,7 @@ static inline uint16_t rte_pktmbuf_tailroom(const struct rte_mbuf *m)\n */\n static inline struct rte_mbuf *rte_pktmbuf_lastseg(struct rte_mbuf *m)\n {\n-\t__rte_mbuf_sanity_check(m, 1);\n+\t__rte_mbuf_validate(m, 1);\n \twhile (m->next != NULL)\n \t\tm = m->next;\n \treturn m;\n@@ -1583,7 +1590,7 @@ static inline struct rte_mbuf *rte_pktmbuf_lastseg(struct rte_mbuf *m)\n static inline char *rte_pktmbuf_prepend(struct rte_mbuf *m,\n \t\t\t\t\tuint16_t len)\n {\n-\t__rte_mbuf_sanity_check(m, 1);\n+\t__rte_mbuf_validate(m, 1);\n \n \tif (unlikely(len > rte_pktmbuf_headroom(m)))\n \t\treturn NULL;\n@@ -1618,7 +1625,7 @@ static inline char *rte_pktmbuf_append(struct rte_mbuf *m, uint16_t len)\n \tvoid *tail;\n \tstruct rte_mbuf *m_last;\n \n-\t__rte_mbuf_sanity_check(m, 1);\n+\t__rte_mbuf_validate(m, 1);\n \n \tm_last = rte_pktmbuf_lastseg(m);\n \tif (unlikely(len > rte_pktmbuf_tailroom(m_last)))\n@@ -1646,7 +1653,7 @@ static inline char *rte_pktmbuf_append(struct rte_mbuf *m, uint16_t len)\n */\n static inline char *rte_pktmbuf_adj(struct rte_mbuf *m, uint16_t len)\n {\n-\t__rte_mbuf_sanity_check(m, 1);\n+\t__rte_mbuf_validate(m, 1);\n \n \tif (unlikely(len > m->data_len))\n \t\treturn NULL;\n@@ -1678,7 +1685,7 @@ static inline int rte_pktmbuf_trim(struct rte_mbuf *m, uint16_t len)\n {\n \tstruct rte_mbuf *m_last;\n \n-\t__rte_mbuf_sanity_check(m, 1);\n+\t__rte_mbuf_validate(m, 1);\n \n \tm_last = rte_pktmbuf_lastseg(m);\n \tif (unlikely(len > m_last->data_len))\n@@ -1700,7 +1707,7 @@ static inline int rte_pktmbuf_trim(struct rte_mbuf *m, uint16_t len)\n */\n static inline int rte_pktmbuf_is_contiguous(const struct rte_mbuf *m)\n {\n-\t__rte_mbuf_sanity_check(m, 1);\n+\t__rte_mbuf_validate(m, 1);\n \treturn m->nb_segs == 1;\n }\n \ndiff --git a/lib/mbuf/version.map b/lib/mbuf/version.map\nindex ed486ed14ec7..e968c54a0807 100644\n--- a/lib/mbuf/version.map\n+++ b/lib/mbuf/version.map\n@@ -27,7 +27,6 @@ DPDK_23 {\n \trte_mbuf_dynflag_register;\n \trte_mbuf_dynflag_register_bitnum;\n \trte_mbuf_platform_mempool_ops;\n-\trte_mbuf_sanity_check;\n \trte_mbuf_set_platform_mempool_ops;\n \trte_mbuf_set_user_mempool_ops;\n \trte_mbuf_user_mempool_ops;\n@@ -39,6 +38,7 @@ DPDK_23 {\n \trte_pktmbuf_pool_create;\n \trte_pktmbuf_pool_create_by_ops;\n \trte_pktmbuf_pool_init;\n+\trte_mbuf_validate;\n \n \tlocal: *;\n };\n", "prefixes": [ "01/20" ] }