Skip to content

Make TCP interfaces compatible. #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions arch/x86/include/asm/kvm_host.h
Original file line number Diff line number Diff line change
Expand Up @@ -669,9 +669,8 @@ struct kvm_lpage_info {

#define KVM_DSM_DEBUG

/* TODO: Make TCP interfaces compatible. */
//#define USE_KTCP_NETWORK
#define USE_KRDMA_NETWORK
#define USE_KTCP_NETWORK
//#define USE_KRDMA_NETWORK

#define IVY_KVM_DSM
//#define TARDIS_KVM_DSM
Expand Down
5 changes: 3 additions & 2 deletions arch/x86/kvm/ktcp.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
#include <linux/slab.h>
#include <linux/delay.h>

#include <linux/kvm_host.h>
#include "ktcp.h"

struct ktcp_hdr {
Expand Down Expand Up @@ -81,11 +82,11 @@ static int __ktcp_send(struct socket *sock, const char *buffer, size_t length,
}

int ktcp_send(struct socket *sock, const char *buffer, size_t length,
unsigned long flags, extent_t extent)
unsigned long flags, const extent_t *extent)
{
struct ktcp_hdr hdr = {
.length = length,
.extent = extent,
.extent = *extent,
};
int ret;
mm_segment_t oldmm;
Expand Down
5 changes: 3 additions & 2 deletions arch/x86/kvm/ktcp.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,11 @@
// How many requests can be buffered in the listening queue
#define DEFAULT_BACKLOG 16

typedef uint32_t extent_t;
struct tx_add;
typedef struct tx_add extent_t;

int ktcp_send(struct socket *sock, const char *buffer, size_t length,
unsigned long flags, extent_t extent);
unsigned long flags, const extent_t *extent);

int ktcp_receive(struct socket *sock, char *buffer, unsigned long flags,
extent_t *extent);
Expand Down