From patchwork Thu Jun 30 08:40:59 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Asias He X-Patchwork-Id: 932272 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p5U8idem000766 for ; Thu, 30 Jun 2011 08:44:39 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758820Ab1F3Iog (ORCPT ); Thu, 30 Jun 2011 04:44:36 -0400 Received: from mail-iy0-f174.google.com ([209.85.210.174]:44108 "EHLO mail-iy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758793Ab1F3Iof (ORCPT ); Thu, 30 Jun 2011 04:44:35 -0400 Received: by mail-iy0-f174.google.com with SMTP id 12so1722680iyb.19 for ; Thu, 30 Jun 2011 01:44:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=yZvQbwNDQueXYptSN6COMIjZzfCQt0kqqr81ZHbW68s=; b=MH/1YMY2pFT/34Ai2BN84Pb5o1vD7qH+j75xitZbqxfFBkdCSM+O6PWZjASDvj9nAW fY+waAWbmN7cqKbgqFt+08VpTIEP3duPJKZB1z48VAbu4qDHuk3Rk3LS30xdIFsSpb4H 2afjC9HD7oF+gJUeJLBBobMqBi8iktH0Rw0N0= Received: by 10.42.163.199 with SMTP id d7mr1731341icy.261.1309423475290; Thu, 30 Jun 2011 01:44:35 -0700 (PDT) Received: from localhost.localdomain ([219.224.169.130]) by mx.google.com with ESMTPS id d6sm1967338icx.1.2011.06.30.01.44.31 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 30 Jun 2011 01:44:34 -0700 (PDT) From: Asias He To: Pekka Enberg Cc: Cyrill Gorcunov , Ingo Molnar , Sasha Levin , Prasad Joshi , kvm@vger.kernel.org, Asias He Subject: [PATCH v2 11/31] kvm tools: Implement uip_csum_udp() to calculate UDP checksum Date: Thu, 30 Jun 2011 16:40:59 +0800 Message-Id: <1309423279-3093-12-git-send-email-asias.hejun@gmail.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1309423279-3093-1-git-send-email-asias.hejun@gmail.com> References: <1309423279-3093-1-git-send-email-asias.hejun@gmail.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Thu, 30 Jun 2011 08:44:39 +0000 (UTC) Signed-off-by: Asias He --- tools/kvm/include/kvm/uip.h | 1 + tools/kvm/uip/csum.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 0 deletions(-) diff --git a/tools/kvm/include/kvm/uip.h b/tools/kvm/include/kvm/uip.h index 979e2b0..e2ad66a 100644 --- a/tools/kvm/include/kvm/uip.h +++ b/tools/kvm/include/kvm/uip.h @@ -161,6 +161,7 @@ int uip_tx_do_ipv4(struct uip_tx_arg *arg); int uip_tx_do_arp(struct uip_tx_arg *arg); u16 uip_csum_icmp(struct uip_icmp *icmp); +u16 uip_csum_udp(struct uip_udp *udp); u16 uip_csum_ip(struct uip_ip *ip); struct uip_buf *uip_buf_set_used(struct uip_info *info, struct uip_buf *buf); diff --git a/tools/kvm/uip/csum.c b/tools/kvm/uip/csum.c index c86bfdf..a152a0f 100644 --- a/tools/kvm/uip/csum.c +++ b/tools/kvm/uip/csum.c @@ -31,3 +31,32 @@ u16 uip_csum_icmp(struct uip_icmp *icmp) ip = &icmp->ip; return icmp->csum = uip_csum(0, &icmp->type, htons(ip->len) - uip_ip_hdrlen(ip) - 8); /* icmp header len = 8 */ } + +u16 uip_csum_udp(struct uip_udp *udp) +{ + struct uip_pseudo_hdr hdr; + struct uip_ip *ip; + int udp_len; + u8 *pad; + + ip = &udp->ip; + + hdr.sip = ip->sip; + hdr.dip = ip->dip; + hdr.zero = 0; + hdr.proto = ip->proto; + hdr.len = udp->len; + + udp_len = uip_udp_len(udp); + + if (udp_len % 2) { + pad = (u8 *)&udp->sport + udp_len; + *pad = 0; + memcpy((u8 *)&udp->sport + udp_len + 1, &hdr, sizeof(hdr)); + return uip_csum(0, (u8 *)&udp->sport, udp_len + 1 + sizeof(hdr)); + } else { + memcpy((u8 *)&udp->sport + udp_len, &hdr, sizeof(hdr)); + return uip_csum(0, (u8 *)&udp->sport, udp_len + sizeof(hdr)); + } + +}