Skip to content

GitLab

Commit 7f1b94ae authored by Antoine Kaufmann's avatar Antoine Kaufmann
Browse files

sims/net/pktgen: new API refactor

parent 391e5cb8
Hide whitespace changes
Inline Side-by-side
Showing with 54 additions and 141 deletions
sims/net/pktgen/pktgen.cc
View file @ 7f1b94ae
...@@ -37,18 +37,16 @@ ...@@ -37,18 +37,16 @@
#include <unordered_map> #include <unordered_map>
#include <vector> #include <vector>
#include <simbricks/base/cxxatomicfix.h>
extern "C" { extern "C" {
#include <simbricks/netif/netif.h> #include <simbricks/network/if.h>
#include <simbricks/nicif/nicif.h> #include <simbricks/nicif/nicif.h>
#include <simbricks/proto/base.h>
}; };
//#define NETSWITCH_DEBUG //#define NETSWITCH_DEBUG
#define NETSWITCH_STAT #define NETSWITCH_STAT
static uint64_t sync_period = (500 * 1000ULL); // 500ns struct SimbricksBaseIfParams netParams;
static uint64_t eth_latency = (500 * 1000ULL); // 500ns
static int sync_mode = SIMBRICKS_PROTO_SYNC_SIMBRICKS;
static pcap_dumper_t *dumpfile = nullptr; static pcap_dumper_t *dumpfile = nullptr;
#define PKT_LEN 1500 //byte #define PKT_LEN 1500 //byte
static uint64_t bit_rate = 100 * 1000ULL * 1000ULL * 1000ULL; // 100 Gbps static uint64_t bit_rate = 100 * 1000ULL * 1000ULL * 1000ULL; // 100 Gbps
...@@ -119,15 +117,15 @@ class Port { ...@@ -119,15 +117,15 @@ class Port {
kRxPollFail = 1, kRxPollFail = 1,
kRxPollSync = 2, kRxPollSync = 2,
}; };
struct mac_addr my_mac; struct mac_addr my_mac;
struct mac_addr dest_mac; struct mac_addr dest_mac;
virtual ~Port() = default; virtual ~Port() = default;
virtual bool Connect(const char *path, int sync) = 0; virtual bool Connect(const char *path, int sync) = 0;
virtual bool IsSync() = 0; virtual bool IsSync() = 0;
virtual void Sync(uint64_t cur_ts) = 0; virtual void Sync(uint64_t cur_ts) = 0;
virtual void AdvanceEpoch(uint64_t cur_ts) = 0;
virtual uint64_t NextTimestamp() = 0; virtual uint64_t NextTimestamp() = 0;
virtual enum RxPollState RxPacket( virtual enum RxPollState RxPacket(
const void *& data, size_t &len, uint64_t cur_ts) = 0; const void *& data, size_t &len, uint64_t cur_ts) = 0;
...@@ -139,21 +137,24 @@ class Port { ...@@ -139,21 +137,24 @@ class Port {
/** Normal network switch port (conneting to a NIC) */ /** Normal network switch port (conneting to a NIC) */
class NetPort : public Port { class NetPort : public Port {
protected: protected:
struct SimbricksNetIf netif_; struct SimbricksNetIf netifObj_;
volatile union SimbricksProtoNetD2N *rx_; struct SimbricksNetIf *netif_;
volatile union SimbricksProtoNetMsg *rx_;
int sync_; int sync_;
public: public:
NetPort() : rx_(nullptr), sync_(0) { NetPort() : netif_(&netifObj_), rx_(nullptr), sync_(0) {
memset(&netif_, 0, sizeof(netif_)); memset(&netifObj_, 0, sizeof(netifObj_));
memset(&my_mac, 0, sizeof(my_mac));
memset(&dest_mac, 0, sizeof(dest_mac));
} }
NetPort(const NetPort &other) : netif_(other.netif_), rx_(other.rx_), NetPort(const NetPort &other) : netifObj_(other.netifObj_),
sync_(other.sync_) {} netif_(&netifObj_), rx_(other.rx_), sync_(other.sync_) {}
virtual bool Connect(const char *path, int sync) override { virtual bool Connect(const char *path, int sync) override {
sync_ = sync; sync_ = sync;
return SimbricksNetIfInit(&netif_, path, &sync_) == 0; return SimbricksNetIfInit(netif_, &netParams, path, &sync_) == 0;
} }
virtual bool IsSync() override { virtual bool IsSync() override {
...@@ -161,35 +162,27 @@ class NetPort : public Port { ...@@ -161,35 +162,27 @@ class NetPort : public Port {
} }
virtual void Sync(uint64_t cur_ts) override { virtual void Sync(uint64_t cur_ts) override {
if (SimbricksNetIfN2DSync(&netif_, cur_ts, eth_latency, sync_period, while (SimbricksNetIfOutSync(netif_, cur_ts));
sync_mode) != 0) {
fprintf(stderr, "SimbricksNetIfN2DSync failed\n");
abort();
}
}
virtual void AdvanceEpoch(uint64_t cur_ts) override {
SimbricksNetIfAdvanceEpoch(cur_ts, sync_period, sync_mode);
} }
virtual uint64_t NextTimestamp() override { virtual uint64_t NextTimestamp() override {
return SimbricksNetIfD2NTimestamp(&netif_); return SimbricksNetIfInTimestamp(netif_);
} }
virtual enum RxPollState RxPacket( virtual enum RxPollState RxPacket(
const void *& data, size_t &len, uint64_t cur_ts) override { const void *& data, size_t &len, uint64_t cur_ts) override {
assert(rx_ == nullptr); assert(rx_ == nullptr);
rx_ = SimbricksNetIfD2NPoll(&netif_, cur_ts); rx_ = SimbricksNetIfInPoll(netif_, cur_ts);
if (!rx_) if (!rx_)
return kRxPollFail; return kRxPollFail;
uint8_t type = rx_->dummy.own_type & SIMBRICKS_PROTO_NET_D2N_MSG_MASK; uint8_t type = SimbricksNetIfInType(netif_, rx_);
if (type == SIMBRICKS_PROTO_NET_D2N_MSG_SEND) { if (type == SIMBRICKS_PROTO_NET_MSG_PACKET) {
data = (const void *)rx_->send.data; data = (const void *)rx_->packet.data;
len = rx_->send.len; len = rx_->packet.len;
return kRxPollSuccess; return kRxPollSuccess;
} else if (type == SIMBRICKS_PROTO_NET_D2N_MSG_SYNC) { } else if (type == SIMBRICKS_PROTO_MSG_TYPE_SYNC) {
return kRxPollSync; return kRxPollSync;
} else { } else {
fprintf(stderr, "switch_pkt: unsupported type=%u\n", type); fprintf(stderr, "switch_pkt: unsupported type=%u\n", type);
...@@ -200,138 +193,64 @@ class NetPort : public Port { ...@@ -200,138 +193,64 @@ class NetPort : public Port {
virtual void RxDone() override { virtual void RxDone() override {
assert(rx_ != nullptr); assert(rx_ != nullptr);
SimbricksNetIfD2NDone(&netif_, rx_); SimbricksNetIfInDone(netif_, rx_);
rx_ = nullptr; rx_ = nullptr;
} }
virtual bool TxPacket( virtual bool TxPacket(
const void *data, size_t len, uint64_t cur_ts) override { const void *data, size_t len, uint64_t cur_ts) override {
volatile union SimbricksProtoNetN2D *msg_to = volatile union SimbricksProtoNetMsg *msg_to =
SimbricksNetIfN2DAlloc(&netif_, cur_ts, eth_latency); SimbricksNetIfOutAlloc(netif_, cur_ts);
if (!msg_to) if (!msg_to && !sync_) {
return false; return false;
} else if (!msg_to && sync_) {
volatile struct SimbricksProtoNetN2DRecv *rx; while (!msg_to)
rx = &msg_to->recv; msg_to = SimbricksNetIfOutAlloc(netif_, cur_ts);
}
volatile struct SimbricksProtoNetMsgPacket *rx;
rx = &msg_to->packet;
rx->len = len; rx->len = len;
rx->port = 0; rx->port = 0;
memcpy((void *)rx->data, data, len); memcpy((void *)rx->data, data, len);
// WMB(); SimbricksNetIfOutSend(netif_, msg_to, SIMBRICKS_PROTO_NET_MSG_PACKET);
rx->own_type =
SIMBRICKS_PROTO_NET_N2D_MSG_RECV | SIMBRICKS_PROTO_NET_N2D_OWN_DEV;
return true; return true;
} }
}; };
/** Hosting network switch port (connected to another network) */ /** Hosting network switch port (connected to another network) */
class NetHostPort : public Port { class NetHostPort : public NetPort {
protected: protected:
struct SimbricksNicIf nicif_; struct SimbricksNicIf nicif_;
volatile union SimbricksProtoNetN2D *rx_;
int sync_;
public: public:
NetHostPort() {
NetHostPort() : rx_(nullptr), sync_(0) { netif_ = &nicif_.net;
memset(&nicif_, 0, sizeof(nicif_)); memset(&nicif_, 0, sizeof(nicif_));
memset(&my_mac, 0, sizeof(my_mac));
memset(&dest_mac, 0, sizeof(dest_mac));
} }
NetHostPort(const NetHostPort &other) : nicif_(other.nicif_), rx_(other.rx_), NetHostPort(const NetHostPort &other) : NetPort(other), nicif_(other.nicif_) {
sync_(other.sync_){} netif_ = &nicif_.net;
}
virtual bool Connect(const char *path, int sync) override { virtual bool Connect(const char *path, int sync) override {
sync_ = sync; sync_ = sync;
std::string shm_path = path; std::string shm_path = path;
shm_path += "-shm"; shm_path += "-shm";
struct SimbricksNicIfParams params = { struct SimbricksBaseIfParams params = netParams;
.pci_socket_path = nullptr, netParams.sock_path = path;
.eth_socket_path = path, if (!sync)
.shm_path = shm_path.c_str(), netParams.sync_mode = kSimbricksBaseIfSyncDisabled;
int ret = SimbricksNicIfInit(&nicif_, shm_path.c_str(), &params, nullptr,
.pci_latency = 0, nullptr);
.eth_latency = eth_latency, sync_ = SimbricksBaseIfSyncEnabled(&netif_->base);
.sync_delay = sync_period,
.sync_pci = 0,
.sync_eth = sync,
.sync_mode = sync_mode,
};
struct SimbricksProtoPcieDevIntro di;
int ret = SimbricksNicIfInit(&nicif_, &params, &di);
sync_ = params.sync_eth;
return ret == 0; return ret == 0;
} }
virtual bool IsSync() override { virtual bool IsSync() override {
return sync_; return sync_;
} }
virtual void Sync(uint64_t cur_ts) override {
if (SimbricksNicIfSync(&nicif_, cur_ts) != 0) {
fprintf(stderr, "SimbricksNicIfSync failed\n");
abort();
}
}
virtual void AdvanceEpoch(uint64_t cur_ts) override {
SimbricksNicIfAdvanceEpoch(&nicif_, cur_ts);
}
virtual uint64_t NextTimestamp() override {
return SimbricksNicIfNextTimestamp(&nicif_);
}
virtual enum RxPollState RxPacket(
const void *& data, size_t &len, uint64_t cur_ts) override {
assert(rx_ == nullptr);
rx_ = SimbricksNicIfN2DPoll(&nicif_, cur_ts);
if (!rx_)
return kRxPollFail;
uint8_t type = rx_->dummy.own_type & SIMBRICKS_PROTO_NET_N2D_MSG_MASK;
if (type == SIMBRICKS_PROTO_NET_N2D_MSG_RECV) {
data = (const void *)rx_->recv.data;
len = rx_->recv.len;
return kRxPollSuccess;
} else if (type == SIMBRICKS_PROTO_NET_N2D_MSG_SYNC) {
return kRxPollSync;
} else {
fprintf(stderr, "switch_pkt: unsupported type=%u\n", type);
abort();
}
}
virtual void RxDone() override {
assert(rx_ != nullptr);
SimbricksNicIfN2DDone(&nicif_, rx_);
SimbricksNicIfN2DNext(&nicif_);
rx_ = nullptr;
}
virtual bool TxPacket(
const void *data, size_t len, uint64_t cur_ts) override {
volatile union SimbricksProtoNetD2N *msg_to =
SimbricksNicIfD2NAlloc(&nicif_, cur_ts);
if (!msg_to)
return false;
volatile struct SimbricksProtoNetD2NSend *rx;
rx = &msg_to->send;
rx->len = len;
rx->port = 0;
memcpy((void *)rx->data, data, len);
// WMB();
rx->own_type =
SIMBRICKS_PROTO_NET_D2N_MSG_SEND | SIMBRICKS_PROTO_NET_D2N_OWN_NET;
return true;
}
}; };
...@@ -495,8 +414,10 @@ int main(int argc, char *argv[]) { ...@@ -495,8 +414,10 @@ int main(int argc, char *argv[]) {
pcap_t *pc = nullptr; pcap_t *pc = nullptr;
int my_num = 0; int my_num = 0;
SimbricksNetIfDefaultParams(&netParams);
// Parse command line argument // Parse command line argument
while ((c = getopt(argc, argv, "s:h:uS:E:m:p:n:")) != -1 && !bad_option) { while ((c = getopt(argc, argv, "s:h:uS:E:p:n:")) != -1 && !bad_option) {
switch (c) { switch (c) {
case 's': { case 's': {
NetPort *port = new NetPort; NetPort *port = new NetPort;
...@@ -525,17 +446,11 @@ int main(int argc, char *argv[]) { ...@@ -525,17 +446,11 @@ int main(int argc, char *argv[]) {
break; break;
case 'S': case 'S':
sync_period = strtoull(optarg, NULL, 0) * 1000ULL; netParams.sync_interval = strtoull(optarg, NULL, 0) * 1000ULL;
break; break;
case 'E': case 'E':
eth_latency = strtoull(optarg, NULL, 0) * 1000ULL; netParams.link_latency = strtoull(optarg, NULL, 0) * 1000ULL;
break;
case 'm':
sync_mode = strtol(optarg, NULL, 0);
assert(sync_mode == SIMBRICKS_PROTO_SYNC_SIMBRICKS ||
sync_mode == SIMBRICKS_PROTO_SYNC_BARRIER);
break; break;
case 'p': case 'p':
...@@ -601,8 +516,6 @@ int main(int argc, char *argv[]) { ...@@ -601,8 +516,6 @@ int main(int argc, char *argv[]) {
// Sync all interfaces // Sync all interfaces
for (auto port : ports) for (auto port : ports)
port->Sync(cur_ts); port->Sync(cur_ts);
for (auto port : ports)
port->AdvanceEpoch(cur_ts);
// Switch packets // Switch packets
uint64_t min_ts; uint64_t min_ts;
...@@ -622,7 +535,7 @@ int main(int argc, char *argv[]) { ...@@ -622,7 +535,7 @@ int main(int argc, char *argv[]) {
// Update cur_ts // Update cur_ts
if (min_ts < ULLONG_MAX) { if (min_ts < ULLONG_MAX) {
// a bit broken but should probably do // a bit broken but should probably do
cur_ts = SimbricksNetIfAdvanceTime(min_ts, sync_period, sync_mode); cur_ts = min_ts;
if (cur_ts >= target_tick){ if (cur_ts >= target_tick){
printf("run to %lu tics\n", cur_ts); printf("run to %lu tics\n", cur_ts);
exiting = 1; exiting = 1;
......
sims/net/pktgen/rules.mk
View file @ 7f1b94ae
...@@ -28,7 +28,7 @@ OBJS := $(d)pktgen.o ...@@ -28,7 +28,7 @@ OBJS := $(d)pktgen.o
$(OBJS): CPPFLAGS := $(CPPFLAGS) -I$(d)include/ $(OBJS): CPPFLAGS := $(CPPFLAGS) -I$(d)include/
$(bin_pktgen): $(OBJS) $(lib_netif) $(lib_nicif) -lpcap $(bin_pktgen): $(OBJS) $(lib_netif) $(lib_nicif) $(lib_base) -lpcap
CLEAN := $(bin_pktgen) $(OBJS) CLEAN := $(bin_pktgen) $(OBJS)
ALL := $(bin_pktgen) ALL := $(bin_pktgen)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment