From nobody Tue Feb 10 01:14:53 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 --- 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