From nobody Sat Nov 1 22:27:56 2025 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.zohomail.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 1527660856410490.3139998664468; Tue, 29 May 2018 23:14:16 -0700 (PDT) Received: from localhost ([::1]:36391 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fNuND-0000sV-Mj for importer@patchew.org; Wed, 30 May 2018 02:14:15 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57163) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fNuJw-0007B9-T9 for qemu-devel@nongnu.org; Wed, 30 May 2018 02:10:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fNuJt-00065E-Mz for qemu-devel@nongnu.org; Wed, 30 May 2018 02:10:52 -0400 Received: from 2.mo2.mail-out.ovh.net ([188.165.53.149]:43131) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fNuJt-00064W-HR for qemu-devel@nongnu.org; Wed, 30 May 2018 02:10:49 -0400 Received: from player168.ha.ovh.net (unknown [10.109.122.118]) by mo2.mail-out.ovh.net (Postfix) with ESMTP id E150013557B for ; Wed, 30 May 2018 08:10:47 +0200 (CEST) Received: from zorba.kaod.org.com (LFbn-TOU-1-49-10.w86-201.abo.wanadoo.fr [86.201.141.10]) (Authenticated sender: clg@kaod.org) by player168.ha.ovh.net (Postfix) with ESMTPSA id 9289F42008A; Wed, 30 May 2018 08:10:43 +0200 (CEST) From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= To: Samuel Thibault Date: Wed, 30 May 2018 08:10:33 +0200 Message-Id: <20180530061035.22592-2-clg@kaod.org> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20180530061035.22592-1-clg@kaod.org> References: <20180530061035.22592-1-clg@kaod.org> MIME-Version: 1.0 X-Ovh-Tracer-Id: 4640677945217420061 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedthedrheelgddutdehucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddm 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: 188.165.53.149 Subject: [Qemu-devel] [PATCH v2 1/3] slirp/ncsi: fix "Get Version ID" payload length 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: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , qemu-devel@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= 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" Signed-off-by: C=C3=A9dric Le Goater Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- slirp/ncsi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/slirp/ncsi.c b/slirp/ncsi.c index d12ba3e494b0..02d0e9def3e8 100644 --- a/slirp/ncsi.c +++ b/slirp/ncsi.c @@ -60,7 +60,7 @@ static const struct ncsi_rsp_handler { { NCSI_PKT_RSP_EGMF, 4, NULL }, { NCSI_PKT_RSP_DGMF, 4, NULL }, { NCSI_PKT_RSP_SNFC, 4, NULL }, - { NCSI_PKT_RSP_GVI, 36, NULL }, + { NCSI_PKT_RSP_GVI, 40, NULL }, { NCSI_PKT_RSP_GC, 32, ncsi_rsp_handler_gc }, { NCSI_PKT_RSP_GP, -1, NULL }, { NCSI_PKT_RSP_GCPS, 172, NULL }, --=20 2.13.6 From nobody Sat Nov 1 22:27:56 2025 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.zohomail.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 1527660774877300.30995202933946; Tue, 29 May 2018 23:12:54 -0700 (PDT) Received: from localhost ([::1]:36378 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fNuLo-00085t-9t for importer@patchew.org; Wed, 30 May 2018 02:12:48 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57188) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fNuK0-0007Dm-UM for qemu-devel@nongnu.org; Wed, 30 May 2018 02:11:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fNuJx-00066f-MU for qemu-devel@nongnu.org; Wed, 30 May 2018 02:10:56 -0400 Received: from 3.mo178.mail-out.ovh.net ([46.105.44.197]:41294) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fNuJx-00066D-GE for qemu-devel@nongnu.org; Wed, 30 May 2018 02:10:53 -0400 Received: from player168.ha.ovh.net (unknown [10.109.108.46]) by mo178.mail-out.ovh.net (Postfix) with ESMTP id 14B2318B6C for ; Wed, 30 May 2018 08:10:52 +0200 (CEST) Received: from zorba.kaod.org.com (LFbn-TOU-1-49-10.w86-201.abo.wanadoo.fr [86.201.141.10]) (Authenticated sender: clg@kaod.org) by player168.ha.ovh.net (Postfix) with ESMTPSA id CB16342008A; Wed, 30 May 2018 08:10:47 +0200 (CEST) From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= To: Samuel Thibault Date: Wed, 30 May 2018 08:10:34 +0200 Message-Id: <20180530061035.22592-3-clg@kaod.org> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20180530061035.22592-1-clg@kaod.org> References: <20180530061035.22592-1-clg@kaod.org> MIME-Version: 1.0 X-Ovh-Tracer-Id: 4641803841207175965 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedthedrheelgddutdehucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddm 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: 46.105.44.197 Subject: [Qemu-devel] [PATCH v2 2/3] slirp/ncsi: add a "Get Parameters" response 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: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , qemu-devel@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= 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" Command 0x17 'Get Parameters' is used to get configuration parameter values currently in effect on the controller and it is mandatory in the NS-CI specification. Provide a minimum response to exercise the kernel. Signed-off-by: C=C3=A9dric Le Goater Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- Changes since v1: - removed bogus MAC addr and initialized VLAN filters to zero. slirp/ncsi.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/slirp/ncsi.c b/slirp/ncsi.c index 02d0e9def3e8..7b3fff207ab3 100644 --- a/slirp/ncsi.c +++ b/slirp/ncsi.c @@ -35,6 +35,20 @@ static int ncsi_rsp_handler_gls(struct ncsi_rsp_pkt_hdr = *rnh) return 0; } =20 +/* Get Parameters */ +static int ncsi_rsp_handler_gp(struct ncsi_rsp_pkt_hdr *rnh) +{ + struct ncsi_rsp_gp_pkt *rsp =3D (struct ncsi_rsp_gp_pkt *) rnh; + + /* no MAC address filters or VLAN filters on the channel */ + rsp->mac_cnt =3D 0; + rsp->mac_enable =3D 0; + rsp->vlan_cnt =3D 0; + rsp->vlan_enable =3D 0; + + return 0; +} + static const struct ncsi_rsp_handler { unsigned char type; int payload; @@ -62,7 +76,7 @@ static const struct ncsi_rsp_handler { { NCSI_PKT_RSP_SNFC, 4, NULL }, { NCSI_PKT_RSP_GVI, 40, NULL }, { NCSI_PKT_RSP_GC, 32, ncsi_rsp_handler_gc }, - { NCSI_PKT_RSP_GP, -1, NULL }, + { NCSI_PKT_RSP_GP, 40, ncsi_rsp_handler_gp }, { NCSI_PKT_RSP_GCPS, 172, NULL }, { NCSI_PKT_RSP_GNS, 172, NULL }, { NCSI_PKT_RSP_GNPTS, 172, NULL }, --=20 2.13.6 From nobody Sat Nov 1 22:27:56 2025 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.zohomail.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 1527660776051489.3907295557934; Tue, 29 May 2018 23:12:56 -0700 (PDT) Received: from localhost ([::1]:36379 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fNuLs-00089I-3P for importer@patchew.org; Wed, 30 May 2018 02:12:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57207) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fNuK7-0007G6-8K for qemu-devel@nongnu.org; Wed, 30 May 2018 02:11:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fNuK2-00068n-9t for qemu-devel@nongnu.org; Wed, 30 May 2018 02:11:01 -0400 Received: from 3.mo173.mail-out.ovh.net ([46.105.34.1]:41297) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fNuK2-000683-40 for qemu-devel@nongnu.org; Wed, 30 May 2018 02:10:58 -0400 Received: from player168.ha.ovh.net (unknown [10.109.122.102]) by mo173.mail-out.ovh.net (Postfix) with ESMTP id 5864CC0DC2 for ; Wed, 30 May 2018 08:10:56 +0200 (CEST) Received: from zorba.kaod.org.com (LFbn-TOU-1-49-10.w86-201.abo.wanadoo.fr [86.201.141.10]) (Authenticated sender: clg@kaod.org) by player168.ha.ovh.net (Postfix) with ESMTPSA id 05220420096; Wed, 30 May 2018 08:10:51 +0200 (CEST) From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= To: Samuel Thibault Date: Wed, 30 May 2018 08:10:35 +0200 Message-Id: <20180530061035.22592-4-clg@kaod.org> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20180530061035.22592-1-clg@kaod.org> References: <20180530061035.22592-1-clg@kaod.org> MIME-Version: 1.0 X-Ovh-Tracer-Id: 4643211217903651613 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedthedrheelgddutdehucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddm 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: 46.105.34.1 Subject: [Qemu-devel] [PATCH v2 3/3] slirp/ncsi: add checksum support 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: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , qemu-devel@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= 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 Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- Changes since v1: - updated Copyright - used uint16_t instead of chars to compute the checksum =20 slirp/ncsi.c | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/slirp/ncsi.c b/slirp/ncsi.c index 7b3fff207ab3..7116034afc20 100644 --- a/slirp/ncsi.c +++ b/slirp/ncsi.c @@ -1,7 +1,7 @@ /* * NC-SI (Network Controller Sideband Interface) "echo" model * - * Copyright (C) 2016 IBM Corp. + * Copyright (C) 2016-2018 IBM Corp. * * This code is licensed under the GPL version 2 or later. See the * COPYING file in the top-level directory. @@ -11,6 +11,23 @@ =20 #include "ncsi-pkt.h" =20 +static uint32_t ncsi_calculate_checksum(uint16_t *data, int len) +{ + uint32_t checksum =3D 0; + int i; + + /* + * 32-bit unsigned sum of the NC-SI packet header and NC-SI packet + * payload interpreted as a series of 16-bit unsigned integer values. + */ + for (i =3D 0; i < len; i++) { + checksum +=3D htons(data[i]); + } + + checksum =3D (~checksum + 1); + return checksum; +} + /* Get Capabilities */ static int ncsi_rsp_handler_gc(struct ncsi_rsp_pkt_hdr *rnh) { @@ -101,6 +118,9 @@ void ncsi_input(Slirp *slirp, const uint8_t *pkt, int p= kt_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 @@ -130,15 +150,18 @@ 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 the optional checksum at the end of the frame. */ + checksum =3D ncsi_calculate_checksum((uint16_t *) rnh, ncsi_rsp_len); + 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.13.6