From nobody Wed May 8 07:48:18 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1492694578429273.2997306525815; Thu, 20 Apr 2017 06:22:58 -0700 (PDT) Received: from localhost ([::1]:53923 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d1C2z-0003fR-2l for importer@patchew.org; Thu, 20 Apr 2017 09:22:57 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35021) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d1C1q-00031U-Un for qemu-devel@nongnu.org; Thu, 20 Apr 2017 09:21:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d1C1m-0007C7-Lg for qemu-devel@nongnu.org; Thu, 20 Apr 2017 09:21:46 -0400 Received: from 4.mo4.mail-out.ovh.net ([178.32.98.131]:43317) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d1C1m-00079y-FV for qemu-devel@nongnu.org; Thu, 20 Apr 2017 09:21:42 -0400 Received: from player159.ha.ovh.net (b9.ovh.net [213.186.33.59]) by mo4.mail-out.ovh.net (Postfix) with ESMTP id 07BF55FA97 for ; Thu, 20 Apr 2017 15:21:33 +0200 (CEST) Received: from zorba.kaod.org (LFbn-1-10647-27.w90-89.abo.wanadoo.fr [90.89.233.27]) (Authenticated sender: clg@kaod.org) by player159.ha.ovh.net (Postfix) with ESMTPSA id 468104800AC; Thu, 20 Apr 2017 15:21:28 +0200 (CEST) From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= To: Jason Wang Date: Thu, 20 Apr 2017 15:21:15 +0200 Message-Id: <1492694475-18198-1-git-send-email-clg@kaod.org> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 X-Ovh-Tracer-Id: 13104630494287203327 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrfeeliedrfedvgdeigecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 178.32.98.131 Subject: [Qemu-devel] [PATCH] slirp: add checksum support to NC-SI backend X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-devel@nongnu.org, Samuel Thibault , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Gavin Shan , Jan Kiszka Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" The checksum field of a NC-SI packet contains a value that may be included in each command and response. The verification is optional but the Linux driver does so when a non-zero value is provided. Let's extend the model to compute the checksum value and exercise a little more the Linux driver. See section "8.2.2.3 - 2's Complement Checksum Compensation" in the Network Controller Sideband Interface (NC-SI) Specification for more details. Signed-off-by: C=C3=A9dric Le Goater --- slirp/ncsi.c | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/slirp/ncsi.c b/slirp/ncsi.c index d12ba3e494b0..81c6bc5576d3 100644 --- a/slirp/ncsi.c +++ b/slirp/ncsi.c @@ -8,9 +8,23 @@ */ #include "qemu/osdep.h" #include "slirp.h" +#include "net/checksum.h" =20 #include "ncsi-pkt.h" =20 +static uint32_t ncsi_calculate_checksum(unsigned char *data, int len) +{ + uint32_t checksum =3D 0; + int i; + + for (i =3D 0; i < len; i +=3D 2) { + checksum +=3D (((uint32_t)data[i] << 8) | data[i + 1]); + } + + checksum =3D (~checksum + 1); + return checksum; +} + /* Get Capabilities */ static int ncsi_rsp_handler_gc(struct ncsi_rsp_pkt_hdr *rnh) { @@ -87,6 +101,9 @@ void ncsi_input(Slirp *slirp, const uint8_t *pkt, int pk= t_len) (ncsi_reply + ETH_HLEN); const struct ncsi_rsp_handler *handler =3D NULL; int i; + int ncsi_rsp_len =3D sizeof(*nh); + uint32_t checksum; + uint32_t *pchecksum; =20 memset(ncsi_reply, 0, sizeof(ncsi_reply)); =20 @@ -116,15 +133,19 @@ void ncsi_input(Slirp *slirp, const uint8_t *pkt, int= pkt_len) /* TODO: handle errors */ handler->handler(rnh); } + ncsi_rsp_len +=3D handler->payload; } else { rnh->common.length =3D 0; rnh->code =3D htons(NCSI_PKT_RSP_C_UNAVAILABLE); rnh->reason =3D htons(NCSI_PKT_RSP_R_UNKNOWN); } =20 - /* TODO: add a checksum at the end of the frame but the specs - * allows it to be zero */ + /* add a checksum at the end of the frame (the specs allows it to + * be zero */ + checksum =3D ncsi_calculate_checksum((unsigned char *) rnh, ncsi_rsp_l= en); + pchecksum =3D (uint32_t *)((void *) rnh + ncsi_rsp_len); + *pchecksum =3D htonl(checksum); + ncsi_rsp_len +=3D 4; =20 - slirp_output(slirp->opaque, ncsi_reply, ETH_HLEN + sizeof(*nh) + - (handler ? handler->payload : 0) + 4); + slirp_output(slirp->opaque, ncsi_reply, ETH_HLEN + ncsi_rsp_len); } --=20 2.7.4