From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 605EAC3F2D1 for ; Thu, 5 Mar 2020 12:19:41 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2906D2146E for ; Thu, 5 Mar 2020 12:19:41 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="fnl6zG/Z" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2906D2146E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:47982 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9pTY-0006ne-An for qemu-devel@archiver.kernel.org; Thu, 05 Mar 2020 07:19:40 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35621) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9pNc-0006fk-MK for qemu-devel@nongnu.org; Thu, 05 Mar 2020 07:13:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j9pNW-0000ZI-CD for qemu-devel@nongnu.org; Thu, 05 Mar 2020 07:13:28 -0500 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:34368 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j9pNW-0000Z1-93 for qemu-devel@nongnu.org; Thu, 05 Mar 2020 07:13:26 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1583410406; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2sgBvEl+jyE9C+iCwWb8YP4xhIVb5G0+M5zi3OeMCiY=; b=fnl6zG/ZRmsm7LJg+Kdj6gS8p9GtQF2u/JN6N/oWDIL1usrPz+L1U3FJKB0OXdhVUje9XR aHPo+iJ9PFXgDkIop50upY9wBNLOZvxkq0RiHZfvjWAZbAdXd4bK1ED0hzdOx4kWJVnsNI Ya9GAjWj40oU3WIzLjXk2SL0BC7NpmQ= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-185-TQTl6SzuMjSIEYwmU9YioA-1; Thu, 05 Mar 2020 07:13:24 -0500 X-MC-Unique: TQTl6SzuMjSIEYwmU9YioA-1 Received: by mail-wm1-f71.google.com with SMTP id p4so2804278wmp.0 for ; Thu, 05 Mar 2020 04:13:24 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zCxk3Zde/q44N7tBo+VCD7daM7l+u+3ZJi6pI1CFBvk=; b=XBEEoE57KjhszqlrJPZRO4pSn7955axidwyNj1jp9X4jQNe31HhabfoPF9EtYh0dY+ rKKBXmh0pFoVXkhgyEq3ZwF81m3ZxT9n3sifFUZOhR3pSQcYKseIZj+ldB2saIHh+Hh/ vyHRcFdZqhuwNKpKZ+Q2UyBg8Jdg2lvfd1rXzakbsravhmh1YRoWhjT+Z5OprnMl7PXZ evJTEP6/3sHQkjdVf0g3KR3POGTdHtfOkI7399dK8wANAC5quowuQMKpy/RfsVqvhlvm FLkBboflTN5VMigksUoVSiXWbxqx2dvX2KYEJ4OfMkw6CLWrMo6PXDRBBI5IXgoj0Rjk nQFQ== X-Gm-Message-State: ANhLgQ377+V22Y/RCnTlfYisSEkWVOIaz5iPO6TaWwDTmDn2s84JiEr/ q39EH73/sDId2D1og9bbPKE3Mh1Ifgh+HPtBpcn2h5pLazO1OaIWmYxB99gQOII/K1XTqIDkfrx llJkAEs9aQqvC1gs= X-Received: by 2002:a1c:7512:: with SMTP id o18mr9237472wmc.110.1583410402942; Thu, 05 Mar 2020 04:13:22 -0800 (PST) X-Google-Smtp-Source: ADFU+vsyv14cLQAJgWrkpyBv8heTFTsU17i81cdnCyRW54J7QltDIZb5EMzm+eTTlyEz5Ghsr6m0YA== X-Received: by 2002:a1c:7512:: with SMTP id o18mr9237449wmc.110.1583410402688; Thu, 05 Mar 2020 04:13:22 -0800 (PST) Received: from localhost.localdomain (47.red-88-21-205.staticip.rima-tde.net. [88.21.205.47]) by smtp.gmail.com with ESMTPSA id a1sm4091094wru.75.2020.03.05.04.13.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Mar 2020 04:13:22 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v3 5/7] hw/scsi/spapr_vscsi: Do not mix SRP IU size with DMA buffer size Date: Thu, 5 Mar 2020 13:12:51 +0100 Message-Id: <20200305121253.19078-6-philmd@redhat.com> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200305121253.19078-1-philmd@redhat.com> References: <20200305121253.19078-1-philmd@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8; text/plain; charset="utf-8" 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: 207.211.31.81 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Greg Kurz , qemu-ppc@nongnu.org, Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , David Gibson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" The 'union srp_iu' is meant as a pointer to any SRP Information Unit type, it is not related to the size of a VIO DMA buffer. Use a plain buffer for the VIO DMA read/write calls. We can remove the reserved buffer from the 'union srp_iu'. This issue was noticed when replacing the zero-length arrays from hw/scsi/srp.h with flexible array member, 'clang -fsanitize=3Dundefined' reported: hw/scsi/spapr_vscsi.c:69:29: error: field 'iu' with variable sized type '= union viosrp_iu' not at the end of a struct or class is a GNU extension [-W= error,-Wgnu-variable-sized-type-not-at-end] union viosrp_iu iu; ^ Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- v2: Removed unuseful _Static_assert (dgibson) --- hw/scsi/viosrp.h | 1 - hw/scsi/spapr_vscsi.c | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/hw/scsi/viosrp.h b/hw/scsi/viosrp.h index 25676c2383..e5f9768e8f 100644 --- a/hw/scsi/viosrp.h +++ b/hw/scsi/viosrp.h @@ -49,7 +49,6 @@ union srp_iu { struct srp_tsk_mgmt tsk_mgmt; struct srp_cmd cmd; struct srp_rsp rsp; - uint8_t reserved[SRP_MAX_IU_LEN]; }; =20 enum viosrp_crq_formats { diff --git a/hw/scsi/spapr_vscsi.c b/hw/scsi/spapr_vscsi.c index 70547f98ac..acf9bb50bc 100644 --- a/hw/scsi/spapr_vscsi.c +++ b/hw/scsi/spapr_vscsi.c @@ -66,7 +66,7 @@ typedef union vscsi_crq { =20 typedef struct vscsi_req { vscsi_crq crq; - union viosrp_iu iu; + uint8_t viosrp_iu_buf[SRP_MAX_IU_LEN]; =20 /* SCSI request tracking */ SCSIRequest *sreq; @@ -99,7 +99,7 @@ typedef struct { =20 static union viosrp_iu *req_iu(vscsi_req *req) { - return &req->iu; + return (union viosrp_iu *)req->viosrp_iu_buf; } =20 static struct vscsi_req *vscsi_get_req(VSCSIState *s) @@ -183,7 +183,7 @@ static int vscsi_send_iu(VSCSIState *s, vscsi_req *req, =20 /* First copy the SRP */ rc =3D spapr_vio_dma_write(&s->vdev, req->crq.s.IU_data_ptr, - &req->iu, length); + &req->viosrp_iu_buf, length); if (rc) { fprintf(stderr, "vscsi_send_iu: DMA write failure !\n"); } @@ -602,7 +602,7 @@ static const VMStateDescription vmstate_spapr_vscsi_req= =3D { .minimum_version_id =3D 1, .fields =3D (VMStateField[]) { VMSTATE_BUFFER(crq.raw, vscsi_req), - VMSTATE_BUFFER(iu.srp.reserved, vscsi_req), + VMSTATE_BUFFER(viosrp_iu_buf, vscsi_req), VMSTATE_UINT32(qtag, vscsi_req), VMSTATE_BOOL(active, vscsi_req), VMSTATE_UINT32(data_len, vscsi_req), @@ -1103,7 +1103,7 @@ static void vscsi_got_payload(VSCSIState *s, vscsi_cr= q *crq) } =20 /* XXX Handle failure differently ? */ - if (spapr_vio_dma_read(&s->vdev, crq->s.IU_data_ptr, &req->iu, + if (spapr_vio_dma_read(&s->vdev, crq->s.IU_data_ptr, &req->viosrp_iu_b= uf, crq->s.IU_length)) { fprintf(stderr, "vscsi_got_payload: DMA read failure !\n"); vscsi_put_req(req); --=20 2.21.1