From nobody Tue Feb 10 05:41:56 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=1640260744; cv=none; d=zohomail.com; s=zohoarc; b=OaJYd7l1vU6zGynNFZYJ/DzqLMUXe6c9MBzsaRd/YT0Ri/OmEXjPfrcEiGbHou/WMWpA30Yl+12X8sF8JoeM7i1HX+alqPY/ZH1eT7/IyYYyEhbCYJ0FjMlfalogA44NypACDvJzaMiGXRLBFtUMM5KimXBroKUvm/lITAUejjE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1640260744; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=XDiu/1Y9UJG/Mr1Uyi7hIwmLFqroGRXmqVVQxLYL8lo=; b=P03SlBCRotWxq4sv2GgxNtlhfVMJHn/O2ZRWaBs7acoKMpnF964+kQRdMESDInJE8Li9UbW6pOysd06teX8oHMTC9pVcAHhQ3w/y1hYAV6L5Rw3qM4fCwB423NHUS4Uv2SVYNJaHIaP9LOXId5N+9snhsTxXurGs7OsmTrg9Hp4= 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 1640260744870278.25490281284146; Thu, 23 Dec 2021 03:59:04 -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-412-c6bMapMcOZGhHYUbmN-A7g-1; Thu, 23 Dec 2021 06:59:02 -0500 Received: by mail-wm1-f69.google.com with SMTP id bg20-20020a05600c3c9400b0033a9300b44bso1877185wmb.2 for ; Thu, 23 Dec 2021 03:59:02 -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 j13sm8693839wmq.11.2021.12.23.03.58.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Dec 2021 03:59:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1640260743; 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=XDiu/1Y9UJG/Mr1Uyi7hIwmLFqroGRXmqVVQxLYL8lo=; b=DxpA90nhmdc4XW5clrMEiJ8FFWhyQCge52Vh1WSvWzLk0q8NfgF09kIzJDJKUJcjy80kWi vEQiAs11TMpXc6lb5o7zdPzc9kq7AhWGoedViippAZ6bRKgTlamUcDK7qraoS/zejMJZh8 Vt4PS4Lk7sqnUWqNBTtVk2fS68Fx37k= X-MC-Unique: c6bMapMcOZGhHYUbmN-A7g-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=XDiu/1Y9UJG/Mr1Uyi7hIwmLFqroGRXmqVVQxLYL8lo=; b=unSQy0FN4pvbylFCFQwqjUz1xNqPHbDeXMAtJ8krGpyb7S87EVcxCjJ3XTt1HScJOi VzFHATHrdq0ACL1TQ9v+2HhLkoIwSuwlqhzXQaEKf2kOEwMsVihfxoXQzIYroU8idWhu oT7q85wDWtjFZUDeCLolWRvTiMYv9H/VJre7FC8q20lCS763bNfCEgAm/iaBmDcEXk87 jlve44IzWKeQKMWMv9dUMjGSOZ4UIBKqtI6kDzirca7aCNHK0tdA8Ie/AcpfTYoyK38u Y1MbZFTOIT7dTzJR6tGr1QXzz9JUzv1fe+Bl/9YeBT9iEIhyKdMpDWx7NJSapjGDbNM6 hQzQ== X-Gm-Message-State: AOAM533VV30rTahMq0VN2NT0m3T+OmC+Yuh+5uPrrCQQQU8dmKDK6BwX bXn3W0ZMx+oWtDSbYOQqElTXAVQPaT5KA58ypg95eq/f+johxfDB+bnNB/rXw0VvXiC38kkqitc t53FjThzvrQgKjA== X-Received: by 2002:a5d:64c6:: with SMTP id f6mr1468885wri.711.1640260741429; Thu, 23 Dec 2021 03:59:01 -0800 (PST) X-Google-Smtp-Source: ABdhPJwnxPoqDT/k37moPDRccV+te9B75XwO+CkBI4dcJ0VLH0B//Q3K/CRWOZpRQ4Wm2X9u03Wvfg== X-Received: by 2002:a5d:64c6:: with SMTP id f6mr1468844wri.711.1640260741252; Thu, 23 Dec 2021 03:59:01 -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 13/23] dma: Let dma_buf_rw() propagate MemTxResult Date: Thu, 23 Dec 2021 12:55:44 +0100 Message-Id: <20211223115554.3155328-14-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: 1640260746187100001 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. Reviewed-by: Klaus Jensen Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- 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