From patchwork Thu Oct 1 17:25:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 303894 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 72D1FC4727E for ; Thu, 1 Oct 2020 17:41:20 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id F148F2054F for ; Thu, 1 Oct 2020 17:41:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="XzgEuls+" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F148F2054F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:37158 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kO2Zy-0005A8-VF for qemu-devel@archiver.kernel.org; Thu, 01 Oct 2020 13:41:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59632) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kO2LD-0004Vj-M6 for qemu-devel@nongnu.org; Thu, 01 Oct 2020 13:26:07 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:51448) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kO2LB-0004M6-Um for qemu-devel@nongnu.org; Thu, 01 Oct 2020 13:26:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601573161; 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=14wd1LoJqDrIDTmO66J1bZUDTtxJuvJH1RTglxmFjpE=; b=XzgEuls+D9dnQjGNZKbWx1QKvvo1m9jIzBVLfOVjYg7Q01tcoAKOgadep/vA/mxBsEwl2F 0LAwAShdx8k7TbZNjSTnmqE3nj6GIiv2zNpTpw9AcVtFpgkHiiT3lOQugc0lZxAufm3KPE xNemtAMTZ+z813juGYl1rTNxcK4tNYI= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-541-YojxBvhiPt6xasGQP5G9eg-1; Thu, 01 Oct 2020 13:25:57 -0400 X-MC-Unique: YojxBvhiPt6xasGQP5G9eg-1 Received: by mail-wr1-f72.google.com with SMTP id l15so2329443wro.10 for ; Thu, 01 Oct 2020 10:25:57 -0700 (PDT) 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=14wd1LoJqDrIDTmO66J1bZUDTtxJuvJH1RTglxmFjpE=; b=L6mS9XmRVHCsrQNu56xNsJvv3cmqI6X8XpfhZlyDuiCCitbMFJ6B+WJ8jSry6o6Lgi 8y0lvjd/j6xJykrF4LQbpM77P8uUiZgVpDzYJJf82pkonpTgV8BZPal/iHvDWyHMCI61 3aTFpwRhosLCHTmLrysaGeFmZ1MbvXtuImcmFFCSdcfKS1Hi5SwnXaXjHt20vf1nU0/Y 7uVNEiIHf/2pFozRl2/Dyz3ODlxKNcWP78GUaugjpjjR+2OLT/YSKfFN9kynWFz0JJfT rN6XrcrpdKmR5tV9Wg6dYEKX0lUeo9tu3H40pJGs4R42mEU98VXu3bxeJs682B/baDgZ j+fg== X-Gm-Message-State: AOAM531l5LAgFsiMFJipCMeuqtzwZQa9L9QoUbMkP9mVdZe2S5GDlFX+ 1qOVt1MUutt2g2W9TV0Mp4K3aIN6jFfx/GNs7M4Ja3wEMhP4dED4PAeh6zU5mlrpkX0FEj5nle8 4WOpsCscmlUKXeJ8= X-Received: by 2002:a1c:4d12:: with SMTP id o18mr1114870wmh.177.1601573156387; Thu, 01 Oct 2020 10:25:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzzTp+6eot3LZUdkaA24Hp014HJhDuGOas8MQ2FtVbQRG69xK2oop5m0br/4ML+XHsvN0Q5jw== X-Received: by 2002:a1c:4d12:: with SMTP id o18mr1114857wmh.177.1601573156212; Thu, 01 Oct 2020 10:25:56 -0700 (PDT) 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 n2sm977308wma.29.2020.10.01.10.25.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Oct 2020 10:25:55 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH RESEND v2 07/16] dma: Let dma_memory_write() propagate MemTxResult Date: Thu, 1 Oct 2020 19:25:10 +0200 Message-Id: <20201001172519.1620782-8-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 Received-SPF: pass client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/01 04:25:37 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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é --- include/sysemu/dma.h | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/include/sysemu/dma.h b/include/sysemu/dma.h index df170047eb..a052f7bca3 100644 --- a/include/sysemu/dma.h +++ b/include/sysemu/dma.h @@ -96,8 +96,10 @@ static inline MemTxResult dma_memory_read_relaxed(AddressSpace *as, return dma_memory_rw_relaxed(as, addr, buf, len, DMA_DIRECTION_TO_DEVICE); } -static inline int dma_memory_write_relaxed(AddressSpace *as, dma_addr_t addr, - const void *buf, dma_addr_t len) +static inline MemTxResult dma_memory_write_relaxed(AddressSpace *as, + dma_addr_t addr, + const void *buf, + dma_addr_t len) { return dma_memory_rw_relaxed(as, addr, (void *)buf, len, DMA_DIRECTION_FROM_DEVICE); @@ -143,8 +145,20 @@ static inline MemTxResult dma_memory_read(AddressSpace *as, dma_addr_t addr, return dma_memory_rw(as, addr, buf, len, DMA_DIRECTION_TO_DEVICE); } -static inline int dma_memory_write(AddressSpace *as, dma_addr_t addr, - const void *buf, dma_addr_t len) +/** + * address_space_write: Write to address space from DMA controller. + * + * Return a MemTxResult indicating whether the operation succeeded + * or failed (eg unassigned memory, device rejected the transaction, + * IOMMU fault). + * + * @as: #AddressSpace to be accessed + * @addr: address within that address space + * @buf: buffer with the data transferred + * @len: the number of bytes to write + */ +static inline MemTxResult dma_memory_write(AddressSpace *as, dma_addr_t addr, + const void *buf, dma_addr_t len) { return dma_memory_rw(as, addr, (void *)buf, len, DMA_DIRECTION_FROM_DEVICE);