implement a simple NETTXF_csum_blank/NETRXF_csum_blank workaround
so that we can talk with linux guests at least. just fill checksum field of received packets if the flag is set. maybe should be revisited later.
This commit is contained in:
yamt
parent
2b405338d9
commit
897bdba2b9
@ -1,4 +1,4 @@
|
||||
# $NetBSD: files.xen,v 1.44 2006/07/09 01:59:42 christos Exp $
|
||||
# $NetBSD: files.xen,v 1.45 2006/07/12 15:02:15 yamt Exp $
|
||||
# NetBSD: files.x86,v 1.10 2003/10/08 17:30:00 bouyer Exp
|
||||
# NetBSD: files.i386,v 1.254 2004/03/25 23:32:10 jmc Exp
|
||||
|
||||
@ -304,6 +304,7 @@ file arch/xen/xen/pci_intr_machdep.c hypervisor & pci
|
||||
file arch/xen/xen/isa_machdep.c hypervisor & dom0ops
|
||||
file arch/xen/xen/xenevt.c xenevt & dom0ops
|
||||
file arch/xen/xen/xennetback_xenbus.c xvif & xen3
|
||||
file arch/xen/xen/xennet_checksum.c (xvif & xen3) | xennet_xenbus
|
||||
file arch/xen/xen/xbdback_xenbus.c xbdback & xen3
|
||||
|
||||
include "arch/i386/conf/majors.i386"
|
||||
|
||||
36
sys/arch/xen/include/xennet_checksum.h
Normal file
36
sys/arch/xen/include/xennet_checksum.h
Normal file
@ -0,0 +1,36 @@
|
||||
/* $NetBSD: xennet_checksum.h,v 1.1 2006/07/12 15:02:15 yamt Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c)2006 YAMAMOTO Takashi,
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
||||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#ifndef _XEN_XENNET_CHECKSUM_H_
|
||||
#define _XEN_XENNET_CHECKSUM_H_
|
||||
|
||||
struct mbuf;
|
||||
|
||||
int xennet_checksum_fill(struct mbuf **);
|
||||
|
||||
#endif /* !_XEN_XENNET_CHECKSUM_H_ */
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: if_xennet_xenbus.c,v 1.11 2006/07/02 16:29:49 bouyer Exp $ */
|
||||
/* $NetBSD: if_xennet_xenbus.c,v 1.12 2006/07/12 15:02:15 yamt Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2006 Manuel Bouyer.
|
||||
@ -61,7 +61,7 @@
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: if_xennet_xenbus.c,v 1.11 2006/07/02 16:29:49 bouyer Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: if_xennet_xenbus.c,v 1.12 2006/07/12 15:02:15 yamt Exp $");
|
||||
|
||||
#include "opt_xen.h"
|
||||
#include "opt_nfs_boot.h"
|
||||
@ -98,6 +98,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_xennet_xenbus.c,v 1.11 2006/07/02 16:29:49 bouyer
|
||||
#include <machine/if_xennetvar.h>
|
||||
#endif /* defined(NFS_BOOT_BOOTSTATIC) */
|
||||
|
||||
#include <machine/xennet_checksum.h>
|
||||
|
||||
#include <uvm/uvm.h>
|
||||
|
||||
#include <machine/xen3-public/io/ring.h>
|
||||
@ -831,6 +833,13 @@ again:
|
||||
continue;
|
||||
}
|
||||
}
|
||||
if ((rx->flags & NETRXF_csum_blank) != 0) {
|
||||
xennet_checksum_fill(&m);
|
||||
if (m == NULL) {
|
||||
ifp->if_ierrors++;
|
||||
continue;
|
||||
}
|
||||
}
|
||||
#if NBPFILTER > 0
|
||||
/*
|
||||
* Pass packet to bpf if there is a listener.
|
||||
|
||||
183
sys/arch/xen/xen/xennet_checksum.c
Normal file
183
sys/arch/xen/xen/xennet_checksum.c
Normal file
@ -0,0 +1,183 @@
|
||||
/* $NetBSD: xennet_checksum.c,v 1.1 2006/07/12 15:02:15 yamt Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c)2006 YAMAMOTO Takashi,
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
||||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: xennet_checksum.c,v 1.1 2006/07/12 15:02:15 yamt Exp $");
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <sys/param.h>
|
||||
|
||||
#include <net/if.h>
|
||||
#include <net/if_dl.h>
|
||||
#include <net/if_ether.h>
|
||||
#include <net/if_vlanvar.h>
|
||||
|
||||
#include <netinet/in.h>
|
||||
#include <netinet/in_systm.h>
|
||||
#include <netinet/ip.h>
|
||||
#include <netinet/tcp.h>
|
||||
#include <netinet/udp.h>
|
||||
|
||||
#include <machine/xennet_checksum.h>
|
||||
|
||||
static const void *m_extract(struct mbuf *, int, int, void *);
|
||||
static void *m_extract_write(struct mbuf *, int, int, void *);
|
||||
|
||||
static void *m_extract1(struct mbuf *, int, int, void *, int);
|
||||
#define MBUF_EXTRACT_WRITE 1
|
||||
|
||||
static void *
|
||||
m_extract1(struct mbuf *m, int off, int len, void *buf, int flags)
|
||||
{
|
||||
void *result;
|
||||
|
||||
KASSERT((m->m_flags & M_PKTHDR) != 0);
|
||||
|
||||
if (m->m_pkthdr.len < off + len) {
|
||||
result = NULL;
|
||||
} else if (m->m_len >= off + len &&
|
||||
((flags & MBUF_EXTRACT_WRITE) != 0 || !M_READONLY(m))) {
|
||||
result = mtod(m, char *) + off;
|
||||
} else {
|
||||
m_copydata(m, off, len, buf);
|
||||
result = buf;
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
static const void *
|
||||
m_extract(struct mbuf *m, int off, int len, void *buf)
|
||||
{
|
||||
|
||||
return m_extract1(m, off, len, buf, 0);
|
||||
}
|
||||
|
||||
static void *
|
||||
m_extract_write(struct mbuf *m, int off, int len, void *buf)
|
||||
{
|
||||
|
||||
return m_extract1(m, off, len, buf, MBUF_EXTRACT_WRITE);
|
||||
}
|
||||
|
||||
/*
|
||||
* xennet_checksum_fill: fill TCP/UDP checksum
|
||||
*/
|
||||
|
||||
int
|
||||
xennet_checksum_fill(struct mbuf **mp)
|
||||
{
|
||||
struct mbuf *m = *mp;
|
||||
struct ether_header eh_store;
|
||||
const struct ether_header *eh;
|
||||
struct ip iph_store;
|
||||
const struct ip *iph;
|
||||
int ehlen;
|
||||
int iphlen;
|
||||
int iplen;
|
||||
uint16_t etype;
|
||||
uint8_t nxt;
|
||||
int error = 0;
|
||||
|
||||
eh = m_extract(m, 0, sizeof(*eh), &eh_store);
|
||||
if (eh == NULL) {
|
||||
return EINVAL;
|
||||
}
|
||||
etype = eh->ether_type;
|
||||
if (etype == htobe16(ETHERTYPE_VLAN)) {
|
||||
ehlen = ETHER_HDR_LEN + ETHER_VLAN_ENCAP_LEN;
|
||||
} else if (etype == htobe16(ETHERTYPE_IP)) {
|
||||
ehlen = ETHER_HDR_LEN;
|
||||
} else {
|
||||
return EINVAL;
|
||||
}
|
||||
|
||||
iph = m_extract(m, ehlen, sizeof(*iph), &iph_store);
|
||||
if (iph == NULL) {
|
||||
printf("iph\n");
|
||||
return EINVAL;
|
||||
}
|
||||
nxt = iph->ip_p;
|
||||
iphlen = iph->ip_hl * 4;
|
||||
iplen = ntohs(iph->ip_len);
|
||||
if (ehlen + iplen != m->m_pkthdr.len) {
|
||||
return EINVAL;
|
||||
}
|
||||
if (nxt == IPPROTO_UDP) {
|
||||
struct udphdr uh_store;
|
||||
struct udphdr *uh;
|
||||
int ulen;
|
||||
|
||||
uh = m_extract_write(m, ehlen + iphlen, sizeof(*uh), &uh_store);
|
||||
ulen = ntohs(uh->uh_ulen);
|
||||
if (ehlen + iphlen + ulen > m->m_pkthdr.len) {
|
||||
return EINVAL;
|
||||
}
|
||||
m->m_len -= ehlen;
|
||||
m->m_data += ehlen;
|
||||
uh->uh_sum = 0;
|
||||
uh->uh_sum = in4_cksum(m, nxt, iphlen, iplen - iphlen);
|
||||
m->m_len += ehlen;
|
||||
m->m_data -= ehlen;
|
||||
if (uh != &uh_store) {
|
||||
m = m_copyback_cow(m, ehlen + iphlen, sizeof(*uh), uh,
|
||||
M_DONTWAIT);
|
||||
if (m == NULL) {
|
||||
error = ENOMEM;
|
||||
}
|
||||
}
|
||||
} else if (nxt == IPPROTO_TCP) {
|
||||
struct tcphdr th_store;
|
||||
struct tcphdr *th;
|
||||
int thlen;
|
||||
|
||||
th = m_extract_write(m, ehlen + iphlen, sizeof(*th), &th_store);
|
||||
thlen = th->th_off * 4;
|
||||
if (ehlen + iphlen + thlen > m->m_pkthdr.len) {
|
||||
return EINVAL;
|
||||
}
|
||||
m->m_len -= ehlen;
|
||||
m->m_data += ehlen;
|
||||
th->th_sum = 0;
|
||||
th->th_sum = in4_cksum(m, nxt, iphlen, iplen - iphlen);
|
||||
m->m_len += ehlen;
|
||||
m->m_data -= ehlen;
|
||||
if (th != &th_store) {
|
||||
m = m_copyback_cow(m, ehlen + iphlen, sizeof(*th), th,
|
||||
M_DONTWAIT);
|
||||
if (m == NULL) {
|
||||
error = ENOMEM;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
error = EINVAL;
|
||||
}
|
||||
|
||||
*mp = m;
|
||||
return error;
|
||||
}
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: xennetback_xenbus.c,v 1.9 2006/07/02 18:54:25 bouyer Exp $ */
|
||||
/* $NetBSD: xennetback_xenbus.c,v 1.10 2006/07/12 15:02:15 yamt Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2006 Manuel Bouyer.
|
||||
@ -63,6 +63,7 @@
|
||||
#include <machine/xen_shm.h>
|
||||
#include <machine/evtchn.h>
|
||||
#include <machine/xenbus.h>
|
||||
#include <machine/xennet_checksum.h>
|
||||
|
||||
#include <uvm/uvm.h>
|
||||
|
||||
@ -759,6 +760,13 @@ so always copy for now.
|
||||
m->m_pkthdr.len = m->m_len = txreq->size;
|
||||
m->m_flags |= M_EXT_ROMAP;
|
||||
}
|
||||
if ((txreq->flags & NETTXF_csum_blank) != 0) {
|
||||
xennet_checksum_fill(&m);
|
||||
if (m == NULL) {
|
||||
ifp->if_ierrors++;
|
||||
continue;
|
||||
}
|
||||
}
|
||||
m->m_pkthdr.rcvif = ifp;
|
||||
ifp->if_ipackets++;
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user