From patchwork Fri Dec 21 11:09:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anatoly Burakov X-Patchwork-Id: 49227 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id F25231BD4C; Fri, 21 Dec 2018 12:09:22 +0100 (CET) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by dpdk.org (Postfix) with ESMTP id F113329C6 for ; Fri, 21 Dec 2018 12:09:21 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 Dec 2018 03:09:21 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,381,1539673200"; d="scan'208";a="109120415" Received: from irvmail001.ir.intel.com ([163.33.26.43]) by fmsmga007.fm.intel.com with ESMTP; 21 Dec 2018 03:09:20 -0800 Received: from sivswdev05.ir.intel.com (sivswdev05.ir.intel.com [10.243.17.64]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id wBLB9Jqu019006; Fri, 21 Dec 2018 11:09:19 GMT Received: from sivswdev05.ir.intel.com (localhost [127.0.0.1]) by sivswdev05.ir.intel.com with ESMTP id wBLB9JWY028333; Fri, 21 Dec 2018 11:09:19 GMT Received: (from aburakov@localhost) by sivswdev05.ir.intel.com with LOCAL id wBLB9FPr028325; Fri, 21 Dec 2018 11:09:15 GMT From: Anatoly Burakov To: dev@dpdk.org Cc: thomas@monjalon.net, stephen@networkplumber.org Date: Fri, 21 Dec 2018 11:09:12 +0000 Message-Id: X-Mailer: git-send-email 1.7.0.7 Subject: [dpdk-dev] [PATCH 1/4] test/extmem: refactor and rename test functions X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" We will be adding a new extmem test that will behave roughly similar to already existing, so clarify function names to distinguish between these tests, as well as factor out the common parts. Signed-off-by: Anatoly Burakov --- test/test/test_external_mem.c | 62 +++++++++++++++++++++-------------- 1 file changed, 37 insertions(+), 25 deletions(-) diff --git a/test/test/test_external_mem.c b/test/test/test_external_mem.c index 998cafa68..6df42e3ae 100644 --- a/test/test/test_external_mem.c +++ b/test/test/test_external_mem.c @@ -23,7 +23,35 @@ #define EXTERNAL_MEM_SZ (RTE_PGSIZE_4K << 10) /* 4M of data */ static int -test_invalid_param(void *addr, size_t len, size_t pgsz, rte_iova_t *iova, +check_mem(void *addr, rte_iova_t *iova, size_t pgsz, int n_pages) +{ + int i; + + /* check that we can get this memory from EAL now */ + for (i = 0; i < n_pages; i++) { + const struct rte_memseg *ms; + void *cur = RTE_PTR_ADD(addr, pgsz * i); + + ms = rte_mem_virt2memseg(cur, NULL); + if (ms == NULL) { + printf("%s():%i: Failed to retrieve memseg for external mem\n", + __func__, __LINE__); + return -1; + } + if (ms->addr != cur) { + printf("%s():%i: VA mismatch\n", __func__, __LINE__); + return -1; + } + if (ms->iova != iova[i]) { + printf("%s():%i: IOVA mismatch\n", __func__, __LINE__); + return -1; + } + } + return 0; +} + +static int +test_malloc_invalid_param(void *addr, size_t len, size_t pgsz, rte_iova_t *iova, int n_pages) { static const char * const names[] = { @@ -223,11 +251,12 @@ test_invalid_param(void *addr, size_t len, size_t pgsz, rte_iova_t *iova, } static int -test_basic(void *addr, size_t len, size_t pgsz, rte_iova_t *iova, int n_pages) +test_malloc_basic(void *addr, size_t len, size_t pgsz, rte_iova_t *iova, + int n_pages) { const char *heap_name = "heap"; void *ptr = NULL; - int socket_id, i; + int socket_id; const struct rte_memzone *mz = NULL; /* create heap */ @@ -261,26 +290,9 @@ test_basic(void *addr, size_t len, size_t pgsz, rte_iova_t *iova, int n_pages) goto fail; } - /* check that we can get this memory from EAL now */ - for (i = 0; i < n_pages; i++) { - const struct rte_memseg *ms; - void *cur = RTE_PTR_ADD(addr, pgsz * i); - - ms = rte_mem_virt2memseg(cur, NULL); - if (ms == NULL) { - printf("%s():%i: Failed to retrieve memseg for external mem\n", - __func__, __LINE__); - goto fail; - } - if (ms->addr != cur) { - printf("%s():%i: VA mismatch\n", __func__, __LINE__); - goto fail; - } - if (ms->iova != iova[i]) { - printf("%s():%i: IOVA mismatch\n", __func__, __LINE__); - goto fail; - } - } + /* check if memory is accessible from EAL */ + if (check_mem(addr, iova, pgsz, n_pages) < 0) + goto fail; /* allocate - this now should succeed */ ptr = rte_malloc_socket("EXTMEM", 64, 0, socket_id); @@ -379,8 +391,8 @@ test_external_mem(void) iova[i] = tmp; } - ret = test_invalid_param(addr, len, pgsz, iova, n_pages); - ret |= test_basic(addr, len, pgsz, iova, n_pages); + ret = test_malloc_invalid_param(addr, len, pgsz, iova, n_pages); + ret |= test_malloc_basic(addr, len, pgsz, iova, n_pages); munmap(addr, len); From patchwork Fri Dec 21 11:09:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anatoly Burakov X-Patchwork-Id: 49228 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id CB35A1BD73; Fri, 21 Dec 2018 12:09:26 +0100 (CET) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by dpdk.org (Postfix) with ESMTP id 386001BD41 for ; Fri, 21 Dec 2018 12:09:22 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 Dec 2018 03:09:21 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,381,1539673200"; d="scan'208";a="304053540" Received: from irvmail001.ir.intel.com ([163.33.26.43]) by fmsmga006.fm.intel.com with ESMTP; 21 Dec 2018 03:09:20 -0800 Received: from sivswdev05.ir.intel.com (sivswdev05.ir.intel.com [10.243.17.64]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id wBLB9Jvl019011; Fri, 21 Dec 2018 11:09:19 GMT Received: from sivswdev05.ir.intel.com (localhost [127.0.0.1]) by sivswdev05.ir.intel.com with ESMTP id wBLB9Jn5028340; Fri, 21 Dec 2018 11:09:19 GMT Received: (from aburakov@localhost) by sivswdev05.ir.intel.com with LOCAL id wBLB9J19028336; Fri, 21 Dec 2018 11:09:19 GMT From: Anatoly Burakov To: dev@dpdk.org Cc: thomas@monjalon.net, stephen@networkplumber.org Date: Fri, 21 Dec 2018 11:09:13 +0000 Message-Id: <0521642ca0052bbfb1a8d21033582276c9782717.1545390524.git.anatoly.burakov@intel.com> X-Mailer: git-send-email 1.7.0.7 In-Reply-To: References: In-Reply-To: References: Subject: [dpdk-dev] [PATCH 2/4] test/extmem: extend autotest to test without IOVA table X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Currently, only scenario with valid IOVA table is tested. Fix this by also testing without IOVA table - in these cases, EAL should always return RTE_BAD_IOVA for all memsegs. Signed-off-by: Anatoly Burakov --- test/test/test_external_mem.c | 68 +++++++++++++++++++++++------------ 1 file changed, 45 insertions(+), 23 deletions(-) diff --git a/test/test/test_external_mem.c b/test/test/test_external_mem.c index 6df42e3ae..845c625d6 100644 --- a/test/test/test_external_mem.c +++ b/test/test/test_external_mem.c @@ -42,7 +42,11 @@ check_mem(void *addr, rte_iova_t *iova, size_t pgsz, int n_pages) printf("%s():%i: VA mismatch\n", __func__, __LINE__); return -1; } - if (ms->iova != iova[i]) { + if (iova == NULL && ms->iova != RTE_BAD_IOVA) { + printf("%s():%i: IOVA is not invalid\n", __func__, + __LINE__); + return -1; + } else if (iova != NULL && ms->iova != iova[i]) { printf("%s():%i: IOVA mismatch\n", __func__, __LINE__); return -1; } @@ -218,24 +222,29 @@ test_malloc_invalid_param(void *addr, size_t len, size_t pgsz, rte_iova_t *iova, goto fail; } - /* wrong page count */ - if (rte_malloc_heap_memory_add(valid_name, addr, len, - iova, 0, pgsz) >= 0 || rte_errno != EINVAL) { - printf("%s():%i: Added memory with invalid parameters\n", - __func__, __LINE__); - goto fail; - } - if (rte_malloc_heap_memory_add(valid_name, addr, len, - iova, n_pages - 1, pgsz) >= 0 || rte_errno != EINVAL) { - printf("%s():%i: Added memory with invalid parameters\n", - __func__, __LINE__); - goto fail; - } - if (rte_malloc_heap_memory_add(valid_name, addr, len, - iova, n_pages + 1, pgsz) >= 0 || rte_errno != EINVAL) { - printf("%s():%i: Added memory with invalid parameters\n", - __func__, __LINE__); - goto fail; + /* the following tests are only valid if IOVA table is not NULL */ + if (iova != NULL) { + /* wrong page count */ + if (rte_malloc_heap_memory_add(valid_name, addr, len, + iova, 0, pgsz) >= 0 || rte_errno != EINVAL) { + printf("%s():%i: Added memory with invalid parameters\n", + __func__, __LINE__); + goto fail; + } + if (rte_malloc_heap_memory_add(valid_name, addr, len, + iova, n_pages - 1, pgsz) >= 0 || + rte_errno != EINVAL) { + printf("%s():%i: Added memory with invalid parameters\n", + __func__, __LINE__); + goto fail; + } + if (rte_malloc_heap_memory_add(valid_name, addr, len, + iova, n_pages + 1, pgsz) >= 0 || + rte_errno != EINVAL) { + printf("%s():%i: Added memory with invalid parameters\n", + __func__, __LINE__); + goto fail; + } } /* tests passed, destroy heap */ @@ -257,7 +266,7 @@ test_malloc_basic(void *addr, size_t len, size_t pgsz, rte_iova_t *iova, const char *heap_name = "heap"; void *ptr = NULL; int socket_id; - const struct rte_memzone *mz = NULL; + const struct rte_memzone *mz = NULL, *contig_mz = NULL; /* create heap */ if (rte_malloc_heap_create(heap_name) != 0) { @@ -322,12 +331,19 @@ test_malloc_basic(void *addr, size_t len, size_t pgsz, rte_iova_t *iova, goto fail; } + /* try allocating a memzone */ + mz = rte_memzone_reserve("heap_test", pgsz * 2, socket_id, 0); + if (mz == NULL) { + printf("%s():%i: Failed to reserve memzone\n", + __func__, __LINE__); + goto fail; + } /* try allocating an IOVA-contiguous memzone - this should succeed - * because we've set up a contiguous IOVA table. + * if we've set up a contiguous IOVA table, and fail if we haven't. */ - mz = rte_memzone_reserve("heap_test", pgsz * 2, socket_id, + contig_mz = rte_memzone_reserve("heap_test_contig", pgsz * 2, socket_id, RTE_MEMZONE_IOVA_CONTIG); - if (mz == NULL) { + if (iova != NULL && contig_mz == NULL) { printf("%s():%i: Failed to reserve memzone\n", __func__, __LINE__); goto fail; @@ -342,6 +358,8 @@ test_malloc_basic(void *addr, size_t len, size_t pgsz, rte_iova_t *iova, rte_memzone_free(mz); mz = NULL; + rte_memzone_free(contig_mz); + contig_mz = NULL; if (rte_malloc_heap_memory_remove(heap_name, addr, len) != 0) { printf("%s():%i: Removing memory from heap failed\n", @@ -356,6 +374,7 @@ test_malloc_basic(void *addr, size_t len, size_t pgsz, rte_iova_t *iova, return 0; fail: + rte_memzone_free(contig_mz); rte_memzone_free(mz); rte_free(ptr); /* even if something failed, attempt to clean up */ @@ -393,6 +412,9 @@ test_external_mem(void) ret = test_malloc_invalid_param(addr, len, pgsz, iova, n_pages); ret |= test_malloc_basic(addr, len, pgsz, iova, n_pages); + /* when iova table is NULL, everything should still work */ + ret |= test_malloc_invalid_param(addr, len, pgsz, NULL, n_pages); + ret |= test_malloc_basic(addr, len, pgsz, NULL, n_pages); munmap(addr, len); From patchwork Fri Dec 21 11:09:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anatoly Burakov X-Patchwork-Id: 49229 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 9C2F01BD81; Fri, 21 Dec 2018 12:09:28 +0100 (CET) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by dpdk.org (Postfix) with ESMTP id E3EB629C6 for ; Fri, 21 Dec 2018 12:09:22 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 Dec 2018 03:09:21 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,381,1539673200"; d="scan'208";a="129724423" Received: from irvmail001.ir.intel.com ([163.33.26.43]) by fmsmga004.fm.intel.com with ESMTP; 21 Dec 2018 03:09:20 -0800 Received: from sivswdev05.ir.intel.com (sivswdev05.ir.intel.com [10.243.17.64]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id wBLB9KVQ019014; Fri, 21 Dec 2018 11:09:20 GMT Received: from sivswdev05.ir.intel.com (localhost [127.0.0.1]) by sivswdev05.ir.intel.com with ESMTP id wBLB9Kao028347; Fri, 21 Dec 2018 11:09:20 GMT Received: (from aburakov@localhost) by sivswdev05.ir.intel.com with LOCAL id wBLB9JCk028343; Fri, 21 Dec 2018 11:09:20 GMT From: Anatoly Burakov To: dev@dpdk.org Cc: thomas@monjalon.net, stephen@networkplumber.org Date: Fri, 21 Dec 2018 11:09:14 +0000 Message-Id: X-Mailer: git-send-email 1.7.0.7 In-Reply-To: References: In-Reply-To: References: Subject: [dpdk-dev] [PATCH 3/4] test/extmem: check if memseg list is external X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Extend the extmem autotest to check whether the memseg lists for externally allocated memory are always marked as external. Signed-off-by: Anatoly Burakov --- test/test/test_external_mem.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/test/test/test_external_mem.c b/test/test/test_external_mem.c index 845c625d6..5557f6e3f 100644 --- a/test/test/test_external_mem.c +++ b/test/test/test_external_mem.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include @@ -29,10 +30,18 @@ check_mem(void *addr, rte_iova_t *iova, size_t pgsz, int n_pages) /* check that we can get this memory from EAL now */ for (i = 0; i < n_pages; i++) { + const struct rte_memseg_list *msl; const struct rte_memseg *ms; void *cur = RTE_PTR_ADD(addr, pgsz * i); - ms = rte_mem_virt2memseg(cur, NULL); + msl = rte_mem_virt2memseg_list(cur); + if (!msl->external) { + printf("%s():%i: Memseg list is not marked as external\n", + __func__, __LINE__); + return -1; + } + + ms = rte_mem_virt2memseg(cur, msl); if (ms == NULL) { printf("%s():%i: Failed to retrieve memseg for external mem\n", __func__, __LINE__); From patchwork Fri Dec 21 11:09:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anatoly Burakov X-Patchwork-Id: 49230 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 3845E1BDB5; Fri, 21 Dec 2018 12:09:30 +0100 (CET) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by dpdk.org (Postfix) with ESMTP id ECCA01BD41 for ; Fri, 21 Dec 2018 12:09:22 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 Dec 2018 03:09:22 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,381,1539673200"; d="scan'208";a="100475690" Received: from irvmail001.ir.intel.com ([163.33.26.43]) by orsmga007.jf.intel.com with ESMTP; 21 Dec 2018 03:09:21 -0800 Received: from sivswdev05.ir.intel.com (sivswdev05.ir.intel.com [10.243.17.64]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id wBLB9Kmu019017; Fri, 21 Dec 2018 11:09:20 GMT Received: from sivswdev05.ir.intel.com (localhost [127.0.0.1]) by sivswdev05.ir.intel.com with ESMTP id wBLB9K4w028354; Fri, 21 Dec 2018 11:09:20 GMT Received: (from aburakov@localhost) by sivswdev05.ir.intel.com with LOCAL id wBLB9K8N028350; Fri, 21 Dec 2018 11:09:20 GMT From: Anatoly Burakov To: dev@dpdk.org Cc: thomas@monjalon.net, stephen@networkplumber.org Date: Fri, 21 Dec 2018 11:09:15 +0000 Message-Id: <740fcadac150c128f62cc2761dfe00fd10c90990.1545390524.git.anatoly.burakov@intel.com> X-Mailer: git-send-email 1.7.0.7 In-Reply-To: References: In-Reply-To: References: Subject: [dpdk-dev] [PATCH 4/4] test/extmem: extend test to cover non-heap API X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Currently, extmem autotest only covers the external malloc heap API. Extend it to also cover the non-heap, register/unregister external memory API. Signed-off-by: Anatoly Burakov --- test/test/test_external_mem.c | 146 ++++++++++++++++++++++++++++++++++ 1 file changed, 146 insertions(+) diff --git a/test/test/test_external_mem.c b/test/test/test_external_mem.c index 5557f6e3f..e1abce104 100644 --- a/test/test/test_external_mem.c +++ b/test/test/test_external_mem.c @@ -393,6 +393,144 @@ test_malloc_basic(void *addr, size_t len, size_t pgsz, rte_iova_t *iova, return -1; } +static int +test_extmem_invalid_param(void *addr, size_t len, size_t pgsz, rte_iova_t *iova, + int n_pages) +{ + /* these calls may fail for other reasons, so check errno */ + if (rte_extmem_unregister(addr, len) >= 0 || + rte_errno != ENOENT) { + printf("%s():%i: Unregistered non-existent memory\n", + __func__, __LINE__); + return -1; + } + + if (rte_extmem_attach(addr, len) >= 0 || + rte_errno != ENOENT) { + printf("%s():%i: Attached to non-existent memory\n", + __func__, __LINE__); + return -1; + } + if (rte_extmem_attach(addr, len) >= 0 || + rte_errno != ENOENT) { + printf("%s():%i: Detached from non-existent memory\n", + __func__, __LINE__); + return -1; + } + + /* zero length */ + if (rte_extmem_register(addr, 0, NULL, 0, pgsz) >= 0 || + rte_errno != EINVAL) { + printf("%s():%i: Registered memory with invalid parameters\n", + __func__, __LINE__); + return -1; + } + + if (rte_extmem_unregister(addr, 0) >= 0 || + rte_errno != EINVAL) { + printf("%s():%i: Unregistered memory with invalid parameters\n", + __func__, __LINE__); + return -1; + } + + if (rte_extmem_attach(addr, 0) >= 0 || + rte_errno != EINVAL) { + printf("%s():%i: Attached memory with invalid parameters\n", + __func__, __LINE__); + return -1; + } + if (rte_extmem_attach(addr, 0) >= 0 || + rte_errno != EINVAL) { + printf("%s():%i: Detached memory with invalid parameters\n", + __func__, __LINE__); + return -1; + } + + /* zero address */ + if (rte_extmem_register(NULL, len, NULL, 0, pgsz) >= 0 || + rte_errno != EINVAL) { + printf("%s():%i: Registered memory with invalid parameters\n", + __func__, __LINE__); + return -1; + } + + if (rte_extmem_unregister(NULL, len) >= 0 || + rte_errno != EINVAL) { + printf("%s():%i: Unregistered memory with invalid parameters\n", + __func__, __LINE__); + return -1; + } + + if (rte_extmem_attach(NULL, len) >= 0 || + rte_errno != EINVAL) { + printf("%s():%i: Attached memory with invalid parameters\n", + __func__, __LINE__); + return -1; + } + if (rte_extmem_attach(NULL, len) >= 0 || + rte_errno != EINVAL) { + printf("%s():%i: Detached memory with invalid parameters\n", + __func__, __LINE__); + return -1; + } + + /* the following tests are only valid if IOVA table is not NULL */ + if (iova != NULL) { + /* wrong page count */ + if (rte_extmem_register(addr, len, + iova, 0, pgsz) >= 0 || rte_errno != EINVAL) { + printf("%s():%i: Registered memory with invalid parameters\n", + __func__, __LINE__); + return -1; + } + if (rte_extmem_register(addr, len, + iova, n_pages - 1, pgsz) >= 0 || + rte_errno != EINVAL) { + printf("%s():%i: Registered memory with invalid parameters\n", + __func__, __LINE__); + return -1; + } + if (rte_extmem_register(addr, len, + iova, n_pages + 1, pgsz) >= 0 || + rte_errno != EINVAL) { + printf("%s():%i: Registered memory with invalid parameters\n", + __func__, __LINE__); + return -1; + } + } + + return 0; +} + +static int +test_extmem_basic(void *addr, size_t len, size_t pgsz, rte_iova_t *iova, + int n_pages) +{ + /* register memory */ + if (rte_extmem_register(addr, len, iova, n_pages, pgsz) != 0) { + printf("%s():%i: Failed to register memory\n", + __func__, __LINE__); + goto fail; + } + + /* check if memory is accessible from EAL */ + if (check_mem(addr, iova, pgsz, n_pages) < 0) + goto fail; + + if (rte_extmem_unregister(addr, len) != 0) { + printf("%s():%i: Removing memory from heap failed\n", + __func__, __LINE__); + goto fail; + } + + return 0; +fail: + /* even if something failed, attempt to clean up */ + rte_extmem_unregister(addr, len); + + return -1; +} + /* we need to test attach/detach in secondary processes. */ static int test_external_mem(void) @@ -419,12 +557,20 @@ test_external_mem(void) iova[i] = tmp; } + /* test external heap memory */ ret = test_malloc_invalid_param(addr, len, pgsz, iova, n_pages); ret |= test_malloc_basic(addr, len, pgsz, iova, n_pages); /* when iova table is NULL, everything should still work */ ret |= test_malloc_invalid_param(addr, len, pgsz, NULL, n_pages); ret |= test_malloc_basic(addr, len, pgsz, NULL, n_pages); + /* test non-heap memory */ + ret |= test_extmem_invalid_param(addr, len, pgsz, iova, n_pages); + ret |= test_extmem_basic(addr, len, pgsz, iova, n_pages); + /* when iova table is NULL, everything should still work */ + ret |= test_extmem_invalid_param(addr, len, pgsz, NULL, n_pages); + ret |= test_extmem_basic(addr, len, pgsz, NULL, n_pages); + munmap(addr, len); return ret;