From nobody Fri Dec 19 17:34:42 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.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 63.128.21.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=1601573157; cv=none; d=zohomail.com; s=zohoarc; b=i3/8zNrSHGZ4KE5CRcJlMZ6+K5k2jZSAkpIQ4iOtNGI269u0oD8en/1IDK+qQafiLHn0i4siQRfl2b57ZNW7+Ndt8V+F1PLOH1+/57UX1wO8PWLSrF5ECTYTStnk0Suy6JQPk4i+CyHKQr0eTya8g1h+kMVyoENw36BdcK3hRbY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601573157; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=llB4vOCcjwlWR9vH+bHBQFNfVDmAnYp9O2qmiiAuZn4=; b=YXfFlTPzFpKC4f10/hjFX8i/JQTd2bw9wAGG2W1Y1LR+FqlmMhjVJcYy0VIsOf/ijJT9NvumxKyQktxFaJQJrr4IdqChz8zid3mZw9gxK1C/hrQZ0cWcj+DFn0mHKVvFL22vErP/hiuLNlUx4dr2GtknaHT2ruYU3V/iOdmj1ro= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1601573157014466.2393583666467; Thu, 1 Oct 2020 10:25:57 -0700 (PDT) Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-564-SEOeLMPPOV6rL09B2cHSyQ-1; Thu, 01 Oct 2020 13:25:52 -0400 Received: by mail-wr1-f69.google.com with SMTP id b7so2334215wrn.6 for ; Thu, 01 Oct 2020 10:25:52 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (74.red-83-53-161.dynamicip.rima-tde.net. [83.53.161.74]) by smtp.gmail.com with ESMTPSA id a13sm853119wme.26.2020.10.01.10.25.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Oct 2020 10:25:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601573154; 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=llB4vOCcjwlWR9vH+bHBQFNfVDmAnYp9O2qmiiAuZn4=; b=RYPhUUJgmvAutUfrVolA354ziS7zf/0EasbOlRZFpFyAYD1jBjFjvcti3RCQ2T6oYII8nS IkVUOt/SLk6FWGL7d63ZwiKKbQKRmzUlPyvl5ZXWEgLoXoJxOoim77Cm0/1PVjBlpgHsbm zV6tguePB1mQeiBCSKtzzw88+AyYGlE= X-MC-Unique: SEOeLMPPOV6rL09B2cHSyQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=llB4vOCcjwlWR9vH+bHBQFNfVDmAnYp9O2qmiiAuZn4=; b=EN01WCQiHs6fQL1xouDp94vl8FgGW0cxMvA0B9zAtb+i+vwQMJZec5ct4eTS0LCGyo l+mD7SBs++aQOb7WNhfKZtPH1OWQA4pfW/kweyW2u0LpwpZFpESZ3zZHNEm2CggLh6M/ 4W6QrYn0TRKsx5OGZKZ5K98B3O96TA7p1k8Xsa0BJUmTs8VqDNJ7bfyaC5/LBth6AxC7 SToXgUuCh3q/zpsWw6JUvBg25x3H8nLoZnXR8oGOd7aF6yjKMG68o+BEJDcPwb8y3FO0 lD+ULCwUwl3TfstGrXv0a8SCakMnDx6Nf4SGg+N4TS7NU1Fzw21C8eQidPvZtMOagnqv WgjQ== X-Gm-Message-State: AOAM533gUVgqdnE/DBfJrpTODGSt6p1K1W133VH6Noax62TvsAt6BEHw M3/qbT5ALRtr1O25vERMsLu3GL6eBSM4baUmYVPICqmwxvCG/9Ve2zfmFEi/qz7sDrab8WDpLmt 65bbdlweJqXAf8A== X-Received: by 2002:a1c:48c3:: with SMTP id v186mr1218513wma.16.1601573151251; Thu, 01 Oct 2020 10:25:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwiH9BrvCDzygapUQgoS7+TVvPomrWUpV0pHMapa8C71iR1ww7iiptp7ggFFu2E7lmPTxosbA== X-Received: by 2002:a1c:48c3:: with SMTP id v186mr1218492wma.16.1601573151065; Thu, 01 Oct 2020 10:25:51 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini Subject: [PATCH RESEND v2 06/16] dma: Let dma_memory_read() propagate MemTxResult Date: Thu, 1 Oct 2020 19:25:09 +0200 Message-Id: <20201001172519.1620782-7-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201001172519.1620782-1-philmd@redhat.com> References: <20201001172519.1620782-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) dma_memory_rw_relaxed() returns a MemTxResult type. Do not discard it, return it to the caller. Reviewed-by: Richard Henderson Reviewed-by: Li Qiang Reviewed-by: Edgar E. Iglesias Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/sysemu/dma.h | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/include/sysemu/dma.h b/include/sysemu/dma.h index 04687d8825..df170047eb 100644 --- a/include/sysemu/dma.h +++ b/include/sysemu/dma.h @@ -89,8 +89,9 @@ static inline MemTxResult dma_memory_rw_relaxed(AddressSp= ace *as, buf, len, dir =3D=3D DMA_DIRECTION_FROM_DEVICE= ); } =20 -static inline int dma_memory_read_relaxed(AddressSpace *as, dma_addr_t add= r, - void *buf, dma_addr_t len) +static inline MemTxResult dma_memory_read_relaxed(AddressSpace *as, + dma_addr_t addr, + void *buf, dma_addr_t le= n) { return dma_memory_rw_relaxed(as, addr, buf, len, DMA_DIRECTION_TO_DEVI= CE); } @@ -124,8 +125,20 @@ static inline MemTxResult dma_memory_rw(AddressSpace *= as, dma_addr_t addr, return dma_memory_rw_relaxed(as, addr, buf, len, dir); } =20 -static inline int dma_memory_read(AddressSpace *as, dma_addr_t addr, - void *buf, dma_addr_t len) +/** + * dma_memory_read: Read from an address space from DMA controller. + * + * Return a MemTxResult indicating whether the operation succeeded + * or failed (eg unassigned memory, device rejected the transaction, + * IOMMU fault). Called within RCU critical section. + * + * @as: #AddressSpace to be accessed + * @addr: address within that address space + * @buf: buffer with the data transferred + * @len: length of the data transferred + */ +static inline MemTxResult dma_memory_read(AddressSpace *as, dma_addr_t add= r, + void *buf, dma_addr_t len) { return dma_memory_rw(as, addr, buf, len, DMA_DIRECTION_TO_DEVICE); } --=20 2.26.2