From nobody Sun Feb 8 21:07:47 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=1639658175; cv=none; d=zohomail.com; s=zohoarc; b=S4gAj/e0gMGlwgtUYK4gLQUb1xUpph6ApVhft/bVZyl2P1HdfHglhEwLTTQE5Laq7J3VRzGjU7w7dxOcSHN/zDnOYknMpiWTkjtCjoNsGnvn0I0YBiOCenl9GPieih/w8mj7+RhIy+82/a+USqRSrq7WiLZlvIkoRruMdCx6LIU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1639658175; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=OjX8CYLaX4R3RIAI7ku1YNlJqt9CA9792fVcfHD3DXE=; b=aIYcsVk66ni0BVL3tiwq12YOmFKH0p1dpZGVqiyKbBiSqHIPIyJQH2VuA5dY8H++bfT7gsESkFPmDfZ1lyKZgzhN1bF8bt90bYVWDgWCp1BIj8u1zXxtmoZfM/XgXcj514mWuBLuUbYpH3rfo8f79oeLKy09hc0EMbqVXoLRi74= 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 1639658175929781.3326207839963; Thu, 16 Dec 2021 04:36:15 -0800 (PST) Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-166-E6niSwPANZKN_wJhizNpRQ-1; Thu, 16 Dec 2021 07:36:13 -0500 Received: by mail-wm1-f70.google.com with SMTP id n31-20020a05600c3b9f00b0034440f99123so3212750wms.7 for ; Thu, 16 Dec 2021 04:36:13 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (174.red-83-50-185.dynamicip.rima-tde.net. [83.50.185.174]) by smtp.gmail.com with ESMTPSA id o12sm6105798wrc.85.2021.12.16.04.36.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Dec 2021 04:36:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1639658174; 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=OjX8CYLaX4R3RIAI7ku1YNlJqt9CA9792fVcfHD3DXE=; b=FAnYdxZK2WAi353qZSKgzwh3N1QHWjG3BCvIDA+xwCufIjNZCJPIUSA9Gt6xBjNYOUPYXy jUiaavx9S1+4gdCI9ghZShsoL6IGVIQFhvioXYM5Je/EgliUOylLutdm30ZCLLoZPf/pTZ n2/dfUAjMkQyQ/j7nQy9trKpVv6KHCY= X-MC-Unique: E6niSwPANZKN_wJhizNpRQ-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=OjX8CYLaX4R3RIAI7ku1YNlJqt9CA9792fVcfHD3DXE=; b=MHeyjjOVWE8Tyqwoy7PZ6YuJsfDpNuSHbnssOY+kQvOMFkMnQDXapznDNwvsvp/Flu xOspSFRHbGvOLLAFQEMQ2gmLc1eZjpRaB8FQYOvSI+fXLkI2d1CdXl5pWOsayTrJNnTP zVp8EioSlwh57gFx47N0FcTAAtoOaO33fOA9zNnAuD0JzJ0uJ7h2Fs+MYaDaQGqid0T3 AReziKM/hMTIWRf5LTEnlYK5e3QtTzhOjwG63QJTb0fXjTaTTBKQwy/v0e9Dp5R4cnup LeKgFtwJCTu0TW3nYdzjYlFQDqb8/fhqvBbwNwBO4yHnHKj1vyMPGq4oE6LYj92isRq/ +gkw== X-Gm-Message-State: AOAM532wgQltJvamjEfNVU8H8ip3tOYAN/MH/6I+8oU7QzeB4Bbyfoo5 YXN11T6MP5jeO4mwzYrJioRhXXcETpBtQ3+VUHsMqAQ2Hwm9JbxZN6Mucy/Tqwg93HAz/EyMFL1 FukNiLJAlrbAmdQ== X-Received: by 2002:a5d:66cb:: with SMTP id k11mr9233282wrw.253.1639658172847; Thu, 16 Dec 2021 04:36:12 -0800 (PST) X-Google-Smtp-Source: ABdhPJz2kn9WZBr5BRR9aX7rH7oWfDlQQBLIJSj9XP+aC0UFvSZ8A6EAhCUwTwi39z/SeU3tS1RolQ== X-Received: by 2002:a5d:66cb:: with SMTP id k11mr9233254wrw.253.1639658172653; Thu, 16 Dec 2021 04:36:12 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Xu , Alexander Bulekov , qemu-block@nongnu.org, Qiuhao Li , Hannes Reinecke , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Klaus Jensen , Jason Wang , Li Qiang , Paolo Bonzini , David Hildenbrand , "Michael S. Tsirkin" , John Snow , Gerd Hoffmann , Marcel Apfelbaum , Keith Busch , Fam Zheng Subject: [PATCH 1/8] dma: Have dma_buf_rw() take a void pointer Date: Thu, 16 Dec 2021 13:35:51 +0100 Message-Id: <20211216123558.799425-2-philmd@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211216123558.799425-1-philmd@redhat.com> References: <20211216123558.799425-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: 1639658177982100001 DMA operations are run on any kind of buffer, not arrays of uint8_t. Convert dma_buf_rw() to take a void pointer argument to save us pointless casts to uint8_t *. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Klaus Jensen --- softmmu/dma-helpers.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/softmmu/dma-helpers.c b/softmmu/dma-helpers.c index 3c06a2feddd..09e29997ee5 100644 --- a/softmmu/dma-helpers.c +++ b/softmmu/dma-helpers.c @@ -294,9 +294,10 @@ BlockAIOCB *dma_blk_write(BlockBackend *blk, } =20 =20 -static uint64_t dma_buf_rw(uint8_t *ptr, int32_t len, QEMUSGList *sg, +static uint64_t dma_buf_rw(void *buf, int32_t len, QEMUSGList *sg, DMADirection dir) { + uint8_t *ptr =3D buf; uint64_t resid; int sg_cur_index; =20 --=20 2.33.1 From nobody Sun Feb 8 21:07:47 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1639658183; cv=none; d=zohomail.com; s=zohoarc; b=XrBU7/CL6QlDAXZYUZafVRwdRjb6it3eIwZW7e9PJcBJOXnG+y5bDmpwnvDMOx1fq01Z5ePgjT+nrO4wPuibSXPlTRPPEqeJypm8rpq+aj4N0LrxbjUPzWWUE+TyMY66FilL+WsLLexMsJnrSu2IPABs2gfYFpzWqUU5Y5uc+bQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1639658183; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=8/M2Z91DmJISpf5VIdppwk0Jxgt7u3GlgWaSk5GaDk0=; b=kIaI/v192FD7lqUOhHtCTfiok+qUS/oyE29nB9359VWdgvn9nZohUosr7wCSaxmF6OhrR14sP9ut5bmnYtVRkAv+MLh+723Gnz9w2k2CLpluo026RYScjKc3MbMAUYXzB4AZ8a8LCAq5er1DE3WzftdWoTZP6E7BALZpgkjkRTM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1639658183150898.3350285269934; Thu, 16 Dec 2021 04:36:23 -0800 (PST) Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-629-HT42BvNmN-aZik3jAinaqQ-1; Thu, 16 Dec 2021 07:36:19 -0500 Received: by mail-wm1-f70.google.com with SMTP id v62-20020a1cac41000000b0033719a1a714so13753401wme.6 for ; Thu, 16 Dec 2021 04:36:18 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (174.red-83-50-185.dynamicip.rima-tde.net. [83.50.185.174]) by smtp.gmail.com with ESMTPSA id z11sm4817241wmf.9.2021.12.16.04.36.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Dec 2021 04:36:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1639658182; 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=8/M2Z91DmJISpf5VIdppwk0Jxgt7u3GlgWaSk5GaDk0=; b=PziryawweNfRDkjtRz1qOKH4T34hUnbSVUMH6wI/3gsIs8ZHDvPdVhukq3kdeJvYkbcDs5 KZPYtoT/Rwh7sIC9MD22DtrUTSCMNMSJz7khoKXcq1mfdq9z+BWQyEpHG4LZUQj20RcOef IDqPqNIuRnu9qLmaNu3FDUbe999+7Ps= X-MC-Unique: HT42BvNmN-aZik3jAinaqQ-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=8/M2Z91DmJISpf5VIdppwk0Jxgt7u3GlgWaSk5GaDk0=; b=nhpIBUstHWmGyzbLFXVDyyc4bQBqW4rejIsMQT7ODajB5TZHl3kEyE+r36dpgNGFCy 5HVTrA8iu5NQrLzAQrQiPmB7Y1XiV+hElSsI4+qGVjbSJWl4hZwlYf4/SSXWk+PGrtEQ ++w3B55t/Y1zs6MXIYaJtlE4kCEH02V2Nnh2zEplWMoGfUGtrQ9qGzzRxWgJ7zJex9PP omvnmg/Ydduw7DUEEG3erfR8AgQrMZ+cuEevgoqIdld5dnWW/o9uqysZwC/cmJTmUVUz 4QsL6e5x7+8Aw/631gLLjwrgWVUJrr9MbCPby8gcbDzNIK7xfqN2KowtgMbJMmS1MaKa E7ow== X-Gm-Message-State: AOAM531m7/YXFpSv0Sr7T4fp7dE+yz2bjL+LAMMVRXLB9co0IkOv/elv fpU+yWJbJHFme4UzMs3+1lu2FpqHZvdVvyo1Qgdl2DqQTEwmNzK8Czk60ChvbaCnjgF6Kzyintt WJXfivfiBm5dNYQ== X-Received: by 2002:a1c:f609:: with SMTP id w9mr4791039wmc.99.1639658177944; Thu, 16 Dec 2021 04:36:17 -0800 (PST) X-Google-Smtp-Source: ABdhPJz6fsYs6o2lFdMDoxOoeLq+MwLP7ixEHYKLskyotIS9oGEYCq9DI/d8Yv4UkdEbRF9k2ZJMZg== X-Received: by 2002:a1c:f609:: with SMTP id w9mr4791022wmc.99.1639658177775; Thu, 16 Dec 2021 04:36:17 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Xu , Alexander Bulekov , qemu-block@nongnu.org, Qiuhao Li , Hannes Reinecke , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Klaus Jensen , Jason Wang , Li Qiang , Paolo Bonzini , David Hildenbrand , "Michael S. Tsirkin" , John Snow , Gerd Hoffmann , Marcel Apfelbaum , Keith Busch , Fam Zheng Subject: [PATCH 2/8] dma: Have dma_buf_read() / dma_buf_write() take a void pointer Date: Thu, 16 Dec 2021 13:35:52 +0100 Message-Id: <20211216123558.799425-3-philmd@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211216123558.799425-1-philmd@redhat.com> References: <20211216123558.799425-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: 1639658185213100001 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. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Klaus Jensen --- 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 531f02db14e..2721bf296a8 100644 --- a/include/sysemu/dma.h +++ b/include/sysemu/dma.h @@ -303,8 +303,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 4ff51221d4c..733ca8e9865 100644 --- a/hw/scsi/megasas.c +++ b/hw/scsi/megasas.c @@ -847,7 +847,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 @@ -877,7 +877,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 @@ -898,7 +898,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 @@ -909,7 +909,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 @@ -936,7 +936,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 @@ -1005,7 +1005,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 @@ -1171,7 +1171,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; } @@ -1220,7 +1220,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; } @@ -1389,7 +1389,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 @@ -1419,7 +1419,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 @@ -1464,7 +1464,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 From nobody Sun Feb 8 21:07:47 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1639658188; cv=none; d=zohomail.com; s=zohoarc; b=gBqyBI0LKBSyppJF9N31jts/iEwzvxbFkom0X/IrXhofLhxB5Y96oJvNTK6YuDDLlw6bK0p4GCfmUOhvrzcM4ozhZWztPAXLAtTht+vwaqcaFAB/XDI2tqoflLnc+ZOtuxI6aA+6d6YVNCDt5b8yKh1y202qWG75XalnVoh+wuM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1639658188; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=q3jfzfAWXoz2z5mwoL5Qi09iCpO4M7rxflJUJE8g74U=; b=JbBObYCewLlFgZ6wb14gMLOhaeIFenjCh3Q33dJGoY8+XIPwPAW3ZDdflAm/ovKjJteoefraeyO3T8OCN6Vh99jKEJG5EiLmColxh/89sjluN2dKhGqTiQWucMicjeB9B2Vz6rsl1nwq+DcLev5m/lkbkcaqgwlmMDZEFMx+BNU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1639658188214201.0106339568348; Thu, 16 Dec 2021 04:36:28 -0800 (PST) Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-79-YtyF4a_jN-qzRN6a2_8cCA-1; Thu, 16 Dec 2021 07:36:23 -0500 Received: by mail-wm1-f71.google.com with SMTP id b75-20020a1c804e000000b0034569bde713so1196581wmd.9 for ; Thu, 16 Dec 2021 04:36:23 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (174.red-83-50-185.dynamicip.rima-tde.net. [83.50.185.174]) by smtp.gmail.com with ESMTPSA id y11sm5960415wry.70.2021.12.16.04.36.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Dec 2021 04:36:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1639658187; 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=q3jfzfAWXoz2z5mwoL5Qi09iCpO4M7rxflJUJE8g74U=; b=RbicoO0/ltdtS/8oggfmYPcON2nf1lfZUEVS20B31UQzP7uosGruESRqVh/QLkgfUpDKg8 Ye3beJvFVhwg0saC6UC6a4Q4NhgXaE9C0tevJ33P7M30ynCKLEHSDOYuy/1fWSFOG1MTYV 4n42paQwMR2A50fauCFmIjXvJFnrw0s= X-MC-Unique: YtyF4a_jN-qzRN6a2_8cCA-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=q3jfzfAWXoz2z5mwoL5Qi09iCpO4M7rxflJUJE8g74U=; b=rzxqGJef0VPrO8qk5djFeT0Qpy8DWn98CVpTlbtSAHlt01Xi5sZ7kFYx86AbT8FuFL 2J0RLH0TfTaHqdFFna06fLG4xNqJMRppn8GXJ7+QQ+ryXuY7i8Aw4w134qEND/5KIz18 JIhylWWw2bdyYpA4TTHhnerzOfpDxLnioAxvDOEYokNBeYaf3B2bK+iVC++PLOKTgsLl l5UW1hsSc9q7pQxNv4Gu85U+Rr/c1Sa0lIOQP44wn0CXvyVagiZvWDQ/2N1fUL9zkTOq 7SaherMH/g2g4bXv+vuRrMdpXinyygoY8zkju3QMsUfmPduik8NuY8IKwhs+qHOpq5kh DmEg== X-Gm-Message-State: AOAM530iSNIdTLlQiHmA29cTogQxQF+ZpLEbBtvH+5U2AnOo0APNqmww /ZoSOB5OEWGCylEM7mdXTzq0V3mrC4m1PuB5JflEybGl9poaAmuUvyfozVLP53dLoNvQx1luGId mTKfxyoJGquDjHA== X-Received: by 2002:a5d:6c67:: with SMTP id r7mr8738400wrz.286.1639658182831; Thu, 16 Dec 2021 04:36:22 -0800 (PST) X-Google-Smtp-Source: ABdhPJzrbMToH/xA0DjntMIzdR8zMyWWz2Dh4GXWc9kRQZGRBQmf8ZHJ3aIiX0bVgHUkgBOu0tWY5w== X-Received: by 2002:a5d:6c67:: with SMTP id r7mr8738374wrz.286.1639658182687; Thu, 16 Dec 2021 04:36:22 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Xu , Alexander Bulekov , qemu-block@nongnu.org, Qiuhao Li , Hannes Reinecke , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Klaus Jensen , Jason Wang , Li Qiang , Paolo Bonzini , David Hildenbrand , "Michael S. Tsirkin" , John Snow , Gerd Hoffmann , Marcel Apfelbaum , Keith Busch , Fam Zheng Subject: [PATCH 3/8] dma: Let pci_dma_rw() take MemTxAttrs argument Date: Thu, 16 Dec 2021 13:35:53 +0100 Message-Id: <20211216123558.799425-4-philmd@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211216123558.799425-1-philmd@redhat.com> References: <20211216123558.799425-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: 1639658190427100001 Let devices specify transaction attributes when calling pci_dma_rw(). Keep the default MEMTXATTRS_UNSPECIFIED in the few callers. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Klaus Jensen --- include/hw/pci/pci.h | 10 ++++++---- hw/audio/intel-hda.c | 3 ++- hw/scsi/esp-pci.c | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h index 1acefc2a4c3..a751ab5a75d 100644 --- a/include/hw/pci/pci.h +++ b/include/hw/pci/pci.h @@ -806,10 +806,10 @@ static inline AddressSpace *pci_get_address_space(PCI= Device *dev) */ static inline MemTxResult pci_dma_rw(PCIDevice *dev, dma_addr_t addr, void *buf, dma_addr_t len, - DMADirection dir) + DMADirection dir, MemTxAttrs attrs) { return dma_memory_rw(pci_get_address_space(dev), addr, buf, len, - dir, MEMTXATTRS_UNSPECIFIED); + dir, attrs); } =20 /** @@ -827,7 +827,8 @@ static inline MemTxResult pci_dma_rw(PCIDevice *dev, dm= a_addr_t addr, static inline MemTxResult pci_dma_read(PCIDevice *dev, dma_addr_t addr, void *buf, dma_addr_t len) { - return pci_dma_rw(dev, addr, buf, len, DMA_DIRECTION_TO_DEVICE); + return pci_dma_rw(dev, addr, buf, len, + DMA_DIRECTION_TO_DEVICE, MEMTXATTRS_UNSPECIFIED); } =20 /** @@ -845,7 +846,8 @@ static inline MemTxResult pci_dma_read(PCIDevice *dev, = dma_addr_t addr, static inline MemTxResult pci_dma_write(PCIDevice *dev, dma_addr_t addr, const void *buf, dma_addr_t len) { - return pci_dma_rw(dev, addr, (void *) buf, len, DMA_DIRECTION_FROM_DEV= ICE); + return pci_dma_rw(dev, addr, (void *) buf, len, + DMA_DIRECTION_FROM_DEVICE, MEMTXATTRS_UNSPECIFIED); } =20 #define PCI_DMA_DEFINE_LDST(_l, _s, _bits) \ diff --git a/hw/audio/intel-hda.c b/hw/audio/intel-hda.c index 8ce9df64e3e..fb3d34a4a0c 100644 --- a/hw/audio/intel-hda.c +++ b/hw/audio/intel-hda.c @@ -427,7 +427,8 @@ static bool intel_hda_xfer(HDACodecDevice *dev, uint32_= t stnr, bool output, dprint(d, 3, "dma: entry %d, pos %d/%d, copy %d\n", st->be, st->bp, st->bpl[st->be].len, copy); =20 - pci_dma_rw(&d->pci, st->bpl[st->be].addr + st->bp, buf, copy, !out= put); + pci_dma_rw(&d->pci, st->bpl[st->be].addr + st->bp, buf, copy, !out= put, + MEMTXATTRS_UNSPECIFIED); st->lpib +=3D copy; st->bp +=3D copy; buf +=3D copy; diff --git a/hw/scsi/esp-pci.c b/hw/scsi/esp-pci.c index dac054aeed4..1792f84cea6 100644 --- a/hw/scsi/esp-pci.c +++ b/hw/scsi/esp-pci.c @@ -280,7 +280,7 @@ static void esp_pci_dma_memory_rw(PCIESPState *pci, uin= t8_t *buf, int len, len =3D pci->dma_regs[DMA_WBC]; } =20 - pci_dma_rw(PCI_DEVICE(pci), addr, buf, len, dir); + pci_dma_rw(PCI_DEVICE(pci), addr, buf, len, dir, MEMTXATTRS_UNSPECIFIE= D); =20 /* update status registers */ pci->dma_regs[DMA_WBC] -=3D len; --=20 2.33.1 From nobody Sun Feb 8 21:07:47 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=1639658190; cv=none; d=zohomail.com; s=zohoarc; b=cdkz+5TD8yC+DvlHBAxYLgdnalTTYBED3vwDHZEKoEQFogUoMd09XY1+W+Y/p7uNtD88iYPVW5J4Jg5ai8cBVey/Vwpq44FglfxqnSOPFc/8TAHYRii9Tng+tz0mcsBQlHHxPi3xIuAZysxodSjotImk1sbvE+GpySw03htEMj0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1639658190; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=7nTVrnVlKHO/lU2wTxpBZUhczYmkS2pwPKBwt8gEo7s=; b=k1M2q72EuH6WveEXoIA3W7GvScDhCEQpMd6MWRYmvA9+W3NFXC8KdV1h9O0fGabBA725f/+SnqGzrFhcvnFFyQL+3/WxeMTraP8mSfEcZVsUOY58xWVuYd7CgFvPMiaLq2cFMgEb+PmcJdEtaTyE6xTFHWEQHJg4PCnt13zRDyA= 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 1639658190991476.24127281912035; Thu, 16 Dec 2021 04:36:30 -0800 (PST) Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-338--J37ssTIMqO7NtVMZ8sLXw-1; Thu, 16 Dec 2021 07:36:28 -0500 Received: by mail-wr1-f72.google.com with SMTP id k8-20020a5d5248000000b001763e7c9ce5so6915364wrc.22 for ; Thu, 16 Dec 2021 04:36:28 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (174.red-83-50-185.dynamicip.rima-tde.net. [83.50.185.174]) by smtp.gmail.com with ESMTPSA id u13sm8723859wmq.14.2021.12.16.04.36.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Dec 2021 04:36:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1639658189; 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=7nTVrnVlKHO/lU2wTxpBZUhczYmkS2pwPKBwt8gEo7s=; b=FEhEm+tWMeKZG9srcFSoTK0Q04Rgga0YlXFjNO70kQwuwnv/YKC+uFYRXX73i/RyruP4Eh sT8t8W1cCkjqoh+sgSBC0R7H/lj4NvkXf6ZQdcaUFJzeMpef8U1P38qn6caOjDuI+B7gMm T9Jrwhz5vpsuhOEsuSkyEM5MKmHtHhE= X-MC-Unique: -J37ssTIMqO7NtVMZ8sLXw-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=7nTVrnVlKHO/lU2wTxpBZUhczYmkS2pwPKBwt8gEo7s=; b=MaMDRvYWMXuDdTcT85De6kA+YM5Pxxg+Ilpto6KvnoXiaGfR/76Xy6ZVPNgKS08dHU J4Ou1oD51U6guCzJbr6iFeBHT4nNOGIucNRSrQ9S1VDrRL4A0uzqhrgp6AXPoV4QXuiM kUM39rq5NzqL/uF9jj8z3GLqDmMqhQ3Wc+S4j8iPZ/CUl5JRyF1dKe0WlXJnWwqAJVV6 5FtnvRqCDBR20G8zsayRXD57+r1Dh6kVGALb/EBYAinjcom4LJeByRKW09pYpcVcgNBK Oj+tNuyErbvsy1HbzREVq6FGxHYxgBxLd5BhwE3eKLYZjoTqSfjbYWZ7HD6OcmfTY0up OVCA== X-Gm-Message-State: AOAM532bqsjMTv5jW7QL+WPxVpBl8jub0mTb1oLf5sqKO8RaMjLfwiLZ uGE96ku2ATIq6BuVJh4h+1GG0oeHNY87z4QryKB6VE7TsG/4/Fjm/Ym5cbAzqaddNM7AEE1mKp7 lS43/QxZrfMUmqg== X-Received: by 2002:a5d:540f:: with SMTP id g15mr6091247wrv.126.1639658187511; Thu, 16 Dec 2021 04:36:27 -0800 (PST) X-Google-Smtp-Source: ABdhPJxPK6hAJ5tfrBHQrpN0z9sWZpZCuwATKNaN0+Xfmz8qbJ7PecPnnNNPda1KDyr7K+lVOUuAnA== X-Received: by 2002:a5d:540f:: with SMTP id g15mr6091229wrv.126.1639658187372; Thu, 16 Dec 2021 04:36:27 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Xu , Alexander Bulekov , qemu-block@nongnu.org, Qiuhao Li , Hannes Reinecke , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Klaus Jensen , Jason Wang , Li Qiang , Paolo Bonzini , David Hildenbrand , "Michael S. Tsirkin" , John Snow , Gerd Hoffmann , Marcel Apfelbaum , Keith Busch , Fam Zheng Subject: [PATCH 4/8] dma: Let dma_buf_rw() take MemTxAttrs argument Date: Thu, 16 Dec 2021 13:35:54 +0100 Message-Id: <20211216123558.799425-5-philmd@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211216123558.799425-1-philmd@redhat.com> References: <20211216123558.799425-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: 1639658191568100003 Let devices specify transaction attributes when calling dma_buf_rw(). Keep the default MEMTXATTRS_UNSPECIFIED in the 2 callers. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Klaus Jensen --- softmmu/dma-helpers.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/softmmu/dma-helpers.c b/softmmu/dma-helpers.c index 7f37548394e..fa81d2b386c 100644 --- a/softmmu/dma-helpers.c +++ b/softmmu/dma-helpers.c @@ -295,7 +295,7 @@ BlockAIOCB *dma_blk_write(BlockBackend *blk, =20 =20 static uint64_t dma_buf_rw(void *buf, int32_t len, QEMUSGList *sg, - DMADirection dir) + DMADirection dir, MemTxAttrs attrs) { uint8_t *ptr =3D buf; uint64_t resid; @@ -307,8 +307,7 @@ static uint64_t dma_buf_rw(void *buf, int32_t len, QEMU= SGList *sg, while (len > 0) { ScatterGatherEntry entry =3D sg->sg[sg_cur_index++]; int32_t xfer =3D MIN(len, entry.len); - dma_memory_rw(sg->as, entry.base, ptr, xfer, dir, - MEMTXATTRS_UNSPECIFIED); + dma_memory_rw(sg->as, entry.base, ptr, xfer, dir, attrs); ptr +=3D xfer; len -=3D xfer; resid -=3D xfer; @@ -319,12 +318,14 @@ static uint64_t dma_buf_rw(void *buf, int32_t len, QE= MUSGList *sg, =20 uint64_t dma_buf_read(void *ptr, int32_t len, QEMUSGList *sg) { - return dma_buf_rw(ptr, len, sg, DMA_DIRECTION_FROM_DEVICE); + return dma_buf_rw(ptr, len, sg, DMA_DIRECTION_FROM_DEVICE, + MEMTXATTRS_UNSPECIFIED); } =20 uint64_t dma_buf_write(void *ptr, int32_t len, QEMUSGList *sg) { - return dma_buf_rw(ptr, len, sg, DMA_DIRECTION_TO_DEVICE); + return dma_buf_rw(ptr, len, sg, DMA_DIRECTION_TO_DEVICE, + MEMTXATTRS_UNSPECIFIED); } =20 void dma_acct_start(BlockBackend *blk, BlockAcctCookie *cookie, --=20 2.33.1 From nobody Sun Feb 8 21:07:47 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1639658196; cv=none; d=zohomail.com; s=zohoarc; b=QJfpoyk8EAB+HiLWV0Yh+/u//0bG/hJ9366HvGrlpMu+m+6j+sLy9lSaCle6SzMwz9vWw4kK/8yXc45VzYpjn0QNzmqdgMVpfieXwf8plOVci8JEVhgHXgvux9cJlGtzPCeeOIxK6MrkiymTg121djm2FpCUpsp8Q1FqFyxcacI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1639658196; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=DJOlGMJ8joo1eoi16SCW57KA4jcS7ihdPt8j7gpCvZc=; b=Y4FmwPiebNogve8M58xmvx9f97QiOroRCpeOggXGdTYCAt1BuS07Z0/bI7q/KyzWEhZhRK0MXgNpQbt42V7rGD4k4WRqUfopjrl2ZOYnARgI7/NOnbE7sPWfHZslVdn8RexgtCk+GUIuNAG2KjIVa1/a8ig/5c1ApZ812LyJ0m8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 163965819622673.45666125979676; Thu, 16 Dec 2021 04:36:36 -0800 (PST) Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-213-JWEw3lUrOGyKrhnN5H_f8w-1; Thu, 16 Dec 2021 07:36:34 -0500 Received: by mail-wm1-f72.google.com with SMTP id 187-20020a1c02c4000000b003335872db8dso13772040wmc.2 for ; Thu, 16 Dec 2021 04:36:34 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (174.red-83-50-185.dynamicip.rima-tde.net. [83.50.185.174]) by smtp.gmail.com with ESMTPSA id m9sm4764559wmq.1.2021.12.16.04.36.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Dec 2021 04:36:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1639658195; 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=DJOlGMJ8joo1eoi16SCW57KA4jcS7ihdPt8j7gpCvZc=; b=BAU737/vb5aQ0VZyqlNqt5LnXDOsaCiXKycWTIcJo9p2FZZj3ZfMiXNvQWq4YQ2HDzW/Au XtQlJ65YlsFPda2yybw1QRh2ZkNJ7QP/ieh+2zx/o3OoTZi8aOWHcl0MXFjnLa6peaR2Oo EjCELIM6thP5ZSSGOtoUdArft56Okag= X-MC-Unique: JWEw3lUrOGyKrhnN5H_f8w-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=DJOlGMJ8joo1eoi16SCW57KA4jcS7ihdPt8j7gpCvZc=; b=I+LN0Q0hDnzfGqVsj7rcaA/TGIEEIAfpJBDxhOsvMF2Xu66hs8eQjnCXfkUgMBKYor wsNDZkmYhSZ5znB4hMxKcfahKd2vs+6srcaJ7vLPEpyTS6bwU6j53qBE1f7jPQ7x/wDm jWZ8K0aVW5ADoTkfReAv/hHhDehb81t7OQwdOcZZmQZbodLKQIoGHfZL15TynD0OirYH kVY89YIqhVX7dUx0jd4YYlpZ6/ZOAagmSgvlv8YE6K6cjxD86SRKTF3xrt2FYFn7iATg OhC79W5w+scvekicHwGvkuzuR67Ka6IlqcJV+RMGf2UdypnmZOiBWSN2D2abY+9fyohQ 4USQ== X-Gm-Message-State: AOAM533iPfL0AmfpOBz8Go3N+i/trLaUhw09eB2nwR1ImnZSasVF84/u Gx3iVyEW55E1N3r92Z/9pwc63SH2EwWnrTSs4aKLsKrrDdLvSnGr+37a6JodPXABmjOGOt5W1MC NqoMt6VNSg/VjTQ== X-Received: by 2002:a5d:4b82:: with SMTP id b2mr8540365wrt.419.1639658192492; Thu, 16 Dec 2021 04:36:32 -0800 (PST) X-Google-Smtp-Source: ABdhPJxSDBKDeGjUklSDVRLHz0YFdo5VUaWto4832aGBcJ9AaQgYEpZE9dVFYOq/UcG9o9tMFyASeg== X-Received: by 2002:a5d:4b82:: with SMTP id b2mr8540342wrt.419.1639658192274; Thu, 16 Dec 2021 04:36:32 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Xu , Alexander Bulekov , qemu-block@nongnu.org, Qiuhao Li , Hannes Reinecke , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Klaus Jensen , Jason Wang , Li Qiang , Paolo Bonzini , David Hildenbrand , "Michael S. Tsirkin" , John Snow , Gerd Hoffmann , Marcel Apfelbaum , Keith Busch , Fam Zheng Subject: [PATCH 5/8] dma: Let dma_buf_write() take MemTxAttrs argument Date: Thu, 16 Dec 2021 13:35:55 +0100 Message-Id: <20211216123558.799425-6-philmd@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211216123558.799425-1-philmd@redhat.com> References: <20211216123558.799425-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: 1639658197439100001 Let devices specify transaction attributes when calling dma_buf_write(). Keep the default MEMTXATTRS_UNSPECIFIED in the few callers. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Klaus Jensen --- include/sysemu/dma.h | 2 +- hw/ide/ahci.c | 6 ++++-- hw/nvme/ctrl.c | 3 ++- hw/scsi/megasas.c | 2 +- hw/scsi/scsi-bus.c | 2 +- softmmu/dma-helpers.c | 5 ++--- 6 files changed, 11 insertions(+), 9 deletions(-) diff --git a/include/sysemu/dma.h b/include/sysemu/dma.h index 2721bf296a8..c5f45f6c594 100644 --- a/include/sysemu/dma.h +++ b/include/sysemu/dma.h @@ -304,7 +304,7 @@ BlockAIOCB *dma_blk_write(BlockBackend *blk, QEMUSGList *sg, uint64_t offset, uint32_t align, BlockCompletionFunc *cb, void *opaque); uint64_t dma_buf_read(void *ptr, int32_t len, QEMUSGList *sg); -uint64_t dma_buf_write(void *ptr, int32_t len, QEMUSGList *sg); +uint64_t dma_buf_write(void *ptr, int32_t len, QEMUSGList *sg, MemTxAttrs = attrs); =20 void dma_acct_start(BlockBackend *blk, BlockAcctCookie *cookie, QEMUSGList *sg, enum BlockAcctType type); diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c index 8e77ddb660f..079d2977f23 100644 --- a/hw/ide/ahci.c +++ b/hw/ide/ahci.c @@ -1381,8 +1381,10 @@ static void ahci_pio_transfer(const IDEDMA *dma) has_sglist ? "" : "o"); =20 if (has_sglist && size) { + const MemTxAttrs attrs =3D MEMTXATTRS_UNSPECIFIED; + if (is_write) { - dma_buf_write(s->data_ptr, size, &s->sg); + dma_buf_write(s->data_ptr, size, &s->sg, attrs); } else { dma_buf_read(s->data_ptr, size, &s->sg); } @@ -1479,7 +1481,7 @@ static int ahci_dma_rw_buf(const IDEDMA *dma, bool is= _write) if (is_write) { dma_buf_read(p, l, &s->sg); } else { - dma_buf_write(p, l, &s->sg); + dma_buf_write(p, l, &s->sg, MEMTXATTRS_UNSPECIFIED); } =20 /* free sglist, update byte count */ diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c index 5f573c417b3..e1a531d5d6c 100644 --- a/hw/nvme/ctrl.c +++ b/hw/nvme/ctrl.c @@ -1146,10 +1146,11 @@ static uint16_t nvme_tx(NvmeCtrl *n, NvmeSg *sg, ui= nt8_t *ptr, uint32_t len, assert(sg->flags & NVME_SG_ALLOC); =20 if (sg->flags & NVME_SG_DMA) { + const MemTxAttrs attrs =3D MEMTXATTRS_UNSPECIFIED; uint64_t residual; =20 if (dir =3D=3D NVME_TX_DIRECTION_TO_DEVICE) { - residual =3D dma_buf_write(ptr, len, &sg->qsg); + residual =3D dma_buf_write(ptr, len, &sg->qsg, attrs); } else { residual =3D dma_buf_read(ptr, len, &sg->qsg); } diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c index 733ca8e9865..4ec104b7820 100644 --- a/hw/scsi/megasas.c +++ b/hw/scsi/megasas.c @@ -1464,7 +1464,7 @@ static int megasas_dcmd_set_properties(MegasasState *= s, MegasasCmd *cmd) dcmd_size); return MFI_STAT_INVALID_PARAMETER; } - dma_buf_write(&info, dcmd_size, &cmd->qsg); + dma_buf_write(&info, dcmd_size, &cmd->qsg, MEMTXATTRS_UNSPECIFIED); trace_megasas_dcmd_unsupported(cmd->index, cmd->iov_size); return MFI_STAT_OK; } diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c index 77325d8cc7a..64a506a3975 100644 --- a/hw/scsi/scsi-bus.c +++ b/hw/scsi/scsi-bus.c @@ -1423,7 +1423,7 @@ void scsi_req_data(SCSIRequest *req, int len) if (req->cmd.mode =3D=3D SCSI_XFER_FROM_DEV) { req->resid =3D dma_buf_read(buf, len, req->sg); } else { - req->resid =3D dma_buf_write(buf, len, req->sg); + req->resid =3D dma_buf_write(buf, len, req->sg, MEMTXATTRS_UNSPECI= FIED); } scsi_req_continue(req); } diff --git a/softmmu/dma-helpers.c b/softmmu/dma-helpers.c index fa81d2b386c..2f1a241b81a 100644 --- a/softmmu/dma-helpers.c +++ b/softmmu/dma-helpers.c @@ -322,10 +322,9 @@ uint64_t dma_buf_read(void *ptr, int32_t len, QEMUSGLi= st *sg) MEMTXATTRS_UNSPECIFIED); } =20 -uint64_t dma_buf_write(void *ptr, int32_t len, QEMUSGList *sg) +uint64_t dma_buf_write(void *ptr, int32_t len, QEMUSGList *sg, MemTxAttrs = attrs) { - return dma_buf_rw(ptr, len, sg, DMA_DIRECTION_TO_DEVICE, - MEMTXATTRS_UNSPECIFIED); + return dma_buf_rw(ptr, len, sg, DMA_DIRECTION_TO_DEVICE, attrs); } =20 void dma_acct_start(BlockBackend *blk, BlockAcctCookie *cookie, --=20 2.33.1 From nobody Sun Feb 8 21:07:47 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1639658201; cv=none; d=zohomail.com; s=zohoarc; b=a6MguZUhvvXEw4yV9nkK8FgbFOKGBMZRZWfAjrs96h+R12howJtD11+JXKOXDAHxYcyFLdrD6AWLxDSP0dIjznuy4FNconB3JmBId5t96DJ+6QZf60jh8ZqZJkXSc1hO1eUOvMp1HdrnUVK0zQq0RJYMFGvdLw9qNkPPL4XW7kk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1639658201; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=v53goszAsL62V3p7LnUQ0hKDZEGdftzFNTJ8i7no6x0=; b=WfGS9Io6m+oDH4K/cbmOu3DcsjndT0Tq3S5G9yqrwS0VeB0i9k6pWEUi9jxGmAFZLxAFeCbBCyZ2N1BgAJ9dSl6KF6x4d2dydebRnVo03Bb86dWL7cD3gG0fxPE9k7w9JJXvmOTsXxV3x3/0HwIabwXWDePO9GCa6ZWfQc1nsjU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1639658201329235.0903110928448; Thu, 16 Dec 2021 04:36:41 -0800 (PST) Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-167-uZMgkVFVMrqLs4X1roO5FA-1; Thu, 16 Dec 2021 07:36:38 -0500 Received: by mail-wr1-f69.google.com with SMTP id j26-20020adfb31a000000b001a2356afd4fso972546wrd.21 for ; Thu, 16 Dec 2021 04:36:38 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (174.red-83-50-185.dynamicip.rima-tde.net. [83.50.185.174]) by smtp.gmail.com with ESMTPSA id o25sm4510312wms.17.2021.12.16.04.36.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Dec 2021 04:36:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1639658200; 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=v53goszAsL62V3p7LnUQ0hKDZEGdftzFNTJ8i7no6x0=; b=GcRflY68irixqq5TULNMUhMXVC8m2tsCDYnlugl0hkWiGPqIBFeULKGjtBxnFvv4WV7q0M ikadF4QAaGa1mZr0T6RI2Y0k5xgSLbxvTWZ5P5/XJ/UkqV4OU61a/nNCUuhMiruv0CI3fs cX9BHmoLRvQtwPDXmvV3/dC92K0j5jM= X-MC-Unique: uZMgkVFVMrqLs4X1roO5FA-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=v53goszAsL62V3p7LnUQ0hKDZEGdftzFNTJ8i7no6x0=; b=aQkQe1KuI5PED01Y1x0zbF9acDlzwGWBYP/eZJSCJgo1WKDaOPFXuhkRZIwQdjQSEV v3JJ0satm5/XJHgy2zYzDGBwL8U3u/HFx1moekfUaMaJTDqP3Ja2coKpvX+cYdrsT0DA l+pqArLKlS6VznucnMP9DXRvgXC6gDugPnbv1I11wjnE/e9RweMKHHp2GechNcSzHScO vm5UWp1Kn+nHlaNfY63tL2/aBi1fQxejc1v4Xx03Tgy3Nu67BQ+B4R3ywKuDNGJNsho6 7AdKTgSuKXpz+itFpp8EOytTn/HHtgHI4oL/v5MoKn/ikXDDc23g/XgsJve13G8m3lMD +qZQ== X-Gm-Message-State: AOAM533U44MptDMNhekA0YfYvsgYG6OGAv5Eb4MFMP9QSK7iWnhiVBvL QiZRg9dK7pblc9kWyppB0qp3GhjK1jpUUjGWasrX7y8K5a0EzO9sFWmVAMyELsqZV8KKjHi/flT w7eOef8olHvepww== X-Received: by 2002:a5d:5303:: with SMTP id e3mr8859187wrv.73.1639658197423; Thu, 16 Dec 2021 04:36:37 -0800 (PST) X-Google-Smtp-Source: ABdhPJw2WQsB2H5PLENDqTRo21FxXtRjmI9pvqpn4Fm9puCWkL96vuusrEd3xRMAaGw6IQqp811y9w== X-Received: by 2002:a5d:5303:: with SMTP id e3mr8859166wrv.73.1639658197199; Thu, 16 Dec 2021 04:36:37 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Xu , Alexander Bulekov , qemu-block@nongnu.org, Qiuhao Li , Hannes Reinecke , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Klaus Jensen , Jason Wang , Li Qiang , Paolo Bonzini , David Hildenbrand , "Michael S. Tsirkin" , John Snow , Gerd Hoffmann , Marcel Apfelbaum , Keith Busch , Fam Zheng Subject: [PATCH 6/8] dma: Let dma_buf_read() take MemTxAttrs argument Date: Thu, 16 Dec 2021 13:35:56 +0100 Message-Id: <20211216123558.799425-7-philmd@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211216123558.799425-1-philmd@redhat.com> References: <20211216123558.799425-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: 1639658202962100001 Let devices specify transaction attributes when calling dma_buf_read(). Keep the default MEMTXATTRS_UNSPECIFIED in the few callers. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Klaus Jensen --- include/sysemu/dma.h | 2 +- hw/ide/ahci.c | 4 ++-- hw/nvme/ctrl.c | 2 +- hw/scsi/megasas.c | 24 ++++++++++++------------ hw/scsi/scsi-bus.c | 2 +- softmmu/dma-helpers.c | 5 ++--- 6 files changed, 19 insertions(+), 20 deletions(-) diff --git a/include/sysemu/dma.h b/include/sysemu/dma.h index c5f45f6c594..cdf379fecad 100644 --- a/include/sysemu/dma.h +++ b/include/sysemu/dma.h @@ -303,7 +303,7 @@ 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(void *ptr, int32_t len, QEMUSGList *sg); +uint64_t dma_buf_read(void *ptr, int32_t len, QEMUSGList *sg, MemTxAttrs a= ttrs); uint64_t dma_buf_write(void *ptr, int32_t len, QEMUSGList *sg, MemTxAttrs = attrs); =20 void dma_acct_start(BlockBackend *blk, BlockAcctCookie *cookie, diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c index 079d2977f23..205dfdc6622 100644 --- a/hw/ide/ahci.c +++ b/hw/ide/ahci.c @@ -1386,7 +1386,7 @@ static void ahci_pio_transfer(const IDEDMA *dma) if (is_write) { dma_buf_write(s->data_ptr, size, &s->sg, attrs); } else { - dma_buf_read(s->data_ptr, size, &s->sg); + dma_buf_read(s->data_ptr, size, &s->sg, attrs); } } =20 @@ -1479,7 +1479,7 @@ static int ahci_dma_rw_buf(const IDEDMA *dma, bool is= _write) } =20 if (is_write) { - dma_buf_read(p, l, &s->sg); + dma_buf_read(p, l, &s->sg, MEMTXATTRS_UNSPECIFIED); } else { dma_buf_write(p, l, &s->sg, MEMTXATTRS_UNSPECIFIED); } diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c index e1a531d5d6c..462f79a1f60 100644 --- a/hw/nvme/ctrl.c +++ b/hw/nvme/ctrl.c @@ -1152,7 +1152,7 @@ static uint16_t nvme_tx(NvmeCtrl *n, NvmeSg *sg, uint= 8_t *ptr, uint32_t len, if (dir =3D=3D NVME_TX_DIRECTION_TO_DEVICE) { residual =3D dma_buf_write(ptr, len, &sg->qsg, attrs); } else { - residual =3D dma_buf_read(ptr, len, &sg->qsg); + residual =3D dma_buf_read(ptr, len, &sg->qsg, attrs); } =20 if (unlikely(residual)) { diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c index 4ec104b7820..dfd48f1a873 100644 --- a/hw/scsi/megasas.c +++ b/hw/scsi/megasas.c @@ -847,7 +847,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(&info, dcmd_size, &cmd->qsg); + cmd->iov_size -=3D dma_buf_read(&info, dcmd_size, &cmd->qsg, MEMTXATTR= S_UNSPECIFIED); return MFI_STAT_OK; } =20 @@ -877,7 +877,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(&info, dcmd_size, &cmd->qsg); + cmd->iov_size -=3D dma_buf_read(&info, dcmd_size, &cmd->qsg, MEMTXATTR= S_UNSPECIFIED); return MFI_STAT_OK; } =20 @@ -898,7 +898,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(&info, dcmd_size, &cmd->qsg); + cmd->iov_size -=3D dma_buf_read(&info, dcmd_size, &cmd->qsg, MEMTXATTR= S_UNSPECIFIED); return MFI_STAT_OK; } =20 @@ -909,7 +909,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(&fw_time, dcmd_size, &cmd->qsg); + cmd->iov_size -=3D dma_buf_read(&fw_time, dcmd_size, &cmd->qsg, MEMTXA= TTRS_UNSPECIFIED); return MFI_STAT_OK; } =20 @@ -936,7 +936,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(&info, dcmd_size, &cmd->qsg); + cmd->iov_size -=3D dma_buf_read(&info, dcmd_size, &cmd->qsg, MEMTXATTR= S_UNSPECIFIED); return MFI_STAT_OK; } =20 @@ -1005,7 +1005,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(&info, offset, &cmd->qsg); + cmd->iov_size -=3D dma_buf_read(&info, offset, &cmd->qsg, MEMTXATTRS_U= NSPECIFIED); return MFI_STAT_OK; } =20 @@ -1099,7 +1099,7 @@ static int megasas_pd_get_info_submit(SCSIDevice *sde= v, int lun, info->connected_port_bitmap =3D 0x1; info->device_speed =3D 1; info->link_speed =3D 1; - resid =3D dma_buf_read(cmd->iov_buf, dcmd_size, &cmd->qsg); + resid =3D dma_buf_read(cmd->iov_buf, dcmd_size, &cmd->qsg, MEMTXATTRS_= UNSPECIFIED); g_free(cmd->iov_buf); cmd->iov_size =3D dcmd_size - resid; cmd->iov_buf =3D NULL; @@ -1171,7 +1171,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(&info, dcmd_size, &cmd->qsg); + resid =3D dma_buf_read(&info, dcmd_size, &cmd->qsg, MEMTXATTRS_UNSPECI= FIED); cmd->iov_size =3D dcmd_size - resid; return MFI_STAT_OK; } @@ -1220,7 +1220,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(&info, dcmd_size, &cmd->qsg); + resid =3D dma_buf_read(&info, dcmd_size, &cmd->qsg, MEMTXATTRS_UNSPECI= FIED); cmd->iov_size =3D dcmd_size - resid; return MFI_STAT_OK; } @@ -1270,7 +1270,7 @@ static int megasas_ld_get_info_submit(SCSIDevice *sde= v, int lun, info->ld_config.span[0].num_blocks =3D info->size; info->ld_config.span[0].array_ref =3D cpu_to_le16(sdev_id); =20 - resid =3D dma_buf_read(cmd->iov_buf, dcmd_size, &cmd->qsg); + resid =3D dma_buf_read(cmd->iov_buf, dcmd_size, &cmd->qsg, MEMTXATTRS_= UNSPECIFIED); g_free(cmd->iov_buf); cmd->iov_size =3D dcmd_size - resid; cmd->iov_buf =3D NULL; @@ -1389,7 +1389,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(data, info->size, &cmd->qsg); + cmd->iov_size -=3D dma_buf_read(data, info->size, &cmd->qsg, MEMTXATTR= S_UNSPECIFIED); return MFI_STAT_OK; } =20 @@ -1419,7 +1419,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(&info, dcmd_size, &cmd->qsg); + cmd->iov_size -=3D dma_buf_read(&info, dcmd_size, &cmd->qsg, MEMTXATTR= S_UNSPECIFIED); return MFI_STAT_OK; } =20 diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c index 64a506a3975..2b5e9dca311 100644 --- a/hw/scsi/scsi-bus.c +++ b/hw/scsi/scsi-bus.c @@ -1421,7 +1421,7 @@ void scsi_req_data(SCSIRequest *req, int len) =20 buf =3D scsi_req_get_buf(req); if (req->cmd.mode =3D=3D SCSI_XFER_FROM_DEV) { - req->resid =3D dma_buf_read(buf, len, req->sg); + req->resid =3D dma_buf_read(buf, len, req->sg, MEMTXATTRS_UNSPECIF= IED); } else { req->resid =3D dma_buf_write(buf, len, req->sg, MEMTXATTRS_UNSPECI= FIED); } diff --git a/softmmu/dma-helpers.c b/softmmu/dma-helpers.c index 2f1a241b81a..a391773c296 100644 --- a/softmmu/dma-helpers.c +++ b/softmmu/dma-helpers.c @@ -316,10 +316,9 @@ static uint64_t dma_buf_rw(void *buf, int32_t len, QEM= USGList *sg, return resid; } =20 -uint64_t dma_buf_read(void *ptr, int32_t len, QEMUSGList *sg) +uint64_t dma_buf_read(void *ptr, int32_t len, QEMUSGList *sg, MemTxAttrs a= ttrs) { - return dma_buf_rw(ptr, len, sg, DMA_DIRECTION_FROM_DEVICE, - MEMTXATTRS_UNSPECIFIED); + return dma_buf_rw(ptr, len, sg, DMA_DIRECTION_FROM_DEVICE, attrs); } =20 uint64_t dma_buf_write(void *ptr, int32_t len, QEMUSGList *sg, MemTxAttrs = attrs) --=20 2.33.1 From nobody Sun Feb 8 21:07:47 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1639658205; cv=none; d=zohomail.com; s=zohoarc; b=gn1tKhkkaQDMSzvVGbuDvY/fBYkv+qrosLVFGsPvvTRZOP458vVnDvDVWcCOiolZsEnlQlD3tw//0LyamvwY+i7RsWgdXXGhdZDIRPWih2vxXTV9IjmQVBqgNcmblykvDL5Azg9EHYDYUqeG9TL42+brZBgPYnXenKh0VomaMjg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1639658205; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=sVs/ItDUtTUaUH7BuhHvQPHC0PdKVqniEjcG6RP0pL0=; b=SSxCM9+lQ7OWGydrjzd6eO4azfsP17/Rep/NN2/nu8O4AE2DJUFPPSD+r/H2dCKAVPJ/zMMXRrXoNVgU8ol0VWvx3dFYb/3Ny4bXED8DgQ30yiTuN6xT/UJZhhiFQI8GIhGYclRzREGPSbxns4rQ/i4XaukgihoYUBb0kcOD2r0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1639658205332647.3714514003566; Thu, 16 Dec 2021 04:36:45 -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-397-irDNNhKFN-2XgauZeAqhbw-1; Thu, 16 Dec 2021 07:36:43 -0500 Received: by mail-wm1-f69.google.com with SMTP id l4-20020a05600c1d0400b00332f47a0fa3so10205862wms.8 for ; Thu, 16 Dec 2021 04:36:42 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (174.red-83-50-185.dynamicip.rima-tde.net. [83.50.185.174]) by smtp.gmail.com with ESMTPSA id b19sm8834949wmb.38.2021.12.16.04.36.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Dec 2021 04:36:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1639658204; 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=sVs/ItDUtTUaUH7BuhHvQPHC0PdKVqniEjcG6RP0pL0=; b=UC7kihorAyUcvV3QgX0kmDIPhzzeM/564Q3Jp2hIBUnbuJBi/63XUOvrnHcT5r/qUhEOPa Pr+UjhzU1WD2ajTRKi/buaErvEgtnk6y/XK/6BugwmYGCsb4CDOtf/jVNBBp+Qg139PhdE wRKRgBm3vEs3NUwfUpWXN+R3mAZjj8o= X-MC-Unique: irDNNhKFN-2XgauZeAqhbw-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=sVs/ItDUtTUaUH7BuhHvQPHC0PdKVqniEjcG6RP0pL0=; b=KE8R5qEswU3ST9MqNLaQKxa4rHOkZw3GGjJZaSO1Ku5dI77Ela3SrPmbMwBgZTb2Wi 74JTnDyZvhDdsTFtfrCdMx/P3vibyRoLVNbCfVsGhyW69tD/1uEGO7P75GdKdGDjA9eg gYvkyjHl5N5488STsxlvglJIjJMtHYWU6RXZDOTJunEEojmrcMVuJ+Bbw8xvMnsVGnYK 9l+puwdV/5drw1TINc7mcGplrWzl2r9/8g6yBI3KyDqH45r6AI3LHsfSPPFtwndlXXYK Ezh+YoHRo1cBrVAANihPP9bhHzzAyAQltyPYfXG2a4kGbSTUAVDBREMw4cLMhc80VsMd q+nA== X-Gm-Message-State: AOAM531ZGURHQipKPiRUO6e4gk4o3+ksaZIWJShh7SzqTu+S0u/pI99Y dayQno/I7QnQCdVP590lbL8DzZzRu2hP7OJJzKrnIIx0x7yKdD2/sbEj0FzZlXw+PR5PgCM2AaU XGmrUMQxhcJ9dUA== X-Received: by 2002:a5d:4311:: with SMTP id h17mr8567130wrq.677.1639658202016; Thu, 16 Dec 2021 04:36:42 -0800 (PST) X-Google-Smtp-Source: ABdhPJw4AZ6EgVgfmx4C5LaKnvqF5PNDBHp+KScJwd5/UulMjh5g+OnpgvH+UrO5LF3xjMEPEmAfMw== X-Received: by 2002:a5d:4311:: with SMTP id h17mr8567112wrq.677.1639658201813; Thu, 16 Dec 2021 04:36:41 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Xu , Alexander Bulekov , qemu-block@nongnu.org, Qiuhao Li , Hannes Reinecke , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Klaus Jensen , Jason Wang , Li Qiang , Paolo Bonzini , David Hildenbrand , "Michael S. Tsirkin" , John Snow , Gerd Hoffmann , Marcel Apfelbaum , Keith Busch , Fam Zheng Subject: [PATCH 7/8] dma: Let dma_buf_rw() propagate MemTxResult Date: Thu, 16 Dec 2021 13:35:57 +0100 Message-Id: <20211216123558.799425-8-philmd@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211216123558.799425-1-philmd@redhat.com> References: <20211216123558.799425-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: 1639658206360100002 dma_memory_rw() returns a MemTxResult type. Do not discard it, return it to the caller. Since dma_buf_rw() was previously returning the QEMUSGList size not consumed, add an extra argument where this size can be stored. Update the 2 callers. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Klaus Jensen --- softmmu/dma-helpers.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/softmmu/dma-helpers.c b/softmmu/dma-helpers.c index a391773c296..b0be1564797 100644 --- a/softmmu/dma-helpers.c +++ b/softmmu/dma-helpers.c @@ -294,12 +294,14 @@ BlockAIOCB *dma_blk_write(BlockBackend *blk, } =20 =20 -static uint64_t dma_buf_rw(void *buf, int32_t len, QEMUSGList *sg, - DMADirection dir, MemTxAttrs attrs) +static MemTxResult dma_buf_rw(void *buf, int32_t len, uint64_t *residp, + QEMUSGList *sg, DMADirection dir, + MemTxAttrs attrs) { uint8_t *ptr =3D buf; uint64_t resid; int sg_cur_index; + MemTxResult res =3D MEMTX_OK; =20 resid =3D sg->size; sg_cur_index =3D 0; @@ -307,23 +309,34 @@ static uint64_t dma_buf_rw(void *buf, int32_t len, QE= MUSGList *sg, while (len > 0) { ScatterGatherEntry entry =3D sg->sg[sg_cur_index++]; int32_t xfer =3D MIN(len, entry.len); - dma_memory_rw(sg->as, entry.base, ptr, xfer, dir, attrs); + res |=3D dma_memory_rw(sg->as, entry.base, ptr, xfer, dir, attrs); ptr +=3D xfer; len -=3D xfer; resid -=3D xfer; } =20 - return resid; + if (residp) { + *residp =3D resid; + } + return res; } =20 uint64_t dma_buf_read(void *ptr, int32_t len, QEMUSGList *sg, MemTxAttrs a= ttrs) { - return dma_buf_rw(ptr, len, sg, DMA_DIRECTION_FROM_DEVICE, attrs); + uint64_t resid; + + dma_buf_rw(ptr, len, &resid, sg, DMA_DIRECTION_FROM_DEVICE, attrs); + + return resid; } =20 uint64_t dma_buf_write(void *ptr, int32_t len, QEMUSGList *sg, MemTxAttrs = attrs) { - return dma_buf_rw(ptr, len, sg, DMA_DIRECTION_TO_DEVICE, attrs); + uint64_t resid; + + dma_buf_rw(ptr, len, &resid, sg, DMA_DIRECTION_TO_DEVICE, attrs); + + return resid; } =20 void dma_acct_start(BlockBackend *blk, BlockAcctCookie *cookie, --=20 2.33.1 From nobody Sun Feb 8 21:07:47 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1639658210; cv=none; d=zohomail.com; s=zohoarc; b=LCCnvLkTqFFIUCyQKr0SaoKHBk3bOl1lbPCTXki7fVKpRh3N65z/+HB+AQRGTuI6xE/vWnIpf/TrxtgqCqZurDwg/7rkKaUATTWsKtFZL2ojQqLN4qdHbhaM7yt45YItJ3FAEuNZ4UESpzfHwZKkuon+eoUNrRTFlQs2eJWdsAE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1639658210; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=4rPa7KjA//lJSRxxycnbP1LB1I+kp+M6JzdaJ86nzhw=; b=WBWa5hgOhNfv8yem6jeDYq+f90+FZr5fFEoYsOrlE+Jb9bZNjxQDwSjYzZMAhfL/AtU7myje2c6BddpB2OgaKH6yYqx81bt1DqYSLiQ+HXIuRknyCSQ31zB+VfKF9XCBABFklLCu34PHnLKs2DtbVCvSpoD0vT8InBlu7GNM7+g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1639658210456620.4018155913152; Thu, 16 Dec 2021 04:36:50 -0800 (PST) Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-665-TJcVhwLvM36-JMNDR7h7Yw-1; Thu, 16 Dec 2021 07:36:48 -0500 Received: by mail-wr1-f72.google.com with SMTP id f13-20020adfe90d000000b001a15c110077so2111558wrm.8 for ; Thu, 16 Dec 2021 04:36:48 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (174.red-83-50-185.dynamicip.rima-tde.net. [83.50.185.174]) by smtp.gmail.com with ESMTPSA id j85sm8489959wmj.3.2021.12.16.04.36.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Dec 2021 04:36:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1639658209; 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=4rPa7KjA//lJSRxxycnbP1LB1I+kp+M6JzdaJ86nzhw=; b=BgqHRg2dPIXzRnvh7lKXMpKxjSRIYeSTctj4ypP0w7SLzYTqxNzUQxwixIH05KYp3YGIL4 KA5IJ8/GPzIwllOrYHWgIZxwvsAG9+fniQSRXuNeNh1L0RSoOx6iXtBG4k3Anrte28aTun FmvR/0UgWiGUjAvsHLT0WO6T4tXLoeo= X-MC-Unique: TJcVhwLvM36-JMNDR7h7Yw-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=4rPa7KjA//lJSRxxycnbP1LB1I+kp+M6JzdaJ86nzhw=; b=mtYkxB2FeUiompyZV2DYN/62wPVacSK3AdzjC0mkkUg4riGnuSF0RAlRsTFiPxcbZT SEkaojPrVjIiFlRctY3nZdQ/I82VbZPhQ2K/w7RPcVG0rA0Nx9hZOk98x4FVDNV7mz0Q s0n5LOgoLexObYjKa2VgvPsD4wuMooYCA8xHzRjJJjoOdXODqvVcG7dDHG6o1qqewcuK +Iy/xn7vSZaKfn+faTRiVt0vq7HB//vIOwvXDl1gBkm3uNEgdF+T1pelL3yeF6t8ufKC a14pe+H8BhE5EJ+LcYStwTXlzL2c+YPKBN2NKNsQOo3UsD77NHc79HPdlD0tzkPBAyyd xICw== X-Gm-Message-State: AOAM530A4JW3g2LXVE1lS3UME6TIXo3+Ry+Yg+edhzrbjZgloXCyCmDv 01ZZn1AC7yvF8f5ntFZgzEwTtAgpHbELlXWFL5sZXZVuzqhlYPYgK8+IVsWWYV1pJy+LB6kqbtl k7GTD3vnkRhgwMw== X-Received: by 2002:adf:ef0b:: with SMTP id e11mr7727949wro.621.1639658206969; Thu, 16 Dec 2021 04:36:46 -0800 (PST) X-Google-Smtp-Source: ABdhPJxMzgHFbEQBfG3ZC+GU03Ked2pUg2humAH1kGSlhDdflufuh9eWNcYHYEXClvzFH5VpX+XQ/A== X-Received: by 2002:adf:ef0b:: with SMTP id e11mr7727920wro.621.1639658206699; Thu, 16 Dec 2021 04:36:46 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Xu , Alexander Bulekov , qemu-block@nongnu.org, Qiuhao Li , Hannes Reinecke , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Klaus Jensen , Jason Wang , Li Qiang , Paolo Bonzini , David Hildenbrand , "Michael S. Tsirkin" , John Snow , Gerd Hoffmann , Marcel Apfelbaum , Keith Busch , Fam Zheng Subject: [PATCH 8/8] dma: Let dma_buf_read() / dma_buf_write() propagate MemTxResult Date: Thu, 16 Dec 2021 13:35:58 +0100 Message-Id: <20211216123558.799425-9-philmd@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211216123558.799425-1-philmd@redhat.com> References: <20211216123558.799425-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: 1639658212439100001 Since the previous commit, dma_buf_rw() returns a MemTxResult type. Do not discard it, return it to the caller. Since both dma_buf_read/dma_buf_write functions were previously returning the QEMUSGList size not consumed, add an extra argument where the unconsummed size can be stored. Update the few callers. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Klaus Jensen --- include/sysemu/dma.h | 6 ++++-- hw/ide/ahci.c | 8 ++++---- hw/nvme/ctrl.c | 4 ++-- hw/scsi/megasas.c | 48 ++++++++++++++++++++++++++++++------------- hw/scsi/scsi-bus.c | 4 ++-- softmmu/dma-helpers.c | 18 ++++++---------- 6 files changed, 52 insertions(+), 36 deletions(-) diff --git a/include/sysemu/dma.h b/include/sysemu/dma.h index cdf379fecad..9f998edbea4 100644 --- a/include/sysemu/dma.h +++ b/include/sysemu/dma.h @@ -303,8 +303,10 @@ 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(void *ptr, int32_t len, QEMUSGList *sg, MemTxAttrs a= ttrs); -uint64_t dma_buf_write(void *ptr, int32_t len, QEMUSGList *sg, MemTxAttrs = attrs); +MemTxResult dma_buf_read(void *ptr, int32_t len, uint64_t *residp, + QEMUSGList *sg, MemTxAttrs attrs); +MemTxResult dma_buf_write(void *ptr, int32_t len, uint64_t *residp, + QEMUSGList *sg, MemTxAttrs attrs); =20 void dma_acct_start(BlockBackend *blk, BlockAcctCookie *cookie, QEMUSGList *sg, enum BlockAcctType type); diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c index 205dfdc6622..0c7d31ceada 100644 --- a/hw/ide/ahci.c +++ b/hw/ide/ahci.c @@ -1384,9 +1384,9 @@ static void ahci_pio_transfer(const IDEDMA *dma) const MemTxAttrs attrs =3D MEMTXATTRS_UNSPECIFIED; =20 if (is_write) { - dma_buf_write(s->data_ptr, size, &s->sg, attrs); + dma_buf_write(s->data_ptr, size, NULL, &s->sg, attrs); } else { - dma_buf_read(s->data_ptr, size, &s->sg, attrs); + dma_buf_read(s->data_ptr, size, NULL, &s->sg, attrs); } } =20 @@ -1479,9 +1479,9 @@ static int ahci_dma_rw_buf(const IDEDMA *dma, bool is= _write) } =20 if (is_write) { - dma_buf_read(p, l, &s->sg, MEMTXATTRS_UNSPECIFIED); + dma_buf_read(p, l, NULL, &s->sg, MEMTXATTRS_UNSPECIFIED); } else { - dma_buf_write(p, l, &s->sg, MEMTXATTRS_UNSPECIFIED); + dma_buf_write(p, l, NULL, &s->sg, MEMTXATTRS_UNSPECIFIED); } =20 /* free sglist, update byte count */ diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c index 462f79a1f60..fa410a179a6 100644 --- a/hw/nvme/ctrl.c +++ b/hw/nvme/ctrl.c @@ -1150,9 +1150,9 @@ static uint16_t nvme_tx(NvmeCtrl *n, NvmeSg *sg, uint= 8_t *ptr, uint32_t len, uint64_t residual; =20 if (dir =3D=3D NVME_TX_DIRECTION_TO_DEVICE) { - residual =3D dma_buf_write(ptr, len, &sg->qsg, attrs); + dma_buf_write(ptr, len, &residual, &sg->qsg, attrs); } else { - residual =3D dma_buf_read(ptr, len, &sg->qsg, attrs); + dma_buf_read(ptr, len, &residual, &sg->qsg, attrs); } =20 if (unlikely(residual)) { diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c index dfd48f1a873..619b66ef0f3 100644 --- a/hw/scsi/megasas.c +++ b/hw/scsi/megasas.c @@ -737,6 +737,7 @@ static int megasas_ctrl_get_info(MegasasState *s, Megas= asCmd *cmd) size_t dcmd_size =3D sizeof(info); BusChild *kid; int num_pd_disks =3D 0; + uint64_t resid; =20 memset(&info, 0x0, dcmd_size); if (cmd->iov_size < dcmd_size) { @@ -847,7 +848,8 @@ 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(&info, dcmd_size, &cmd->qsg, MEMTXATTR= S_UNSPECIFIED); + dma_buf_read(&info, dcmd_size, &resid, &cmd->qsg, MEMTXATTRS_UNSPECIFI= ED); + cmd->iov_size -=3D resid; return MFI_STAT_OK; } =20 @@ -855,6 +857,7 @@ static int megasas_mfc_get_defaults(MegasasState *s, Me= gasasCmd *cmd) { struct mfi_defaults info; size_t dcmd_size =3D sizeof(struct mfi_defaults); + uint64_t resid; =20 memset(&info, 0x0, dcmd_size); if (cmd->iov_size < dcmd_size) { @@ -877,7 +880,8 @@ 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(&info, dcmd_size, &cmd->qsg, MEMTXATTR= S_UNSPECIFIED); + dma_buf_read(&info, dcmd_size, &resid, &cmd->qsg, MEMTXATTRS_UNSPECIFI= ED); + cmd->iov_size -=3D resid; return MFI_STAT_OK; } =20 @@ -885,6 +889,7 @@ static int megasas_dcmd_get_bios_info(MegasasState *s, = MegasasCmd *cmd) { struct mfi_bios_data info; size_t dcmd_size =3D sizeof(info); + uint64_t resid; =20 memset(&info, 0x0, dcmd_size); if (cmd->iov_size < dcmd_size) { @@ -898,7 +903,8 @@ 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(&info, dcmd_size, &cmd->qsg, MEMTXATTR= S_UNSPECIFIED); + dma_buf_read(&info, dcmd_size, &resid, &cmd->qsg, MEMTXATTRS_UNSPECIFI= ED); + cmd->iov_size -=3D resid; return MFI_STAT_OK; } =20 @@ -906,10 +912,12 @@ static int megasas_dcmd_get_fw_time(MegasasState *s, = MegasasCmd *cmd) { uint64_t fw_time; size_t dcmd_size =3D sizeof(fw_time); + uint64_t resid; =20 fw_time =3D cpu_to_le64(megasas_fw_time()); =20 - cmd->iov_size -=3D dma_buf_read(&fw_time, dcmd_size, &cmd->qsg, MEMTXA= TTRS_UNSPECIFIED); + dma_buf_read(&fw_time, dcmd_size, &resid, &cmd->qsg, MEMTXATTRS_UNSPEC= IFIED); + cmd->iov_size -=3D resid; return MFI_STAT_OK; } =20 @@ -929,6 +937,7 @@ static int megasas_event_info(MegasasState *s, MegasasC= md *cmd) { struct mfi_evt_log_state info; size_t dcmd_size =3D sizeof(info); + uint64_t resid; =20 memset(&info, 0, dcmd_size); =20 @@ -936,7 +945,8 @@ 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(&info, dcmd_size, &cmd->qsg, MEMTXATTR= S_UNSPECIFIED); + dma_buf_read(&info, dcmd_size, &resid, &cmd->qsg, MEMTXATTRS_UNSPECIFI= ED); + cmd->iov_size -=3D resid; return MFI_STAT_OK; } =20 @@ -966,6 +976,7 @@ static int megasas_dcmd_pd_get_list(MegasasState *s, Me= gasasCmd *cmd) size_t dcmd_size =3D sizeof(info); BusChild *kid; uint32_t offset, dcmd_limit, num_pd_disks =3D 0, max_pd_disks; + uint64_t resid; =20 memset(&info, 0, dcmd_size); offset =3D 8; @@ -1005,7 +1016,8 @@ 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(&info, offset, &cmd->qsg, MEMTXATTRS_U= NSPECIFIED); + dma_buf_read(&info, offset, &resid, &cmd->qsg, MEMTXATTRS_UNSPECIFIED); + cmd->iov_size -=3D resid; return MFI_STAT_OK; } =20 @@ -1099,7 +1111,9 @@ static int megasas_pd_get_info_submit(SCSIDevice *sde= v, int lun, info->connected_port_bitmap =3D 0x1; info->device_speed =3D 1; info->link_speed =3D 1; - resid =3D dma_buf_read(cmd->iov_buf, dcmd_size, &cmd->qsg, MEMTXATTRS_= UNSPECIFIED); + dma_buf_read(cmd->iov_buf, dcmd_size, &resid, &cmd->qsg, + MEMTXATTRS_UNSPECIFIED); + cmd->iov_size -=3D resid; g_free(cmd->iov_buf); cmd->iov_size =3D dcmd_size - resid; cmd->iov_buf =3D NULL; @@ -1171,7 +1185,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(&info, dcmd_size, &cmd->qsg, MEMTXATTRS_UNSPECI= FIED); + dma_buf_read(&info, dcmd_size, &resid, &cmd->qsg, MEMTXATTRS_UNSPECIFI= ED); cmd->iov_size =3D dcmd_size - resid; return MFI_STAT_OK; } @@ -1220,7 +1234,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(&info, dcmd_size, &cmd->qsg, MEMTXATTRS_UNSPECI= FIED); + dma_buf_read(&info, dcmd_size, &resid, &cmd->qsg, MEMTXATTRS_UNSPECIFI= ED); cmd->iov_size =3D dcmd_size - resid; return MFI_STAT_OK; } @@ -1231,9 +1245,10 @@ static int megasas_ld_get_info_submit(SCSIDevice *sd= ev, int lun, struct mfi_ld_info *info =3D cmd->iov_buf; size_t dcmd_size =3D sizeof(struct mfi_ld_info); uint8_t cdb[6]; - ssize_t len, resid; + ssize_t len; uint16_t sdev_id =3D ((sdev->id & 0xFF) << 8) | (lun & 0xFF); uint64_t ld_size; + uint64_t resid; =20 if (!cmd->iov_buf) { cmd->iov_buf =3D g_malloc0(dcmd_size); @@ -1270,7 +1285,8 @@ static int megasas_ld_get_info_submit(SCSIDevice *sde= v, int lun, info->ld_config.span[0].num_blocks =3D info->size; info->ld_config.span[0].array_ref =3D cpu_to_le16(sdev_id); =20 - resid =3D dma_buf_read(cmd->iov_buf, dcmd_size, &cmd->qsg, MEMTXATTRS_= UNSPECIFIED); + dma_buf_read(cmd->iov_buf, dcmd_size, &resid, &cmd->qsg, + MEMTXATTRS_UNSPECIFIED); g_free(cmd->iov_buf); cmd->iov_size =3D dcmd_size - resid; cmd->iov_buf =3D NULL; @@ -1315,6 +1331,7 @@ static int megasas_dcmd_cfg_read(MegasasState *s, Meg= asasCmd *cmd) struct mfi_config_data *info; int num_pd_disks =3D 0, array_offset, ld_offset; BusChild *kid; + uint64_t resid; =20 if (cmd->iov_size > 4096) { return MFI_STAT_INVALID_PARAMETER; @@ -1389,7 +1406,8 @@ 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(data, info->size, &cmd->qsg, MEMTXATTR= S_UNSPECIFIED); + dma_buf_read(data, info->size, &resid, &cmd->qsg, MEMTXATTRS_UNSPECIFI= ED); + cmd->iov_size -=3D resid; return MFI_STAT_OK; } =20 @@ -1397,6 +1415,7 @@ static int megasas_dcmd_get_properties(MegasasState *= s, MegasasCmd *cmd) { struct mfi_ctrl_props info; size_t dcmd_size =3D sizeof(info); + uint64_t resid; =20 memset(&info, 0x0, dcmd_size); if (cmd->iov_size < dcmd_size) { @@ -1419,7 +1438,8 @@ 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(&info, dcmd_size, &cmd->qsg, MEMTXATTR= S_UNSPECIFIED); + dma_buf_read(&info, dcmd_size, &resid, &cmd->qsg, MEMTXATTRS_UNSPECIFI= ED); + cmd->iov_size -=3D resid; return MFI_STAT_OK; } =20 @@ -1464,7 +1484,7 @@ static int megasas_dcmd_set_properties(MegasasState *= s, MegasasCmd *cmd) dcmd_size); return MFI_STAT_INVALID_PARAMETER; } - dma_buf_write(&info, dcmd_size, &cmd->qsg, MEMTXATTRS_UNSPECIFIED); + dma_buf_write(&info, dcmd_size, NULL, &cmd->qsg, MEMTXATTRS_UNSPECIFIE= D); trace_megasas_dcmd_unsupported(cmd->index, cmd->iov_size); return MFI_STAT_OK; } diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c index 2b5e9dca311..34cf41796bb 100644 --- a/hw/scsi/scsi-bus.c +++ b/hw/scsi/scsi-bus.c @@ -1421,9 +1421,9 @@ void scsi_req_data(SCSIRequest *req, int len) =20 buf =3D scsi_req_get_buf(req); if (req->cmd.mode =3D=3D SCSI_XFER_FROM_DEV) { - req->resid =3D dma_buf_read(buf, len, req->sg, MEMTXATTRS_UNSPECIF= IED); + dma_buf_read(buf, len, &req->resid, req->sg, MEMTXATTRS_UNSPECIFIE= D); } else { - req->resid =3D dma_buf_write(buf, len, req->sg, MEMTXATTRS_UNSPECI= FIED); + dma_buf_write(buf, len, &req->resid, req->sg, MEMTXATTRS_UNSPECIFI= ED); } scsi_req_continue(req); } diff --git a/softmmu/dma-helpers.c b/softmmu/dma-helpers.c index b0be1564797..498303157e9 100644 --- a/softmmu/dma-helpers.c +++ b/softmmu/dma-helpers.c @@ -321,22 +321,16 @@ static MemTxResult dma_buf_rw(void *buf, int32_t len,= uint64_t *residp, return res; } =20 -uint64_t dma_buf_read(void *ptr, int32_t len, QEMUSGList *sg, MemTxAttrs a= ttrs) +MemTxResult dma_buf_read(void *ptr, int32_t len, uint64_t *residp, + QEMUSGList *sg, MemTxAttrs attrs) { - uint64_t resid; - - dma_buf_rw(ptr, len, &resid, sg, DMA_DIRECTION_FROM_DEVICE, attrs); - - return resid; + return dma_buf_rw(ptr, len, residp, sg, DMA_DIRECTION_FROM_DEVICE, att= rs); } =20 -uint64_t dma_buf_write(void *ptr, int32_t len, QEMUSGList *sg, MemTxAttrs = attrs) +MemTxResult dma_buf_write(void *ptr, int32_t len, uint64_t *residp, + QEMUSGList *sg, MemTxAttrs attrs) { - uint64_t resid; - - dma_buf_rw(ptr, len, &resid, sg, DMA_DIRECTION_TO_DEVICE, attrs); - - return resid; + return dma_buf_rw(ptr, len, residp, sg, DMA_DIRECTION_TO_DEVICE, attrs= ); } =20 void dma_acct_start(BlockBackend *blk, BlockAcctCookie *cookie, --=20 2.33.1