From patchwork Thu Dec 7 21:34:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corey Minyard X-Patchwork-Id: 121085 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp8893674qgn; Thu, 7 Dec 2017 13:40:12 -0800 (PST) X-Google-Smtp-Source: AGs4zMbkWdwcuPkVTAy53CdlNs1a7BKGDNAe9R/cTqIhkw4X3ek6Eb/FAOPrr7cbWMe+tqTzHDZQ X-Received: by 10.13.243.195 with SMTP id c186mr19102664ywf.170.1512682812362; Thu, 07 Dec 2017 13:40:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512682812; cv=none; d=google.com; s=arc-20160816; b=Z08+/xaAK+PZ4QyPQTxi+SgMJNLbcTYE1K+cE8qJ+8p/j8ff33MxueLllrfYRbKBll f0fBr4DqlkHw4Qjw23UJVVmFCCfGANNz1SseX4McsuvbEPWJg4/x+yMI384Jrz1mYs5S 5+3uSt6x8KJEEcAtBLd6562B7om9C0T4TDEUbTaINIymje3Oox9gwI7WJqZO5DP6R93J i51Uqlpr9LMHLvqMzHa17XhC1n7APV1//7CD6JGDWonNm5L8ZBuQs2SVf7vOxuviVZLS LHqkSN5U8bcuy6BiDHU4wca7RMuailMJvVwh2Q9hcWyrE4Rh1qvd1Ai88DmvCI6yfIp5 HxCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=IIsa0k4TSzytd1gcdXeGvAL79/YvEgP8Bz5UukWutHE=; b=d4lLTg29KPjlPhU0gssZhWX8kOY8vJ/Vf7H8fExA4m0PxuPJvbrcZp8aUwUvygj25R tCOpuoHevPerlXMgUKSWNWleEOUNxoY5JA357XjksUHcNFWgq+NNqLNpP+pFu6zrlW04 hYyUhT56SO2xBcD4pXFxcCx1taZMjUat1Odt2p3hAoT/wgZSE5JdyDWxZvZ9s/EqSL/A YR1c2PPCkxVg5QjQHsVSd9PTC8KF6FUn/CQN54gjFvFc64W2PN2fiqdcFV8AC7j1ebE0 zj6eC717lHzMi0Q7WOyqcGQbAxJ4WrJ7IYMvpH4Upu52MaMX5Q7ftTYHzkcOiKeoSsnV p0nw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=Tup79Wem; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id m125si215727ybm.322.2017.12.07.13.40.12 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 07 Dec 2017 13:40:12 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=Tup79Wem; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org Received: from localhost ([::1]:34455 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eN3tr-0006wx-S9 for patch@linaro.org; Thu, 07 Dec 2017 16:40:11 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46661) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eN3op-0001rJ-82 for qemu-devel@nongnu.org; Thu, 07 Dec 2017 16:35:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eN3oo-00052F-7M for qemu-devel@nongnu.org; Thu, 07 Dec 2017 16:34:59 -0500 Received: from mail-pg0-x244.google.com ([2607:f8b0:400e:c05::244]:39787) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eN3on-00051q-UP for qemu-devel@nongnu.org; Thu, 07 Dec 2017 16:34:58 -0500 Received: by mail-pg0-x244.google.com with SMTP id w7so5364854pgv.6 for ; Thu, 07 Dec 2017 13:34:57 -0800 (PST) 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=IIsa0k4TSzytd1gcdXeGvAL79/YvEgP8Bz5UukWutHE=; b=Tup79WemppZ4zHOePPRRPYtMXJEhaAsgvDwNVPxhChSB4UTjReqaRQRLnZnR3JKHiE t57v99kNvuFBX2hWqeZn93FVxP6A5tKrSNSotCLmpQbTErjB9N43Op/qBf3HgpEAFa9P q/a8NFfWi2bJsryNsMMjV3ZxmDvOWe12ssmnawI/IuKlm3+OL2OBsZSM298jPRF3XgVt qOw4U3ex0uLbsuiLBYAa8vZLyLLf4uZX+DRwlDcL714eAQVCA/QCn+o5MEb+C1yV3ixi 6J2LCS330m98PplBob57ypmUNvKaQwfTw8nIZnQsYrHZFVkOLRZUSHr/1xzTvmhEBeVn WLZg== 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=IIsa0k4TSzytd1gcdXeGvAL79/YvEgP8Bz5UukWutHE=; b=hUEjfH/960aCj1Es+bi/eAlomslZWCESPKo4KLRm/5uiQfsojyIcztGfAp0wps7xHl ROKr76KtTQ5IsZoSLENNWn/SEzl/29LId0YpFZnmiE0NHidnGACxG/V4XtlLssHGo2HK 4OTsv0nZ3raqQyYlDh/ufAUdMXKdGWXUv3MD393Kp6VHxM/np6lnYUcWxnxrttbHtE5D FvXcdLma7tkkJV2OqdJrLPjBi2aZCSbJvRk1AzunTxUJGv/IlH4bsByqwDENRJdARHyS yszoAi4IA/jRjNi83o8S9MZEwBMSK5ibjGW7sy+6rrFxkgzuAifyv4Pnda+ASo4I6q8d dj1A== X-Gm-Message-State: AJaThX6iaawCQGc5XsYVcAszqr+p3HvLLI1AeL7rS5XYs+HUwZ3yGBUW hK2BVqHPJPunumEDWaD3gfrHg2s= X-Received: by 10.99.108.5 with SMTP id h5mr27735360pgc.113.1512682496933; Thu, 07 Dec 2017 13:34:56 -0800 (PST) Received: from serve.minyard.net ([47.184.168.85]) by smtp.gmail.com with ESMTPSA id t23sm12014797pfg.97.2017.12.07.13.34.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Dec 2017 13:34:55 -0800 (PST) Received: from t430.minyard.net (t430m.minyard.net [192.168.27.3]) by serve.minyard.net (Postfix) with ESMTPA id 2E2FA901; Thu, 7 Dec 2017 15:34:53 -0600 (CST) Received: by t430.minyard.net (Postfix, from userid 1000) id F1E3A300082; Thu, 7 Dec 2017 15:34:51 -0600 (CST) From: minyard@acm.org To: qemu-devel@nongnu.org Date: Thu, 7 Dec 2017 15:34:43 -0600 Message-Id: <1512682489-4474-2-git-send-email-minyard@acm.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1512682489-4474-1-git-send-email-minyard@acm.org> References: <1512682489-4474-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:400e:c05::244 Subject: [Qemu-devel] [PATCH 1/7] 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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(-) -- 2.7.4 diff --git a/hw/ipmi/isa_ipmi_kcs.c b/hw/ipmi/isa_ipmi_kcs.c index 8044497..c887251 100644 --- a/hw/ipmi/isa_ipmi_kcs.c +++ b/hw/ipmi/isa_ipmi_kcs.c @@ -423,24 +423,69 @@ static void ipmi_isa_realize(DeviceState *dev, Error **errp) isa_register_ioport(isadev, &iik->kcs.io, iik->kcs.io_base); } -const VMStateDescription vmstate_ISAIPMIKCSDevice = { - .name = TYPE_IPMI_INTERFACE, +static const VMStateDescription vmstate_IPMIKCS = { + .name = TYPE_IPMI_INTERFACE_PREFIX "kcs", .version_id = 1, .minimum_version_id = 1, .fields = (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_SIZE), - 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 = opaque; + IPMIKCS *k = &iik->kcs; + unsigned int i; + + if (version_id != 1) { + return -EINVAL; + } + + k->obf_irq_set = qemu_get_byte(f); + k->atn_irq_set = qemu_get_byte(f); + qemu_get_byte(f); /* Used to be use_irq, but that's not a good idea. */ + k->irqs_enabled = qemu_get_byte(f); + k->outpos = qemu_get_be32(f); + for (i = 0; i < MAX_IPMI_MSG_SIZE; i++) { + k->outmsg[i] = qemu_get_byte(f); + } + k->inlen = 0; /* This was forgotten on version 1, just reset it. */ + for (i = 0; i < MAX_IPMI_MSG_SIZE; i++) { + k->inmsg[i] = qemu_get_byte(f); + } + k->write_end = qemu_get_byte(f); + k->status_reg = qemu_get_byte(f); + k->data_out_reg = qemu_get_byte(f); + k->data_in_reg = qemu_get_be16(f); + k->cmd_reg = qemu_get_be16(f); + k->waiting_rsp = qemu_get_byte(f); + + return 0; +} + +static const VMStateDescription vmstate_ISAIPMIKCSDevice = { + .name = TYPE_IPMI_INTERFACE_PREFIX "isa-kcs", + .version_id = 2, + .minimum_version_id = 2, + .minimum_version_id_old = 1, + .load_state_old = isa_ipmi_kcs_load_old, + .fields = (VMStateField[]) { + VMSTATE_STRUCT(kcs, ISAIPMIKCSDevice, 1, vmstate_IPMIKCS, IPMIKCS), VMSTATE_END_OF_LIST() } };