From nobody Sat May 4 16:43:47 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.zohomail.com; dkim=fail; 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 1517511885349729.1091736669517; Thu, 1 Feb 2018 11:04:45 -0800 (PST) Received: from localhost ([::1]:55021 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ehKA8-0004GG-G8 for importer@patchew.org; Thu, 01 Feb 2018 14:04:44 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39137) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ehK4q-0000J4-Ra for qemu-devel@nongnu.org; Thu, 01 Feb 2018 13:59:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ehK4n-0001OA-Ky for qemu-devel@nongnu.org; Thu, 01 Feb 2018 13:59:16 -0500 Received: from mail-oi0-x241.google.com ([2607:f8b0:4003:c06::241]:41103) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ehK4n-0001NC-EM for qemu-devel@nongnu.org; Thu, 01 Feb 2018 13:59:13 -0500 Received: by mail-oi0-x241.google.com with SMTP id m83so14179228oik.8 for ; Thu, 01 Feb 2018 10:59:13 -0800 (PST) Received: from serve.minyard.net ([47.184.168.85]) by smtp.gmail.com with ESMTPSA id h196sm118718oic.9.2018.02.01.10.59.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 01 Feb 2018 10:59:10 -0800 (PST) Received: from t430.minyard.net (t430m.minyard.net [192.168.27.3]) by serve.minyard.net (Postfix) with ESMTPA id DAA5C79A; Thu, 1 Feb 2018 12:59:09 -0600 (CST) Received: by t430.minyard.net (Postfix, from userid 1000) id 1A48E3000A3; Thu, 1 Feb 2018 12:59:09 -0600 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=E9OFFWDo05OoEcAKguIO3xcoxGiLCZNemTeC/2Bk+b4=; b=kD5xnmZ29ebpOtxb9Mt0v7+uyYh0svyGh6uGtX7xka1JBSPkQMCObCz9Zr3hXE6MoM uAtwC5r1spEgYsMHRNlO7VGLO9qizTCfvYVPAcwCRuT0d6BYUAGUzlckwfU9PV+8TLe/ uFJA7irOdQINy+D3d0Snt9Adi2SctjY/yiJ5hbCPYttChDl9hvhuqNdsxyUUWqlqUFSZ JxU3d93efb/RI4rWf07fPL37RAIlNejvR02O/CkgOljsHLzD32yi/2E0pX4EDhOtsD0i S+k1yprZfb0bPLmdIBrI64kvAYv7GQc0RI/z8Mj+jzwpLytnDVTLyzurwFd3h3TyZe9I 1uPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=E9OFFWDo05OoEcAKguIO3xcoxGiLCZNemTeC/2Bk+b4=; b=K2pQStgz8frYt0TfgGR+huqpsEw04c8eNRwlAetEsmhmW6QU2fZtyuJdjUUzUB6seS VNvWnTfdrFmPWpvFhr/SWhzXnS0/R0UPWbiZOWOoiBWC0/KuQvOGakPMhfnjB/4ps9aM PFTUtOCu5ZLWeUFM+KOVOfNm0kcnJXLTmVjVrVOUFLstf9Kz1TU8SVll4KX/ta1E0QJE 2uxAhQ06kZ9ANo6DRLZmLoNj3L83VvFgtDUbh7xoxoscSoRxZXmlHOhfn9VzGQ3Mhc7y mCP/D6kLGWieRjg51RUm52Zh3zwczu/c0Ng0taDtK69tlM/rRHfmxbbCWHF03YBIWJCO EvCg== X-Gm-Message-State: AKwxytdtCbVRiYA5zTvI14c8xPb19o2QwwXYBfcr4oyROtjZWB6q7ELX xobmc2FqfOiw/QwL0uKaog== X-Google-Smtp-Source: AH8x22792kO2bFe3NFiJ+3ca5aNs3ltSWpB5lJCnZ55Ey6A50FrA8g5pjH2dJVBnFMQRy0kd7y++Tw== X-Received: by 10.202.245.201 with SMTP id t192mr13575917oih.295.1517511552446; Thu, 01 Feb 2018 10:59:12 -0800 (PST) From: minyard@acm.org To: qemu-devel@nongnu.org Date: Thu, 1 Feb 2018 12:59:06 -0600 Message-Id: <1517511547-10147-2-git-send-email-minyard@acm.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1517511547-10147-1-git-send-email-minyard@acm.org> References: <1517511547-10147-1-git-send-email-minyard@acm.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4003:c06::241 Subject: [Qemu-devel] [PATCH 1/2] ipmi: Use proper struct reference for KCS vmstate 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: Corey Minyard Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Corey Minyard The vmstate for isa_ipmi_kcs was referencing into the kcs structure, instead create a kcs structure separate and use that. There was also some issues in the state transfer. The inlen field was not being transferred, so if a transaction was in process during the transfer it would be messed up. And the use_irq field was transferred, but that should come from the configuration. This also fixes those issues and is tested under heavy load. Signed-off-by: Corey Minyard --- hw/ipmi/isa_ipmi_kcs.c | 75 ++++++++++++++++++++++++++++++++++++++++------= ---- 1 file changed, 60 insertions(+), 15 deletions(-) diff --git a/hw/ipmi/isa_ipmi_kcs.c b/hw/ipmi/isa_ipmi_kcs.c index 689587b..3c942d6 100644 --- a/hw/ipmi/isa_ipmi_kcs.c +++ b/hw/ipmi/isa_ipmi_kcs.c @@ -422,24 +422,69 @@ static void ipmi_isa_realize(DeviceState *dev, Error = **errp) isa_register_ioport(isadev, &iik->kcs.io, iik->kcs.io_base); } =20 -const VMStateDescription vmstate_ISAIPMIKCSDevice =3D { - .name =3D TYPE_IPMI_INTERFACE, +static const VMStateDescription vmstate_IPMIKCS =3D { + .name =3D TYPE_IPMI_INTERFACE_PREFIX "kcs", .version_id =3D 1, .minimum_version_id =3D 1, .fields =3D (VMStateField[]) { - VMSTATE_BOOL(kcs.obf_irq_set, ISAIPMIKCSDevice), - VMSTATE_BOOL(kcs.atn_irq_set, ISAIPMIKCSDevice), - VMSTATE_BOOL(kcs.use_irq, ISAIPMIKCSDevice), - VMSTATE_BOOL(kcs.irqs_enabled, ISAIPMIKCSDevice), - VMSTATE_UINT32(kcs.outpos, ISAIPMIKCSDevice), - VMSTATE_UINT8_ARRAY(kcs.outmsg, ISAIPMIKCSDevice, MAX_IPMI_MSG_SIZ= E), - VMSTATE_UINT8_ARRAY(kcs.inmsg, ISAIPMIKCSDevice, MAX_IPMI_MSG_SIZE= ), - VMSTATE_BOOL(kcs.write_end, ISAIPMIKCSDevice), - VMSTATE_UINT8(kcs.status_reg, ISAIPMIKCSDevice), - VMSTATE_UINT8(kcs.data_out_reg, ISAIPMIKCSDevice), - VMSTATE_INT16(kcs.data_in_reg, ISAIPMIKCSDevice), - VMSTATE_INT16(kcs.cmd_reg, ISAIPMIKCSDevice), - VMSTATE_UINT8(kcs.waiting_rsp, ISAIPMIKCSDevice), + VMSTATE_BOOL(obf_irq_set, IPMIKCS), + VMSTATE_BOOL(atn_irq_set, IPMIKCS), + VMSTATE_BOOL(use_irq, IPMIKCS), + VMSTATE_BOOL(irqs_enabled, IPMIKCS), + VMSTATE_UINT32(outpos, IPMIKCS), + VMSTATE_UINT8_ARRAY(outmsg, IPMIKCS, MAX_IPMI_MSG_SIZE), + VMSTATE_UINT32(inlen, IPMIKCS), + VMSTATE_UINT8_ARRAY(inmsg, IPMIKCS, MAX_IPMI_MSG_SIZE), + VMSTATE_BOOL(write_end, IPMIKCS), + VMSTATE_UINT8(status_reg, IPMIKCS), + VMSTATE_UINT8(data_out_reg, IPMIKCS), + VMSTATE_INT16(data_in_reg, IPMIKCS), + VMSTATE_INT16(cmd_reg, IPMIKCS), + VMSTATE_UINT8(waiting_rsp, IPMIKCS), + VMSTATE_END_OF_LIST() + } +}; + +static int isa_ipmi_kcs_load_old(QEMUFile *f, void *opaque, int version_id) +{ + ISAIPMIKCSDevice *iik =3D opaque; + IPMIKCS *k =3D &iik->kcs; + unsigned int i; + + if (version_id !=3D 1) { + return -EINVAL; + } + + k->obf_irq_set =3D qemu_get_byte(f); + k->atn_irq_set =3D qemu_get_byte(f); + qemu_get_byte(f); /* Used to be use_irq, but that's not a good idea. */ + k->irqs_enabled =3D qemu_get_byte(f); + k->outpos =3D qemu_get_be32(f); + for (i =3D 0; i < MAX_IPMI_MSG_SIZE; i++) { + k->outmsg[i] =3D qemu_get_byte(f); + } + k->inlen =3D 0; /* This was forgotten on version 1, just reset it. */ + for (i =3D 0; i < MAX_IPMI_MSG_SIZE; i++) { + k->inmsg[i] =3D qemu_get_byte(f); + } + k->write_end =3D qemu_get_byte(f); + k->status_reg =3D qemu_get_byte(f); + k->data_out_reg =3D qemu_get_byte(f); + k->data_in_reg =3D qemu_get_be16(f); + k->cmd_reg =3D qemu_get_be16(f); + k->waiting_rsp =3D qemu_get_byte(f); + + return 0; +} + +static const VMStateDescription vmstate_ISAIPMIKCSDevice =3D { + .name =3D TYPE_IPMI_INTERFACE_PREFIX "isa-kcs", + .version_id =3D 2, + .minimum_version_id =3D 2, + .minimum_version_id_old =3D 1, + .load_state_old =3D isa_ipmi_kcs_load_old, + .fields =3D (VMStateField[]) { + VMSTATE_STRUCT(kcs, ISAIPMIKCSDevice, 1, vmstate_IPMIKCS, IPMIKCS), VMSTATE_END_OF_LIST() } }; --=20 2.7.4 From nobody Sat May 4 16:43:47 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.zohomail.com; dkim=fail; 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 1517511690300674.3666429381033; Thu, 1 Feb 2018 11:01:30 -0800 (PST) Received: from localhost ([::1]:54906 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ehK6y-0001ce-Hm for importer@patchew.org; Thu, 01 Feb 2018 14:01:28 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39139) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ehK4q-0000J6-Rh for qemu-devel@nongnu.org; Thu, 01 Feb 2018 13:59:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ehK4n-0001N2-0H for qemu-devel@nongnu.org; Thu, 01 Feb 2018 13:59:16 -0500 Received: from mail-oi0-x243.google.com ([2607:f8b0:4003:c06::243]:44325) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ehK4m-0001MD-Qt for qemu-devel@nongnu.org; Thu, 01 Feb 2018 13:59:12 -0500 Received: by mail-oi0-x243.google.com with SMTP id b3so11250482oib.11 for ; Thu, 01 Feb 2018 10:59:12 -0800 (PST) Received: from serve.minyard.net ([47.184.168.85]) by smtp.gmail.com with ESMTPSA id e7sm101894oic.50.2018.02.01.10.59.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 01 Feb 2018 10:59:10 -0800 (PST) Received: from t430.minyard.net (t430m.minyard.net [192.168.27.3]) by serve.minyard.net (Postfix) with ESMTPA id E59A09E7; Thu, 1 Feb 2018 12:59:09 -0600 (CST) Received: by t430.minyard.net (Postfix, from userid 1000) id 26AE43000A6; Thu, 1 Feb 2018 12:59:09 -0600 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=HeRgkkJvlpwRnJw6m0neGXSr1i/mq3/IC4ktRq4o57I=; b=PsEr/hl489WGaiViMI93z1f+brm+WJkFN0DZM1lTTHqJbPi1m1dt/w8j9scX9beNQA /vNvLWcdf7gbhj70Hy9K2MORjjaOgroKU5rJekskBWTUzcg8pOuQDZ6rNkohhVEtY6lG U/lAqihh1RKxNEPciZqkjgHXVaGvLCrw2B9aJb3XJK7mf6+FnFaqZqIf9GmjJy4ASLZ6 e8ZF1k5wqx42l6aj3bmBFB+2MKdUPwLX0TNdVojyaV4sOb35kPSKNGGYJYqmZKd7L6Hw vvu+c7btJBnHN5YW4VoifEhajWEaxfEJuo33RhdihpPMvGRH3wMaC7d/9amOe3MKpz5S Lshw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=HeRgkkJvlpwRnJw6m0neGXSr1i/mq3/IC4ktRq4o57I=; b=F48Va4st9dziSRs91SWdASnycSO96Fc0BkxQBTDRNvOSgRmXTUQrPY/kRBxge9rBXK Wliit+eXUKah3POsIsQjEWPGiT4+/HoESSX47tqkotkUu1ANcNv/h3g37Ylp1aOco/6w BKZLYxnbLmE5TyrEVFfmu+88t6eLH5XkOpqIrOEkieNgUzfArLYulsDyPMS03i+qX6A6 6Fv0PVQQXAQ0WKGgH2Q70AiR750klgKAFY8nOE9arYM9SwppagiiCyfON2hg5l4Gqz8k MxBVdz0Iq+K3p4lwWuMhYSALGhc2A/6DustE0GmxFM8jouRnyCFqNJsXch6eXTDOON/w AHvQ== X-Gm-Message-State: AKwxytdAHAQaltRvVx53UCUBuFXIk4wJICd76J7AhTfaZN9o8C5EGjzC UzejzYyRsff7LjHu0NjA4WkVcc4= X-Google-Smtp-Source: AH8x226WB4RMq8YmbohxUFpTEMlCYB3FJQK41huC+mM4r97us9n30N9uLofSUuVts6W5DIzMmjZ59w== X-Received: by 10.202.226.204 with SMTP id z195mr3582074oig.141.1517511551808; Thu, 01 Feb 2018 10:59:11 -0800 (PST) From: minyard@acm.org To: qemu-devel@nongnu.org Date: Thu, 1 Feb 2018 12:59:07 -0600 Message-Id: <1517511547-10147-3-git-send-email-minyard@acm.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1517511547-10147-1-git-send-email-minyard@acm.org> References: <1517511547-10147-1-git-send-email-minyard@acm.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4003:c06::243 Subject: [Qemu-devel] [PATCH 2/2] ipmi: Use proper struct reference for BT vmstate 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: Corey Minyard Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Corey Minyard The vmstate for isa_ipmi_bt was referencing into the bt structure, instead create a bt structure separate and use that. The version 1 of the BT transfer was fairly broken, if a migration occured during an IPMI operation, it is likely the migration would be corrupted because I misunderstood the VMSTATE_VBUFFER_UINT32() handling, I thought it handled transferring the length field, too. So I just remove support for that. I doubt anyone is using it at this point. This also removes the transfer of use_irq, since that should come from configuration. Signed-off-by: Corey Minyard --- hw/ipmi/isa_ipmi_bt.c | 43 ++++++++++++++++++++++++++++++------------- 1 file changed, 30 insertions(+), 13 deletions(-) diff --git a/hw/ipmi/isa_ipmi_bt.c b/hw/ipmi/isa_ipmi_bt.c index e946030..a990ab7 100644 --- a/hw/ipmi/isa_ipmi_bt.c +++ b/hw/ipmi/isa_ipmi_bt.c @@ -450,22 +450,39 @@ static void isa_ipmi_bt_realize(DeviceState *dev, Err= or **errp) isa_register_ioport(isadev, &iib->bt.io, iib->bt.io_base); } =20 -static const VMStateDescription vmstate_ISAIPMIBTDevice =3D { - .name =3D TYPE_IPMI_INTERFACE, + +const VMStateDescription vmstate_IPMIBT =3D { + .name =3D TYPE_IPMI_INTERFACE_PREFIX "bt", .version_id =3D 1, .minimum_version_id =3D 1, .fields =3D (VMStateField[]) { - VMSTATE_BOOL(bt.obf_irq_set, ISAIPMIBTDevice), - VMSTATE_BOOL(bt.atn_irq_set, ISAIPMIBTDevice), - VMSTATE_BOOL(bt.use_irq, ISAIPMIBTDevice), - VMSTATE_BOOL(bt.irqs_enabled, ISAIPMIBTDevice), - VMSTATE_UINT32(bt.outpos, ISAIPMIBTDevice), - VMSTATE_VBUFFER_UINT32(bt.outmsg, ISAIPMIBTDevice, 1, NULL, bt.out= len), - VMSTATE_VBUFFER_UINT32(bt.inmsg, ISAIPMIBTDevice, 1, NULL, bt.inle= n), - VMSTATE_UINT8(bt.control_reg, ISAIPMIBTDevice), - VMSTATE_UINT8(bt.mask_reg, ISAIPMIBTDevice), - VMSTATE_UINT8(bt.waiting_rsp, ISAIPMIBTDevice), - VMSTATE_UINT8(bt.waiting_seq, ISAIPMIBTDevice), + VMSTATE_BOOL(obf_irq_set, IPMIBT), + VMSTATE_BOOL(atn_irq_set, IPMIBT), + VMSTATE_BOOL(irqs_enabled, IPMIBT), + VMSTATE_UINT32(outpos, IPMIBT), + VMSTATE_UINT32(outlen, IPMIBT), + VMSTATE_UINT8_ARRAY(outmsg, IPMIBT, MAX_IPMI_MSG_SIZE), + VMSTATE_UINT32(inlen, IPMIBT), + VMSTATE_UINT8_ARRAY(inmsg, IPMIBT, MAX_IPMI_MSG_SIZE), + VMSTATE_UINT8(control_reg, IPMIBT), + VMSTATE_UINT8(mask_reg, IPMIBT), + VMSTATE_UINT8(waiting_rsp, IPMIBT), + VMSTATE_UINT8(waiting_seq, IPMIBT), + VMSTATE_END_OF_LIST() + } +}; + +static const VMStateDescription vmstate_ISAIPMIBTDevice =3D { + .name =3D TYPE_IPMI_INTERFACE_PREFIX "isa-bt", + .version_id =3D 2, + .minimum_version_id =3D 2, + /* + * Version 1 had messed up the array transfer, it's not even usable + * because it used VMSTATE_VBUFFER_UINT32, but it did not transfer + * the buffer length, so random things would happen. + */ + .fields =3D (VMStateField[]) { + VMSTATE_STRUCT(bt, ISAIPMIBTDevice, 1, vmstate_IPMIBT, IPMIBT), VMSTATE_END_OF_LIST() } }; --=20 2.7.4