From nobody Mon Feb 9 09:28:33 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=1639840274; cv=none; d=zohomail.com; s=zohoarc; b=D5rQAS5Gd3SPN0y78tNA58k51T7Vi/C7vxjU+CUF8d0mMknioPQWmQ+QYSTvxm+Z7Md6fA/KpVor9tsioESNMksy/C52GQ1Y0wnQrh0uDgU2wc5dYnVWvNbFB+Tn0FWntlBr02T0mcTdrvksMxiTaZNrsXUEreMM375IRgIcsYI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1639840274; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=dyGasbUZIFPw7fvwhyTaoJCMYzza07uwayvggRa8jm0=; b=hLc91eQnATIRLTts3Kq3dG98qYYeTxYaLTyDps0CILbVQA6UC99QzeW91LPXslOadlEcX+gMWGM5N+aqRB+mnyRLeWl/1WqdLgjSClnxMa4PAy2Z8lKvB23z93M0k8WuzGwJurBFetNH9lFJTjCFomsrGR191du0O4Qh+SmxA6c= 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 1639840274915101.63620713953696; Sat, 18 Dec 2021 07:11:14 -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-564-sgZ6o-3MODuKITfXfC-xJg-1; Sat, 18 Dec 2021 10:11:10 -0500 Received: by mail-wr1-f69.google.com with SMTP id f13-20020adfe90d000000b001a15c110077so1505628wrm.8 for ; Sat, 18 Dec 2021 07:11:10 -0800 (PST) Return-Path: Return-Path: Received: from x1w.. (174.red-83-50-185.dynamicip.rima-tde.net. [83.50.185.174]) by smtp.gmail.com with ESMTPSA id az15sm5948661wmb.47.2021.12.18.07.11.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Dec 2021 07:11:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1639840273; 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=dyGasbUZIFPw7fvwhyTaoJCMYzza07uwayvggRa8jm0=; b=f0MZiv68G+QkZR5vqG9v+nh0p507P7SQJpCbP6Vw5Z3LGxP+w3Qw6eb7a0cZFVj/lRt8LQ C/Tky8RXQfonmhgd+HqOE+EraDKeZBW2wQE7+UpQVedsQlnj7G3gtZuzocLsWJ+xSSIrn7 wRoWPaBK4YBleg4qvHhLD77C2CGTnGY= X-MC-Unique: sgZ6o-3MODuKITfXfC-xJg-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=dyGasbUZIFPw7fvwhyTaoJCMYzza07uwayvggRa8jm0=; b=XB0sAq61mHB1lBgr3kU2M6hN/Ylb10pnVKG3FJLTQOFgUX/Ud4QFILLtdfwjDZlXcZ XBAr0b+XuvjyhHlEZwHqZkPMoq49TWx0nwjnQD8h8xekPMYRfi2lV18+qjceUEivvQDi 3Oq71aTu2H7rjrG9f37OpZ1U/DYpCbItUZhbch2xmMAVQRNOdol+qJZPj5IlvGgVD6vD c+s6/2fI/1bpYnOy/+u214SGk2r1wP5S3D+fW97CYgsCu0nYq7QShM1kgfDqxwfS9IDY 6o3BgpFO6gQZZ6VzbQKGii1RvI32Zx6W+ItEzadzSMbZdGRoaIdrg1USSg2PNxMn/agr gV6Q== X-Gm-Message-State: AOAM5307dBf1LYxNuBfMnnoCfHxon8cTHFF89iwmLZbHlwPuQS6xkOPQ nPitoWfnc2UuBFS1n7UuR/DXwZY6YePJ//jFEAfgZYaB0W/vF7Tp1wwjPOJmorpRHe4Ii34P+KA HsB5PylVDWjNpMg== X-Received: by 2002:adf:f8cb:: with SMTP id f11mr6464728wrq.700.1639840269543; Sat, 18 Dec 2021 07:11:09 -0800 (PST) X-Google-Smtp-Source: ABdhPJwctQ0B7QLQ6XiLThzG4ssPryhsg7iV9BJ8glDYihq0/sPdMknGC1Qf2cY75x7CvRyxloKRlA== X-Received: by 2002:adf:f8cb:: with SMTP id f11mr6464714wrq.700.1639840269365; Sat, 18 Dec 2021 07:11:09 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Fam Zheng , "Michael S. Tsirkin" , Sven Schnelle , qemu-block@nongnu.org, Li Qiang , Jason Wang , Stefan Weil , David Hildenbrand , Dmitry Fleytman , Peter Xu , Hannes Reinecke , Gerd Hoffmann , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Marcel Apfelbaum , Qiuhao Li , Alexander Bulekov , Paolo Bonzini Subject: [PATCH 3/5] dma: Let ld*_pci_dma() take MemTxAttrs argument Date: Sat, 18 Dec 2021 16:10:51 +0100 Message-Id: <20211218151053.1545962-4-philmd@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211218151053.1545962-1-philmd@redhat.com> References: <20211218151053.1545962-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: 1639840276567100001 Let devices specify transaction attributes when calling ld*_pci_dma(). Keep the default MEMTXATTRS_UNSPECIFIED in the few callers. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- include/hw/pci/pci.h | 6 +++--- hw/audio/intel-hda.c | 2 +- hw/net/eepro100.c | 19 +++++++++++++------ hw/net/tulip.c | 18 ++++++++++-------- hw/scsi/megasas.c | 16 ++++++++++------ hw/scsi/mptsas.c | 10 ++++++---- hw/scsi/vmw_pvscsi.c | 3 ++- hw/usb/hcd-xhci.c | 1 + 8 files changed, 46 insertions(+), 29 deletions(-) diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h index 9f51ef2c3c2..7a46c1fa226 100644 --- a/include/hw/pci/pci.h +++ b/include/hw/pci/pci.h @@ -852,11 +852,11 @@ static inline MemTxResult pci_dma_write(PCIDevice *de= v, dma_addr_t addr, =20 #define PCI_DMA_DEFINE_LDST(_l, _s, _bits) \ static inline uint##_bits##_t ld##_l##_pci_dma(PCIDevice *dev, \ - dma_addr_t addr) \ + dma_addr_t addr, \ + MemTxAttrs attrs) \ { \ uint##_bits##_t val; \ - ld##_l##_dma(pci_get_address_space(dev), addr, &val, \ - MEMTXATTRS_UNSPECIFIED); \ + ld##_l##_dma(pci_get_address_space(dev), addr, &val, attrs); \ return val; \ } \ static inline void st##_s##_pci_dma(PCIDevice *dev, \ diff --git a/hw/audio/intel-hda.c b/hw/audio/intel-hda.c index 3309ae0ea18..e34b7ab0e92 100644 --- a/hw/audio/intel-hda.c +++ b/hw/audio/intel-hda.c @@ -335,7 +335,7 @@ static void intel_hda_corb_run(IntelHDAState *d) =20 rp =3D (d->corb_rp + 1) & 0xff; addr =3D intel_hda_addr(d->corb_lbase, d->corb_ubase); - verb =3D ldl_le_pci_dma(&d->pci, addr + 4*rp); + verb =3D ldl_le_pci_dma(&d->pci, addr + 4 * rp, MEMTXATTRS_UNSPECI= FIED); d->corb_rp =3D rp; =20 dprint(d, 2, "%s: [rp 0x%x] verb 0x%08x\n", __func__, rp, verb); diff --git a/hw/net/eepro100.c b/hw/net/eepro100.c index 83c4431b1ad..eb82e9cb118 100644 --- a/hw/net/eepro100.c +++ b/hw/net/eepro100.c @@ -737,6 +737,7 @@ static void read_cb(EEPRO100State *s) =20 static void tx_command(EEPRO100State *s) { + const MemTxAttrs attrs =3D MEMTXATTRS_UNSPECIFIED; uint32_t tbd_array =3D s->tx.tbd_array_addr; uint16_t tcb_bytes =3D s->tx.tcb_bytes & 0x3fff; /* Sends larger than MAX_ETH_FRAME_SIZE are allowed, up to 2600 bytes.= */ @@ -772,11 +773,14 @@ static void tx_command(EEPRO100State *s) /* Extended Flexible TCB. */ for (; tbd_count < 2; tbd_count++) { uint32_t tx_buffer_address =3D ldl_le_pci_dma(&s->dev, - tbd_address); + tbd_address, + attrs); uint16_t tx_buffer_size =3D lduw_le_pci_dma(&s->dev, - tbd_address + 4); + tbd_address + 4, + attrs); uint16_t tx_buffer_el =3D lduw_le_pci_dma(&s->dev, - tbd_address + 6); + tbd_address + 6, + attrs); tbd_address +=3D 8; TRACE(RXTX, logout ("TBD (extended flexible mode): buffer address 0x%08x,= size 0x%04x\n", @@ -792,9 +796,12 @@ static void tx_command(EEPRO100State *s) } tbd_address =3D tbd_array; for (; tbd_count < s->tx.tbd_count; tbd_count++) { - uint32_t tx_buffer_address =3D ldl_le_pci_dma(&s->dev, tbd_add= ress); - uint16_t tx_buffer_size =3D lduw_le_pci_dma(&s->dev, tbd_addre= ss + 4); - uint16_t tx_buffer_el =3D lduw_le_pci_dma(&s->dev, tbd_address= + 6); + uint32_t tx_buffer_address =3D ldl_le_pci_dma(&s->dev, tbd_add= ress, + attrs); + uint16_t tx_buffer_size =3D lduw_le_pci_dma(&s->dev, tbd_addre= ss + 4, + attrs); + uint16_t tx_buffer_el =3D lduw_le_pci_dma(&s->dev, tbd_address= + 6, + attrs); tbd_address +=3D 8; TRACE(RXTX, logout ("TBD (flexible mode): buffer address 0x%08x, size 0x%04x\= n", diff --git a/hw/net/tulip.c b/hw/net/tulip.c index 1f2c79dd58b..c76e4868f73 100644 --- a/hw/net/tulip.c +++ b/hw/net/tulip.c @@ -70,16 +70,18 @@ static const VMStateDescription vmstate_pci_tulip =3D { static void tulip_desc_read(TULIPState *s, hwaddr p, struct tulip_descriptor *desc) { + const MemTxAttrs attrs =3D MEMTXATTRS_UNSPECIFIED; + if (s->csr[0] & CSR0_DBO) { - desc->status =3D ldl_be_pci_dma(&s->dev, p); - desc->control =3D ldl_be_pci_dma(&s->dev, p + 4); - desc->buf_addr1 =3D ldl_be_pci_dma(&s->dev, p + 8); - desc->buf_addr2 =3D ldl_be_pci_dma(&s->dev, p + 12); + desc->status =3D ldl_be_pci_dma(&s->dev, p, attrs); + desc->control =3D ldl_be_pci_dma(&s->dev, p + 4, attrs); + desc->buf_addr1 =3D ldl_be_pci_dma(&s->dev, p + 8, attrs); + desc->buf_addr2 =3D ldl_be_pci_dma(&s->dev, p + 12, attrs); } else { - desc->status =3D ldl_le_pci_dma(&s->dev, p); - desc->control =3D ldl_le_pci_dma(&s->dev, p + 4); - desc->buf_addr1 =3D ldl_le_pci_dma(&s->dev, p + 8); - desc->buf_addr2 =3D ldl_le_pci_dma(&s->dev, p + 12); + desc->status =3D ldl_le_pci_dma(&s->dev, p, attrs); + desc->control =3D ldl_le_pci_dma(&s->dev, p + 4, attrs); + desc->buf_addr1 =3D ldl_le_pci_dma(&s->dev, p + 8, attrs); + desc->buf_addr2 =3D ldl_le_pci_dma(&s->dev, p + 12, attrs); } } =20 diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c index bcf8de9aa19..d6b452f07ce 100644 --- a/hw/scsi/megasas.c +++ b/hw/scsi/megasas.c @@ -202,7 +202,9 @@ static uint64_t megasas_frame_get_context(MegasasState = *s, unsigned long frame) { PCIDevice *pci =3D &s->parent_obj; - return ldq_le_pci_dma(pci, frame + offsetof(struct mfi_frame_header, c= ontext)); + return ldq_le_pci_dma(pci, + frame + offsetof(struct mfi_frame_header, contex= t), + MEMTXATTRS_UNSPECIFIED); } =20 static bool megasas_frame_is_ieee_sgl(MegasasCmd *cmd) @@ -522,7 +524,8 @@ static MegasasCmd *megasas_enqueue_frame(MegasasState *= s, s->busy++; =20 if (s->consumer_pa) { - s->reply_queue_tail =3D ldl_le_pci_dma(pcid, s->consumer_pa); + s->reply_queue_tail =3D ldl_le_pci_dma(pcid, s->consumer_pa, + MEMTXATTRS_UNSPECIFIED); } trace_megasas_qf_enqueue(cmd->index, cmd->count, cmd->context, s->reply_queue_head, s->reply_queue_tail, s->= busy); @@ -553,14 +556,14 @@ static void megasas_complete_frame(MegasasState *s, u= int64_t context) stl_le_pci_dma(pci_dev, s->reply_queue_pa + queue_offset, context, attrs); } - s->reply_queue_tail =3D ldl_le_pci_dma(pci_dev, s->consumer_pa); + s->reply_queue_tail =3D ldl_le_pci_dma(pci_dev, s->consumer_pa, at= trs); trace_megasas_qf_complete(context, s->reply_queue_head, s->reply_queue_tail, s->busy); } =20 if (megasas_intr_enabled(s)) { /* Update reply queue pointer */ - s->reply_queue_tail =3D ldl_le_pci_dma(pci_dev, s->consumer_pa); + s->reply_queue_tail =3D ldl_le_pci_dma(pci_dev, s->consumer_pa, at= trs); tail =3D s->reply_queue_head; s->reply_queue_head =3D megasas_next_index(s, tail, s->fw_cmds); trace_megasas_qf_update(s->reply_queue_head, s->reply_queue_tail, @@ -625,6 +628,7 @@ static void megasas_abort_command(MegasasCmd *cmd) =20 static int megasas_init_firmware(MegasasState *s, MegasasCmd *cmd) { + const MemTxAttrs attrs =3D MEMTXATTRS_UNSPECIFIED; PCIDevice *pcid =3D PCI_DEVICE(s); uint32_t pa_hi, pa_lo; hwaddr iq_pa, initq_size =3D sizeof(struct mfi_init_qinfo); @@ -663,9 +667,9 @@ static int megasas_init_firmware(MegasasState *s, Megas= asCmd *cmd) pa_lo =3D le32_to_cpu(initq->pi_addr_lo); pa_hi =3D le32_to_cpu(initq->pi_addr_hi); s->producer_pa =3D ((uint64_t) pa_hi << 32) | pa_lo; - s->reply_queue_head =3D ldl_le_pci_dma(pcid, s->producer_pa); + s->reply_queue_head =3D ldl_le_pci_dma(pcid, s->producer_pa, attrs); s->reply_queue_head %=3D MEGASAS_MAX_FRAMES; - s->reply_queue_tail =3D ldl_le_pci_dma(pcid, s->consumer_pa); + s->reply_queue_tail =3D ldl_le_pci_dma(pcid, s->consumer_pa, attrs); s->reply_queue_tail %=3D MEGASAS_MAX_FRAMES; flags =3D le32_to_cpu(initq->flags); if (flags & MFI_QUEUE_FLAG_CONTEXT64) { diff --git a/hw/scsi/mptsas.c b/hw/scsi/mptsas.c index f6c77655443..ac9f4dfcd2a 100644 --- a/hw/scsi/mptsas.c +++ b/hw/scsi/mptsas.c @@ -172,14 +172,15 @@ static const int mpi_request_sizes[] =3D { static dma_addr_t mptsas_ld_sg_base(MPTSASState *s, uint32_t flags_and_len= gth, dma_addr_t *sgaddr) { + const MemTxAttrs attrs =3D MEMTXATTRS_UNSPECIFIED; PCIDevice *pci =3D (PCIDevice *) s; dma_addr_t addr; =20 if (flags_and_length & MPI_SGE_FLAGS_64_BIT_ADDRESSING) { - addr =3D ldq_le_pci_dma(pci, *sgaddr + 4); + addr =3D ldq_le_pci_dma(pci, *sgaddr + 4, attrs); *sgaddr +=3D 12; } else { - addr =3D ldl_le_pci_dma(pci, *sgaddr + 4); + addr =3D ldl_le_pci_dma(pci, *sgaddr + 4, attrs); *sgaddr +=3D 8; } return addr; @@ -203,7 +204,7 @@ static int mptsas_build_sgl(MPTSASState *s, MPTSASReque= st *req, hwaddr addr) dma_addr_t addr, len; uint32_t flags_and_length; =20 - flags_and_length =3D ldl_le_pci_dma(pci, sgaddr); + flags_and_length =3D ldl_le_pci_dma(pci, sgaddr, MEMTXATTRS_UNSPEC= IFIED); len =3D flags_and_length & MPI_SGE_LENGTH_MASK; if ((flags_and_length & MPI_SGE_FLAGS_ELEMENT_TYPE_MASK) !=3D MPI_SGE_FLAGS_SIMPLE_ELEMENT || @@ -234,7 +235,8 @@ static int mptsas_build_sgl(MPTSASState *s, MPTSASReque= st *req, hwaddr addr) break; } =20 - flags_and_length =3D ldl_le_pci_dma(pci, next_chain_addr); + flags_and_length =3D ldl_le_pci_dma(pci, next_chain_addr, + MEMTXATTRS_UNSPECIFIED); if ((flags_and_length & MPI_SGE_FLAGS_ELEMENT_TYPE_MASK) !=3D MPI_SGE_FLAGS_CHAIN_ELEMENT) { return MPI_IOCSTATUS_INVALID_SGL; diff --git a/hw/scsi/vmw_pvscsi.c b/hw/scsi/vmw_pvscsi.c index 59c3e8ba048..33e16f91116 100644 --- a/hw/scsi/vmw_pvscsi.c +++ b/hw/scsi/vmw_pvscsi.c @@ -52,7 +52,8 @@ =20 #define RS_GET_FIELD(m, field) \ (ldl_le_pci_dma(&container_of(m, PVSCSIState, rings)->parent_obj, \ - (m)->rs_pa + offsetof(struct PVSCSIRingsState, field))) + (m)->rs_pa + offsetof(struct PVSCSIRingsState, field), \ + MEMTXATTRS_UNSPECIFIED)) #define RS_SET_FIELD(m, field, val) \ (stl_le_pci_dma(&container_of(m, PVSCSIState, rings)->parent_obj, \ (m)->rs_pa + offsetof(struct PVSCSIRingsState, field), va= l, \ diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c index da5a4072107..14bdb896768 100644 --- a/hw/usb/hcd-xhci.c +++ b/hw/usb/hcd-xhci.c @@ -3440,6 +3440,7 @@ static int usb_xhci_post_load(void *opaque, int versi= on_id) } ldq_le_dma(xhci->as, dcbaap + 8 * slotid, &addr, MEMTXATTRS_UNSPEC= IFIED); slot->ctx =3D xhci_mask64(addr); + xhci_dma_read_u32s(xhci, slot->ctx, slot_ctx, sizeof(slot_ctx)); slot->uport =3D xhci_lookup_uport(xhci, slot_ctx); if (!slot->uport) { --=20 2.33.1