From nobody Tue Feb 10 15:46:31 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1640260690; cv=none; d=zohomail.com; s=zohoarc; b=ATPoPFdIiND0E2XloWrIgQdjAIjAFGJbTsWGHEDxttRpKCJwhyDw2cFf8RRFwn3ru8fYhocPTiLE/Vf3k1zMjAvxjOU4W+m+ZCevSdHMqMrBaAylqMmpOSWagW7G/iV4Ylfh4hlt9h0gsnkSTpkf/8ArhHua283lSG/i54pYN4c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1640260690; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=4MZDcjrRTlV4xDeU9/QkaMx4+S9qLpo1jo/kWB7g2uY=; b=MaCXhVuzpf7spFmC6oOp2Li6qUPIzbpEMbGRpeAOLRBLosnYrx1HcOdOD9QU5HrSQouq7EStsLZonMTe1+/jJKQAlXvSBkH1mOnT4kJ55QoUUlqahoYEj4BB8KMIU0CZbR/crU0X1bsusW+kapoPoeh86JWKzJtD8jBnO6KZrgQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1640260690018590.658159208711; Thu, 23 Dec 2021 03:58:10 -0800 (PST) Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-134-gWSRTgZePD-dUgq86prGIw-1; Thu, 23 Dec 2021 06:58:08 -0500 Received: by mail-wm1-f69.google.com with SMTP id z13-20020a05600c0a0d00b003457d6619f8so1879513wmp.1 for ; Thu, 23 Dec 2021 03:58:07 -0800 (PST) Return-Path: Return-Path: Received: from x1w.. (33.red-193-152-124.dynamicip.rima-tde.net. [193.152.124.33]) by smtp.gmail.com with ESMTPSA id q13sm4553548wrr.64.2021.12.23.03.57.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Dec 2021 03:58:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1640260689; 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=4MZDcjrRTlV4xDeU9/QkaMx4+S9qLpo1jo/kWB7g2uY=; b=gABiCVqSYTjcUMj9mp7tvvO5HVkBdNYKyfIB9OMmUxY8KU4+JIND/R7YKgraE4x1kvn7vb OCWZsfVvc3RUjpAzr9tarhPlcKfO7gyXQvKh6RGaPn7SXhsKB5CZqC+YdeFQzySEuJAjK0 rqqmwWJCLGqtTM84yBEC6VowH4h1Itc= X-MC-Unique: gWSRTgZePD-dUgq86prGIw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4MZDcjrRTlV4xDeU9/QkaMx4+S9qLpo1jo/kWB7g2uY=; b=0hPIahe0AfGYqAQbzmYOU8gUJGcpi+SSMriZ6fJszCvFVa3i2cexxQ9xvcT4Cx1zBR pCQV/1VWzhvSnLfMC+JNfzk7PEx5U5Vmmipl2byggnv3vJ+8N7T7R66S8KQ6slXmO36j /DO9apXfceuCzjD3XijHil5TIOqx/pVNVUF2rOWLd7ASD3GL2t3mm3LwUjzNhAuTqa+3 N8H7KPtdwyBuJQemqHHW36ODNrWZ/qIW701wR3TW2OEv+jh+QtEdrZkpTrOA6lg/ZhAi 8j0MDsU/XXRSvBjIgnEZcC6tYMB2dxOtC+6LORw6IscSMYCyD6mrKdeF+XzRQ/do1kNF DPag== X-Gm-Message-State: AOAM5339H4bwciDNvNtywhsW5aMOEcfCpxjXHrT5c2JPz0DQIooBmX9e YvTAaGKSFiPLG3+wiGcot5t2/+g520VGX3ERb7BqUKGdRrAwGqfkPN3zEiJeYz9QVR8HYvGtJFY 5JyigT7KmZQtmoA== X-Received: by 2002:adf:f985:: with SMTP id f5mr1539767wrr.14.1640260686736; Thu, 23 Dec 2021 03:58:06 -0800 (PST) X-Google-Smtp-Source: ABdhPJxA4cNRWKqaNRPfPCkDahQPJhOFZX/1ksH6nhn80QsBvQaBrYXHasYAPCxsZWNpOBY1YHVQCA== X-Received: by 2002:adf:f985:: with SMTP id f5mr1539734wrr.14.1640260686553; Thu, 23 Dec 2021 03:58:06 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Joel Stanley , Richard Henderson , qemu-block@nongnu.org, Jason Wang , Keith Busch , "Michael S. Tsirkin" , Fam Zheng , Alistair Francis , David Hildenbrand , Eduardo Habkost , Havard Skinnemoen , Sven Schnelle , Tyrone Ting , Gerd Hoffmann , Peter Maydell , Beniamino Galvani , Daniel Henrique Barboza , Dmitry Fleytman , John Snow , Bin Meng , Greg Kurz , Eric Auger , Mark Cave-Ayland , "Edgar E. Iglesias" , Andrew Jeffery , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Marcel Apfelbaum , Andrew Baumann , Hannes Reinecke , Paolo Bonzini , Peter Xu , qemu-arm@nongnu.org, Klaus Jensen , Stefan Weil , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-ppc@nongnu.org, Jan Kiszka , David Gibson , Klaus Jensen Subject: [PATCH v2 08/23] dma: Have dma_buf_read() / dma_buf_write() take a void pointer Date: Thu, 23 Dec 2021 12:55:39 +0100 Message-Id: <20211223115554.3155328-9-philmd@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211223115554.3155328-1-philmd@redhat.com> References: <20211223115554.3155328-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1640260690553100001 DMA operations are run on any kind of buffer, not arrays of uint8_t. Convert dma_buf_read/dma_buf_write functions to take a void pointer argument and save us pointless casts to uint8_t *. Remove this pointless casts in the megasas device model. Reviewed-by: Klaus Jensen Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/sysemu/dma.h | 4 ++-- hw/scsi/megasas.c | 22 +++++++++++----------- softmmu/dma-helpers.c | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/include/sysemu/dma.h b/include/sysemu/dma.h index 97ff6f29f8c..0d5b836013d 100644 --- a/include/sysemu/dma.h +++ b/include/sysemu/dma.h @@ -302,8 +302,8 @@ BlockAIOCB *dma_blk_read(BlockBackend *blk, BlockAIOCB *dma_blk_write(BlockBackend *blk, QEMUSGList *sg, uint64_t offset, uint32_t align, BlockCompletionFunc *cb, void *opaque); -uint64_t dma_buf_read(uint8_t *ptr, int32_t len, QEMUSGList *sg); -uint64_t dma_buf_write(uint8_t *ptr, int32_t len, QEMUSGList *sg); +uint64_t dma_buf_read(void *ptr, int32_t len, QEMUSGList *sg); +uint64_t dma_buf_write(void *ptr, int32_t len, QEMUSGList *sg); =20 void dma_acct_start(BlockBackend *blk, BlockAcctCookie *cookie, QEMUSGList *sg, enum BlockAcctType type); diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c index 8f357841004..dc28302f96d 100644 --- a/hw/scsi/megasas.c +++ b/hw/scsi/megasas.c @@ -848,7 +848,7 @@ static int megasas_ctrl_get_info(MegasasState *s, Megas= asCmd *cmd) MFI_INFO_PDMIX_SATA | MFI_INFO_PDMIX_LD); =20 - cmd->iov_size -=3D dma_buf_read((uint8_t *)&info, dcmd_size, &cmd->qsg= ); + cmd->iov_size -=3D dma_buf_read(&info, dcmd_size, &cmd->qsg); return MFI_STAT_OK; } =20 @@ -878,7 +878,7 @@ static int megasas_mfc_get_defaults(MegasasState *s, Me= gasasCmd *cmd) info.disable_preboot_cli =3D 1; info.cluster_disable =3D 1; =20 - cmd->iov_size -=3D dma_buf_read((uint8_t *)&info, dcmd_size, &cmd->qsg= ); + cmd->iov_size -=3D dma_buf_read(&info, dcmd_size, &cmd->qsg); return MFI_STAT_OK; } =20 @@ -899,7 +899,7 @@ static int megasas_dcmd_get_bios_info(MegasasState *s, = MegasasCmd *cmd) info.expose_all_drives =3D 1; } =20 - cmd->iov_size -=3D dma_buf_read((uint8_t *)&info, dcmd_size, &cmd->qsg= ); + cmd->iov_size -=3D dma_buf_read(&info, dcmd_size, &cmd->qsg); return MFI_STAT_OK; } =20 @@ -910,7 +910,7 @@ static int megasas_dcmd_get_fw_time(MegasasState *s, Me= gasasCmd *cmd) =20 fw_time =3D cpu_to_le64(megasas_fw_time()); =20 - cmd->iov_size -=3D dma_buf_read((uint8_t *)&fw_time, dcmd_size, &cmd->= qsg); + cmd->iov_size -=3D dma_buf_read(&fw_time, dcmd_size, &cmd->qsg); return MFI_STAT_OK; } =20 @@ -937,7 +937,7 @@ static int megasas_event_info(MegasasState *s, MegasasC= md *cmd) info.shutdown_seq_num =3D cpu_to_le32(s->shutdown_event); info.boot_seq_num =3D cpu_to_le32(s->boot_event); =20 - cmd->iov_size -=3D dma_buf_read((uint8_t *)&info, dcmd_size, &cmd->qsg= ); + cmd->iov_size -=3D dma_buf_read(&info, dcmd_size, &cmd->qsg); return MFI_STAT_OK; } =20 @@ -1006,7 +1006,7 @@ static int megasas_dcmd_pd_get_list(MegasasState *s, = MegasasCmd *cmd) info.size =3D cpu_to_le32(offset); info.count =3D cpu_to_le32(num_pd_disks); =20 - cmd->iov_size -=3D dma_buf_read((uint8_t *)&info, offset, &cmd->qsg); + cmd->iov_size -=3D dma_buf_read(&info, offset, &cmd->qsg); return MFI_STAT_OK; } =20 @@ -1172,7 +1172,7 @@ static int megasas_dcmd_ld_get_list(MegasasState *s, = MegasasCmd *cmd) info.ld_count =3D cpu_to_le32(num_ld_disks); trace_megasas_dcmd_ld_get_list(cmd->index, num_ld_disks, max_ld_disks); =20 - resid =3D dma_buf_read((uint8_t *)&info, dcmd_size, &cmd->qsg); + resid =3D dma_buf_read(&info, dcmd_size, &cmd->qsg); cmd->iov_size =3D dcmd_size - resid; return MFI_STAT_OK; } @@ -1221,7 +1221,7 @@ static int megasas_dcmd_ld_list_query(MegasasState *s= , MegasasCmd *cmd) info.size =3D dcmd_size; trace_megasas_dcmd_ld_get_list(cmd->index, num_ld_disks, max_ld_disks); =20 - resid =3D dma_buf_read((uint8_t *)&info, dcmd_size, &cmd->qsg); + resid =3D dma_buf_read(&info, dcmd_size, &cmd->qsg); cmd->iov_size =3D dcmd_size - resid; return MFI_STAT_OK; } @@ -1390,7 +1390,7 @@ static int megasas_dcmd_cfg_read(MegasasState *s, Meg= asasCmd *cmd) ld_offset +=3D sizeof(struct mfi_ld_config); } =20 - cmd->iov_size -=3D dma_buf_read((uint8_t *)data, info->size, &cmd->qsg= ); + cmd->iov_size -=3D dma_buf_read(data, info->size, &cmd->qsg); return MFI_STAT_OK; } =20 @@ -1420,7 +1420,7 @@ static int megasas_dcmd_get_properties(MegasasState *= s, MegasasCmd *cmd) info.ecc_bucket_leak_rate =3D cpu_to_le16(1440); info.expose_encl_devices =3D 1; =20 - cmd->iov_size -=3D dma_buf_read((uint8_t *)&info, dcmd_size, &cmd->qsg= ); + cmd->iov_size -=3D dma_buf_read(&info, dcmd_size, &cmd->qsg); return MFI_STAT_OK; } =20 @@ -1465,7 +1465,7 @@ static int megasas_dcmd_set_properties(MegasasState *= s, MegasasCmd *cmd) dcmd_size); return MFI_STAT_INVALID_PARAMETER; } - dma_buf_write((uint8_t *)&info, dcmd_size, &cmd->qsg); + dma_buf_write(&info, dcmd_size, &cmd->qsg); trace_megasas_dcmd_unsupported(cmd->index, cmd->iov_size); return MFI_STAT_OK; } diff --git a/softmmu/dma-helpers.c b/softmmu/dma-helpers.c index 09e29997ee5..7f37548394e 100644 --- a/softmmu/dma-helpers.c +++ b/softmmu/dma-helpers.c @@ -317,12 +317,12 @@ static uint64_t dma_buf_rw(void *buf, int32_t len, QE= MUSGList *sg, return resid; } =20 -uint64_t dma_buf_read(uint8_t *ptr, int32_t len, QEMUSGList *sg) +uint64_t dma_buf_read(void *ptr, int32_t len, QEMUSGList *sg) { return dma_buf_rw(ptr, len, sg, DMA_DIRECTION_FROM_DEVICE); } =20 -uint64_t dma_buf_write(uint8_t *ptr, int32_t len, QEMUSGList *sg) +uint64_t dma_buf_write(void *ptr, int32_t len, QEMUSGList *sg) { return dma_buf_rw(ptr, len, sg, DMA_DIRECTION_TO_DEVICE); } --=20 2.33.1