Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ycai
simbricks
Commits
a639c632
Commit
a639c632
authored
Sep 17, 2020
by
Antoine Kaufmann
Browse files
libnicbm: limit number of concurrent dma ops
Otherwise gem5 crashes
parent
54e521d5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
46 additions
and
2 deletions
+46
-2
libnicbm/include/nicbm.h
libnicbm/include/nicbm.h
+6
-0
libnicbm/nicbm.cc
libnicbm/nicbm.cc
+40
-2
No files found.
libnicbm/include/nicbm.h
View file @
a639c632
#include <set>
#include <set>
#include <deque>
namespace
nicbm
{
namespace
nicbm
{
...
@@ -85,6 +86,8 @@ class Runner {
...
@@ -85,6 +86,8 @@ class Runner {
Device
&
dev
;
Device
&
dev
;
std
::
set
<
TimedEvent
*
,
event_cmp
>
events
;
std
::
set
<
TimedEvent
*
,
event_cmp
>
events
;
std
::
deque
<
DMAOp
*>
dma_queue
;
size_t
dma_pending
;
uint64_t
mac_addr
;
uint64_t
mac_addr
;
struct
nicsim_params
nsparams
;
struct
nicsim_params
nsparams
;
struct
cosim_pcie_proto_dev_intro
dintro
;
struct
cosim_pcie_proto_dev_intro
dintro
;
...
@@ -103,6 +106,9 @@ class Runner {
...
@@ -103,6 +106,9 @@ class Runner {
bool
event_next
(
uint64_t
&
retval
);
bool
event_next
(
uint64_t
&
retval
);
void
event_trigger
();
void
event_trigger
();
void
dma_do
(
DMAOp
&
op
);
void
dma_trigger
();
public:
public:
Runner
(
Device
&
dev_
);
Runner
(
Device
&
dev_
);
...
...
libnicbm/nicbm.cc
View file @
a639c632
...
@@ -15,6 +15,7 @@
...
@@ -15,6 +15,7 @@
#define SYNC_PERIOD (100 * 1000ULL) // 100ns
#define SYNC_PERIOD (100 * 1000ULL) // 100ns
#define PCI_LATENCY (500 * 1000ULL) // 500ns
#define PCI_LATENCY (500 * 1000ULL) // 500ns
#define ETH_LATENCY (500 * 1000ULL) // 500ns
#define ETH_LATENCY (500 * 1000ULL) // 500ns
#define DMA_MAX_PENDING 64
using
namespace
nicbm
;
using
namespace
nicbm
;
...
@@ -57,11 +58,41 @@ volatile union cosim_eth_proto_d2n *Runner::d2n_alloc(void)
...
@@ -57,11 +58,41 @@ volatile union cosim_eth_proto_d2n *Runner::d2n_alloc(void)
}
}
void
Runner
::
issue_dma
(
DMAOp
&
op
)
void
Runner
::
issue_dma
(
DMAOp
&
op
)
{
if
(
dma_pending
<
DMA_MAX_PENDING
)
{
// can directly issue
#ifdef DEBUG_NICBM
printf
(
"nicbm: issuing dma op %p addr %lx len %zu pending %zu
\n
"
,
&
op
,
op
.
dma_addr
,
op
.
len
,
dma_pending
);
#endif
dma_do
(
op
);
}
else
{
#ifdef DEBUG_NICBM
printf
(
"nicbm: enqueuing dma op %p addr %lx len %zu pending %zu
\n
"
,
&
op
,
op
.
dma_addr
,
op
.
len
,
dma_pending
);
#endif
dma_queue
.
push_back
(
&
op
);
}
}
void
Runner
::
dma_trigger
()
{
if
(
dma_queue
.
empty
()
||
dma_pending
==
DMA_MAX_PENDING
)
return
;
DMAOp
*
op
=
dma_queue
.
front
();
dma_queue
.
pop_front
();
dma_do
(
*
op
);
}
void
Runner
::
dma_do
(
DMAOp
&
op
)
{
{
volatile
union
cosim_pcie_proto_d2h
*
msg
=
d2h_alloc
();
volatile
union
cosim_pcie_proto_d2h
*
msg
=
d2h_alloc
();
dma_pending
++
;
#ifdef DEBUG_NICBM
#ifdef DEBUG_NICBM
printf
(
"nicbm:
issue
dma op %p addr %lx len %zu
\n
"
,
&
op
,
op
.
dma_addr
,
printf
(
"nicbm:
executing
dma op %p addr %lx len %zu
pending %zu
\n
"
,
&
op
,
op
.
len
);
op
.
dma_addr
,
op
.
len
,
dma_pending
);
#endif
#endif
if
(
op
.
write
)
{
if
(
op
.
write
)
{
...
@@ -179,6 +210,9 @@ void Runner::h2d_readcomp(volatile struct cosim_pcie_proto_h2d_readcomp *rc)
...
@@ -179,6 +210,9 @@ void Runner::h2d_readcomp(volatile struct cosim_pcie_proto_h2d_readcomp *rc)
memcpy
(
op
->
data
,
(
void
*
)
rc
->
data
,
op
->
len
);
memcpy
(
op
->
data
,
(
void
*
)
rc
->
data
,
op
->
len
);
dev
.
dma_complete
(
*
op
);
dev
.
dma_complete
(
*
op
);
dma_pending
--
;
dma_trigger
();
}
}
void
Runner
::
h2d_writecomp
(
volatile
struct
cosim_pcie_proto_h2d_writecomp
*
wc
)
void
Runner
::
h2d_writecomp
(
volatile
struct
cosim_pcie_proto_h2d_writecomp
*
wc
)
...
@@ -191,6 +225,9 @@ void Runner::h2d_writecomp(volatile struct cosim_pcie_proto_h2d_writecomp *wc)
...
@@ -191,6 +225,9 @@ void Runner::h2d_writecomp(volatile struct cosim_pcie_proto_h2d_writecomp *wc)
#endif
#endif
dev
.
dma_complete
(
*
op
);
dev
.
dma_complete
(
*
op
);
dma_pending
--
;
dma_trigger
();
}
}
void
Runner
::
eth_recv
(
volatile
struct
cosim_eth_proto_n2d_recv
*
recv
)
void
Runner
::
eth_recv
(
volatile
struct
cosim_eth_proto_n2d_recv
*
recv
)
...
@@ -320,6 +357,7 @@ Runner::Runner(Device &dev_)
...
@@ -320,6 +357,7 @@ Runner::Runner(Device &dev_)
:
dev
(
dev_
),
events
(
event_cmp
())
:
dev
(
dev_
),
events
(
event_cmp
())
{
{
//mac_addr = lrand48() & ~(3ULL << 46);
//mac_addr = lrand48() & ~(3ULL << 46);
dma_pending
=
0
;
srand48
(
time
(
NULL
)
^
getpid
());
srand48
(
time
(
NULL
)
^
getpid
());
mac_addr
=
lrand48
();
mac_addr
=
lrand48
();
mac_addr
<<=
16
;
mac_addr
<<=
16
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment