DPDK patches and discussions
 help / color / mirror / Atom feed
From: talshn@mellanox.com
To: dev@dpdk.org
Cc: thomas@monjalon.net, pallavi.kadam@intel.com,
	dmitry.kozliuk@gmail.com, david.marchand@redhat.com,
	grive@u256.net, Tal Shnaiderman <talshn@mellanox.com>
Subject: [dpdk-dev] [PATCH 2/7] pci: build on Windows
Date: Wed, 22 Apr 2020 10:27:42 +0300	[thread overview]
Message-ID: <20200422072747.15960-3-talshn@mellanox.com> (raw)
In-Reply-To: <20200422072747.15960-1-talshn@mellanox.com>

From: Tal Shnaiderman <talshn@mellanox.com>

Changing all of PCIs Unix memory mapping to the
new memory allocation API wrapper.

Added off_t in Windows header file as a supported type since it is needed by PCI.

Signed-off-by: Tal Shnaiderman <talshn@mellanox.com>
---
 lib/librte_eal/windows/include/rte_os.h | 1 +
 lib/librte_pci/rte_pci.c                | 9 ++++-----
 lib/meson.build                         | 5 ++++-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/lib/librte_eal/windows/include/rte_os.h b/lib/librte_eal/windows/include/rte_os.h
index 62805a307..1c433b976 100644
--- a/lib/librte_eal/windows/include/rte_os.h
+++ b/lib/librte_eal/windows/include/rte_os.h
@@ -48,6 +48,7 @@ extern "C" {
 
 /* as in <windows.h> */
 typedef long long ssize_t;
+typedef long off_t;
 
 #ifndef RTE_TOOLCHAIN_GCC
 static inline int
diff --git a/lib/librte_pci/rte_pci.c b/lib/librte_pci/rte_pci.c
index d1ab6b414..8c7272ec4 100644
--- a/lib/librte_pci/rte_pci.c
+++ b/lib/librte_pci/rte_pci.c
@@ -9,7 +9,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <sys/queue.h>
-#include <sys/mman.h>
 
 #include <rte_errno.h>
 #include <rte_interrupts.h>
@@ -138,9 +137,9 @@ pci_map_resource(void *requested_addr, int fd, off_t offset, size_t size,
 	void *mapaddr;
 
 	/* Map the PCI memory resource of device */
-	mapaddr = mmap(requested_addr, size, PROT_READ | PROT_WRITE,
-			MAP_SHARED | additional_flags, fd, offset);
-	if (mapaddr == MAP_FAILED) {
+	mapaddr = rte_mem_map(requested_addr, size,RTE_PROT_READ | RTE_PROT_WRITE,
+			RTE_MAP_SHARED | additional_flags, fd, offset);
+	if (mapaddr == NULL) {
 		RTE_LOG(ERR, EAL,
 			"%s(): cannot mmap(%d, %p, 0x%zx, 0x%llx): %s (%p)\n",
 			__func__, fd, requested_addr, size,
@@ -160,7 +159,7 @@ pci_unmap_resource(void *requested_addr, size_t size)
 		return;
 
 	/* Unmap the PCI memory resource of device */
-	if (munmap(requested_addr, size)) {
+	if (rte_mem_unmap(requested_addr, size)) {
 		RTE_LOG(ERR, EAL, "%s(): cannot munmap(%p, %#zx): %s\n",
 			__func__, requested_addr, size,
 			strerror(errno));
diff --git a/lib/meson.build b/lib/meson.build
index 63c17ee75..a01bcf04d 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -33,7 +33,10 @@ libraries = [
 	'flow_classify', 'bpf', 'telemetry']
 
 if is_windows
-	libraries = ['kvargs','eal'] # only supported libraries for windows
+	libraries = [
+		'kvargs','eal',
+		'pci',
+	] # only supported libraries for windows
 endif
 
 default_cflags = machine_args + ['-DALLOW_EXPERIMENTAL_API']
-- 
2.16.1.windows.4


  parent reply	other threads:[~2020-04-22  7:29 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-04-22  7:27 [dpdk-dev] [PATCH 0/7] Windows bus/pci support talshn
2020-04-22  7:27 ` [dpdk-dev] [PATCH 1/7] eal: move OS common functions to single file talshn
2020-04-22 23:51   ` Ranjit Menon
2020-04-23  7:27     ` Thomas Monjalon
2020-04-23  9:06       ` Dmitry Kozlyuk
2020-04-23 10:48         ` Thomas Monjalon
2020-04-23 16:31           ` Ranjit Menon
2020-04-22  7:27 ` talshn [this message]
2020-04-22  7:27 ` [dpdk-dev] [PATCH 3/7] eal: add function finding integer in a string talshn
2020-04-22  7:27 ` [dpdk-dev] [PATCH 4/7] drivers: ignore pmdinfogen generation for Windows talshn
2020-04-22  7:27 ` [dpdk-dev] [PATCH 5/7] drivers: fix incorrect meson import folder " talshn
2020-04-22  7:27 ` [dpdk-dev] [PATCH 6/7] bus/pci: introduce Windows support with stubs talshn
2020-04-22  7:27 ` [dpdk-dev] [PATCH 7/7] bus/pci: support Windows with bifurcated drivers talshn
2020-04-27 22:58   ` Narcisa Ana Maria Vasile
2020-04-28  8:11     ` Tal Shnaiderman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200422072747.15960-3-talshn@mellanox.com \
    --to=talshn@mellanox.com \
    --cc=david.marchand@redhat.com \
    --cc=dev@dpdk.org \
    --cc=dmitry.kozliuk@gmail.com \
    --cc=grive@u256.net \
    --cc=pallavi.kadam@intel.com \
    --cc=thomas@monjalon.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).