Series comparison

-[Qemu-devel] [PULL 00/15] Block patches
+[PULL v2 0/8] Block patches
-The following changes since commit 23919ddfd56135cad3cb468a8f54d5a595f024f4:
+The following changes since commit 813bac3d8d70d85cb7835f7945eb9eed84c2d8d0:
-  Merge remote-tracking branch 'remotes/aperard/tags/pull-xen-20190827' into staging (2019-08-27 15:52:36 +0100)
+  Merge tag '2023q3-bsd-user-pull-request' of https://gitlab.com/bsdimp/qemu into staging (2023-08-29 08:58:00 -0400)
 are available in the Git repository at:
-  https://github.com/XanClic/qemu.git tags/pull-block-2019-08-27
+  https://gitlab.com/stefanha/qemu.git tags/block-pull-request
-for you to fetch changes up to bb043c056cffcc2f3ce88bfdaf2e76e455c09e2c:
+for you to fetch changes up to 3f5f2285bfcdd855508a55da7875fb92de1a6ed0:
-  iotests: Unify cache mode quoting (2019-08-27 19:48:44 +0200)
+  tests/qemu-iotests/197: add testcase for CoR with subclusters (2023-08-29 13:19:56 -0400)
 ----------------------------------------------------------------
-Block patches:
+Pull request
-- qemu-io now accepts a file to read a write pattern from
-- Ensure that raw files have their first block allocated so we can probe
+v2:
-  the O_DIRECT alignment if necessary
+- Fix authorship information lost by the mailing list for Andrey Drobyshev
 - Various fixes
 ----------------------------------------------------------------
-Denis Plotnikov (1):
-  qemu-io: add pattern file for write command
-Max Reitz (7):
+Andrey Drobyshev (3):
-  iotests: Fix _filter_img_create()
+  block: add subcluster_size field to BlockDriverInfo
-  vmdk: Use bdrv_dirname() for relative extent paths
+  block/io: align requests to subcluster_size
-  iotests: Keep testing broken relative extent paths
+  tests/qemu-iotests/197: add testcase for CoR with subclusters
   vmdk: Reject invalid compressed writes
   iotests: Disable broken streamOptimized tests
   iotests: Disable 110 for vmdk.twoGbMaxExtentSparse
   iotests: Disable 126 for flat vmdk subformats
-Nir Soffer (3):
+Fabiano Rosas (1):
-  block: posix: Always allocate the first block
+  block-migration: Ensure we don't crash during migration cleanup
   iotests: Test allocate_first_block() with O_DIRECT
   iotests: Unify cache mode quoting
-Stefan Hajnoczi (1):
+Jeuk Kim (4):
-  file-posix: fix request_alignment typo
+  hw/ufs: Initial commit for emulated Universal-Flash-Storage
   hw/ufs: Support for Query Transfer Requests
   hw/ufs: Support for UFS logical unit
   tests/qtest: Introduce tests for UFS
-Thomas Huth (2):
+ MAINTAINERS                  |    7 +
-  iotests: Check for enabled drivers before testing them
+ docs/specs/pci-ids.rst       |    2 +
-  tests/check-block: Skip iotests when sanitizers are enabled
+ meson.build                  |    1 +
+ hw/ufs/trace.h               |    1 +
-Vladimir Sementsov-Ogievskiy (1):
+ hw/ufs/ufs.h                 |  131 +++
-  block: fix permission update in bdrv_replace_node
+ include/block/block-common.h |    5 +
+ include/block/block-io.h     |    8 +-
- block.c                                       |  5 +-
+ include/block/ufs.h          | 1090 +++++++++++++++++++++++++
- block/file-posix.c                            | 53 +++++++++-
+ include/hw/pci/pci.h         |    1 +
- block/vmdk.c                                  | 64 ++++++++----
+ include/hw/pci/pci_ids.h     |    1 +
- qemu-io-cmds.c                                | 99 +++++++++++++++++--
+ include/scsi/constants.h     |    1 +
- tests/check-block.sh                          |  5 +
+ block.c                      |    7 +
- tests/qemu-iotests/002                        |  1 +
+ block/io.c                   |   50 +-
- tests/qemu-iotests/003                        |  1 +
+ block/mirror.c               |    8 +-
- tests/qemu-iotests/005                        |  3 +-
+ block/qcow2.c                |    1 +
- tests/qemu-iotests/009                        |  1 +
+ hw/ufs/lu.c                  | 1445 ++++++++++++++++++++++++++++++++
- tests/qemu-iotests/010                        |  1 +
+ hw/ufs/ufs.c                 | 1494 ++++++++++++++++++++++++++++++++++
- tests/qemu-iotests/011                        |  1 +
+ migration/block.c            |   11 +-
- tests/qemu-iotests/017                        |  3 +-
+ tests/qtest/ufs-test.c       |  584 +++++++++++++
- tests/qemu-iotests/018                        |  3 +-
+ hw/Kconfig                   |    1 +
- tests/qemu-iotests/019                        |  3 +-
+ hw/meson.build               |    1 +
- tests/qemu-iotests/020                        |  3 +-
+ hw/ufs/Kconfig               |    4 +
- tests/qemu-iotests/026                        |  4 +-
+ hw/ufs/meson.build           |    1 +
- tests/qemu-iotests/027                        |  1 +
+ hw/ufs/trace-events          |   58 ++
- tests/qemu-iotests/032                        |  1 +
+ tests/qemu-iotests/197       |   29 +
- tests/qemu-iotests/033                        |  1 +
+ tests/qemu-iotests/197.out   |   24 +
- tests/qemu-iotests/034                        |  3 +-
+ tests/qtest/meson.build      |    1 +
- tests/qemu-iotests/037                        |  3 +-
+files changed, 4932 insertions(+), 35 deletions(-)
- tests/qemu-iotests/039                        |  4 +-
+ create mode 100644 hw/ufs/trace.h
- tests/qemu-iotests/052                        |  2 +-
+ create mode 100644 hw/ufs/ufs.h
- tests/qemu-iotests/059                        | 34 ++++++-
+ create mode 100644 include/block/ufs.h
- tests/qemu-iotests/059.out                    | 26 +++--
+ create mode 100644 hw/ufs/lu.c
- tests/qemu-iotests/063                        |  3 +-
+ create mode 100644 hw/ufs/ufs.c
- tests/qemu-iotests/071                        |  1 +
+ create mode 100644 tests/qtest/ufs-test.c
- tests/qemu-iotests/072                        |  1 +
+ create mode 100644 hw/ufs/Kconfig
- tests/qemu-iotests/081                        |  4 +-
+ create mode 100644 hw/ufs/meson.build
- tests/qemu-iotests/091                        |  4 +-
+ create mode 100644 hw/ufs/trace-events
  tests/qemu-iotests/099                        |  1 +
  tests/qemu-iotests/105                        |  3 +-
  tests/qemu-iotests/110                        |  3 +-
  tests/qemu-iotests/120                        |  1 +
  tests/qemu-iotests/126                        |  2 +
  tests/qemu-iotests/{150.out => 150.out.qcow2} |  0
  tests/qemu-iotests/150.out.raw                | 12 +++
  tests/qemu-iotests/162                        |  4 +-
  tests/qemu-iotests/175                        | 47 +++++++--
  tests/qemu-iotests/175.out                    | 16 ++-
  tests/qemu-iotests/178.out.qcow2              |  4 +-
  tests/qemu-iotests/184                        |  1 +
  tests/qemu-iotests/186                        |  1 +
  tests/qemu-iotests/197                        |  1 +
  tests/qemu-iotests/215                        |  1 +
  tests/qemu-iotests/221.out                    | 12 ++-
  tests/qemu-iotests/251                        |  1 +
  tests/qemu-iotests/253.out                    | 12 ++-
  tests/qemu-iotests/common.filter              |  4 +-
  tests/qemu-iotests/common.rc                  | 14 +++
 files changed, 391 insertions(+), 87 deletions(-)
  rename tests/qemu-iotests/{150.out => 150.out.qcow2} (100%)
  create mode 100644 tests/qemu-iotests/150.out.raw
 --
-.21.0
+.41.0

-[Qemu-devel] [PULL 01/15] qemu-io: add pattern file for write command
+[PULL v2 1/8] hw/ufs: Initial commit for emulated Universal-Flash-Storage
-From: Denis Plotnikov <dplotnikov@virtuozzo.com>
+From: Jeuk Kim <jeuk20.kim@gmail.com>
-The patch allows to provide a pattern file for write
+Universal Flash Storage (UFS) is a high-performance mass storage device
-command. There was no similar ability before.
+with a serial interface. It is primarily used as a high-performance
 data storage device for embedded applications.
-Signed-off-by: Denis Plotnikov <dplotnikov@virtuozzo.com>
+This commit contains code for UFS device to be recognized
-Message-id: 20190820164616.4072-1-dplotnikov@virtuozzo.com
+as a UFS PCI device.
-Reviewed-by: Eric Blake <eblake@redhat.com>
+Patches to handle UFS logical unit and Transfer Request will follow.
-[mreitz: Keep optstring in alphabetical order]
-Signed-off-by: Max Reitz <mreitz@redhat.com>
+Signed-off-by: Jeuk Kim <jeuk20.kim@samsung.com>
 Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
 Message-id: 9f3db32fe1c708090a6bb764d456973b5abef55f.1691062912.git.jeuk20.kim@samsung.com
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 ---
- qemu-io-cmds.c | 99 +++++++++++++++++++++++++++++++++++++++++++++++---
+ MAINTAINERS              |    6 +
-file changed, 93 insertions(+), 6 deletions(-)
+ docs/specs/pci-ids.rst   |    2 +
  meson.build              |    1 +
  hw/ufs/trace.h           |    1 +
  hw/ufs/ufs.h             |   42 ++
  include/block/ufs.h      | 1090 ++++++++++++++++++++++++++++++++++++++
  include/hw/pci/pci.h     |    1 +
  include/hw/pci/pci_ids.h |    1 +
  hw/ufs/ufs.c             |  278 ++++++++++
  hw/Kconfig               |    1 +
  hw/meson.build           |    1 +
  hw/ufs/Kconfig           |    4 +
  hw/ufs/meson.build       |    1 +
  hw/ufs/trace-events      |   32 ++
 files changed, 1461 insertions(+)
  create mode 100644 hw/ufs/trace.h
  create mode 100644 hw/ufs/ufs.h
  create mode 100644 include/block/ufs.h
  create mode 100644 hw/ufs/ufs.c
  create mode 100644 hw/ufs/Kconfig
  create mode 100644 hw/ufs/meson.build
  create mode 100644 hw/ufs/trace-events
-diff --git a/qemu-io-cmds.c b/qemu-io-cmds.c
+diff --git a/MAINTAINERS b/MAINTAINERS
 index XXXXXXX..XXXXXXX 100644
---- a/qemu-io-cmds.c
+--- a/MAINTAINERS
-+++ b/qemu-io-cmds.c
++++ b/MAINTAINERS
-@@ -XXX,XX +XXX,XX @@ static void qemu_io_free(void *p)
+@@ -XXX,XX +XXX,XX @@ F: tests/qtest/nvme-test.c
-     qemu_vfree(p);
+ F: docs/system/devices/nvme.rst
- }
+ T: git git://git.infradead.org/qemu-nvme.git nvme-next
-+/*
++ufs
-+ * qemu_io_alloc_from_file()
++M: Jeuk Kim <jeuk20.kim@samsung.com>
 +S: Supported
 +F: hw/ufs/*
 +F: include/block/ufs.h
 +
  megasas
  M: Hannes Reinecke <hare@suse.com>
  L: qemu-block@nongnu.org
 diff --git a/docs/specs/pci-ids.rst b/docs/specs/pci-ids.rst
 index XXXXXXX..XXXXXXX 100644
 --- a/docs/specs/pci-ids.rst
 +++ b/docs/specs/pci-ids.rst
@@ -XXX,XX +XXX,XX @@ PCI devices (other than virtio):
    PCI PVPanic device (``-device pvpanic-pci``)
 b36:0012
    PCI ACPI ERST device (``-device acpi-erst``)
 +1b36:0013
 +  PCI UFS device (``-device ufs``)
  All these devices are documented in :doc:`index`.
 diff --git a/meson.build b/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/meson.build
 +++ b/meson.build
@@ -XXX,XX +XXX,XX @@ if have_system
      'hw/ssi',
      'hw/timer',
      'hw/tpm',
 +    'hw/ufs',
      'hw/usb',
      'hw/vfio',
      'hw/virtio',
 diff --git a/hw/ufs/trace.h b/hw/ufs/trace.h
 new file mode 100644
 index XXXXXXX..XXXXXXX
 --- /dev/null
 +++ b/hw/ufs/trace.h
@@ -0,0 +1 @@
 +#include "trace/trace-hw_ufs.h"
 diff --git a/hw/ufs/ufs.h b/hw/ufs/ufs.h
 new file mode 100644
 index XXXXXXX..XXXXXXX
 --- /dev/null
 +++ b/hw/ufs/ufs.h
@@ -XXX,XX +XXX,XX @@
 +/*
 + * QEMU UFS
 + *
-+ * Allocates the buffer and populates it with the content of the given file
++ * Copyright (c) 2023 Samsung Electronics Co., Ltd. All rights reserved.
 + * up to @len bytes. If the file length is less than @len, then the buffer
 + * is populated with the file content cyclically.
 + *
-+ * @blk - the block backend where the buffer content is going to be written to
++ * Written by Jeuk Kim <jeuk20.kim@samsung.com>
 + * @len - the buffer length
 + * @file_name - the file to read the content from
 + *
-+ * Returns: the buffer pointer on success
++ * SPDX-License-Identifier: GPL-2.0-or-later
-+ *          NULL on error
++ */
-+ */
++
-+static void *qemu_io_alloc_from_file(BlockBackend *blk, size_t len,
++#ifndef HW_UFS_UFS_H
-+                                     const char *file_name)
++#define HW_UFS_UFS_H
 +
 +#include "hw/pci/pci_device.h"
 +#include "hw/scsi/scsi.h"
 +#include "block/ufs.h"
 +
 +#define UFS_MAX_LUS 32
 +#define UFS_BLOCK_SIZE 4096
 +
 +typedef struct UfsParams {
 +    char *serial;
 +    uint8_t nutrs; /* Number of UTP Transfer Request Slots */
 +    uint8_t nutmrs; /* Number of UTP Task Management Request Slots */
 +} UfsParams;
 +
 +typedef struct UfsHc {
 +    PCIDevice parent_obj;
 +    MemoryRegion iomem;
 +    UfsReg reg;
 +    UfsParams params;
 +    uint32_t reg_size;
 +
 +    qemu_irq irq;
 +    QEMUBH *doorbell_bh;
 +    QEMUBH *complete_bh;
 +} UfsHc;
 +
 +#define TYPE_UFS "ufs"
 +#define UFS(obj) OBJECT_CHECK(UfsHc, (obj), TYPE_UFS)
 +
 +#endif /* HW_UFS_UFS_H */
 diff --git a/include/block/ufs.h b/include/block/ufs.h
 new file mode 100644
 index XXXXXXX..XXXXXXX
 --- /dev/null
 +++ b/include/block/ufs.h
@@ -XXX,XX +XXX,XX @@
 +/* SPDX-License-Identifier: GPL-2.0-or-later */
 +
 +#ifndef BLOCK_UFS_H
 +#define BLOCK_UFS_H
 +
 +#include "hw/registerfields.h"
 +
 +typedef struct QEMU_PACKED UfsReg {
 +    uint32_t cap;
 +    uint32_t rsvd0;
 +    uint32_t ver;
 +    uint32_t rsvd1;
 +    uint32_t hcpid;
 +    uint32_t hcmid;
 +    uint32_t ahit;
 +    uint32_t rsvd2;
 +    uint32_t is;
 +    uint32_t ie;
 +    uint32_t rsvd3[2];
 +    uint32_t hcs;
 +    uint32_t hce;
 +    uint32_t uecpa;
 +    uint32_t uecdl;
 +    uint32_t uecn;
 +    uint32_t uect;
 +    uint32_t uecdme;
 +    uint32_t utriacr;
 +    uint32_t utrlba;
 +    uint32_t utrlbau;
 +    uint32_t utrldbr;
 +    uint32_t utrlclr;
 +    uint32_t utrlrsr;
 +    uint32_t utrlcnr;
 +    uint32_t rsvd4[2];
 +    uint32_t utmrlba;
 +    uint32_t utmrlbau;
 +    uint32_t utmrldbr;
 +    uint32_t utmrlclr;
 +    uint32_t utmrlrsr;
 +    uint32_t rsvd5[3];
 +    uint32_t uiccmd;
 +    uint32_t ucmdarg1;
 +    uint32_t ucmdarg2;
 +    uint32_t ucmdarg3;
 +    uint32_t rsvd6[4];
 +    uint32_t rsvd7[4];
 +    uint32_t rsvd8[16];
 +    uint32_t ccap;
 +} UfsReg;
 +
 +REG32(CAP, offsetof(UfsReg, cap))
 +    FIELD(CAP, NUTRS, 0, 5)
 +    FIELD(CAP, RTT, 8, 8)
 +    FIELD(CAP, NUTMRS, 16, 3)
 +    FIELD(CAP, AUTOH8, 23, 1)
 +    FIELD(CAP, 64AS, 24, 1)
 +    FIELD(CAP, OODDS, 25, 1)
 +    FIELD(CAP, UICDMETMS, 26, 1)
 +    FIELD(CAP, CS, 28, 1)
 +REG32(VER, offsetof(UfsReg, ver))
 +REG32(HCPID, offsetof(UfsReg, hcpid))
 +REG32(HCMID, offsetof(UfsReg, hcmid))
 +REG32(AHIT, offsetof(UfsReg, ahit))
 +REG32(IS, offsetof(UfsReg, is))
 +    FIELD(IS, UTRCS, 0, 1)
 +    FIELD(IS, UDEPRI, 1, 1)
 +    FIELD(IS, UE, 2, 1)
 +    FIELD(IS, UTMS, 3, 1)
 +    FIELD(IS, UPMS, 4, 1)
 +    FIELD(IS, UHXS, 5, 1)
 +    FIELD(IS, UHES, 6, 1)
 +    FIELD(IS, ULLS, 7, 1)
 +    FIELD(IS, ULSS, 8, 1)
 +    FIELD(IS, UTMRCS, 9, 1)
 +    FIELD(IS, UCCS, 10, 1)
 +    FIELD(IS, DFES, 11, 1)
 +    FIELD(IS, UTPES, 12, 1)
 +    FIELD(IS, HCFES, 16, 1)
 +    FIELD(IS, SBFES, 17, 1)
 +    FIELD(IS, CEFES, 18, 1)
 +REG32(IE, offsetof(UfsReg, ie))
 +    FIELD(IE, UTRCE, 0, 1)
 +    FIELD(IE, UDEPRIE, 1, 1)
 +    FIELD(IE, UEE, 2, 1)
 +    FIELD(IE, UTMSE, 3, 1)
 +    FIELD(IE, UPMSE, 4, 1)
 +    FIELD(IE, UHXSE, 5, 1)
 +    FIELD(IE, UHESE, 6, 1)
 +    FIELD(IE, ULLSE, 7, 1)
 +    FIELD(IE, ULSSE, 8, 1)
 +    FIELD(IE, UTMRCE, 9, 1)
 +    FIELD(IE, UCCE, 10, 1)
 +    FIELD(IE, DFEE, 11, 1)
 +    FIELD(IE, UTPEE, 12, 1)
 +    FIELD(IE, HCFEE, 16, 1)
 +    FIELD(IE, SBFEE, 17, 1)
 +    FIELD(IE, CEFEE, 18, 1)
 +REG32(HCS, offsetof(UfsReg, hcs))
 +    FIELD(HCS, DP, 0, 1)
 +    FIELD(HCS, UTRLRDY, 1, 1)
 +    FIELD(HCS, UTMRLRDY, 2, 1)
 +    FIELD(HCS, UCRDY, 3, 1)
 +    FIELD(HCS, UPMCRS, 8, 3)
 +REG32(HCE, offsetof(UfsReg, hce))
 +    FIELD(HCE, HCE, 0, 1)
 +    FIELD(HCE, CGE, 1, 1)
 +REG32(UECPA, offsetof(UfsReg, uecpa))
 +REG32(UECDL, offsetof(UfsReg, uecdl))
 +REG32(UECN, offsetof(UfsReg, uecn))
 +REG32(UECT, offsetof(UfsReg, uect))
 +REG32(UECDME, offsetof(UfsReg, uecdme))
 +REG32(UTRIACR, offsetof(UfsReg, utriacr))
 +REG32(UTRLBA, offsetof(UfsReg, utrlba))
 +    FIELD(UTRLBA, UTRLBA, 9, 22)
 +REG32(UTRLBAU, offsetof(UfsReg, utrlbau))
 +REG32(UTRLDBR, offsetof(UfsReg, utrldbr))
 +REG32(UTRLCLR, offsetof(UfsReg, utrlclr))
 +REG32(UTRLRSR, offsetof(UfsReg, utrlrsr))
 +REG32(UTRLCNR, offsetof(UfsReg, utrlcnr))
 +REG32(UTMRLBA, offsetof(UfsReg, utmrlba))
 +    FIELD(UTMRLBA, UTMRLBA, 9, 22)
 +REG32(UTMRLBAU, offsetof(UfsReg, utmrlbau))
 +REG32(UTMRLDBR, offsetof(UfsReg, utmrldbr))
 +REG32(UTMRLCLR, offsetof(UfsReg, utmrlclr))
 +REG32(UTMRLRSR, offsetof(UfsReg, utmrlrsr))
 +REG32(UICCMD, offsetof(UfsReg, uiccmd))
 +REG32(UCMDARG1, offsetof(UfsReg, ucmdarg1))
 +REG32(UCMDARG2, offsetof(UfsReg, ucmdarg2))
 +REG32(UCMDARG3, offsetof(UfsReg, ucmdarg3))
 +REG32(CCAP, offsetof(UfsReg, ccap))
 +
 +#define UFS_INTR_MASK                                    \
 +    ((1 << R_IS_CEFES_SHIFT) | (1 << R_IS_SBFES_SHIFT) | \
 +     (1 << R_IS_HCFES_SHIFT) | (1 << R_IS_UTPES_SHIFT) | \
 +     (1 << R_IS_DFES_SHIFT) | (1 << R_IS_UCCS_SHIFT) |   \
 +     (1 << R_IS_UTMRCS_SHIFT) | (1 << R_IS_ULSS_SHIFT) | \
 +     (1 << R_IS_ULLS_SHIFT) | (1 << R_IS_UHES_SHIFT) |   \
 +     (1 << R_IS_UHXS_SHIFT) | (1 << R_IS_UPMS_SHIFT) |   \
 +     (1 << R_IS_UTMS_SHIFT) | (1 << R_IS_UE_SHIFT) |     \
 +     (1 << R_IS_UDEPRI_SHIFT) | (1 << R_IS_UTRCS_SHIFT))
 +
 +#define UFS_UPIU_HEADER_TRANSACTION_TYPE_SHIFT 24
 +#define UFS_UPIU_HEADER_TRANSACTION_TYPE_MASK 0xff
 +#define UFS_UPIU_HEADER_TRANSACTION_TYPE(dword0)                       \
 +    ((be32_to_cpu(dword0) >> UFS_UPIU_HEADER_TRANSACTION_TYPE_SHIFT) & \
 +     UFS_UPIU_HEADER_TRANSACTION_TYPE_MASK)
 +
 +#define UFS_UPIU_HEADER_QUERY_FUNC_SHIFT 16
 +#define UFS_UPIU_HEADER_QUERY_FUNC_MASK 0xff
 +#define UFS_UPIU_HEADER_QUERY_FUNC(dword1)                       \
 +    ((be32_to_cpu(dword1) >> UFS_UPIU_HEADER_QUERY_FUNC_SHIFT) & \
 +     UFS_UPIU_HEADER_QUERY_FUNC_MASK)
 +
 +#define UFS_UPIU_HEADER_DATA_SEGMENT_LENGTH_SHIFT 0
 +#define UFS_UPIU_HEADER_DATA_SEGMENT_LENGTH_MASK 0xffff
 +#define UFS_UPIU_HEADER_DATA_SEGMENT_LENGTH(dword2)                       \
 +    ((be32_to_cpu(dword2) >> UFS_UPIU_HEADER_DATA_SEGMENT_LENGTH_SHIFT) & \
 +     UFS_UPIU_HEADER_DATA_SEGMENT_LENGTH_MASK)
 +
 +typedef struct QEMU_PACKED DeviceDescriptor {
 +    uint8_t length;
 +    uint8_t descriptor_idn;
 +    uint8_t device;
 +    uint8_t device_class;
 +    uint8_t device_sub_class;
 +    uint8_t protocol;
 +    uint8_t number_lu;
 +    uint8_t number_wlu;
 +    uint8_t boot_enable;
 +    uint8_t descr_access_en;
 +    uint8_t init_power_mode;
 +    uint8_t high_priority_lun;
 +    uint8_t secure_removal_type;
 +    uint8_t security_lu;
 +    uint8_t background_ops_term_lat;
 +    uint8_t init_active_icc_level;
 +    uint16_t spec_version;
 +    uint16_t manufacture_date;
 +    uint8_t manufacturer_name;
 +    uint8_t product_name;
 +    uint8_t serial_number;
 +    uint8_t oem_id;
 +    uint16_t manufacturer_id;
 +    uint8_t ud_0_base_offset;
 +    uint8_t ud_config_p_length;
 +    uint8_t device_rtt_cap;
 +    uint16_t periodic_rtc_update;
 +    uint8_t ufs_features_support;
 +    uint8_t ffu_timeout;
 +    uint8_t queue_depth;
 +    uint16_t device_version;
 +    uint8_t num_secure_wp_area;
 +    uint32_t psa_max_data_size;
 +    uint8_t psa_state_timeout;
 +    uint8_t product_revision_level;
 +    uint8_t reserved[36];
 +    uint32_t extended_ufs_features_support;
 +    uint8_t write_booster_buffer_preserve_user_space_en;
 +    uint8_t write_booster_buffer_type;
 +    uint32_t num_shared_write_booster_buffer_alloc_units;
 +} DeviceDescriptor;
 +
 +typedef struct QEMU_PACKED GeometryDescriptor {
 +    uint8_t length;
 +    uint8_t descriptor_idn;
 +    uint8_t media_technology;
 +    uint8_t reserved;
 +    uint64_t total_raw_device_capacity;
 +    uint8_t max_number_lu;
 +    uint32_t segment_size;
 +    uint8_t allocation_unit_size;
 +    uint8_t min_addr_block_size;
 +    uint8_t optimal_read_block_size;
 +    uint8_t optimal_write_block_size;
 +    uint8_t max_in_buffer_size;
 +    uint8_t max_out_buffer_size;
 +    uint8_t rpmb_read_write_size;
 +    uint8_t dynamic_capacity_resource_policy;
 +    uint8_t data_ordering;
 +    uint8_t max_context_id_number;
 +    uint8_t sys_data_tag_unit_size;
 +    uint8_t sys_data_tag_res_size;
 +    uint8_t supported_sec_r_types;
 +    uint16_t supported_memory_types;
 +    uint32_t system_code_max_n_alloc_u;
 +    uint16_t system_code_cap_adj_fac;
 +    uint32_t non_persist_max_n_alloc_u;
 +    uint16_t non_persist_cap_adj_fac;
 +    uint32_t enhanced_1_max_n_alloc_u;
 +    uint16_t enhanced_1_cap_adj_fac;
 +    uint32_t enhanced_2_max_n_alloc_u;
 +    uint16_t enhanced_2_cap_adj_fac;
 +    uint32_t enhanced_3_max_n_alloc_u;
 +    uint16_t enhanced_3_cap_adj_fac;
 +    uint32_t enhanced_4_max_n_alloc_u;
 +    uint16_t enhanced_4_cap_adj_fac;
 +    uint32_t optimal_logical_block_size;
 +    uint8_t reserved2[7];
 +    uint32_t write_booster_buffer_max_n_alloc_units;
 +    uint8_t device_max_write_booster_l_us;
 +    uint8_t write_booster_buffer_cap_adj_fac;
 +    uint8_t supported_write_booster_buffer_user_space_reduction_types;
 +    uint8_t supported_write_booster_buffer_types;
 +} GeometryDescriptor;
 +
 +#define UFS_GEOMETRY_CAPACITY_SHIFT 9
 +
 +typedef struct QEMU_PACKED UnitDescriptor {
 +    uint8_t length;
 +    uint8_t descriptor_idn;
 +    uint8_t unit_index;
 +    uint8_t lu_enable;
 +    uint8_t boot_lun_id;
 +    uint8_t lu_write_protect;
 +    uint8_t lu_queue_depth;
 +    uint8_t psa_sensitive;
 +    uint8_t memory_type;
 +    uint8_t data_reliability;
 +    uint8_t logical_block_size;
 +    uint64_t logical_block_count;
 +    uint32_t erase_block_size;
 +    uint8_t provisioning_type;
 +    uint64_t phy_mem_resource_count;
 +    uint16_t context_capabilities;
 +    uint8_t large_unit_granularity_m1;
 +    uint8_t reserved[6];
 +    uint32_t lu_num_write_booster_buffer_alloc_units;
 +} UnitDescriptor;
 +
 +typedef struct QEMU_PACKED RpmbUnitDescriptor {
 +    uint8_t length;
 +    uint8_t descriptor_idn;
 +    uint8_t unit_index;
 +    uint8_t lu_enable;
 +    uint8_t boot_lun_id;
 +    uint8_t lu_write_protect;
 +    uint8_t lu_queue_depth;
 +    uint8_t psa_sensitive;
 +    uint8_t memory_type;
 +    uint8_t reserved;
 +    uint8_t logical_block_size;
 +    uint64_t logical_block_count;
 +    uint32_t erase_block_size;
 +    uint8_t provisioning_type;
 +    uint64_t phy_mem_resource_count;
 +    uint8_t reserved2[3];
 +} RpmbUnitDescriptor;
 +
 +typedef struct QEMU_PACKED PowerParametersDescriptor {
 +    uint8_t length;
 +    uint8_t descriptor_idn;
 +    uint16_t active_icc_levels_vcc[16];
 +    uint16_t active_icc_levels_vccq[16];
 +    uint16_t active_icc_levels_vccq_2[16];
 +} PowerParametersDescriptor;
 +
 +typedef struct QEMU_PACKED InterconnectDescriptor {
 +    uint8_t length;
 +    uint8_t descriptor_idn;
 +    uint16_t bcd_unipro_version;
 +    uint16_t bcd_mphy_version;
 +} InterconnectDescriptor;
 +
 +typedef struct QEMU_PACKED StringDescriptor {
 +    uint8_t length;
 +    uint8_t descriptor_idn;
 +    uint16_t UC[126];
 +} StringDescriptor;
 +
 +typedef struct QEMU_PACKED DeviceHealthDescriptor {
 +    uint8_t length;
 +    uint8_t descriptor_idn;
 +    uint8_t pre_eol_info;
 +    uint8_t device_life_time_est_a;
 +    uint8_t device_life_time_est_b;
 +    uint8_t vendor_prop_info[32];
 +    uint32_t refresh_total_count;
 +    uint32_t refresh_progress;
 +} DeviceHealthDescriptor;
 +
 +typedef struct QEMU_PACKED Flags {
 +    uint8_t reserved;
 +    uint8_t device_init;
 +    uint8_t permanent_wp_en;
 +    uint8_t power_on_wp_en;
 +    uint8_t background_ops_en;
 +    uint8_t device_life_span_mode_en;
 +    uint8_t purge_enable;
 +    uint8_t refresh_enable;
 +    uint8_t phy_resource_removal;
 +    uint8_t busy_rtc;
 +    uint8_t reserved2;
 +    uint8_t permanently_disable_fw_update;
 +    uint8_t reserved3[2];
 +    uint8_t wb_en;
 +    uint8_t wb_buffer_flush_en;
 +    uint8_t wb_buffer_flush_during_hibernate;
 +    uint8_t reserved4[2];
 +} Flags;
 +
 +typedef struct Attributes {
 +    uint8_t boot_lun_en;
 +    uint8_t reserved;
 +    uint8_t current_power_mode;
 +    uint8_t active_icc_level;
 +    uint8_t out_of_order_data_en;
 +    uint8_t background_op_status;
 +    uint8_t purge_status;
 +    uint8_t max_data_in_size;
 +    uint8_t max_data_out_size;
 +    uint32_t dyn_cap_needed;
 +    uint8_t ref_clk_freq;
 +    uint8_t config_descr_lock;
 +    uint8_t max_num_of_rtt;
 +    uint16_t exception_event_control;
 +    uint16_t exception_event_status;
 +    uint32_t seconds_passed;
 +    uint16_t context_conf;
 +    uint8_t device_ffu_status;
 +    uint8_t psa_state;
 +    uint32_t psa_data_size;
 +    uint8_t ref_clk_gating_wait_time;
 +    uint8_t device_case_rough_temperaure;
 +    uint8_t device_too_high_temp_boundary;
 +    uint8_t device_too_low_temp_boundary;
 +    uint8_t throttling_status;
 +    uint8_t wb_buffer_flush_status;
 +    uint8_t available_wb_buffer_size;
 +    uint8_t wb_buffer_life_time_est;
 +    uint32_t current_wb_buffer_size;
 +    uint8_t refresh_status;
 +    uint8_t refresh_freq;
 +    uint8_t refresh_unit;
 +    uint8_t refresh_method;
 +} Attributes;
 +
 +#define UFS_TRANSACTION_SPECIFIC_FIELD_SIZE 20
 +#define UFS_MAX_QUERY_DATA_SIZE 256
 +
 +/* Command response result code */
 +typedef enum CommandRespCode {
 +    COMMAND_RESULT_SUCESS = 0x00,
 +    COMMAND_RESULT_FAIL = 0x01,
 +} CommandRespCode;
 +
 +enum {
 +    UFS_UPIU_FLAG_UNDERFLOW = 0x20,
 +    UFS_UPIU_FLAG_OVERFLOW = 0x40,
 +};
 +
 +typedef struct QEMU_PACKED UtpUpiuHeader {
 +    uint8_t trans_type;
 +    uint8_t flags;
 +    uint8_t lun;
 +    uint8_t task_tag;
 +    uint8_t iid_cmd_set_type;
 +    uint8_t query_func;
 +    uint8_t response;
 +    uint8_t scsi_status;
 +    uint8_t ehs_len;
 +    uint8_t device_inf;
 +    uint16_t data_segment_length;
 +} UtpUpiuHeader;
 +
 +/*
 + * The code below is copied from the linux kernel
 + * ("include/uapi/scsi/scsi_bsg_ufs.h") and modified to fit the qemu style.
 + */
 +
 +typedef struct QEMU_PACKED UtpUpiuQuery {
 +    uint8_t opcode;
 +    uint8_t idn;
 +    uint8_t index;
 +    uint8_t selector;
 +    uint16_t reserved_osf;
 +    uint16_t length;
 +    uint32_t value;
 +    uint32_t reserved[2];
 +    /* EHS length should be 0. We don't have to worry about EHS area. */
 +    uint8_t data[UFS_MAX_QUERY_DATA_SIZE];
 +} UtpUpiuQuery;
 +
 +#define UFS_CDB_SIZE 16
 +
 +/*
 + * struct UtpUpiuCmd - Command UPIU structure
 + * @data_transfer_len: Data Transfer Length DW-3
 + * @cdb: Command Descriptor Block CDB DW-4 to DW-7
 + */
 +typedef struct QEMU_PACKED UtpUpiuCmd {
 +    uint32_t exp_data_transfer_len;
 +    uint8_t cdb[UFS_CDB_SIZE];
 +} UtpUpiuCmd;
 +
 +/*
 + * struct UtpUpiuReq - general upiu request structure
 + * @header:UPIU header structure DW-0 to DW-2
 + * @sc: fields structure for scsi command DW-3 to DW-7
 + * @qr: fields structure for query request DW-3 to DW-7
 + * @uc: use utp_upiu_query to host the 4 dwords of uic command
 + */
 +typedef struct QEMU_PACKED UtpUpiuReq {
 +    UtpUpiuHeader header;
 +    union {
 +        UtpUpiuCmd sc;
 +        UtpUpiuQuery qr;
 +    };
 +} UtpUpiuReq;
 +
 +/*
 + * The code below is copied from the linux kernel ("include/ufs/ufshci.h") and
 + * modified to fit the qemu style.
 + */
 +
 +enum {
 +    PWR_OK = 0x0,
 +    PWR_LOCAL = 0x01,
 +    PWR_REMOTE = 0x02,
 +    PWR_BUSY = 0x03,
 +    PWR_ERROR_CAP = 0x04,
 +    PWR_FATAL_ERROR = 0x05,
 +};
 +
 +/* UIC Commands */
 +enum uic_cmd_dme {
 +    UIC_CMD_DME_GET = 0x01,
 +    UIC_CMD_DME_SET = 0x02,
 +    UIC_CMD_DME_PEER_GET = 0x03,
 +    UIC_CMD_DME_PEER_SET = 0x04,
 +    UIC_CMD_DME_POWERON = 0x10,
 +    UIC_CMD_DME_POWEROFF = 0x11,
 +    UIC_CMD_DME_ENABLE = 0x12,
 +    UIC_CMD_DME_RESET = 0x14,
 +    UIC_CMD_DME_END_PT_RST = 0x15,
 +    UIC_CMD_DME_LINK_STARTUP = 0x16,
 +    UIC_CMD_DME_HIBER_ENTER = 0x17,
 +    UIC_CMD_DME_HIBER_EXIT = 0x18,
 +    UIC_CMD_DME_TEST_MODE = 0x1A,
 +};
 +
 +/* UIC Config result code / Generic error code */
 +enum {
 +    UIC_CMD_RESULT_SUCCESS = 0x00,
 +    UIC_CMD_RESULT_INVALID_ATTR = 0x01,
 +    UIC_CMD_RESULT_FAILURE = 0x01,
 +    UIC_CMD_RESULT_INVALID_ATTR_VALUE = 0x02,
 +    UIC_CMD_RESULT_READ_ONLY_ATTR = 0x03,
 +    UIC_CMD_RESULT_WRITE_ONLY_ATTR = 0x04,
 +    UIC_CMD_RESULT_BAD_INDEX = 0x05,
 +    UIC_CMD_RESULT_LOCKED_ATTR = 0x06,
 +    UIC_CMD_RESULT_BAD_TEST_FEATURE_INDEX = 0x07,
 +    UIC_CMD_RESULT_PEER_COMM_FAILURE = 0x08,
 +    UIC_CMD_RESULT_BUSY = 0x09,
 +    UIC_CMD_RESULT_DME_FAILURE = 0x0A,
 +};
 +
 +#define MASK_UIC_COMMAND_RESULT 0xFF
 +
 +/*
 + * Request Descriptor Definitions
 + */
 +
 +/* Transfer request command type */
 +enum {
 +    UTP_CMD_TYPE_SCSI = 0x0,
 +    UTP_CMD_TYPE_UFS = 0x1,
 +    UTP_CMD_TYPE_DEV_MANAGE = 0x2,
 +};
 +
 +/* To accommodate UFS2.0 required Command type */
 +enum {
 +    UTP_CMD_TYPE_UFS_STORAGE = 0x1,
 +};
 +
 +enum {
 +    UTP_SCSI_COMMAND = 0x00000000,
 +    UTP_NATIVE_UFS_COMMAND = 0x10000000,
 +    UTP_DEVICE_MANAGEMENT_FUNCTION = 0x20000000,
 +    UTP_REQ_DESC_INT_CMD = 0x01000000,
 +    UTP_REQ_DESC_CRYPTO_ENABLE_CMD = 0x00800000,
 +};
 +
 +/* UTP Transfer Request Data Direction (DD) */
 +enum {
 +    UTP_NO_DATA_TRANSFER = 0x00000000,
 +    UTP_HOST_TO_DEVICE = 0x02000000,
 +    UTP_DEVICE_TO_HOST = 0x04000000,
 +};
 +
 +/* Overall command status values */
 +enum UtpOcsCodes {
 +    OCS_SUCCESS = 0x0,
 +    OCS_INVALID_CMD_TABLE_ATTR = 0x1,
 +    OCS_INVALID_PRDT_ATTR = 0x2,
 +    OCS_MISMATCH_DATA_BUF_SIZE = 0x3,
 +    OCS_MISMATCH_RESP_UPIU_SIZE = 0x4,
 +    OCS_PEER_COMM_FAILURE = 0x5,
 +    OCS_ABORTED = 0x6,
 +    OCS_FATAL_ERROR = 0x7,
 +    OCS_DEVICE_FATAL_ERROR = 0x8,
 +    OCS_INVALID_CRYPTO_CONFIG = 0x9,
 +    OCS_GENERAL_CRYPTO_ERROR = 0xa,
 +    OCS_INVALID_COMMAND_STATUS = 0xf,
 +};
 +
 +enum {
 +    MASK_OCS = 0x0F,
 +};
 +
 +/*
 + * struct UfshcdSgEntry - UFSHCI PRD Entry
 + * @addr: Physical address; DW-0 and DW-1.
 + * @reserved: Reserved for future use DW-2
 + * @size: size of physical segment DW-3
 + */
 +typedef struct QEMU_PACKED UfshcdSgEntry {
 +    uint64_t addr;
 +    uint32_t reserved;
 +    uint32_t size;
 +    /*
 +     * followed by variant-specific fields if
 +     * CONFIG_SCSI_UFS_VARIABLE_SG_ENTRY_SIZE has been defined.
 +     */
 +} UfshcdSgEntry;
 +
 +/*
 + * struct RequestDescHeader - Descriptor Header common to both UTRD and UTMRD
 + * @dword0: Descriptor Header DW0
 + * @dword1: Descriptor Header DW1
 + * @dword2: Descriptor Header DW2
 + * @dword3: Descriptor Header DW3
 + */
 +typedef struct QEMU_PACKED RequestDescHeader {
 +    uint32_t dword_0;
 +    uint32_t dword_1;
 +    uint32_t dword_2;
 +    uint32_t dword_3;
 +} RequestDescHeader;
 +
 +/*
 + * struct UtpTransferReqDesc - UTP Transfer Request Descriptor (UTRD)
 + * @header: UTRD header DW-0 to DW-3
 + * @command_desc_base_addr_lo: UCD base address low DW-4
 + * @command_desc_base_addr_hi: UCD base address high DW-5
 + * @response_upiu_length: response UPIU length DW-6
 + * @response_upiu_offset: response UPIU offset DW-6
 + * @prd_table_length: Physical region descriptor length DW-7
 + * @prd_table_offset: Physical region descriptor offset DW-7
 + */
 +typedef struct QEMU_PACKED UtpTransferReqDesc {
 +    /* DW 0-3 */
 +    RequestDescHeader header;
 +
 +    /* DW 4-5*/
 +    uint32_t command_desc_base_addr_lo;
 +    uint32_t command_desc_base_addr_hi;
 +
 +    /* DW 6 */
 +    uint16_t response_upiu_length;
 +    uint16_t response_upiu_offset;
 +
 +    /* DW 7 */
 +    uint16_t prd_table_length;
 +    uint16_t prd_table_offset;
 +} UtpTransferReqDesc;
 +
 +/*
 + * UTMRD structure.
 + */
 +typedef struct QEMU_PACKED UtpTaskReqDesc {
 +    /* DW 0-3 */
 +    RequestDescHeader header;
 +
 +    /* DW 4-11 - Task request UPIU structure */
 +    struct {
 +        UtpUpiuHeader req_header;
 +        uint32_t input_param1;
 +        uint32_t input_param2;
 +        uint32_t input_param3;
 +        uint32_t reserved1[2];
 +    } upiu_req;
 +
 +    /* DW 12-19 - Task Management Response UPIU structure */
 +    struct {
 +        UtpUpiuHeader rsp_header;
 +        uint32_t output_param1;
 +        uint32_t output_param2;
 +        uint32_t reserved2[3];
 +    } upiu_rsp;
 +} UtpTaskReqDesc;
 +
 +/*
 + * The code below is copied from the linux kernel ("include/ufs/ufs.h") and
 + * modified to fit the qemu style.
 + */
 +
 +#define GENERAL_UPIU_REQUEST_SIZE (sizeof(UtpUpiuReq))
 +#define QUERY_DESC_MAX_SIZE 255
 +#define QUERY_DESC_MIN_SIZE 2
 +#define QUERY_DESC_HDR_SIZE 2
 +#define QUERY_OSF_SIZE (GENERAL_UPIU_REQUEST_SIZE - (sizeof(UtpUpiuHeader)))
 +#define UFS_SENSE_SIZE 18
 +
 +/*
 + * UFS device may have standard LUs and LUN id could be from 0x00 to
 + * 0x7F. Standard LUs use "Peripheral Device Addressing Format".
 + * UFS device may also have the Well Known LUs (also referred as W-LU)
 + * which again could be from 0x00 to 0x7F. For W-LUs, device only use
 + * the "Extended Addressing Format" which means the W-LUNs would be
 + * from 0xc100 (SCSI_W_LUN_BASE) onwards.
 + * This means max. LUN number reported from UFS device could be 0xC17F.
 + */
 +#define UFS_UPIU_MAX_UNIT_NUM_ID 0x7F
 +#define UFS_UPIU_WLUN_ID (1 << 7)
 +
 +/* WriteBooster buffer is available only for the logical unit from 0 to 7 */
 +#define UFS_UPIU_MAX_WB_LUN_ID 8
 +
 +/*
 + * WriteBooster buffer lifetime has a limit setted by vendor.
 + * If it is over the limit, WriteBooster feature will be disabled.
 + */
 +#define UFS_WB_EXCEED_LIFETIME 0x0B
 +
 +/*
 + * In UFS Spec, the Extra Header Segment (EHS) starts from byte 32 in UPIU
 + * request/response packet
 + */
 +#define EHS_OFFSET_IN_RESPONSE 32
 +
 +/* Well known logical unit id in LUN field of UPIU */
 +enum {
 +    UFS_UPIU_REPORT_LUNS_WLUN = 0x81,
 +    UFS_UPIU_UFS_DEVICE_WLUN = 0xD0,
 +    UFS_UPIU_BOOT_WLUN = 0xB0,
 +    UFS_UPIU_RPMB_WLUN = 0xC4,
 +};
 +
 +/*
 + * UFS Protocol Information Unit related definitions
 + */
 +
 +/* Task management functions */
 +enum {
 +    UFS_ABORT_TASK = 0x01,
 +    UFS_ABORT_TASK_SET = 0x02,
 +    UFS_CLEAR_TASK_SET = 0x04,
 +    UFS_LOGICAL_RESET = 0x08,
 +    UFS_QUERY_TASK = 0x80,
 +    UFS_QUERY_TASK_SET = 0x81,
 +};
 +
 +/* UTP UPIU Transaction Codes Initiator to Target */
 +enum {
 +    UPIU_TRANSACTION_NOP_OUT = 0x00,
 +    UPIU_TRANSACTION_COMMAND = 0x01,
 +    UPIU_TRANSACTION_DATA_OUT = 0x02,
 +    UPIU_TRANSACTION_TASK_REQ = 0x04,
 +    UPIU_TRANSACTION_QUERY_REQ = 0x16,
 +};
 +
 +/* UTP UPIU Transaction Codes Target to Initiator */
 +enum {
 +    UPIU_TRANSACTION_NOP_IN = 0x20,
 +    UPIU_TRANSACTION_RESPONSE = 0x21,
 +    UPIU_TRANSACTION_DATA_IN = 0x22,
 +    UPIU_TRANSACTION_TASK_RSP = 0x24,
 +    UPIU_TRANSACTION_READY_XFER = 0x31,
 +    UPIU_TRANSACTION_QUERY_RSP = 0x36,
 +    UPIU_TRANSACTION_REJECT_UPIU = 0x3F,
 +};
 +
 +/* UPIU Read/Write flags */
 +enum {
 +    UPIU_CMD_FLAGS_NONE = 0x00,
 +    UPIU_CMD_FLAGS_WRITE = 0x20,
 +    UPIU_CMD_FLAGS_READ = 0x40,
 +};
 +
 +/* UPIU Task Attributes */
 +enum {
 +    UPIU_TASK_ATTR_SIMPLE = 0x00,
 +    UPIU_TASK_ATTR_ORDERED = 0x01,
 +    UPIU_TASK_ATTR_HEADQ = 0x02,
 +    UPIU_TASK_ATTR_ACA = 0x03,
 +};
 +
 +/* UPIU Query request function */
 +enum {
 +    UPIU_QUERY_FUNC_STANDARD_READ_REQUEST = 0x01,
 +    UPIU_QUERY_FUNC_STANDARD_WRITE_REQUEST = 0x81,
 +};
 +
 +/* Flag idn for Query Requests*/
 +enum flag_idn {
 +    QUERY_FLAG_IDN_FDEVICEINIT = 0x01,
 +    QUERY_FLAG_IDN_PERMANENT_WPE = 0x02,
 +    QUERY_FLAG_IDN_PWR_ON_WPE = 0x03,
 +    QUERY_FLAG_IDN_BKOPS_EN = 0x04,
 +    QUERY_FLAG_IDN_LIFE_SPAN_MODE_ENABLE = 0x05,
 +    QUERY_FLAG_IDN_PURGE_ENABLE = 0x06,
 +    QUERY_FLAG_IDN_REFRESH_ENABLE = 0x07,
 +    QUERY_FLAG_IDN_FPHYRESOURCEREMOVAL = 0x08,
 +    QUERY_FLAG_IDN_BUSY_RTC = 0x09,
 +    QUERY_FLAG_IDN_RESERVED3 = 0x0A,
 +    QUERY_FLAG_IDN_PERMANENTLY_DISABLE_FW_UPDATE = 0x0B,
 +    QUERY_FLAG_IDN_WB_EN = 0x0E,
 +    QUERY_FLAG_IDN_WB_BUFF_FLUSH_EN = 0x0F,
 +    QUERY_FLAG_IDN_WB_BUFF_FLUSH_DURING_HIBERN8 = 0x10,
 +    QUERY_FLAG_IDN_HPB_RESET = 0x11,
 +    QUERY_FLAG_IDN_HPB_EN = 0x12,
 +    QUERY_FLAG_IDN_COUNT,
 +};
 +
 +/* Attribute idn for Query requests */
 +enum attr_idn {
 +    QUERY_ATTR_IDN_BOOT_LU_EN = 0x00,
 +    QUERY_ATTR_IDN_MAX_HPB_SINGLE_CMD = 0x01,
 +    QUERY_ATTR_IDN_POWER_MODE = 0x02,
 +    QUERY_ATTR_IDN_ACTIVE_ICC_LVL = 0x03,
 +    QUERY_ATTR_IDN_OOO_DATA_EN = 0x04,
 +    QUERY_ATTR_IDN_BKOPS_STATUS = 0x05,
 +    QUERY_ATTR_IDN_PURGE_STATUS = 0x06,
 +    QUERY_ATTR_IDN_MAX_DATA_IN = 0x07,
 +    QUERY_ATTR_IDN_MAX_DATA_OUT = 0x08,
 +    QUERY_ATTR_IDN_DYN_CAP_NEEDED = 0x09,
 +    QUERY_ATTR_IDN_REF_CLK_FREQ = 0x0A,
 +    QUERY_ATTR_IDN_CONF_DESC_LOCK = 0x0B,
 +    QUERY_ATTR_IDN_MAX_NUM_OF_RTT = 0x0C,
 +    QUERY_ATTR_IDN_EE_CONTROL = 0x0D,
 +    QUERY_ATTR_IDN_EE_STATUS = 0x0E,
 +    QUERY_ATTR_IDN_SECONDS_PASSED = 0x0F,
 +    QUERY_ATTR_IDN_CNTX_CONF = 0x10,
 +    QUERY_ATTR_IDN_CORR_PRG_BLK_NUM = 0x11,
 +    QUERY_ATTR_IDN_RESERVED2 = 0x12,
 +    QUERY_ATTR_IDN_RESERVED3 = 0x13,
 +    QUERY_ATTR_IDN_FFU_STATUS = 0x14,
 +    QUERY_ATTR_IDN_PSA_STATE = 0x15,
 +    QUERY_ATTR_IDN_PSA_DATA_SIZE = 0x16,
 +    QUERY_ATTR_IDN_REF_CLK_GATING_WAIT_TIME = 0x17,
 +    QUERY_ATTR_IDN_CASE_ROUGH_TEMP = 0x18,
 +    QUERY_ATTR_IDN_HIGH_TEMP_BOUND = 0x19,
 +    QUERY_ATTR_IDN_LOW_TEMP_BOUND = 0x1A,
 +    QUERY_ATTR_IDN_THROTTLING_STATUS = 0x1B,
 +    QUERY_ATTR_IDN_WB_FLUSH_STATUS = 0x1C,
 +    QUERY_ATTR_IDN_AVAIL_WB_BUFF_SIZE = 0x1D,
 +    QUERY_ATTR_IDN_WB_BUFF_LIFE_TIME_EST = 0x1E,
 +    QUERY_ATTR_IDN_CURR_WB_BUFF_SIZE = 0x1F,
 +    QUERY_ATTR_IDN_REFRESH_STATUS = 0x2C,
 +    QUERY_ATTR_IDN_REFRESH_FREQ = 0x2D,
 +    QUERY_ATTR_IDN_REFRESH_UNIT = 0x2E,
 +    QUERY_ATTR_IDN_COUNT,
 +};
 +
 +/* Descriptor idn for Query requests */
 +enum desc_idn {
 +    QUERY_DESC_IDN_DEVICE = 0x0,
 +    QUERY_DESC_IDN_CONFIGURATION = 0x1,
 +    QUERY_DESC_IDN_UNIT = 0x2,
 +    QUERY_DESC_IDN_RFU_0 = 0x3,
 +    QUERY_DESC_IDN_INTERCONNECT = 0x4,
 +    QUERY_DESC_IDN_STRING = 0x5,
 +    QUERY_DESC_IDN_RFU_1 = 0x6,
 +    QUERY_DESC_IDN_GEOMETRY = 0x7,
 +    QUERY_DESC_IDN_POWER = 0x8,
 +    QUERY_DESC_IDN_HEALTH = 0x9,
 +    QUERY_DESC_IDN_MAX,
 +};
 +
 +enum desc_header_offset {
 +    QUERY_DESC_LENGTH_OFFSET = 0x00,
 +    QUERY_DESC_DESC_TYPE_OFFSET = 0x01,
 +};
 +
 +/* Unit descriptor parameters offsets in bytes*/
 +enum unit_desc_param {
 +    UNIT_DESC_PARAM_LEN = 0x0,
 +    UNIT_DESC_PARAM_TYPE = 0x1,
 +    UNIT_DESC_PARAM_UNIT_INDEX = 0x2,
 +    UNIT_DESC_PARAM_LU_ENABLE = 0x3,
 +    UNIT_DESC_PARAM_BOOT_LUN_ID = 0x4,
 +    UNIT_DESC_PARAM_LU_WR_PROTECT = 0x5,
 +    UNIT_DESC_PARAM_LU_Q_DEPTH = 0x6,
 +    UNIT_DESC_PARAM_PSA_SENSITIVE = 0x7,
 +    UNIT_DESC_PARAM_MEM_TYPE = 0x8,
 +    UNIT_DESC_PARAM_DATA_RELIABILITY = 0x9,
 +    UNIT_DESC_PARAM_LOGICAL_BLK_SIZE = 0xA,
 +    UNIT_DESC_PARAM_LOGICAL_BLK_COUNT = 0xB,
 +    UNIT_DESC_PARAM_ERASE_BLK_SIZE = 0x13,
 +    UNIT_DESC_PARAM_PROVISIONING_TYPE = 0x17,
 +    UNIT_DESC_PARAM_PHY_MEM_RSRC_CNT = 0x18,
 +    UNIT_DESC_PARAM_CTX_CAPABILITIES = 0x20,
 +    UNIT_DESC_PARAM_LARGE_UNIT_SIZE_M1 = 0x22,
 +    UNIT_DESC_PARAM_HPB_LU_MAX_ACTIVE_RGNS = 0x23,
 +    UNIT_DESC_PARAM_HPB_PIN_RGN_START_OFF = 0x25,
 +    UNIT_DESC_PARAM_HPB_NUM_PIN_RGNS = 0x27,
 +    UNIT_DESC_PARAM_WB_BUF_ALLOC_UNITS = 0x29,
 +};
 +
 +/* RPMB Unit descriptor parameters offsets in bytes*/
 +enum rpmb_unit_desc_param {
 +    RPMB_UNIT_DESC_PARAM_LEN = 0x0,
 +    RPMB_UNIT_DESC_PARAM_TYPE = 0x1,
 +    RPMB_UNIT_DESC_PARAM_UNIT_INDEX = 0x2,
 +    RPMB_UNIT_DESC_PARAM_LU_ENABLE = 0x3,
 +    RPMB_UNIT_DESC_PARAM_BOOT_LUN_ID = 0x4,
 +    RPMB_UNIT_DESC_PARAM_LU_WR_PROTECT = 0x5,
 +    RPMB_UNIT_DESC_PARAM_LU_Q_DEPTH = 0x6,
 +    RPMB_UNIT_DESC_PARAM_PSA_SENSITIVE = 0x7,
 +    RPMB_UNIT_DESC_PARAM_MEM_TYPE = 0x8,
 +    RPMB_UNIT_DESC_PARAM_REGION_EN = 0x9,
 +    RPMB_UNIT_DESC_PARAM_LOGICAL_BLK_SIZE = 0xA,
 +    RPMB_UNIT_DESC_PARAM_LOGICAL_BLK_COUNT = 0xB,
 +    RPMB_UNIT_DESC_PARAM_REGION0_SIZE = 0x13,
 +    RPMB_UNIT_DESC_PARAM_REGION1_SIZE = 0x14,
 +    RPMB_UNIT_DESC_PARAM_REGION2_SIZE = 0x15,
 +    RPMB_UNIT_DESC_PARAM_REGION3_SIZE = 0x16,
 +    RPMB_UNIT_DESC_PARAM_PROVISIONING_TYPE = 0x17,
 +    RPMB_UNIT_DESC_PARAM_PHY_MEM_RSRC_CNT = 0x18,
 +};
 +
 +/* Device descriptor parameters offsets in bytes*/
 +enum device_desc_param {
 +    DEVICE_DESC_PARAM_LEN = 0x0,
 +    DEVICE_DESC_PARAM_TYPE = 0x1,
 +    DEVICE_DESC_PARAM_DEVICE_TYPE = 0x2,
 +    DEVICE_DESC_PARAM_DEVICE_CLASS = 0x3,
 +    DEVICE_DESC_PARAM_DEVICE_SUB_CLASS = 0x4,
 +    DEVICE_DESC_PARAM_PRTCL = 0x5,
 +    DEVICE_DESC_PARAM_NUM_LU = 0x6,
 +    DEVICE_DESC_PARAM_NUM_WLU = 0x7,
 +    DEVICE_DESC_PARAM_BOOT_ENBL = 0x8,
 +    DEVICE_DESC_PARAM_DESC_ACCSS_ENBL = 0x9,
 +    DEVICE_DESC_PARAM_INIT_PWR_MODE = 0xA,
 +    DEVICE_DESC_PARAM_HIGH_PR_LUN = 0xB,
 +    DEVICE_DESC_PARAM_SEC_RMV_TYPE = 0xC,
 +    DEVICE_DESC_PARAM_SEC_LU = 0xD,
 +    DEVICE_DESC_PARAM_BKOP_TERM_LT = 0xE,
 +    DEVICE_DESC_PARAM_ACTVE_ICC_LVL = 0xF,
 +    DEVICE_DESC_PARAM_SPEC_VER = 0x10,
 +    DEVICE_DESC_PARAM_MANF_DATE = 0x12,
 +    DEVICE_DESC_PARAM_MANF_NAME = 0x14,
 +    DEVICE_DESC_PARAM_PRDCT_NAME = 0x15,
 +    DEVICE_DESC_PARAM_SN = 0x16,
 +    DEVICE_DESC_PARAM_OEM_ID = 0x17,
 +    DEVICE_DESC_PARAM_MANF_ID = 0x18,
 +    DEVICE_DESC_PARAM_UD_OFFSET = 0x1A,
 +    DEVICE_DESC_PARAM_UD_LEN = 0x1B,
 +    DEVICE_DESC_PARAM_RTT_CAP = 0x1C,
 +    DEVICE_DESC_PARAM_FRQ_RTC = 0x1D,
 +    DEVICE_DESC_PARAM_UFS_FEAT = 0x1F,
 +    DEVICE_DESC_PARAM_FFU_TMT = 0x20,
 +    DEVICE_DESC_PARAM_Q_DPTH = 0x21,
 +    DEVICE_DESC_PARAM_DEV_VER = 0x22,
 +    DEVICE_DESC_PARAM_NUM_SEC_WPA = 0x24,
 +    DEVICE_DESC_PARAM_PSA_MAX_DATA = 0x25,
 +    DEVICE_DESC_PARAM_PSA_TMT = 0x29,
 +    DEVICE_DESC_PARAM_PRDCT_REV = 0x2A,
 +    DEVICE_DESC_PARAM_HPB_VER = 0x40,
 +    DEVICE_DESC_PARAM_HPB_CONTROL = 0x42,
 +    DEVICE_DESC_PARAM_EXT_UFS_FEATURE_SUP = 0x4F,
 +    DEVICE_DESC_PARAM_WB_PRESRV_USRSPC_EN = 0x53,
 +    DEVICE_DESC_PARAM_WB_TYPE = 0x54,
 +    DEVICE_DESC_PARAM_WB_SHARED_ALLOC_UNITS = 0x55,
 +};
 +
 +/* Interconnect descriptor parameters offsets in bytes*/
 +enum interconnect_desc_param {
 +    INTERCONNECT_DESC_PARAM_LEN = 0x0,
 +    INTERCONNECT_DESC_PARAM_TYPE = 0x1,
 +    INTERCONNECT_DESC_PARAM_UNIPRO_VER = 0x2,
 +    INTERCONNECT_DESC_PARAM_MPHY_VER = 0x4,
 +};
 +
 +/* Geometry descriptor parameters offsets in bytes*/
 +enum geometry_desc_param {
 +    GEOMETRY_DESC_PARAM_LEN = 0x0,
 +    GEOMETRY_DESC_PARAM_TYPE = 0x1,
 +    GEOMETRY_DESC_PARAM_DEV_CAP = 0x4,
 +    GEOMETRY_DESC_PARAM_MAX_NUM_LUN = 0xC,
 +    GEOMETRY_DESC_PARAM_SEG_SIZE = 0xD,
 +    GEOMETRY_DESC_PARAM_ALLOC_UNIT_SIZE = 0x11,
 +    GEOMETRY_DESC_PARAM_MIN_BLK_SIZE = 0x12,
 +    GEOMETRY_DESC_PARAM_OPT_RD_BLK_SIZE = 0x13,
 +    GEOMETRY_DESC_PARAM_OPT_WR_BLK_SIZE = 0x14,
 +    GEOMETRY_DESC_PARAM_MAX_IN_BUF_SIZE = 0x15,
 +    GEOMETRY_DESC_PARAM_MAX_OUT_BUF_SIZE = 0x16,
 +    GEOMETRY_DESC_PARAM_RPMB_RW_SIZE = 0x17,
 +    GEOMETRY_DESC_PARAM_DYN_CAP_RSRC_PLC = 0x18,
 +    GEOMETRY_DESC_PARAM_DATA_ORDER = 0x19,
 +    GEOMETRY_DESC_PARAM_MAX_NUM_CTX = 0x1A,
 +    GEOMETRY_DESC_PARAM_TAG_UNIT_SIZE = 0x1B,
 +    GEOMETRY_DESC_PARAM_TAG_RSRC_SIZE = 0x1C,
 +    GEOMETRY_DESC_PARAM_SEC_RM_TYPES = 0x1D,
 +    GEOMETRY_DESC_PARAM_MEM_TYPES = 0x1E,
 +    GEOMETRY_DESC_PARAM_SCM_MAX_NUM_UNITS = 0x20,
 +    GEOMETRY_DESC_PARAM_SCM_CAP_ADJ_FCTR = 0x24,
 +    GEOMETRY_DESC_PARAM_NPM_MAX_NUM_UNITS = 0x26,
 +    GEOMETRY_DESC_PARAM_NPM_CAP_ADJ_FCTR = 0x2A,
 +    GEOMETRY_DESC_PARAM_ENM1_MAX_NUM_UNITS = 0x2C,
 +    GEOMETRY_DESC_PARAM_ENM1_CAP_ADJ_FCTR = 0x30,
 +    GEOMETRY_DESC_PARAM_ENM2_MAX_NUM_UNITS = 0x32,
 +    GEOMETRY_DESC_PARAM_ENM2_CAP_ADJ_FCTR = 0x36,
 +    GEOMETRY_DESC_PARAM_ENM3_MAX_NUM_UNITS = 0x38,
 +    GEOMETRY_DESC_PARAM_ENM3_CAP_ADJ_FCTR = 0x3C,
 +    GEOMETRY_DESC_PARAM_ENM4_MAX_NUM_UNITS = 0x3E,
 +    GEOMETRY_DESC_PARAM_ENM4_CAP_ADJ_FCTR = 0x42,
 +    GEOMETRY_DESC_PARAM_OPT_LOG_BLK_SIZE = 0x44,
 +    GEOMETRY_DESC_PARAM_HPB_REGION_SIZE = 0x48,
 +    GEOMETRY_DESC_PARAM_HPB_NUMBER_LU = 0x49,
 +    GEOMETRY_DESC_PARAM_HPB_SUBREGION_SIZE = 0x4A,
 +    GEOMETRY_DESC_PARAM_HPB_MAX_ACTIVE_REGS = 0x4B,
 +    GEOMETRY_DESC_PARAM_WB_MAX_ALLOC_UNITS = 0x4F,
 +    GEOMETRY_DESC_PARAM_WB_MAX_WB_LUNS = 0x53,
 +    GEOMETRY_DESC_PARAM_WB_BUFF_CAP_ADJ = 0x54,
 +    GEOMETRY_DESC_PARAM_WB_SUP_RED_TYPE = 0x55,
 +    GEOMETRY_DESC_PARAM_WB_SUP_WB_TYPE = 0x56,
 +};
 +
 +/* Health descriptor parameters offsets in bytes*/
 +enum health_desc_param {
 +    HEALTH_DESC_PARAM_LEN = 0x0,
 +    HEALTH_DESC_PARAM_TYPE = 0x1,
 +    HEALTH_DESC_PARAM_EOL_INFO = 0x2,
 +    HEALTH_DESC_PARAM_LIFE_TIME_EST_A = 0x3,
 +    HEALTH_DESC_PARAM_LIFE_TIME_EST_B = 0x4,
 +};
 +
 +/* WriteBooster buffer mode */
 +enum {
 +    WB_BUF_MODE_LU_DEDICATED = 0x0,
 +    WB_BUF_MODE_SHARED = 0x1,
 +};
 +
 +/*
 + * Logical Unit Write Protect
 + * 00h: LU not write protected
 + * 01h: LU write protected when fPowerOnWPEn =1
 + * 02h: LU permanently write protected when fPermanentWPEn =1
 + */
 +enum ufs_lu_wp_type {
 +    UFS_LU_NO_WP = 0x00,
 +    UFS_LU_POWER_ON_WP = 0x01,
 +    UFS_LU_PERM_WP = 0x02,
 +};
 +
 +/* UTP QUERY Transaction Specific Fields OpCode */
 +enum query_opcode {
 +    UPIU_QUERY_OPCODE_NOP = 0x0,
 +    UPIU_QUERY_OPCODE_READ_DESC = 0x1,
 +    UPIU_QUERY_OPCODE_WRITE_DESC = 0x2,
 +    UPIU_QUERY_OPCODE_READ_ATTR = 0x3,
 +    UPIU_QUERY_OPCODE_WRITE_ATTR = 0x4,
 +    UPIU_QUERY_OPCODE_READ_FLAG = 0x5,
 +    UPIU_QUERY_OPCODE_SET_FLAG = 0x6,
 +    UPIU_QUERY_OPCODE_CLEAR_FLAG = 0x7,
 +    UPIU_QUERY_OPCODE_TOGGLE_FLAG = 0x8,
 +};
 +
 +/* Query response result code */
 +typedef enum QueryRespCode {
 +    QUERY_RESULT_SUCCESS = 0x00,
 +    QUERY_RESULT_NOT_READABLE = 0xF6,
 +    QUERY_RESULT_NOT_WRITEABLE = 0xF7,
 +    QUERY_RESULT_ALREADY_WRITTEN = 0xF8,
 +    QUERY_RESULT_INVALID_LENGTH = 0xF9,
 +    QUERY_RESULT_INVALID_VALUE = 0xFA,
 +    QUERY_RESULT_INVALID_SELECTOR = 0xFB,
 +    QUERY_RESULT_INVALID_INDEX = 0xFC,
 +    QUERY_RESULT_INVALID_IDN = 0xFD,
 +    QUERY_RESULT_INVALID_OPCODE = 0xFE,
 +    QUERY_RESULT_GENERAL_FAILURE = 0xFF,
 +} QueryRespCode;
 +
 +/* UTP Transfer Request Command Type (CT) */
 +enum {
 +    UPIU_COMMAND_SET_TYPE_SCSI = 0x0,
 +    UPIU_COMMAND_SET_TYPE_UFS = 0x1,
 +    UPIU_COMMAND_SET_TYPE_QUERY = 0x2,
 +};
 +
 +/* Task management service response */
 +enum {
 +    UPIU_TASK_MANAGEMENT_FUNC_COMPL = 0x00,
 +    UPIU_TASK_MANAGEMENT_FUNC_NOT_SUPPORTED = 0x04,
 +    UPIU_TASK_MANAGEMENT_FUNC_SUCCEEDED = 0x08,
 +    UPIU_TASK_MANAGEMENT_FUNC_FAILED = 0x05,
 +    UPIU_INCORRECT_LOGICAL_UNIT_NO = 0x09,
 +};
 +
 +/* UFS device power modes */
 +enum ufs_dev_pwr_mode {
 +    UFS_ACTIVE_PWR_MODE = 1,
 +    UFS_SLEEP_PWR_MODE = 2,
 +    UFS_POWERDOWN_PWR_MODE = 3,
 +    UFS_DEEPSLEEP_PWR_MODE = 4,
 +};
 +
 +/*
 + * struct UtpCmdRsp - Response UPIU structure
 + * @residual_transfer_count: Residual transfer count DW-3
 + * @reserved: Reserved double words DW-4 to DW-7
 + * @sense_data_len: Sense data length DW-8 U16
 + * @sense_data: Sense data field DW-8 to DW-12
 + */
 +typedef struct QEMU_PACKED UtpCmdRsp {
 +    uint32_t residual_transfer_count;
 +    uint32_t reserved[4];
 +    uint16_t sense_data_len;
 +    uint8_t sense_data[UFS_SENSE_SIZE];
 +} UtpCmdRsp;
 +
 +/*
 + * struct UtpUpiuRsp - general upiu response structure
 + * @header: UPIU header structure DW-0 to DW-2
 + * @sr: fields structure for scsi command DW-3 to DW-12
 + * @qr: fields structure for query request DW-3 to DW-7
 + */
 +typedef struct QEMU_PACKED UtpUpiuRsp {
 +    UtpUpiuHeader header;
 +    union {
 +        UtpCmdRsp sr;
 +        UtpUpiuQuery qr;
 +    };
 +} UtpUpiuRsp;
 +
 +static inline void _ufs_check_size(void)
 +{
-+    char *buf, *buf_origin;
++    QEMU_BUILD_BUG_ON(sizeof(UfsReg) != 0x104);
-+    FILE *f = fopen(file_name, "r");
++    QEMU_BUILD_BUG_ON(sizeof(DeviceDescriptor) != 89);
-+    int pattern_len;
++    QEMU_BUILD_BUG_ON(sizeof(GeometryDescriptor) != 87);
-+
++    QEMU_BUILD_BUG_ON(sizeof(UnitDescriptor) != 45);
-+    if (!f) {
++    QEMU_BUILD_BUG_ON(sizeof(RpmbUnitDescriptor) != 35);
-+        perror(file_name);
++    QEMU_BUILD_BUG_ON(sizeof(PowerParametersDescriptor) != 98);
-+        return NULL;
++    QEMU_BUILD_BUG_ON(sizeof(InterconnectDescriptor) != 6);
 +    QEMU_BUILD_BUG_ON(sizeof(StringDescriptor) != 254);
 +    QEMU_BUILD_BUG_ON(sizeof(DeviceHealthDescriptor) != 45);
 +    QEMU_BUILD_BUG_ON(sizeof(Flags) != 0x13);
 +    QEMU_BUILD_BUG_ON(sizeof(UtpUpiuHeader) != 12);
 +    QEMU_BUILD_BUG_ON(sizeof(UtpUpiuQuery) != 276);
 +    QEMU_BUILD_BUG_ON(sizeof(UtpUpiuCmd) != 20);
 +    QEMU_BUILD_BUG_ON(sizeof(UtpUpiuReq) != 288);
 +    QEMU_BUILD_BUG_ON(sizeof(UfshcdSgEntry) != 16);
 +    QEMU_BUILD_BUG_ON(sizeof(RequestDescHeader) != 16);
 +    QEMU_BUILD_BUG_ON(sizeof(UtpTransferReqDesc) != 32);
 +    QEMU_BUILD_BUG_ON(sizeof(UtpTaskReqDesc) != 80);
 +    QEMU_BUILD_BUG_ON(sizeof(UtpCmdRsp) != 40);
 +    QEMU_BUILD_BUG_ON(sizeof(UtpUpiuRsp) != 288);
 +}
 +#endif
 diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h
 index XXXXXXX..XXXXXXX 100644
 --- a/include/hw/pci/pci.h
 +++ b/include/hw/pci/pci.h
@@ -XXX,XX +XXX,XX @@ extern bool pci_available;
  #define PCI_DEVICE_ID_REDHAT_NVME        0x0010
  #define PCI_DEVICE_ID_REDHAT_PVPANIC     0x0011
  #define PCI_DEVICE_ID_REDHAT_ACPI_ERST   0x0012
 +#define PCI_DEVICE_ID_REDHAT_UFS         0x0013
  #define PCI_DEVICE_ID_REDHAT_QXL         0x0100
  #define FMT_PCIBUS                      PRIx64
 diff --git a/include/hw/pci/pci_ids.h b/include/hw/pci/pci_ids.h
 index XXXXXXX..XXXXXXX 100644
 --- a/include/hw/pci/pci_ids.h
 +++ b/include/hw/pci/pci_ids.h
@@ -XXX,XX +XXX,XX @@
  #define PCI_CLASS_STORAGE_SATA           0x0106
  #define PCI_CLASS_STORAGE_SAS            0x0107
  #define PCI_CLASS_STORAGE_EXPRESS        0x0108
 +#define PCI_CLASS_STORAGE_UFS            0x0109
  #define PCI_CLASS_STORAGE_OTHER          0x0180
  #define PCI_BASE_CLASS_NETWORK           0x02
 diff --git a/hw/ufs/ufs.c b/hw/ufs/ufs.c
 new file mode 100644
 index XXXXXXX..XXXXXXX
 --- /dev/null
 +++ b/hw/ufs/ufs.c
@@ -XXX,XX +XXX,XX @@
 +/*
 + * QEMU Universal Flash Storage (UFS) Controller
 + *
 + * Copyright (c) 2023 Samsung Electronics Co., Ltd. All rights reserved.
 + *
 + * Written by Jeuk Kim <jeuk20.kim@samsung.com>
 + *
 + * SPDX-License-Identifier: GPL-2.0-or-later
 + */
 +
 +#include "qemu/osdep.h"
 +#include "qapi/error.h"
 +#include "migration/vmstate.h"
 +#include "trace.h"
 +#include "ufs.h"
 +
 +/* The QEMU-UFS device follows spec version 3.1 */
 +#define UFS_SPEC_VER 0x00000310
 +#define UFS_MAX_NUTRS 32
 +#define UFS_MAX_NUTMRS 8
 +
 +static void ufs_irq_check(UfsHc *u)
 +{
 +    PCIDevice *pci = PCI_DEVICE(u);
 +
 +    if ((u->reg.is & UFS_INTR_MASK) & u->reg.ie) {
 +        trace_ufs_irq_raise();
 +        pci_irq_assert(pci);
 +    } else {
 +        trace_ufs_irq_lower();
 +        pci_irq_deassert(pci);
 +    }
-+
++}
-+    if (qemuio_misalign) {
++
-+        len += MISALIGN_OFFSET;
++static void ufs_process_uiccmd(UfsHc *u, uint32_t val)
 +{
 +    trace_ufs_process_uiccmd(val, u->reg.ucmdarg1, u->reg.ucmdarg2,
 +                             u->reg.ucmdarg3);
 +    /*
 +     * Only the essential uic commands for running drivers on Linux and Windows
 +     * are implemented.
 +     */
 +    switch (val) {
 +    case UIC_CMD_DME_LINK_STARTUP:
 +        u->reg.hcs = FIELD_DP32(u->reg.hcs, HCS, DP, 1);
 +        u->reg.hcs = FIELD_DP32(u->reg.hcs, HCS, UTRLRDY, 1);
 +        u->reg.hcs = FIELD_DP32(u->reg.hcs, HCS, UTMRLRDY, 1);
 +        u->reg.ucmdarg2 = UIC_CMD_RESULT_SUCCESS;
 +        break;
 +    /* TODO: Revisit it when Power Management is implemented */
 +    case UIC_CMD_DME_HIBER_ENTER:
 +        u->reg.is = FIELD_DP32(u->reg.is, IS, UHES, 1);
 +        u->reg.hcs = FIELD_DP32(u->reg.hcs, HCS, UPMCRS, PWR_LOCAL);
 +        u->reg.ucmdarg2 = UIC_CMD_RESULT_SUCCESS;
 +        break;
 +    case UIC_CMD_DME_HIBER_EXIT:
 +        u->reg.is = FIELD_DP32(u->reg.is, IS, UHXS, 1);
 +        u->reg.hcs = FIELD_DP32(u->reg.hcs, HCS, UPMCRS, PWR_LOCAL);
 +        u->reg.ucmdarg2 = UIC_CMD_RESULT_SUCCESS;
 +        break;
 +    default:
 +        u->reg.ucmdarg2 = UIC_CMD_RESULT_FAILURE;
 +    }
 +
-+    buf_origin = buf = blk_blockalign(blk, len);
++    u->reg.is = FIELD_DP32(u->reg.is, IS, UCCS, 1);
 +
-+    if (qemuio_misalign) {
++    ufs_irq_check(u);
-+        buf_origin += MISALIGN_OFFSET;
++}
-+        buf += MISALIGN_OFFSET;
++
-+        len -= MISALIGN_OFFSET;
++static void ufs_write_reg(UfsHc *u, hwaddr offset, uint32_t data, unsigned size)
 +{
 +    switch (offset) {
 +    case A_IS:
 +        u->reg.is &= ~data;
 +        ufs_irq_check(u);
 +        break;
 +    case A_IE:
 +        u->reg.ie = data;
 +        ufs_irq_check(u);
 +        break;
 +    case A_HCE:
 +        if (!FIELD_EX32(u->reg.hce, HCE, HCE) && FIELD_EX32(data, HCE, HCE)) {
 +            u->reg.hcs = FIELD_DP32(u->reg.hcs, HCS, UCRDY, 1);
 +            u->reg.hce = FIELD_DP32(u->reg.hce, HCE, HCE, 1);
 +        } else if (FIELD_EX32(u->reg.hce, HCE, HCE) &&
 +                   !FIELD_EX32(data, HCE, HCE)) {
 +            u->reg.hcs = 0;
 +            u->reg.hce = FIELD_DP32(u->reg.hce, HCE, HCE, 0);
 +        }
 +        break;
 +    case A_UTRLBA:
 +        u->reg.utrlba = data & R_UTRLBA_UTRLBA_MASK;
 +        break;
 +    case A_UTRLBAU:
 +        u->reg.utrlbau = data;
 +        break;
 +    case A_UTRLDBR:
 +        /* Not yet supported */
 +        break;
 +    case A_UTRLRSR:
 +        u->reg.utrlrsr = data;
 +        break;
 +    case A_UTRLCNR:
 +        u->reg.utrlcnr &= ~data;
 +        break;
 +    case A_UTMRLBA:
 +        u->reg.utmrlba = data & R_UTMRLBA_UTMRLBA_MASK;
 +        break;
 +    case A_UTMRLBAU:
 +        u->reg.utmrlbau = data;
 +        break;
 +    case A_UICCMD:
 +        ufs_process_uiccmd(u, data);
 +        break;
 +    case A_UCMDARG1:
 +        u->reg.ucmdarg1 = data;
 +        break;
 +    case A_UCMDARG2:
 +        u->reg.ucmdarg2 = data;
 +        break;
 +    case A_UCMDARG3:
 +        u->reg.ucmdarg3 = data;
 +        break;
 +    case A_UTRLCLR:
 +    case A_UTMRLDBR:
 +    case A_UTMRLCLR:
 +    case A_UTMRLRSR:
 +        trace_ufs_err_unsupport_register_offset(offset);
 +        break;
 +    default:
 +        trace_ufs_err_invalid_register_offset(offset);
 +        break;
 +    }
-+
++}
-+    pattern_len = fread(buf_origin, 1, len, f);
++
-+
++static uint64_t ufs_mmio_read(void *opaque, hwaddr addr, unsigned size)
-+    if (ferror(f)) {
++{
-+        perror(file_name);
++    UfsHc *u = (UfsHc *)opaque;
-+        goto error;
++    uint8_t *ptr = (uint8_t *)&u->reg;
 +    uint64_t value;
 +
 +    if (addr > sizeof(u->reg) - size) {
 +        trace_ufs_err_invalid_register_offset(addr);
 +        return 0;
 +    }
 +
-+    if (pattern_len == 0) {
++    value = *(uint32_t *)(ptr + addr);
-+        fprintf(stderr, "%s: file is empty\n", file_name);
++    trace_ufs_mmio_read(addr, value, size);
-+        goto error;
++    return value;
 +}
 +
 +static void ufs_mmio_write(void *opaque, hwaddr addr, uint64_t data,
 +                           unsigned size)
 +{
 +    UfsHc *u = (UfsHc *)opaque;
 +
 +    if (addr > sizeof(u->reg) - size) {
 +        trace_ufs_err_invalid_register_offset(addr);
 +        return;
 +    }
 +
-+    fclose(f);
++    trace_ufs_mmio_write(addr, data, size);
-+
++    ufs_write_reg(u, addr, data, size);
-+    if (len > pattern_len) {
++}
-+        len -= pattern_len;
++
-+        buf += pattern_len;
++static const MemoryRegionOps ufs_mmio_ops = {
-+
++    .read = ufs_mmio_read,
-+        while (len > 0) {
++    .write = ufs_mmio_write,
-+            size_t len_to_copy = MIN(pattern_len, len);
++    .endianness = DEVICE_LITTLE_ENDIAN,
-+
++    .impl = {
-+            memcpy(buf, buf_origin, len_to_copy);
++        .min_access_size = 4,
-+
++        .max_access_size = 4,
-+            len -= len_to_copy;
++    },
-+            buf += len_to_copy;
++};
-+        }
++
 +static bool ufs_check_constraints(UfsHc *u, Error **errp)
 +{
 +    if (u->params.nutrs > UFS_MAX_NUTRS) {
 +        error_setg(errp, "nutrs must be less than or equal to %d",
 +                   UFS_MAX_NUTRS);
 +        return false;
 +    }
 +
-+    return buf_origin;
++    if (u->params.nutmrs > UFS_MAX_NUTMRS) {
-+
++        error_setg(errp, "nutmrs must be less than or equal to %d",
-+error:
++                   UFS_MAX_NUTMRS);
-+    qemu_io_free(buf_origin);
++        return false;
-+    return NULL;
++    }
 +
 +    return true;
 +}
 +
- static void dump_buffer(const void *buffer, int64_t offset, int64_t len)
++static void ufs_init_pci(UfsHc *u, PCIDevice *pci_dev)
- {
++{
-     uint64_t i;
++    uint8_t *pci_conf = pci_dev->config;
-@@ -XXX,XX +XXX,XX @@ static void write_help(void)
++
- " -n, -- with -z, don't allow slow fallback\n"
++    pci_conf[PCI_INTERRUPT_PIN] = 1;
- " -p, -- ignored for backwards compatibility\n"
++    pci_config_set_prog_interface(pci_conf, 0x1);
- " -P, -- use different pattern to fill file\n"
++
-+" -s, -- use a pattern file to fill the write buffer\n"
++    memory_region_init_io(&u->iomem, OBJECT(u), &ufs_mmio_ops, u, "ufs",
- " -C, -- report statistics in a machine parsable format\n"
++                          u->reg_size);
- " -q, -- quiet mode, do not show I/O statistics\n"
++    pci_register_bar(pci_dev, 0, PCI_BASE_ADDRESS_SPACE_MEMORY, &u->iomem);
- " -u, -- with -z, allow unmapping\n"
++    u->irq = pci_allocate_irq(pci_dev);
-@@ -XXX,XX +XXX,XX @@ static const cmdinfo_t write_cmd = {
++}
-     .perm       = BLK_PERM_WRITE,
++
-     .argmin     = 2,
++static void ufs_init_hc(UfsHc *u)
-     .argmax     = -1,
++{
--    .args       = "[-bcCfnquz] [-P pattern] off len",
++    uint32_t cap = 0;
-+    .args       = "[-bcCfnquz] [-P pattern | -s source_file] off len",
++
-     .oneline    = "writes a number of bytes at a specified offset",
++    u->reg_size = pow2ceil(sizeof(UfsReg));
-     .help       = write_help,
++
- };
++    memset(&u->reg, 0, sizeof(u->reg));
-@@ -XXX,XX +XXX,XX @@ static int write_f(BlockBackend *blk, int argc, char **argv)
++    cap = FIELD_DP32(cap, CAP, NUTRS, (u->params.nutrs - 1));
- {
++    cap = FIELD_DP32(cap, CAP, RTT, 2);
-     struct timespec t1, t2;
++    cap = FIELD_DP32(cap, CAP, NUTMRS, (u->params.nutmrs - 1));
-     bool Cflag = false, qflag = false, bflag = false;
++    cap = FIELD_DP32(cap, CAP, AUTOH8, 0);
--    bool Pflag = false, zflag = false, cflag = false;
++    cap = FIELD_DP32(cap, CAP, 64AS, 1);
-+    bool Pflag = false, zflag = false, cflag = false, sflag = false;
++    cap = FIELD_DP32(cap, CAP, OODDS, 0);
-     int flags = 0;
++    cap = FIELD_DP32(cap, CAP, UICDMETMS, 0);
-     int c, cnt, ret;
++    cap = FIELD_DP32(cap, CAP, CS, 0);
-     char *buf = NULL;
++    u->reg.cap = cap;
-@@ -XXX,XX +XXX,XX @@ static int write_f(BlockBackend *blk, int argc, char **argv)
++    u->reg.ver = UFS_SPEC_VER;
-     /* Some compilers get confused and warn if this is not initialized.  */
++}
-     int64_t total = 0;
++
-     int pattern = 0xcd;
++static void ufs_realize(PCIDevice *pci_dev, Error **errp)
-+    const char *file_name = NULL;
++{
++    UfsHc *u = UFS(pci_dev);
--    while ((c = getopt(argc, argv, "bcCfnpP:quz")) != -1) {
++
-+    while ((c = getopt(argc, argv, "bcCfnpP:qs:uz")) != -1) {
++    if (!ufs_check_constraints(u, errp)) {
-         switch (c) {
++        return;
-         case 'b':
++    }
-             bflag = true;
++
-@@ -XXX,XX +XXX,XX @@ static int write_f(BlockBackend *blk, int argc, char **argv)
++    ufs_init_hc(u);
-         case 'q':
++    ufs_init_pci(u, pci_dev);
-             qflag = true;
++}
-             break;
++
-+        case 's':
++static Property ufs_props[] = {
-+            sflag = true;
++    DEFINE_PROP_STRING("serial", UfsHc, params.serial),
-+            file_name = optarg;
++    DEFINE_PROP_UINT8("nutrs", UfsHc, params.nutrs, 32),
-+            break;
++    DEFINE_PROP_UINT8("nutmrs", UfsHc, params.nutmrs, 8),
-         case 'u':
++    DEFINE_PROP_END_OF_LIST(),
-             flags |= BDRV_REQ_MAY_UNMAP;
++};
-             break;
++
-@@ -XXX,XX +XXX,XX @@ static int write_f(BlockBackend *blk, int argc, char **argv)
++static const VMStateDescription ufs_vmstate = {
-         return -EINVAL;
++    .name = "ufs",
-     }
++    .unmigratable = 1,
++};
--    if (zflag && Pflag) {
++
--        printf("-z and -P cannot be specified at the same time\n");
++static void ufs_class_init(ObjectClass *oc, void *data)
-+    if (zflag + Pflag + sflag > 1) {
++{
-+        printf("Only one of -z, -P, and -s "
++    DeviceClass *dc = DEVICE_CLASS(oc);
-+               "can be specified at the same time\n");
++    PCIDeviceClass *pc = PCI_DEVICE_CLASS(oc);
-         return -EINVAL;
++
-     }
++    pc->realize = ufs_realize;
++    pc->vendor_id = PCI_VENDOR_ID_REDHAT;
-@@ -XXX,XX +XXX,XX @@ static int write_f(BlockBackend *blk, int argc, char **argv)
++    pc->device_id = PCI_DEVICE_ID_REDHAT_UFS;
-     }
++    pc->class_id = PCI_CLASS_STORAGE_UFS;
++
-     if (!zflag) {
++    set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
--        buf = qemu_io_alloc(blk, count, pattern);
++    dc->desc = "Universal Flash Storage";
-+        if (sflag) {
++    device_class_set_props(dc, ufs_props);
-+            buf = qemu_io_alloc_from_file(blk, count, file_name);
++    dc->vmsd = &ufs_vmstate;
-+            if (!buf) {
++}
-+                return -EINVAL;
++
-+            }
++static const TypeInfo ufs_info = {
-+        } else {
++    .name = TYPE_UFS,
-+            buf = qemu_io_alloc(blk, count, pattern);
++    .parent = TYPE_PCI_DEVICE,
-+        }
++    .class_init = ufs_class_init,
-     }
++    .instance_size = sizeof(UfsHc),
++    .interfaces = (InterfaceInfo[]){ { INTERFACE_PCIE_DEVICE }, {} },
-     clock_gettime(CLOCK_MONOTONIC, &t1);
++};
 +
 +static void ufs_register_types(void)
 +{
 +    type_register_static(&ufs_info);
 +}
 +
 +type_init(ufs_register_types)
 diff --git a/hw/Kconfig b/hw/Kconfig
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/Kconfig
 +++ b/hw/Kconfig
@@ -XXX,XX +XXX,XX @@ source smbios/Kconfig
  source ssi/Kconfig
  source timer/Kconfig
  source tpm/Kconfig
 +source ufs/Kconfig
  source usb/Kconfig
  source virtio/Kconfig
  source vfio/Kconfig
 diff --git a/hw/meson.build b/hw/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/meson.build
 +++ b/hw/meson.build
@@ -XXX,XX +XXX,XX @@ subdir('smbios')
  subdir('ssi')
  subdir('timer')
  subdir('tpm')
 +subdir('ufs')
  subdir('usb')
  subdir('vfio')
  subdir('virtio')
 diff --git a/hw/ufs/Kconfig b/hw/ufs/Kconfig
 new file mode 100644
 index XXXXXXX..XXXXXXX
 --- /dev/null
 +++ b/hw/ufs/Kconfig
@@ -XXX,XX +XXX,XX @@
 +config UFS_PCI
 +    bool
 +    default y if PCI_DEVICES
 +    depends on PCI
 diff --git a/hw/ufs/meson.build b/hw/ufs/meson.build
 new file mode 100644
 index XXXXXXX..XXXXXXX
 --- /dev/null
 +++ b/hw/ufs/meson.build
@@ -0,0 +1 @@
 +system_ss.add(when: 'CONFIG_UFS_PCI', if_true: files('ufs.c'))
 diff --git a/hw/ufs/trace-events b/hw/ufs/trace-events
 new file mode 100644
 index XXXXXXX..XXXXXXX
 --- /dev/null
 +++ b/hw/ufs/trace-events
@@ -XXX,XX +XXX,XX @@
 +# ufs.c
 +ufs_irq_raise(void) "INTx"
 +ufs_irq_lower(void) "INTx"
 +ufs_mmio_read(uint64_t addr, uint64_t data, unsigned size) "addr 0x%"PRIx64" data 0x%"PRIx64" size %d"
 +ufs_mmio_write(uint64_t addr, uint64_t data, unsigned size) "addr 0x%"PRIx64" data 0x%"PRIx64" size %d"
 +ufs_process_db(uint32_t slot) "UTRLDBR slot %"PRIu32""
 +ufs_process_req(uint32_t slot) "UTRLDBR slot %"PRIu32""
 +ufs_complete_req(uint32_t slot) "UTRLDBR slot %"PRIu32""
 +ufs_sendback_req(uint32_t slot) "UTRLDBR slot %"PRIu32""
 +ufs_exec_nop_cmd(uint32_t slot) "UTRLDBR slot %"PRIu32""
 +ufs_exec_scsi_cmd(uint32_t slot, uint8_t lun, uint8_t opcode) "slot %"PRIu32", lun 0x%"PRIx8", opcode 0x%"PRIx8""
 +ufs_exec_query_cmd(uint32_t slot, uint8_t opcode) "slot %"PRIu32", opcode 0x%"PRIx8""
 +ufs_process_uiccmd(uint32_t uiccmd, uint32_t ucmdarg1, uint32_t ucmdarg2, uint32_t ucmdarg3) "uiccmd 0x%"PRIx32", ucmdarg1 0x%"PRIx32", ucmdarg2 0x%"PRIx32", ucmdarg3 0x%"PRIx32""
 +
 +# error condition
 +ufs_err_dma_read_utrd(uint32_t slot, uint64_t addr) "failed to read utrd. UTRLDBR slot %"PRIu32", UTRD dma addr %"PRIu64""
 +ufs_err_dma_read_req_upiu(uint32_t slot, uint64_t addr) "failed to read req upiu. UTRLDBR slot %"PRIu32", request upiu addr %"PRIu64""
 +ufs_err_dma_read_prdt(uint32_t slot, uint64_t addr) "failed to read prdt. UTRLDBR slot %"PRIu32", prdt addr %"PRIu64""
 +ufs_err_dma_write_utrd(uint32_t slot, uint64_t addr) "failed to write utrd. UTRLDBR slot %"PRIu32", UTRD dma addr %"PRIu64""
 +ufs_err_dma_write_rsp_upiu(uint32_t slot, uint64_t addr) "failed to write rsp upiu. UTRLDBR slot %"PRIu32", response upiu addr %"PRIu64""
 +ufs_err_utrl_slot_busy(uint32_t slot) "UTRLDBR slot %"PRIu32" is busy"
 +ufs_err_unsupport_register_offset(uint32_t offset) "Register offset 0x%"PRIx32" is not yet supported"
 +ufs_err_invalid_register_offset(uint32_t offset) "Register offset 0x%"PRIx32" is invalid"
 +ufs_err_scsi_cmd_invalid_lun(uint8_t lun) "scsi command has invalid lun: 0x%"PRIx8""
 +ufs_err_query_flag_not_readable(uint8_t idn) "query flag idn 0x%"PRIx8" is denied to read"
 +ufs_err_query_flag_not_writable(uint8_t idn) "query flag idn 0x%"PRIx8" is denied to write"
 +ufs_err_query_attr_not_readable(uint8_t idn) "query attribute idn 0x%"PRIx8" is denied to read"
 +ufs_err_query_attr_not_writable(uint8_t idn) "query attribute idn 0x%"PRIx8" is denied to write"
 +ufs_err_query_invalid_opcode(uint8_t opcode) "query request has invalid opcode. opcode: 0x%"PRIx8""
 +ufs_err_query_invalid_idn(uint8_t opcode, uint8_t idn) "query request has invalid idn. opcode: 0x%"PRIx8", idn 0x%"PRIx8""
 +ufs_err_query_invalid_index(uint8_t opcode, uint8_t index) "query request has invalid index. opcode: 0x%"PRIx8", index 0x%"PRIx8""
 +ufs_err_invalid_trans_code(uint32_t slot, uint8_t trans_code) "request upiu has invalid transaction code. slot: %"PRIu32", trans_code: 0x%"PRIx8""
 --
-.21.0
+.41.0

-[Qemu-devel] [PULL 13/15] iotests: Check for enabled drivers before testing them
+[PULL v2 2/8] hw/ufs: Support for Query Transfer Requests
-From: Thomas Huth <thuth@redhat.com>
+From: Jeuk Kim <jeuk20.kim@gmail.com>
-It is possible to enable only a subset of the block drivers with the
+This commit makes the UFS device support query
-"--block-drv-rw-whitelist" option of the "configure" script. All other
+and nop out transfer requests.
 drivers are marked as unusable (or only included as read-only with the
 "--block-drv-ro-whitelist" option). If an iotest is now using such a
 disabled block driver, it is failing - which is bad, since at least the
 tests in the "auto" group should be able to deal with this situation.
 Thus let's introduce a "_require_drivers" function that can be used by
 the shell tests to check for the availability of certain drivers first,
 and marks the test as "not run" if one of the drivers is missing.
-This patch mainly targets the test in the "auto" group which should
+The next patch would be support for UFS logical
-never fail in such a case, but also improves some of the other tests
+unit and scsi command transfer request.
 along the way. Note that we also assume that the "qcow2" and "file"
 drivers are always available - otherwise it does not make sense to
 run "make check-block" at all (which only tests with qcow2 by default).
-Signed-off-by: Thomas Huth <thuth@redhat.com>
+Signed-off-by: Jeuk Kim <jeuk20.kim@samsung.com>
-Message-id: 20190823133552.11680-1-thuth@redhat.com
+Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
-Signed-off-by: Max Reitz <mreitz@redhat.com>
+Message-id: d06b440d660872092f70af1b8167bd5f4704c957.1691062912.git.jeuk20.kim@samsung.com
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 ---
- tests/qemu-iotests/071       |  1 +
+ hw/ufs/ufs.h        |  46 +++
- tests/qemu-iotests/081       |  4 +---
+ hw/ufs/ufs.c        | 980 +++++++++++++++++++++++++++++++++++++++++++-
- tests/qemu-iotests/099       |  1 +
+ hw/ufs/trace-events |   1 +
- tests/qemu-iotests/120       |  1 +
+files changed, 1025 insertions(+), 2 deletions(-)
  tests/qemu-iotests/162       |  4 +---
  tests/qemu-iotests/184       |  1 +
  tests/qemu-iotests/186       |  1 +
  tests/qemu-iotests/common.rc | 14 ++++++++++++++
 files changed, 21 insertions(+), 6 deletions(-)
-diff --git a/tests/qemu-iotests/071 b/tests/qemu-iotests/071
+diff --git a/hw/ufs/ufs.h b/hw/ufs/ufs.h
-index XXXXXXX..XXXXXXX 100755
+index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/071
+--- a/hw/ufs/ufs.h
-+++ b/tests/qemu-iotests/071
++++ b/hw/ufs/ufs.h
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
+@@ -XXX,XX +XXX,XX @@
+ #define UFS_MAX_LUS 32
- _supported_fmt qcow2
+ #define UFS_BLOCK_SIZE 4096
- _supported_proto file
-+_require_drivers blkdebug blkverify
++typedef enum UfsRequestState {
++    UFS_REQUEST_IDLE = 0,
- do_run_qemu()
++    UFS_REQUEST_READY = 1,
 +    UFS_REQUEST_RUNNING = 2,
 +    UFS_REQUEST_COMPLETE = 3,
 +    UFS_REQUEST_ERROR = 4,
 +} UfsRequestState;
 +
 +typedef enum UfsReqResult {
 +    UFS_REQUEST_SUCCESS = 0,
 +    UFS_REQUEST_FAIL = 1,
 +} UfsReqResult;
 +
 +typedef struct UfsRequest {
 +    struct UfsHc *hc;
 +    UfsRequestState state;
 +    int slot;
 +
 +    UtpTransferReqDesc utrd;
 +    UtpUpiuReq req_upiu;
 +    UtpUpiuRsp rsp_upiu;
 +
 +    /* for scsi command */
 +    QEMUSGList *sg;
 +} UfsRequest;
 +
  typedef struct UfsParams {
      char *serial;
      uint8_t nutrs; /* Number of UTP Transfer Request Slots */
@@ -XXX,XX +XXX,XX @@ typedef struct UfsHc {
      UfsReg reg;
      UfsParams params;
      uint32_t reg_size;
 +    UfsRequest *req_list;
 +
 +    DeviceDescriptor device_desc;
 +    GeometryDescriptor geometry_desc;
 +    Attributes attributes;
 +    Flags flags;
      qemu_irq irq;
      QEMUBH *doorbell_bh;
@@ -XXX,XX +XXX,XX @@ typedef struct UfsHc {
  #define TYPE_UFS "ufs"
  #define UFS(obj) OBJECT_CHECK(UfsHc, (obj), TYPE_UFS)
 +typedef enum UfsQueryFlagPerm {
 +    UFS_QUERY_FLAG_NONE = 0x0,
 +    UFS_QUERY_FLAG_READ = 0x1,
 +    UFS_QUERY_FLAG_SET = 0x2,
 +    UFS_QUERY_FLAG_CLEAR = 0x4,
 +    UFS_QUERY_FLAG_TOGGLE = 0x8,
 +} UfsQueryFlagPerm;
 +
 +typedef enum UfsQueryAttrPerm {
 +    UFS_QUERY_ATTR_NONE = 0x0,
 +    UFS_QUERY_ATTR_READ = 0x1,
 +    UFS_QUERY_ATTR_WRITE = 0x2,
 +} UfsQueryAttrPerm;
 +
  #endif /* HW_UFS_UFS_H */
 diff --git a/hw/ufs/ufs.c b/hw/ufs/ufs.c
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/ufs/ufs.c
 +++ b/hw/ufs/ufs.c
@@ -XXX,XX +XXX,XX @@
  #include "ufs.h"
  /* The QEMU-UFS device follows spec version 3.1 */
 -#define UFS_SPEC_VER 0x00000310
 +#define UFS_SPEC_VER 0x0310
  #define UFS_MAX_NUTRS 32
  #define UFS_MAX_NUTMRS 8
 +static MemTxResult ufs_addr_read(UfsHc *u, hwaddr addr, void *buf, int size)
 +{
 +    hwaddr hi = addr + size - 1;
 +
 +    if (hi < addr) {
 +        return MEMTX_DECODE_ERROR;
 +    }
 +
 +    if (!FIELD_EX32(u->reg.cap, CAP, 64AS) && (hi >> 32)) {
 +        return MEMTX_DECODE_ERROR;
 +    }
 +
 +    return pci_dma_read(PCI_DEVICE(u), addr, buf, size);
 +}
 +
 +static MemTxResult ufs_addr_write(UfsHc *u, hwaddr addr, const void *buf,
 +                                  int size)
 +{
 +    hwaddr hi = addr + size - 1;
 +    if (hi < addr) {
 +        return MEMTX_DECODE_ERROR;
 +    }
 +
 +    if (!FIELD_EX32(u->reg.cap, CAP, 64AS) && (hi >> 32)) {
 +        return MEMTX_DECODE_ERROR;
 +    }
 +
 +    return pci_dma_write(PCI_DEVICE(u), addr, buf, size);
 +}
 +
 +static void ufs_complete_req(UfsRequest *req, UfsReqResult req_result);
 +
 +static inline hwaddr ufs_get_utrd_addr(UfsHc *u, uint32_t slot)
 +{
 +    hwaddr utrl_base_addr = (((hwaddr)u->reg.utrlbau) << 32) + u->reg.utrlba;
 +    hwaddr utrd_addr = utrl_base_addr + slot * sizeof(UtpTransferReqDesc);
 +
 +    return utrd_addr;
 +}
 +
 +static inline hwaddr ufs_get_req_upiu_base_addr(const UtpTransferReqDesc *utrd)
 +{
 +    uint32_t cmd_desc_base_addr_lo =
 +        le32_to_cpu(utrd->command_desc_base_addr_lo);
 +    uint32_t cmd_desc_base_addr_hi =
 +        le32_to_cpu(utrd->command_desc_base_addr_hi);
 +
 +    return (((hwaddr)cmd_desc_base_addr_hi) << 32) + cmd_desc_base_addr_lo;
 +}
 +
 +static inline hwaddr ufs_get_rsp_upiu_base_addr(const UtpTransferReqDesc *utrd)
 +{
 +    hwaddr req_upiu_base_addr = ufs_get_req_upiu_base_addr(utrd);
 +    uint32_t rsp_upiu_byte_off =
 +        le16_to_cpu(utrd->response_upiu_offset) * sizeof(uint32_t);
 +    return req_upiu_base_addr + rsp_upiu_byte_off;
 +}
 +
 +static MemTxResult ufs_dma_read_utrd(UfsRequest *req)
 +{
 +    UfsHc *u = req->hc;
 +    hwaddr utrd_addr = ufs_get_utrd_addr(u, req->slot);
 +    MemTxResult ret;
 +
 +    ret = ufs_addr_read(u, utrd_addr, &req->utrd, sizeof(req->utrd));
 +    if (ret) {
 +        trace_ufs_err_dma_read_utrd(req->slot, utrd_addr);
 +    }
 +    return ret;
 +}
 +
 +static MemTxResult ufs_dma_read_req_upiu(UfsRequest *req)
 +{
 +    UfsHc *u = req->hc;
 +    hwaddr req_upiu_base_addr = ufs_get_req_upiu_base_addr(&req->utrd);
 +    UtpUpiuReq *req_upiu = &req->req_upiu;
 +    uint32_t copy_size;
 +    uint16_t data_segment_length;
 +    MemTxResult ret;
 +
 +    /*
 +     * To know the size of the req_upiu, we need to read the
 +     * data_segment_length in the header first.
 +     */
 +    ret = ufs_addr_read(u, req_upiu_base_addr, &req_upiu->header,
 +                        sizeof(UtpUpiuHeader));
 +    if (ret) {
 +        trace_ufs_err_dma_read_req_upiu(req->slot, req_upiu_base_addr);
 +        return ret;
 +    }
 +    data_segment_length = be16_to_cpu(req_upiu->header.data_segment_length);
 +
 +    copy_size = sizeof(UtpUpiuHeader) + UFS_TRANSACTION_SPECIFIC_FIELD_SIZE +
 +                data_segment_length;
 +
 +    ret = ufs_addr_read(u, req_upiu_base_addr, &req->req_upiu, copy_size);
 +    if (ret) {
 +        trace_ufs_err_dma_read_req_upiu(req->slot, req_upiu_base_addr);
 +    }
 +    return ret;
 +}
 +
 +static MemTxResult ufs_dma_read_prdt(UfsRequest *req)
 +{
 +    UfsHc *u = req->hc;
 +    uint16_t prdt_len = le16_to_cpu(req->utrd.prd_table_length);
 +    uint16_t prdt_byte_off =
 +        le16_to_cpu(req->utrd.prd_table_offset) * sizeof(uint32_t);
 +    uint32_t prdt_size = prdt_len * sizeof(UfshcdSgEntry);
 +    g_autofree UfshcdSgEntry *prd_entries = NULL;
 +    hwaddr req_upiu_base_addr, prdt_base_addr;
 +    int err;
 +
 +    assert(!req->sg);
 +
 +    if (prdt_size == 0) {
 +        return MEMTX_OK;
 +    }
 +    prd_entries = g_new(UfshcdSgEntry, prdt_size);
 +
 +    req_upiu_base_addr = ufs_get_req_upiu_base_addr(&req->utrd);
 +    prdt_base_addr = req_upiu_base_addr + prdt_byte_off;
 +
 +    err = ufs_addr_read(u, prdt_base_addr, prd_entries, prdt_size);
 +    if (err) {
 +        trace_ufs_err_dma_read_prdt(req->slot, prdt_base_addr);
 +        return err;
 +    }
 +
 +    req->sg = g_malloc0(sizeof(QEMUSGList));
 +    pci_dma_sglist_init(req->sg, PCI_DEVICE(u), prdt_len);
 +
 +    for (uint16_t i = 0; i < prdt_len; ++i) {
 +        hwaddr data_dma_addr = le64_to_cpu(prd_entries[i].addr);
 +        uint32_t data_byte_count = le32_to_cpu(prd_entries[i].size) + 1;
 +        qemu_sglist_add(req->sg, data_dma_addr, data_byte_count);
 +    }
 +    return MEMTX_OK;
 +}
 +
 +static MemTxResult ufs_dma_read_upiu(UfsRequest *req)
 +{
 +    MemTxResult ret;
 +
 +    ret = ufs_dma_read_utrd(req);
 +    if (ret) {
 +        return ret;
 +    }
 +
 +    ret = ufs_dma_read_req_upiu(req);
 +    if (ret) {
 +        return ret;
 +    }
 +
 +    ret = ufs_dma_read_prdt(req);
 +    if (ret) {
 +        return ret;
 +    }
 +
 +    return 0;
 +}
 +
 +static MemTxResult ufs_dma_write_utrd(UfsRequest *req)
 +{
 +    UfsHc *u = req->hc;
 +    hwaddr utrd_addr = ufs_get_utrd_addr(u, req->slot);
 +    MemTxResult ret;
 +
 +    ret = ufs_addr_write(u, utrd_addr, &req->utrd, sizeof(req->utrd));
 +    if (ret) {
 +        trace_ufs_err_dma_write_utrd(req->slot, utrd_addr);
 +    }
 +    return ret;
 +}
 +
 +static MemTxResult ufs_dma_write_rsp_upiu(UfsRequest *req)
 +{
 +    UfsHc *u = req->hc;
 +    hwaddr rsp_upiu_base_addr = ufs_get_rsp_upiu_base_addr(&req->utrd);
 +    uint32_t rsp_upiu_byte_len =
 +        le16_to_cpu(req->utrd.response_upiu_length) * sizeof(uint32_t);
 +    uint16_t data_segment_length =
 +        be16_to_cpu(req->rsp_upiu.header.data_segment_length);
 +    uint32_t copy_size = sizeof(UtpUpiuHeader) +
 +                         UFS_TRANSACTION_SPECIFIC_FIELD_SIZE +
 +                         data_segment_length;
 +    MemTxResult ret;
 +
 +    if (copy_size > rsp_upiu_byte_len) {
 +        copy_size = rsp_upiu_byte_len;
 +    }
 +
 +    ret = ufs_addr_write(u, rsp_upiu_base_addr, &req->rsp_upiu, copy_size);
 +    if (ret) {
 +        trace_ufs_err_dma_write_rsp_upiu(req->slot, rsp_upiu_base_addr);
 +    }
 +    return ret;
 +}
 +
 +static MemTxResult ufs_dma_write_upiu(UfsRequest *req)
 +{
 +    MemTxResult ret;
 +
 +    ret = ufs_dma_write_rsp_upiu(req);
 +    if (ret) {
 +        return ret;
 +    }
 +
 +    return ufs_dma_write_utrd(req);
 +}
 +
  static void ufs_irq_check(UfsHc *u)
  {
-diff --git a/tests/qemu-iotests/081 b/tests/qemu-iotests/081
+     PCIDevice *pci = PCI_DEVICE(u);
-index XXXXXXX..XXXXXXX 100755
+@@ -XXX,XX +XXX,XX @@ static void ufs_irq_check(UfsHc *u)
---- a/tests/qemu-iotests/081
+     }
-+++ b/tests/qemu-iotests/081
+ }
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
- _supported_fmt raw
++static void ufs_process_db(UfsHc *u, uint32_t val)
- _supported_proto file
++{
- _supported_os Linux
++    uint32_t slot;
-+_require_drivers quorum
++    uint32_t nutrs = u->params.nutrs;
++    UfsRequest *req;
- do_run_qemu()
++
 +    val &= ~u->reg.utrldbr;
 +    if (!val) {
 +        return;
 +    }
 +
 +    slot = find_first_bit((unsigned long *)&val, nutrs);
 +
 +    while (slot < nutrs) {
 +        req = &u->req_list[slot];
 +        if (req->state == UFS_REQUEST_ERROR) {
 +            trace_ufs_err_utrl_slot_error(req->slot);
 +            return;
 +        }
 +
 +        if (req->state != UFS_REQUEST_IDLE) {
 +            trace_ufs_err_utrl_slot_busy(req->slot);
 +            return;
 +        }
 +
 +        trace_ufs_process_db(slot);
 +        req->state = UFS_REQUEST_READY;
 +        slot = find_next_bit((unsigned long *)&val, nutrs, slot + 1);
 +    }
 +
 +    qemu_bh_schedule(u->doorbell_bh);
 +}
 +
  static void ufs_process_uiccmd(UfsHc *u, uint32_t val)
  {
-@@ -XXX,XX +XXX,XX @@ run_qemu()
+     trace_ufs_process_uiccmd(val, u->reg.ucmdarg1, u->reg.ucmdarg2,
-                           | _filter_qemu_io | _filter_generated_node_ids
+@@ -XXX,XX +XXX,XX @@ static void ufs_write_reg(UfsHc *u, hwaddr offset, uint32_t data, unsigned size)
          u->reg.utrlbau = data;
          break;
      case A_UTRLDBR:
 -        /* Not yet supported */
 +        ufs_process_db(u, data);
 +        u->reg.utrldbr |= data;
          break;
      case A_UTRLRSR:
          u->reg.utrlrsr = data;
@@ -XXX,XX +XXX,XX @@ static const MemoryRegionOps ufs_mmio_ops = {
      },
  };
 +static void ufs_build_upiu_header(UfsRequest *req, uint8_t trans_type,
 +                                  uint8_t flags, uint8_t response,
 +                                  uint8_t scsi_status,
 +                                  uint16_t data_segment_length)
 +{
 +    memcpy(&req->rsp_upiu.header, &req->req_upiu.header, sizeof(UtpUpiuHeader));
 +    req->rsp_upiu.header.trans_type = trans_type;
 +    req->rsp_upiu.header.flags = flags;
 +    req->rsp_upiu.header.response = response;
 +    req->rsp_upiu.header.scsi_status = scsi_status;
 +    req->rsp_upiu.header.data_segment_length = cpu_to_be16(data_segment_length);
 +}
 +
 +static UfsReqResult ufs_exec_nop_cmd(UfsRequest *req)
 +{
 +    trace_ufs_exec_nop_cmd(req->slot);
 +    ufs_build_upiu_header(req, UPIU_TRANSACTION_NOP_IN, 0, 0, 0, 0);
 +    return UFS_REQUEST_SUCCESS;
 +}
 +
 +/*
 + * This defines the permission of flags based on their IDN. There are some
 + * things that are declared read-only, which is inconsistent with the ufs spec,
 + * because we want to return an error for features that are not yet supported.
 + */
 +static const int flag_permission[QUERY_FLAG_IDN_COUNT] = {
 +    [QUERY_FLAG_IDN_FDEVICEINIT] = UFS_QUERY_FLAG_READ | UFS_QUERY_FLAG_SET,
 +    /* Write protection is not supported */
 +    [QUERY_FLAG_IDN_PERMANENT_WPE] = UFS_QUERY_FLAG_READ,
 +    [QUERY_FLAG_IDN_PWR_ON_WPE] = UFS_QUERY_FLAG_READ,
 +    [QUERY_FLAG_IDN_BKOPS_EN] = UFS_QUERY_FLAG_READ | UFS_QUERY_FLAG_SET |
 +                                UFS_QUERY_FLAG_CLEAR | UFS_QUERY_FLAG_TOGGLE,
 +    [QUERY_FLAG_IDN_LIFE_SPAN_MODE_ENABLE] =
 +        UFS_QUERY_FLAG_READ | UFS_QUERY_FLAG_SET | UFS_QUERY_FLAG_CLEAR |
 +        UFS_QUERY_FLAG_TOGGLE,
 +    /* Purge Operation is not supported */
 +    [QUERY_FLAG_IDN_PURGE_ENABLE] = UFS_QUERY_FLAG_NONE,
 +    /* Refresh Operation is not supported */
 +    [QUERY_FLAG_IDN_REFRESH_ENABLE] = UFS_QUERY_FLAG_NONE,
 +    /* Physical Resource Removal is not supported */
 +    [QUERY_FLAG_IDN_FPHYRESOURCEREMOVAL] = UFS_QUERY_FLAG_READ,
 +    [QUERY_FLAG_IDN_BUSY_RTC] = UFS_QUERY_FLAG_READ,
 +    [QUERY_FLAG_IDN_PERMANENTLY_DISABLE_FW_UPDATE] = UFS_QUERY_FLAG_READ,
 +    /* Write Booster is not supported */
 +    [QUERY_FLAG_IDN_WB_EN] = UFS_QUERY_FLAG_READ,
 +    [QUERY_FLAG_IDN_WB_BUFF_FLUSH_EN] = UFS_QUERY_FLAG_READ,
 +    [QUERY_FLAG_IDN_WB_BUFF_FLUSH_DURING_HIBERN8] = UFS_QUERY_FLAG_READ,
 +};
 +
 +static inline QueryRespCode ufs_flag_check_idn_valid(uint8_t idn, int op)
 +{
 +    if (idn >= QUERY_FLAG_IDN_COUNT) {
 +        return QUERY_RESULT_INVALID_IDN;
 +    }
 +
 +    if (!(flag_permission[idn] & op)) {
 +        if (op == UFS_QUERY_FLAG_READ) {
 +            trace_ufs_err_query_flag_not_readable(idn);
 +            return QUERY_RESULT_NOT_READABLE;
 +        }
 +        trace_ufs_err_query_flag_not_writable(idn);
 +        return QUERY_RESULT_NOT_WRITEABLE;
 +    }
 +
 +    return QUERY_RESULT_SUCCESS;
 +}
 +
 +static const int attr_permission[QUERY_ATTR_IDN_COUNT] = {
 +    /* booting is not supported */
 +    [QUERY_ATTR_IDN_BOOT_LU_EN] = UFS_QUERY_ATTR_READ,
 +    [QUERY_ATTR_IDN_POWER_MODE] = UFS_QUERY_ATTR_READ,
 +    [QUERY_ATTR_IDN_ACTIVE_ICC_LVL] =
 +        UFS_QUERY_ATTR_READ | UFS_QUERY_ATTR_WRITE,
 +    [QUERY_ATTR_IDN_OOO_DATA_EN] = UFS_QUERY_ATTR_READ,
 +    [QUERY_ATTR_IDN_BKOPS_STATUS] = UFS_QUERY_ATTR_READ,
 +    [QUERY_ATTR_IDN_PURGE_STATUS] = UFS_QUERY_ATTR_READ,
 +    [QUERY_ATTR_IDN_MAX_DATA_IN] = UFS_QUERY_ATTR_READ | UFS_QUERY_ATTR_WRITE,
 +    [QUERY_ATTR_IDN_MAX_DATA_OUT] = UFS_QUERY_ATTR_READ | UFS_QUERY_ATTR_WRITE,
 +    [QUERY_ATTR_IDN_DYN_CAP_NEEDED] = UFS_QUERY_ATTR_READ,
 +    [QUERY_ATTR_IDN_REF_CLK_FREQ] = UFS_QUERY_ATTR_READ | UFS_QUERY_ATTR_WRITE,
 +    [QUERY_ATTR_IDN_CONF_DESC_LOCK] = UFS_QUERY_ATTR_READ,
 +    [QUERY_ATTR_IDN_MAX_NUM_OF_RTT] =
 +        UFS_QUERY_ATTR_READ | UFS_QUERY_ATTR_WRITE,
 +    [QUERY_ATTR_IDN_EE_CONTROL] = UFS_QUERY_ATTR_READ | UFS_QUERY_ATTR_WRITE,
 +    [QUERY_ATTR_IDN_EE_STATUS] = UFS_QUERY_ATTR_READ,
 +    [QUERY_ATTR_IDN_SECONDS_PASSED] = UFS_QUERY_ATTR_WRITE,
 +    [QUERY_ATTR_IDN_CNTX_CONF] = UFS_QUERY_ATTR_READ,
 +    [QUERY_ATTR_IDN_FFU_STATUS] = UFS_QUERY_ATTR_READ,
 +    [QUERY_ATTR_IDN_PSA_STATE] = UFS_QUERY_ATTR_READ | UFS_QUERY_ATTR_WRITE,
 +    [QUERY_ATTR_IDN_PSA_DATA_SIZE] = UFS_QUERY_ATTR_READ | UFS_QUERY_ATTR_WRITE,
 +    [QUERY_ATTR_IDN_REF_CLK_GATING_WAIT_TIME] = UFS_QUERY_ATTR_READ,
 +    [QUERY_ATTR_IDN_CASE_ROUGH_TEMP] = UFS_QUERY_ATTR_READ,
 +    [QUERY_ATTR_IDN_HIGH_TEMP_BOUND] = UFS_QUERY_ATTR_READ,
 +    [QUERY_ATTR_IDN_LOW_TEMP_BOUND] = UFS_QUERY_ATTR_READ,
 +    [QUERY_ATTR_IDN_THROTTLING_STATUS] = UFS_QUERY_ATTR_READ,
 +    [QUERY_ATTR_IDN_WB_FLUSH_STATUS] = UFS_QUERY_ATTR_READ,
 +    [QUERY_ATTR_IDN_AVAIL_WB_BUFF_SIZE] = UFS_QUERY_ATTR_READ,
 +    [QUERY_ATTR_IDN_WB_BUFF_LIFE_TIME_EST] = UFS_QUERY_ATTR_READ,
 +    [QUERY_ATTR_IDN_CURR_WB_BUFF_SIZE] = UFS_QUERY_ATTR_READ,
 +    /* refresh operation is not supported */
 +    [QUERY_ATTR_IDN_REFRESH_STATUS] = UFS_QUERY_ATTR_READ,
 +    [QUERY_ATTR_IDN_REFRESH_FREQ] = UFS_QUERY_ATTR_READ,
 +    [QUERY_ATTR_IDN_REFRESH_UNIT] = UFS_QUERY_ATTR_READ,
 +};
 +
 +static inline QueryRespCode ufs_attr_check_idn_valid(uint8_t idn, int op)
 +{
 +    if (idn >= QUERY_ATTR_IDN_COUNT) {
 +        return QUERY_RESULT_INVALID_IDN;
 +    }
 +
 +    if (!(attr_permission[idn] & op)) {
 +        if (op == UFS_QUERY_ATTR_READ) {
 +            trace_ufs_err_query_attr_not_readable(idn);
 +            return QUERY_RESULT_NOT_READABLE;
 +        }
 +        trace_ufs_err_query_attr_not_writable(idn);
 +        return QUERY_RESULT_NOT_WRITEABLE;
 +    }
 +
 +    return QUERY_RESULT_SUCCESS;
 +}
 +
 +static QueryRespCode ufs_exec_query_flag(UfsRequest *req, int op)
 +{
 +    UfsHc *u = req->hc;
 +    uint8_t idn = req->req_upiu.qr.idn;
 +    uint32_t value;
 +    QueryRespCode ret;
 +
 +    ret = ufs_flag_check_idn_valid(idn, op);
 +    if (ret) {
 +        return ret;
 +    }
 +
 +    if (idn == QUERY_FLAG_IDN_FDEVICEINIT) {
 +        value = 0;
 +    } else if (op == UFS_QUERY_FLAG_READ) {
 +        value = *(((uint8_t *)&u->flags) + idn);
 +    } else if (op == UFS_QUERY_FLAG_SET) {
 +        value = 1;
 +    } else if (op == UFS_QUERY_FLAG_CLEAR) {
 +        value = 0;
 +    } else if (op == UFS_QUERY_FLAG_TOGGLE) {
 +        value = *(((uint8_t *)&u->flags) + idn);
 +        value = !value;
 +    } else {
 +        trace_ufs_err_query_invalid_opcode(op);
 +        return QUERY_RESULT_INVALID_OPCODE;
 +    }
 +
 +    *(((uint8_t *)&u->flags) + idn) = value;
 +    req->rsp_upiu.qr.value = cpu_to_be32(value);
 +    return QUERY_RESULT_SUCCESS;
 +}
 +
 +static uint32_t ufs_read_attr_value(UfsHc *u, uint8_t idn)
 +{
 +    switch (idn) {
 +    case QUERY_ATTR_IDN_BOOT_LU_EN:
 +        return u->attributes.boot_lun_en;
 +    case QUERY_ATTR_IDN_POWER_MODE:
 +        return u->attributes.current_power_mode;
 +    case QUERY_ATTR_IDN_ACTIVE_ICC_LVL:
 +        return u->attributes.active_icc_level;
 +    case QUERY_ATTR_IDN_OOO_DATA_EN:
 +        return u->attributes.out_of_order_data_en;
 +    case QUERY_ATTR_IDN_BKOPS_STATUS:
 +        return u->attributes.background_op_status;
 +    case QUERY_ATTR_IDN_PURGE_STATUS:
 +        return u->attributes.purge_status;
 +    case QUERY_ATTR_IDN_MAX_DATA_IN:
 +        return u->attributes.max_data_in_size;
 +    case QUERY_ATTR_IDN_MAX_DATA_OUT:
 +        return u->attributes.max_data_out_size;
 +    case QUERY_ATTR_IDN_DYN_CAP_NEEDED:
 +        return be32_to_cpu(u->attributes.dyn_cap_needed);
 +    case QUERY_ATTR_IDN_REF_CLK_FREQ:
 +        return u->attributes.ref_clk_freq;
 +    case QUERY_ATTR_IDN_CONF_DESC_LOCK:
 +        return u->attributes.config_descr_lock;
 +    case QUERY_ATTR_IDN_MAX_NUM_OF_RTT:
 +        return u->attributes.max_num_of_rtt;
 +    case QUERY_ATTR_IDN_EE_CONTROL:
 +        return be16_to_cpu(u->attributes.exception_event_control);
 +    case QUERY_ATTR_IDN_EE_STATUS:
 +        return be16_to_cpu(u->attributes.exception_event_status);
 +    case QUERY_ATTR_IDN_SECONDS_PASSED:
 +        return be32_to_cpu(u->attributes.seconds_passed);
 +    case QUERY_ATTR_IDN_CNTX_CONF:
 +        return be16_to_cpu(u->attributes.context_conf);
 +    case QUERY_ATTR_IDN_FFU_STATUS:
 +        return u->attributes.device_ffu_status;
 +    case QUERY_ATTR_IDN_PSA_STATE:
 +        return be32_to_cpu(u->attributes.psa_state);
 +    case QUERY_ATTR_IDN_PSA_DATA_SIZE:
 +        return be32_to_cpu(u->attributes.psa_data_size);
 +    case QUERY_ATTR_IDN_REF_CLK_GATING_WAIT_TIME:
 +        return u->attributes.ref_clk_gating_wait_time;
 +    case QUERY_ATTR_IDN_CASE_ROUGH_TEMP:
 +        return u->attributes.device_case_rough_temperaure;
 +    case QUERY_ATTR_IDN_HIGH_TEMP_BOUND:
 +        return u->attributes.device_too_high_temp_boundary;
 +    case QUERY_ATTR_IDN_LOW_TEMP_BOUND:
 +        return u->attributes.device_too_low_temp_boundary;
 +    case QUERY_ATTR_IDN_THROTTLING_STATUS:
 +        return u->attributes.throttling_status;
 +    case QUERY_ATTR_IDN_WB_FLUSH_STATUS:
 +        return u->attributes.wb_buffer_flush_status;
 +    case QUERY_ATTR_IDN_AVAIL_WB_BUFF_SIZE:
 +        return u->attributes.available_wb_buffer_size;
 +    case QUERY_ATTR_IDN_WB_BUFF_LIFE_TIME_EST:
 +        return u->attributes.wb_buffer_life_time_est;
 +    case QUERY_ATTR_IDN_CURR_WB_BUFF_SIZE:
 +        return be32_to_cpu(u->attributes.current_wb_buffer_size);
 +    case QUERY_ATTR_IDN_REFRESH_STATUS:
 +        return u->attributes.refresh_status;
 +    case QUERY_ATTR_IDN_REFRESH_FREQ:
 +        return u->attributes.refresh_freq;
 +    case QUERY_ATTR_IDN_REFRESH_UNIT:
 +        return u->attributes.refresh_unit;
 +    }
 +    return 0;
 +}
 +
 +static void ufs_write_attr_value(UfsHc *u, uint8_t idn, uint32_t value)
 +{
 +    switch (idn) {
 +    case QUERY_ATTR_IDN_ACTIVE_ICC_LVL:
 +        u->attributes.active_icc_level = value;
 +        break;
 +    case QUERY_ATTR_IDN_MAX_DATA_IN:
 +        u->attributes.max_data_in_size = value;
 +        break;
 +    case QUERY_ATTR_IDN_MAX_DATA_OUT:
 +        u->attributes.max_data_out_size = value;
 +        break;
 +    case QUERY_ATTR_IDN_REF_CLK_FREQ:
 +        u->attributes.ref_clk_freq = value;
 +        break;
 +    case QUERY_ATTR_IDN_MAX_NUM_OF_RTT:
 +        u->attributes.max_num_of_rtt = value;
 +        break;
 +    case QUERY_ATTR_IDN_EE_CONTROL:
 +        u->attributes.exception_event_control = cpu_to_be16(value);
 +        break;
 +    case QUERY_ATTR_IDN_SECONDS_PASSED:
 +        u->attributes.seconds_passed = cpu_to_be32(value);
 +        break;
 +    case QUERY_ATTR_IDN_PSA_STATE:
 +        u->attributes.psa_state = value;
 +        break;
 +    case QUERY_ATTR_IDN_PSA_DATA_SIZE:
 +        u->attributes.psa_data_size = cpu_to_be32(value);
 +        break;
 +    }
 +}
 +
 +static QueryRespCode ufs_exec_query_attr(UfsRequest *req, int op)
 +{
 +    UfsHc *u = req->hc;
 +    uint8_t idn = req->req_upiu.qr.idn;
 +    uint32_t value;
 +    QueryRespCode ret;
 +
 +    ret = ufs_attr_check_idn_valid(idn, op);
 +    if (ret) {
 +        return ret;
 +    }
 +
 +    if (op == UFS_QUERY_ATTR_READ) {
 +        value = ufs_read_attr_value(u, idn);
 +    } else {
 +        value = be32_to_cpu(req->req_upiu.qr.value);
 +        ufs_write_attr_value(u, idn, value);
 +    }
 +
 +    req->rsp_upiu.qr.value = cpu_to_be32(value);
 +    return QUERY_RESULT_SUCCESS;
 +}
 +
 +static const RpmbUnitDescriptor rpmb_unit_desc = {
 +    .length = sizeof(RpmbUnitDescriptor),
 +    .descriptor_idn = 2,
 +    .unit_index = UFS_UPIU_RPMB_WLUN,
 +    .lu_enable = 0,
 +};
 +
 +static QueryRespCode ufs_read_unit_desc(UfsRequest *req)
 +{
 +    uint8_t lun = req->req_upiu.qr.index;
 +
 +    if (lun != UFS_UPIU_RPMB_WLUN && lun > UFS_MAX_LUS) {
 +        trace_ufs_err_query_invalid_index(req->req_upiu.qr.opcode, lun);
 +        return QUERY_RESULT_INVALID_INDEX;
 +    }
 +
 +    if (lun == UFS_UPIU_RPMB_WLUN) {
 +        memcpy(&req->rsp_upiu.qr.data, &rpmb_unit_desc, rpmb_unit_desc.length);
 +    } else {
 +        /* unit descriptor is not yet supported */
 +        return QUERY_RESULT_INVALID_INDEX;
 +    }
 +
 +    return QUERY_RESULT_SUCCESS;
 +}
 +
 +static inline StringDescriptor manufacturer_str_desc(void)
 +{
 +    StringDescriptor desc = {
 +        .length = 0x12,
 +        .descriptor_idn = QUERY_DESC_IDN_STRING,
 +    };
 +    desc.UC[0] = cpu_to_be16('R');
 +    desc.UC[1] = cpu_to_be16('E');
 +    desc.UC[2] = cpu_to_be16('D');
 +    desc.UC[3] = cpu_to_be16('H');
 +    desc.UC[4] = cpu_to_be16('A');
 +    desc.UC[5] = cpu_to_be16('T');
 +    return desc;
 +}
 +
 +static inline StringDescriptor product_name_str_desc(void)
 +{
 +    StringDescriptor desc = {
 +        .length = 0x22,
 +        .descriptor_idn = QUERY_DESC_IDN_STRING,
 +    };
 +    desc.UC[0] = cpu_to_be16('Q');
 +    desc.UC[1] = cpu_to_be16('E');
 +    desc.UC[2] = cpu_to_be16('M');
 +    desc.UC[3] = cpu_to_be16('U');
 +    desc.UC[4] = cpu_to_be16(' ');
 +    desc.UC[5] = cpu_to_be16('U');
 +    desc.UC[6] = cpu_to_be16('F');
 +    desc.UC[7] = cpu_to_be16('S');
 +    return desc;
 +}
 +
 +static inline StringDescriptor product_rev_level_str_desc(void)
 +{
 +    StringDescriptor desc = {
 +        .length = 0x0a,
 +        .descriptor_idn = QUERY_DESC_IDN_STRING,
 +    };
 +    desc.UC[0] = cpu_to_be16('0');
 +    desc.UC[1] = cpu_to_be16('0');
 +    desc.UC[2] = cpu_to_be16('0');
 +    desc.UC[3] = cpu_to_be16('1');
 +    return desc;
 +}
 +
 +static const StringDescriptor null_str_desc = {
 +    .length = 0x02,
 +    .descriptor_idn = QUERY_DESC_IDN_STRING,
 +};
 +
 +static QueryRespCode ufs_read_string_desc(UfsRequest *req)
 +{
 +    UfsHc *u = req->hc;
 +    uint8_t index = req->req_upiu.qr.index;
 +    StringDescriptor desc;
 +
 +    if (index == u->device_desc.manufacturer_name) {
 +        desc = manufacturer_str_desc();
 +        memcpy(&req->rsp_upiu.qr.data, &desc, desc.length);
 +    } else if (index == u->device_desc.product_name) {
 +        desc = product_name_str_desc();
 +        memcpy(&req->rsp_upiu.qr.data, &desc, desc.length);
 +    } else if (index == u->device_desc.serial_number) {
 +        memcpy(&req->rsp_upiu.qr.data, &null_str_desc, null_str_desc.length);
 +    } else if (index == u->device_desc.oem_id) {
 +        memcpy(&req->rsp_upiu.qr.data, &null_str_desc, null_str_desc.length);
 +    } else if (index == u->device_desc.product_revision_level) {
 +        desc = product_rev_level_str_desc();
 +        memcpy(&req->rsp_upiu.qr.data, &desc, desc.length);
 +    } else {
 +        trace_ufs_err_query_invalid_index(req->req_upiu.qr.opcode, index);
 +        return QUERY_RESULT_INVALID_INDEX;
 +    }
 +    return QUERY_RESULT_SUCCESS;
 +}
 +
 +static inline InterconnectDescriptor interconnect_desc(void)
 +{
 +    InterconnectDescriptor desc = {
 +        .length = sizeof(InterconnectDescriptor),
 +        .descriptor_idn = QUERY_DESC_IDN_INTERCONNECT,
 +    };
 +    desc.bcd_unipro_version = cpu_to_be16(0x180);
 +    desc.bcd_mphy_version = cpu_to_be16(0x410);
 +    return desc;
 +}
 +
 +static QueryRespCode ufs_read_desc(UfsRequest *req)
 +{
 +    UfsHc *u = req->hc;
 +    QueryRespCode status;
 +    uint8_t idn = req->req_upiu.qr.idn;
 +    uint16_t length = be16_to_cpu(req->req_upiu.qr.length);
 +    InterconnectDescriptor desc;
 +
 +    switch (idn) {
 +    case QUERY_DESC_IDN_DEVICE:
 +        memcpy(&req->rsp_upiu.qr.data, &u->device_desc, sizeof(u->device_desc));
 +        status = QUERY_RESULT_SUCCESS;
 +        break;
 +    case QUERY_DESC_IDN_UNIT:
 +        status = ufs_read_unit_desc(req);
 +        break;
 +    case QUERY_DESC_IDN_GEOMETRY:
 +        memcpy(&req->rsp_upiu.qr.data, &u->geometry_desc,
 +               sizeof(u->geometry_desc));
 +        status = QUERY_RESULT_SUCCESS;
 +        break;
 +    case QUERY_DESC_IDN_INTERCONNECT: {
 +        desc = interconnect_desc();
 +        memcpy(&req->rsp_upiu.qr.data, &desc, sizeof(InterconnectDescriptor));
 +        status = QUERY_RESULT_SUCCESS;
 +        break;
 +    }
 +    case QUERY_DESC_IDN_STRING:
 +        status = ufs_read_string_desc(req);
 +        break;
 +    case QUERY_DESC_IDN_POWER:
 +        /* mocking of power descriptor is not supported */
 +        memset(&req->rsp_upiu.qr.data, 0, sizeof(PowerParametersDescriptor));
 +        req->rsp_upiu.qr.data[0] = sizeof(PowerParametersDescriptor);
 +        req->rsp_upiu.qr.data[1] = QUERY_DESC_IDN_POWER;
 +        status = QUERY_RESULT_SUCCESS;
 +        break;
 +    case QUERY_DESC_IDN_HEALTH:
 +        /* mocking of health descriptor is not supported */
 +        memset(&req->rsp_upiu.qr.data, 0, sizeof(DeviceHealthDescriptor));
 +        req->rsp_upiu.qr.data[0] = sizeof(DeviceHealthDescriptor);
 +        req->rsp_upiu.qr.data[1] = QUERY_DESC_IDN_HEALTH;
 +        status = QUERY_RESULT_SUCCESS;
 +        break;
 +    default:
 +        length = 0;
 +        trace_ufs_err_query_invalid_idn(req->req_upiu.qr.opcode, idn);
 +        status = QUERY_RESULT_INVALID_IDN;
 +    }
 +
 +    if (length > req->rsp_upiu.qr.data[0]) {
 +        length = req->rsp_upiu.qr.data[0];
 +    }
 +    req->rsp_upiu.qr.opcode = req->req_upiu.qr.opcode;
 +    req->rsp_upiu.qr.idn = req->req_upiu.qr.idn;
 +    req->rsp_upiu.qr.index = req->req_upiu.qr.index;
 +    req->rsp_upiu.qr.selector = req->req_upiu.qr.selector;
 +    req->rsp_upiu.qr.length = cpu_to_be16(length);
 +
 +    return status;
 +}
 +
 +static QueryRespCode ufs_exec_query_read(UfsRequest *req)
 +{
 +    QueryRespCode status;
 +    switch (req->req_upiu.qr.opcode) {
 +    case UPIU_QUERY_OPCODE_NOP:
 +        status = QUERY_RESULT_SUCCESS;
 +        break;
 +    case UPIU_QUERY_OPCODE_READ_DESC:
 +        status = ufs_read_desc(req);
 +        break;
 +    case UPIU_QUERY_OPCODE_READ_ATTR:
 +        status = ufs_exec_query_attr(req, UFS_QUERY_ATTR_READ);
 +        break;
 +    case UPIU_QUERY_OPCODE_READ_FLAG:
 +        status = ufs_exec_query_flag(req, UFS_QUERY_FLAG_READ);
 +        break;
 +    default:
 +        trace_ufs_err_query_invalid_opcode(req->req_upiu.qr.opcode);
 +        status = QUERY_RESULT_INVALID_OPCODE;
 +        break;
 +    }
 +
 +    return status;
 +}
 +
 +static QueryRespCode ufs_exec_query_write(UfsRequest *req)
 +{
 +    QueryRespCode status;
 +    switch (req->req_upiu.qr.opcode) {
 +    case UPIU_QUERY_OPCODE_NOP:
 +        status = QUERY_RESULT_SUCCESS;
 +        break;
 +    case UPIU_QUERY_OPCODE_WRITE_DESC:
 +        /* write descriptor is not supported */
 +        status = QUERY_RESULT_NOT_WRITEABLE;
 +        break;
 +    case UPIU_QUERY_OPCODE_WRITE_ATTR:
 +        status = ufs_exec_query_attr(req, UFS_QUERY_ATTR_WRITE);
 +        break;
 +    case UPIU_QUERY_OPCODE_SET_FLAG:
 +        status = ufs_exec_query_flag(req, UFS_QUERY_FLAG_SET);
 +        break;
 +    case UPIU_QUERY_OPCODE_CLEAR_FLAG:
 +        status = ufs_exec_query_flag(req, UFS_QUERY_FLAG_CLEAR);
 +        break;
 +    case UPIU_QUERY_OPCODE_TOGGLE_FLAG:
 +        status = ufs_exec_query_flag(req, UFS_QUERY_FLAG_TOGGLE);
 +        break;
 +    default:
 +        trace_ufs_err_query_invalid_opcode(req->req_upiu.qr.opcode);
 +        status = QUERY_RESULT_INVALID_OPCODE;
 +        break;
 +    }
 +
 +    return status;
 +}
 +
 +static UfsReqResult ufs_exec_query_cmd(UfsRequest *req)
 +{
 +    uint8_t query_func = req->req_upiu.header.query_func;
 +    uint16_t data_segment_length;
 +    QueryRespCode status;
 +
 +    trace_ufs_exec_query_cmd(req->slot, req->req_upiu.qr.opcode);
 +    if (query_func == UPIU_QUERY_FUNC_STANDARD_READ_REQUEST) {
 +        status = ufs_exec_query_read(req);
 +    } else if (query_func == UPIU_QUERY_FUNC_STANDARD_WRITE_REQUEST) {
 +        status = ufs_exec_query_write(req);
 +    } else {
 +        status = QUERY_RESULT_GENERAL_FAILURE;
 +    }
 +
 +    data_segment_length = be16_to_cpu(req->rsp_upiu.qr.length);
 +    ufs_build_upiu_header(req, UPIU_TRANSACTION_QUERY_RSP, 0, status, 0,
 +                          data_segment_length);
 +
 +    if (status != QUERY_RESULT_SUCCESS) {
 +        return UFS_REQUEST_FAIL;
 +    }
 +    return UFS_REQUEST_SUCCESS;
 +}
 +
 +static void ufs_exec_req(UfsRequest *req)
 +{
 +    UfsReqResult req_result;
 +
 +    if (ufs_dma_read_upiu(req)) {
 +        return;
 +    }
 +
 +    switch (req->req_upiu.header.trans_type) {
 +    case UPIU_TRANSACTION_NOP_OUT:
 +        req_result = ufs_exec_nop_cmd(req);
 +        break;
 +    case UPIU_TRANSACTION_COMMAND:
 +        /* Not yet implemented */
 +        req_result = UFS_REQUEST_FAIL;
 +        break;
 +    case UPIU_TRANSACTION_QUERY_REQ:
 +        req_result = ufs_exec_query_cmd(req);
 +        break;
 +    default:
 +        trace_ufs_err_invalid_trans_code(req->slot,
 +                                         req->req_upiu.header.trans_type);
 +        req_result = UFS_REQUEST_FAIL;
 +    }
 +
 +    ufs_complete_req(req, req_result);
 +}
 +
 +static void ufs_process_req(void *opaque)
 +{
 +    UfsHc *u = opaque;
 +    UfsRequest *req;
 +    int slot;
 +
 +    for (slot = 0; slot < u->params.nutrs; slot++) {
 +        req = &u->req_list[slot];
 +
 +        if (req->state != UFS_REQUEST_READY) {
 +            continue;
 +        }
 +        trace_ufs_process_req(slot);
 +        req->state = UFS_REQUEST_RUNNING;
 +
 +        ufs_exec_req(req);
 +    }
 +}
 +
 +static void ufs_complete_req(UfsRequest *req, UfsReqResult req_result)
 +{
 +    UfsHc *u = req->hc;
 +    assert(req->state == UFS_REQUEST_RUNNING);
 +
 +    if (req_result == UFS_REQUEST_SUCCESS) {
 +        req->utrd.header.dword_2 = cpu_to_le32(OCS_SUCCESS);
 +    } else {
 +        req->utrd.header.dword_2 = cpu_to_le32(OCS_INVALID_CMD_TABLE_ATTR);
 +    }
 +
 +    trace_ufs_complete_req(req->slot);
 +    req->state = UFS_REQUEST_COMPLETE;
 +    qemu_bh_schedule(u->complete_bh);
 +}
 +
 +static void ufs_clear_req(UfsRequest *req)
 +{
 +    if (req->sg != NULL) {
 +        qemu_sglist_destroy(req->sg);
 +        g_free(req->sg);
 +        req->sg = NULL;
 +    }
 +
 +    memset(&req->utrd, 0, sizeof(req->utrd));
 +    memset(&req->req_upiu, 0, sizeof(req->req_upiu));
 +    memset(&req->rsp_upiu, 0, sizeof(req->rsp_upiu));
 +}
 +
 +static void ufs_sendback_req(void *opaque)
 +{
 +    UfsHc *u = opaque;
 +    UfsRequest *req;
 +    int slot;
 +
 +    for (slot = 0; slot < u->params.nutrs; slot++) {
 +        req = &u->req_list[slot];
 +
 +        if (req->state != UFS_REQUEST_COMPLETE) {
 +            continue;
 +        }
 +
 +        if (ufs_dma_write_upiu(req)) {
 +            req->state = UFS_REQUEST_ERROR;
 +            continue;
 +        }
 +
 +        /*
 +         * TODO: UTP Transfer Request Interrupt Aggregation Control is not yet
 +         * supported
 +         */
 +        if (le32_to_cpu(req->utrd.header.dword_2) != OCS_SUCCESS ||
 +            le32_to_cpu(req->utrd.header.dword_0) & UTP_REQ_DESC_INT_CMD) {
 +            u->reg.is = FIELD_DP32(u->reg.is, IS, UTRCS, 1);
 +        }
 +
 +        u->reg.utrldbr &= ~(1 << slot);
 +        u->reg.utrlcnr |= (1 << slot);
 +
 +        trace_ufs_sendback_req(req->slot);
 +
 +        ufs_clear_req(req);
 +        req->state = UFS_REQUEST_IDLE;
 +    }
 +
 +    ufs_irq_check(u);
 +}
 +
  static bool ufs_check_constraints(UfsHc *u, Error **errp)
  {
      if (u->params.nutrs > UFS_MAX_NUTRS) {
@@ -XXX,XX +XXX,XX @@ static void ufs_init_pci(UfsHc *u, PCIDevice *pci_dev)
      u->irq = pci_allocate_irq(pci_dev);
  }
--test_quorum=$($QEMU_IMG --help|grep quorum)
++static void ufs_init_state(UfsHc *u)
--[ "$test_quorum" = "" ] && _supported_fmt quorum
++{
--
++    u->req_list = g_new0(UfsRequest, u->params.nutrs);
- quorum="driver=raw,file.driver=quorum,file.vote-threshold=2"
++
- quorum="$quorum,file.children.0.file.filename=$TEST_DIR/1.raw"
++    for (int i = 0; i < u->params.nutrs; i++) {
- quorum="$quorum,file.children.1.file.filename=$TEST_DIR/2.raw"
++        u->req_list[i].hc = u;
-diff --git a/tests/qemu-iotests/099 b/tests/qemu-iotests/099
++        u->req_list[i].slot = i;
-index XXXXXXX..XXXXXXX 100755
++        u->req_list[i].sg = NULL;
---- a/tests/qemu-iotests/099
++        u->req_list[i].state = UFS_REQUEST_IDLE;
-+++ b/tests/qemu-iotests/099
++    }
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
++
- _supported_fmt qcow qcow2 qed vdi vhdx vmdk vpc
++    u->doorbell_bh = qemu_bh_new_guarded(ufs_process_req, u,
- _supported_proto file
++                                         &DEVICE(u)->mem_reentrancy_guard);
- _supported_os Linux
++    u->complete_bh = qemu_bh_new_guarded(ufs_sendback_req, u,
-+_require_drivers blkdebug blkverify
++                                         &DEVICE(u)->mem_reentrancy_guard);
- _unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat" \
++}
-     "subformat=twoGbMaxExtentSparse"
++
+ static void ufs_init_hc(UfsHc *u)
 diff --git a/tests/qemu-iotests/120 b/tests/qemu-iotests/120
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/120
 +++ b/tests/qemu-iotests/120
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
  _supported_fmt generic
  _supported_proto file
  _unsupported_fmt luks
 +_require_drivers raw
  _make_test_img 64M
 diff --git a/tests/qemu-iotests/162 b/tests/qemu-iotests/162
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/162
 +++ b/tests/qemu-iotests/162
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
  . ./common.filter
  _supported_fmt generic
 -
 -test_ssh=$($QEMU_IMG --help | grep '^Supported formats:.* ssh\( \|$\)')
 -[ "$test_ssh" = "" ] && _notrun "ssh support required"
 +_require_drivers ssh
  echo
  echo '=== NBD ==='
 diff --git a/tests/qemu-iotests/184 b/tests/qemu-iotests/184
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/184
 +++ b/tests/qemu-iotests/184
@@ -XXX,XX +XXX,XX @@ trap "exit \$status" 0 1 2 3 15
  . ./common.filter
  _supported_os Linux
 +_require_drivers throttle
  do_run_qemu()
  {
-diff --git a/tests/qemu-iotests/186 b/tests/qemu-iotests/186
+     uint32_t cap = 0;
-index XXXXXXX..XXXXXXX 100755
+@@ -XXX,XX +XXX,XX @@ static void ufs_init_hc(UfsHc *u)
---- a/tests/qemu-iotests/186
+     cap = FIELD_DP32(cap, CAP, CS, 0);
-+++ b/tests/qemu-iotests/186
+     u->reg.cap = cap;
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
+     u->reg.ver = UFS_SPEC_VER;
++
- _supported_fmt qcow2
++    memset(&u->device_desc, 0, sizeof(DeviceDescriptor));
- _supported_proto file
++    u->device_desc.length = sizeof(DeviceDescriptor);
-+_require_drivers null-co
++    u->device_desc.descriptor_idn = QUERY_DESC_IDN_DEVICE;
++    u->device_desc.device_sub_class = 0x01;
- if [ "$QEMU_DEFAULT_MACHINE" != "pc" ]; then
++    u->device_desc.number_lu = 0x00;
-     _notrun "Requires a PC machine"
++    u->device_desc.number_wlu = 0x04;
-diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
++    /* TODO: Revisit it when Power Management is implemented */
 +    u->device_desc.init_power_mode = 0x01; /* Active Mode */
 +    u->device_desc.high_priority_lun = 0x7F; /* Same Priority */
 +    u->device_desc.spec_version = cpu_to_be16(UFS_SPEC_VER);
 +    u->device_desc.manufacturer_name = 0x00;
 +    u->device_desc.product_name = 0x01;
 +    u->device_desc.serial_number = 0x02;
 +    u->device_desc.oem_id = 0x03;
 +    u->device_desc.ud_0_base_offset = 0x16;
 +    u->device_desc.ud_config_p_length = 0x1A;
 +    u->device_desc.device_rtt_cap = 0x02;
 +    u->device_desc.queue_depth = u->params.nutrs;
 +    u->device_desc.product_revision_level = 0x04;
 +
 +    memset(&u->geometry_desc, 0, sizeof(GeometryDescriptor));
 +    u->geometry_desc.length = sizeof(GeometryDescriptor);
 +    u->geometry_desc.descriptor_idn = QUERY_DESC_IDN_GEOMETRY;
 +    u->geometry_desc.max_number_lu = (UFS_MAX_LUS == 32) ? 0x1 : 0x0;
 +    u->geometry_desc.segment_size = cpu_to_be32(0x2000); /* 4KB */
 +    u->geometry_desc.allocation_unit_size = 0x1; /* 4KB */
 +    u->geometry_desc.min_addr_block_size = 0x8; /* 4KB */
 +    u->geometry_desc.max_in_buffer_size = 0x8;
 +    u->geometry_desc.max_out_buffer_size = 0x8;
 +    u->geometry_desc.rpmb_read_write_size = 0x40;
 +    u->geometry_desc.data_ordering =
 +        0x0; /* out-of-order data transfer is not supported */
 +    u->geometry_desc.max_context_id_number = 0x5;
 +    u->geometry_desc.supported_memory_types = cpu_to_be16(0x8001);
 +
 +    memset(&u->attributes, 0, sizeof(u->attributes));
 +    u->attributes.max_data_in_size = 0x08;
 +    u->attributes.max_data_out_size = 0x08;
 +    u->attributes.ref_clk_freq = 0x01; /* 26 MHz */
 +    /* configure descriptor is not supported */
 +    u->attributes.config_descr_lock = 0x01;
 +    u->attributes.max_num_of_rtt = 0x02;
 +
 +    memset(&u->flags, 0, sizeof(u->flags));
 +    u->flags.permanently_disable_fw_update = 1;
  }
  static void ufs_realize(PCIDevice *pci_dev, Error **errp)
@@ -XXX,XX +XXX,XX @@ static void ufs_realize(PCIDevice *pci_dev, Error **errp)
          return;
      }
 +    ufs_init_state(u);
      ufs_init_hc(u);
      ufs_init_pci(u, pci_dev);
  }
 +static void ufs_exit(PCIDevice *pci_dev)
 +{
 +    UfsHc *u = UFS(pci_dev);
 +
 +    qemu_bh_delete(u->doorbell_bh);
 +    qemu_bh_delete(u->complete_bh);
 +
 +    for (int i = 0; i < u->params.nutrs; i++) {
 +        ufs_clear_req(&u->req_list[i]);
 +    }
 +    g_free(u->req_list);
 +}
 +
  static Property ufs_props[] = {
      DEFINE_PROP_STRING("serial", UfsHc, params.serial),
      DEFINE_PROP_UINT8("nutrs", UfsHc, params.nutrs, 32),
@@ -XXX,XX +XXX,XX @@ static void ufs_class_init(ObjectClass *oc, void *data)
      PCIDeviceClass *pc = PCI_DEVICE_CLASS(oc);
      pc->realize = ufs_realize;
 +    pc->exit = ufs_exit;
      pc->vendor_id = PCI_VENDOR_ID_REDHAT;
      pc->device_id = PCI_DEVICE_ID_REDHAT_UFS;
      pc->class_id = PCI_CLASS_STORAGE_UFS;
 diff --git a/hw/ufs/trace-events b/hw/ufs/trace-events
 index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/common.rc
+--- a/hw/ufs/trace-events
-+++ b/tests/qemu-iotests/common.rc
++++ b/hw/ufs/trace-events
-@@ -XXX,XX +XXX,XX @@ _require_command()
+@@ -XXX,XX +XXX,XX @@ ufs_err_dma_read_req_upiu(uint32_t slot, uint64_t addr) "failed to read req upiu
-     [ -x "$c" ] || _notrun "$1 utility required, skipped this test"
+ ufs_err_dma_read_prdt(uint32_t slot, uint64_t addr) "failed to read prdt. UTRLDBR slot %"PRIu32", prdt addr %"PRIu64""
- }
+ ufs_err_dma_write_utrd(uint32_t slot, uint64_t addr) "failed to write utrd. UTRLDBR slot %"PRIu32", UTRD dma addr %"PRIu64""
+ ufs_err_dma_write_rsp_upiu(uint32_t slot, uint64_t addr) "failed to write rsp upiu. UTRLDBR slot %"PRIu32", response upiu addr %"PRIu64""
-+# Check that a set of drivers has been whitelisted in the QEMU binary
++ufs_err_utrl_slot_error(uint32_t slot) "UTRLDBR slot %"PRIu32" is in error"
-+#
+ ufs_err_utrl_slot_busy(uint32_t slot) "UTRLDBR slot %"PRIu32" is busy"
-+_require_drivers()
+ ufs_err_unsupport_register_offset(uint32_t offset) "Register offset 0x%"PRIx32" is not yet supported"
-+{
+ ufs_err_invalid_register_offset(uint32_t offset) "Register offset 0x%"PRIx32" is invalid"
 +    available=$($QEMU -drive format=help | \
 +                sed -e '/Supported formats:/!d' -e 's/Supported formats://')
 +    for driver
 +    do
 +        if ! echo "$available" | grep -q " $driver\( \|$\)"; then
 +            _notrun "$driver not available"
 +        fi
 +    done
 +}
 +
  # make sure this script returns success
  true
 --
-.21.0
+.41.0

-[Qemu-devel] [PULL 03/15] block: posix: Always allocate the first block
+[PULL v2 3/8] hw/ufs: Support for UFS logical unit
-From: Nir Soffer <nirsof@gmail.com>
+From: Jeuk Kim <jeuk20.kim@gmail.com>
-When creating an image with preallocation "off" or "falloc", the first
+This commit adds support for ufs logical unit.
-block of the image is typically not allocated. When using Gluster
+The LU handles processing for the SCSI command,
-storage backed by XFS filesystem, reading this block using direct I/O
+unit descriptor query request.
 succeeds regardless of request length, fooling alignment detection.
-In this case we fallback to a safe value (4096) instead of the optimal
+This commit enables the UFS device to process
-value (512), which may lead to unneeded data copying when aligning
+IO requests.
 requests.  Allocating the first block avoids the fallback.
-Since we allocate the first block even with preallocation=off, we no
+Signed-off-by: Jeuk Kim <jeuk20.kim@samsung.com>
-longer create images with zero disk size:
+Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
 Message-id: 898cea923e819dc21a99597bf045a12d7983be28.1691062912.git.jeuk20.kim@samsung.com
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 ---
  hw/ufs/ufs.h             |   43 ++
  include/scsi/constants.h |    1 +
  hw/ufs/lu.c              | 1445 ++++++++++++++++++++++++++++++++++++++
  hw/ufs/ufs.c             |  252 ++++++-
  hw/ufs/meson.build       |    2 +-
  hw/ufs/trace-events      |   25 +
 files changed, 1761 insertions(+), 7 deletions(-)
  create mode 100644 hw/ufs/lu.c
-    $ ./qemu-img create -f raw test.raw 1g
+diff --git a/hw/ufs/ufs.h b/hw/ufs/ufs.h
     Formatting 'test.raw', fmt=raw size=1073741824
     $ ls -lhs test.raw
 .0K -rw-r--r--. 1 nsoffer nsoffer 1.0G Aug 16 23:48 test.raw
 And converting the image requires additional cluster:
     $ ./qemu-img measure -f raw -O qcow2 test.raw
     required size: 458752
     fully allocated size: 1074135040
 When using format like vmdk with multiple files per image, we allocate
 one block per file:
     $ ./qemu-img create -f vmdk -o subformat=twoGbMaxExtentFlat test.vmdk 4g
     Formatting 'test.vmdk', fmt=vmdk size=4294967296 compat6=off hwversion=undefined subformat=twoGbMaxExtentFlat
     $ ls -lhs test*.vmdk
 .0K -rw-r--r--. 1 nsoffer nsoffer 2.0G Aug 27 03:23 test-f001.vmdk
 .0K -rw-r--r--. 1 nsoffer nsoffer 2.0G Aug 27 03:23 test-f002.vmdk
 .0K -rw-r--r--. 1 nsoffer nsoffer  353 Aug 27 03:23 test.vmdk
 I did quick performance test for copying disks with qemu-img convert to
 new raw target image to Gluster storage with sector size of 512 bytes:
     for i in $(seq 10); do
         rm -f dst.raw
         sleep 10
         time ./qemu-img convert -f raw -O raw -t none -T none src.raw dst.raw
     done
 Here is a table comparing the total time spent:
 Type    Before(s)   After(s)    Diff(%)
 ---------------------------------------
 real      530.028    469.123      -11.4
 user       17.204     10.768      -37.4
 sys        17.881      7.011      -60.7
 We can see very clear improvement in CPU usage.
 Signed-off-by: Nir Soffer <nsoffer@redhat.com>
 Message-id: 20190827010528.8818-2-nsoffer@redhat.com
 Reviewed-by: Max Reitz <mreitz@redhat.com>
 Signed-off-by: Max Reitz <mreitz@redhat.com>
 ---
  block/file-posix.c                            | 51 +++++++++++++++++++
  tests/qemu-iotests/059.out                    |  2 +-
  tests/qemu-iotests/{150.out => 150.out.qcow2} |  0
  tests/qemu-iotests/150.out.raw                | 12 +++++
  tests/qemu-iotests/175                        | 19 ++++---
  tests/qemu-iotests/175.out                    |  8 +--
  tests/qemu-iotests/178.out.qcow2              |  4 +-
  tests/qemu-iotests/221.out                    | 12 +++--
  tests/qemu-iotests/253.out                    | 12 +++--
 files changed, 99 insertions(+), 21 deletions(-)
  rename tests/qemu-iotests/{150.out => 150.out.qcow2} (100%)
  create mode 100644 tests/qemu-iotests/150.out.raw
 diff --git a/block/file-posix.c b/block/file-posix.c
 index XXXXXXX..XXXXXXX 100644
---- a/block/file-posix.c
+--- a/hw/ufs/ufs.h
-+++ b/block/file-posix.c
++++ b/hw/ufs/ufs.h
-@@ -XXX,XX +XXX,XX @@ static int handle_aiocb_discard(void *opaque)
+@@ -XXX,XX +XXX,XX @@
-     return ret;
+ #define UFS_MAX_LUS 32
- }
+ #define UFS_BLOCK_SIZE 4096
-+/*
++typedef struct UfsBusClass {
-+ * Help alignment probing by allocating the first block.
++    BusClass parent_class;
-+ *
++    bool (*parent_check_address)(BusState *bus, DeviceState *dev, Error **errp);
-+ * When reading with direct I/O from unallocated area on Gluster backed by XFS,
++} UfsBusClass;
-+ * reading succeeds regardless of request length. In this case we fallback to
++
-+ * safe alignment which is not optimal. Allocating the first block avoids this
++typedef struct UfsBus {
-+ * fallback.
++    SCSIBus parent_bus;
-+ *
++} UfsBus;
-+ * fd may be opened with O_DIRECT, but we don't know the buffer alignment or
++
-+ * request alignment, so we use safe values.
++#define TYPE_UFS_BUS "ufs-bus"
-+ *
++DECLARE_OBJ_CHECKERS(UfsBus, UfsBusClass, UFS_BUS, TYPE_UFS_BUS)
-+ * Returns: 0 on success, -errno on failure. Since this is an optimization,
++
-+ * caller may ignore failures.
+ typedef enum UfsRequestState {
-+ */
+     UFS_REQUEST_IDLE = 0,
-+static int allocate_first_block(int fd, size_t max_size)
+     UFS_REQUEST_READY = 1,
-+{
+@@ -XXX,XX +XXX,XX @@ typedef enum UfsRequestState {
-+    size_t write_size = (max_size < MAX_BLOCKSIZE)
+ typedef enum UfsReqResult {
-+        ? BDRV_SECTOR_SIZE
+     UFS_REQUEST_SUCCESS = 0,
-+        : MAX_BLOCKSIZE;
+     UFS_REQUEST_FAIL = 1,
-+    size_t max_align = MAX(MAX_BLOCKSIZE, getpagesize());
++    UFS_REQUEST_NO_COMPLETE = 2,
-+    void *buf;
+ } UfsReqResult;
-+    ssize_t n;
-+    int ret;
+ typedef struct UfsRequest {
-+
+@@ -XXX,XX +XXX,XX @@ typedef struct UfsRequest {
-+    buf = qemu_memalign(max_align, write_size);
+     QEMUSGList *sg;
-+    memset(buf, 0, write_size);
+ } UfsRequest;
-+
-+    do {
++typedef struct UfsLu {
-+        n = pwrite(fd, buf, write_size, 0);
++    SCSIDevice qdev;
-+    } while (n == -1 && errno == EINTR);
++    uint8_t lun;
-+
++    UnitDescriptor unit_desc;
-+    ret = (n == -1) ? -errno : 0;
++} UfsLu;
 +
-+    qemu_vfree(buf);
++typedef struct UfsWLu {
-+    return ret;
++    SCSIDevice qdev;
-+}
++    uint8_t lun;
-+
++} UfsWLu;
- static int handle_aiocb_truncate(void *opaque)
++
- {
+ typedef struct UfsParams {
-     RawPosixAIOData *aiocb = opaque;
+     char *serial;
-@@ -XXX,XX +XXX,XX @@ static int handle_aiocb_truncate(void *opaque)
+     uint8_t nutrs; /* Number of UTP Transfer Request Slots */
-                 /* posix_fallocate() doesn't set errno. */
+@@ -XXX,XX +XXX,XX @@ typedef struct UfsParams {
-                 error_setg_errno(errp, -result,
-                                  "Could not preallocate new data");
+ typedef struct UfsHc {
-+            } else if (current_length == 0) {
+     PCIDevice parent_obj;
-+                /*
++    UfsBus bus;
-+                 * posix_fallocate() uses fallocate() if the filesystem
+     MemoryRegion iomem;
-+                 * supports it, or fallback to manually writing zeroes. If
+     UfsReg reg;
-+                 * fallocate() was used, unaligned reads from the fallocated
+     UfsParams params;
-+                 * area in raw_probe_alignment() will succeed, hence we need to
+     uint32_t reg_size;
-+                 * allocate the first block.
+     UfsRequest *req_list;
-+                 *
-+                 * Optimize future alignment probing; ignore failures.
++    UfsLu *lus[UFS_MAX_LUS];
-+                 */
++    UfsWLu *report_wlu;
-+                allocate_first_block(fd, offset);
++    UfsWLu *dev_wlu;
-             }
++    UfsWLu *boot_wlu;
-         } else {
++    UfsWLu *rpmb_wlu;
-             result = 0;
+     DeviceDescriptor device_desc;
-@@ -XXX,XX +XXX,XX @@ static int handle_aiocb_truncate(void *opaque)
+     GeometryDescriptor geometry_desc;
-         if (ftruncate(fd, offset) != 0) {
+     Attributes attributes;
-             result = -errno;
+@@ -XXX,XX +XXX,XX @@ typedef struct UfsHc {
-             error_setg_errno(errp, -result, "Could not resize file");
+ #define TYPE_UFS "ufs"
-+        } else if (current_length == 0 && offset > current_length) {
+ #define UFS(obj) OBJECT_CHECK(UfsHc, (obj), TYPE_UFS)
-+            /* Optimize future alignment probing; ignore failures. */
-+            allocate_first_block(fd, offset);
++#define TYPE_UFS_LU "ufs-lu"
-         }
++#define UFSLU(obj) OBJECT_CHECK(UfsLu, (obj), TYPE_UFS_LU)
-         return result;
++
-     default:
++#define TYPE_UFS_WLU "ufs-wlu"
-diff --git a/tests/qemu-iotests/059.out b/tests/qemu-iotests/059.out
++#define UFSWLU(obj) OBJECT_CHECK(UfsWLu, (obj), TYPE_UFS_WLU)
 +
  typedef enum UfsQueryFlagPerm {
      UFS_QUERY_FLAG_NONE = 0x0,
      UFS_QUERY_FLAG_READ = 0x1,
@@ -XXX,XX +XXX,XX @@ typedef enum UfsQueryAttrPerm {
      UFS_QUERY_ATTR_WRITE = 0x2,
  } UfsQueryAttrPerm;
 +static inline bool is_wlun(uint8_t lun)
 +{
 +    return (lun == UFS_UPIU_REPORT_LUNS_WLUN ||
 +            lun == UFS_UPIU_UFS_DEVICE_WLUN || lun == UFS_UPIU_BOOT_WLUN ||
 +            lun == UFS_UPIU_RPMB_WLUN);
 +}
 +
  #endif /* HW_UFS_UFS_H */
 diff --git a/include/scsi/constants.h b/include/scsi/constants.h
 index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/059.out
+--- a/include/scsi/constants.h
-+++ b/tests/qemu-iotests/059.out
++++ b/include/scsi/constants.h
-@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824000 subformat=twoGbMax
+@@ -XXX,XX +XXX,XX @@
- image: TEST_DIR/t.vmdk
+ #define MODE_PAGE_FLEXIBLE_DISK_GEOMETRY      0x05
- file format: vmdk
+ #define MODE_PAGE_CACHING                     0x08
- virtual size: 0.977 TiB (1073741824000 bytes)
+ #define MODE_PAGE_AUDIO_CTL                   0x0e
--disk size: 16 KiB
++#define MODE_PAGE_CONTROL                     0x0a
-+disk size: 1.97 MiB
+ #define MODE_PAGE_POWER                       0x1a
- Format specific information:
+ #define MODE_PAGE_FAULT_FAIL                  0x1c
-     cid: XXXXXXXX
+ #define MODE_PAGE_TO_PROTECT                  0x1d
-     parent cid: XXXXXXXX
+diff --git a/hw/ufs/lu.c b/hw/ufs/lu.c
 diff --git a/tests/qemu-iotests/150.out b/tests/qemu-iotests/150.out.qcow2
 similarity index 100%
 rename from tests/qemu-iotests/150.out
 rename to tests/qemu-iotests/150.out.qcow2
 diff --git a/tests/qemu-iotests/150.out.raw b/tests/qemu-iotests/150.out.raw
 new file mode 100644
 index XXXXXXX..XXXXXXX
 --- /dev/null
-+++ b/tests/qemu-iotests/150.out.raw
++++ b/hw/ufs/lu.c
 @@ -XXX,XX +XXX,XX @@
-+QA output created by 150
++/*
-+
++ * QEMU UFS Logical Unit
-+=== Mapping sparse conversion ===
++ *
-+
++ * Copyright (c) 2023 Samsung Electronics Co., Ltd. All rights reserved.
-+Offset          Length          File
++ *
-+0               0x1000          TEST_DIR/t.IMGFMT
++ * Written by Jeuk Kim <jeuk20.kim@samsung.com>
-+
++ *
-+=== Mapping non-sparse conversion ===
++ * This code is licensed under the GNU GPL v2 or later.
-+
++ */
-+Offset          Length          File
++
-+0               0x100000        TEST_DIR/t.IMGFMT
++#include "qemu/osdep.h"
-+*** done
++#include "qemu/units.h"
-diff --git a/tests/qemu-iotests/175 b/tests/qemu-iotests/175
++#include "qapi/error.h"
-index XXXXXXX..XXXXXXX 100755
++#include "qemu/memalign.h"
---- a/tests/qemu-iotests/175
++#include "hw/scsi/scsi.h"
-+++ b/tests/qemu-iotests/175
++#include "scsi/constants.h"
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
++#include "sysemu/block-backend.h"
- # the file size.  This function hides the resulting difference in the
++#include "qemu/cutils.h"
- # stat -c '%b' output.
++#include "trace.h"
- # Parameter 1: Number of blocks an empty file occupies
++#include "ufs.h"
--# Parameter 2: Image size in bytes
++
-+# Parameter 2: Minimal number of blocks in an image
++/*
-+# Parameter 3: Image size in bytes
++ * The code below handling SCSI commands is copied from hw/scsi/scsi-disk.c,
- _filter_blocks()
++ * with minor adjustments to make it work for UFS.
 + */
 +
 +#define SCSI_DMA_BUF_SIZE (128 * KiB)
 +#define SCSI_MAX_INQUIRY_LEN 256
 +#define SCSI_INQUIRY_DATA_SIZE 36
 +#define SCSI_MAX_MODE_LEN 256
 +
 +typedef struct UfsSCSIReq {
 +    SCSIRequest req;
 +    /* Both sector and sector_count are in terms of BDRV_SECTOR_SIZE bytes.  */
 +    uint64_t sector;
 +    uint32_t sector_count;
 +    uint32_t buflen;
 +    bool started;
 +    bool need_fua_emulation;
 +    struct iovec iov;
 +    QEMUIOVector qiov;
 +    BlockAcctCookie acct;
 +} UfsSCSIReq;
 +
 +static void ufs_scsi_free_request(SCSIRequest *req)
 +{
 +    UfsSCSIReq *r = DO_UPCAST(UfsSCSIReq, req, req);
 +
 +    qemu_vfree(r->iov.iov_base);
 +}
 +
 +static void scsi_check_condition(UfsSCSIReq *r, SCSISense sense)
 +{
 +    trace_ufs_scsi_check_condition(r->req.tag, sense.key, sense.asc,
 +                                   sense.ascq);
 +    scsi_req_build_sense(&r->req, sense);
 +    scsi_req_complete(&r->req, CHECK_CONDITION);
 +}
 +
 +static int ufs_scsi_emulate_vpd_page(SCSIRequest *req, uint8_t *outbuf,
 +                                     uint32_t outbuf_len)
 +{
 +    UfsHc *u = UFS(req->bus->qbus.parent);
 +    UfsLu *lu = DO_UPCAST(UfsLu, qdev, req->dev);
 +    uint8_t page_code = req->cmd.buf[2];
 +    int start, buflen = 0;
 +
 +    if (outbuf_len < SCSI_INQUIRY_DATA_SIZE) {
 +        return -1;
 +    }
 +
 +    outbuf[buflen++] = lu->qdev.type & 0x1f;
 +    outbuf[buflen++] = page_code;
 +    outbuf[buflen++] = 0x00;
 +    outbuf[buflen++] = 0x00;
 +    start = buflen;
 +
 +    switch (page_code) {
 +    case 0x00: /* Supported page codes, mandatory */
 +    {
 +        trace_ufs_scsi_emulate_vpd_page_00(req->cmd.xfer);
 +        outbuf[buflen++] = 0x00; /* list of supported pages (this page) */
 +        if (u->params.serial) {
 +            outbuf[buflen++] = 0x80; /* unit serial number */
 +        }
 +        outbuf[buflen++] = 0x87; /* mode page policy */
 +        break;
 +    }
 +    case 0x80: /* Device serial number, optional */
 +    {
 +        int l;
 +
 +        if (!u->params.serial) {
 +            trace_ufs_scsi_emulate_vpd_page_80_not_supported();
 +            return -1;
 +        }
 +
 +        l = strlen(u->params.serial);
 +        if (l > SCSI_INQUIRY_DATA_SIZE) {
 +            l = SCSI_INQUIRY_DATA_SIZE;
 +        }
 +
 +        trace_ufs_scsi_emulate_vpd_page_80(req->cmd.xfer);
 +        memcpy(outbuf + buflen, u->params.serial, l);
 +        buflen += l;
 +        break;
 +    }
 +    case 0x87: /* Mode Page Policy, mandatory */
 +    {
 +        trace_ufs_scsi_emulate_vpd_page_87(req->cmd.xfer);
 +        outbuf[buflen++] = 0x3f; /* apply to all mode pages and subpages */
 +        outbuf[buflen++] = 0xff;
 +        outbuf[buflen++] = 0; /* shared */
 +        outbuf[buflen++] = 0;
 +        break;
 +    }
 +    default:
 +        return -1;
 +    }
 +    /* done with EVPD */
 +    assert(buflen - start <= 255);
 +    outbuf[start - 1] = buflen - start;
 +    return buflen;
 +}
 +
 +static int ufs_scsi_emulate_inquiry(SCSIRequest *req, uint8_t *outbuf,
 +                                    uint32_t outbuf_len)
 +{
 +    int buflen = 0;
 +
 +    if (outbuf_len < SCSI_INQUIRY_DATA_SIZE) {
 +        return -1;
 +    }
 +
 +    if (req->cmd.buf[1] & 0x1) {
 +        /* Vital product data */
 +        return ufs_scsi_emulate_vpd_page(req, outbuf, outbuf_len);
 +    }
 +
 +    /* Standard INQUIRY data */
 +    if (req->cmd.buf[2] != 0) {
 +        return -1;
 +    }
 +
 +    /* PAGE CODE == 0 */
 +    buflen = req->cmd.xfer;
 +    if (buflen > SCSI_MAX_INQUIRY_LEN) {
 +        buflen = SCSI_MAX_INQUIRY_LEN;
 +    }
 +
 +    if (is_wlun(req->lun)) {
 +        outbuf[0] = TYPE_WLUN;
 +    } else {
 +        outbuf[0] = 0;
 +    }
 +    outbuf[1] = 0;
 +
 +    strpadcpy((char *)&outbuf[16], 16, "QEMU UFS", ' ');
 +    strpadcpy((char *)&outbuf[8], 8, "QEMU", ' ');
 +
 +    memset(&outbuf[32], 0, 4);
 +
 +    outbuf[2] = 0x06; /* SPC-4 */
 +    outbuf[3] = 0x2;
 +
 +    if (buflen > SCSI_INQUIRY_DATA_SIZE) {
 +        outbuf[4] = buflen - 5; /* Additional Length = (Len - 1) - 4 */
 +    } else {
 +        /*
 +         * If the allocation length of CDB is too small, the additional
 +         * length is not adjusted
 +         */
 +        outbuf[4] = SCSI_INQUIRY_DATA_SIZE - 5;
 +    }
 +
 +    /* Support TCQ.  */
 +    outbuf[7] = req->bus->info->tcq ? 0x02 : 0;
 +    return buflen;
 +}
 +
 +static int mode_sense_page(UfsLu *lu, int page, uint8_t **p_outbuf,
 +                           int page_control)
 +{
 +    static const int mode_sense_valid[0x3f] = {
 +        [MODE_PAGE_CACHING] = 1,
 +        [MODE_PAGE_R_W_ERROR] = 1,
 +        [MODE_PAGE_CONTROL] = 1,
 +    };
 +
 +    uint8_t *p = *p_outbuf + 2;
 +    int length;
 +
 +    assert(page < ARRAY_SIZE(mode_sense_valid));
 +    if ((mode_sense_valid[page]) == 0) {
 +        return -1;
 +    }
 +
 +    /*
 +     * If Changeable Values are requested, a mask denoting those mode parameters
 +     * that are changeable shall be returned. As we currently don't support
 +     * parameter changes via MODE_SELECT all bits are returned set to zero.
 +     * The buffer was already memset to zero by the caller of this function.
 +     */
 +    switch (page) {
 +    case MODE_PAGE_CACHING:
 +        length = 0x12;
 +        if (page_control == 1 || /* Changeable Values */
 +            blk_enable_write_cache(lu->qdev.conf.blk)) {
 +            p[0] = 4; /* WCE */
 +        }
 +        break;
 +
 +    case MODE_PAGE_R_W_ERROR:
 +        length = 10;
 +        if (page_control == 1) { /* Changeable Values */
 +            break;
 +        }
 +        p[0] = 0x80; /* Automatic Write Reallocation Enabled */
 +        break;
 +
 +    case MODE_PAGE_CONTROL:
 +        length = 10;
 +        if (page_control == 1) { /* Changeable Values */
 +            break;
 +        }
 +        p[1] = 0x10; /* Queue Algorithm modifier */
 +        p[8] = 0xff; /* Busy Timeout Period */
 +        p[9] = 0xff;
 +        break;
 +
 +    default:
 +        return -1;
 +    }
 +
 +    assert(length < 256);
 +    (*p_outbuf)[0] = page;
 +    (*p_outbuf)[1] = length;
 +    *p_outbuf += length + 2;
 +    return length + 2;
 +}
 +
 +static int ufs_scsi_emulate_mode_sense(UfsSCSIReq *r, uint8_t *outbuf)
 +{
 +    UfsLu *lu = DO_UPCAST(UfsLu, qdev, r->req.dev);
 +    bool dbd;
 +    int page, buflen, ret, page_control;
 +    uint8_t *p;
 +    uint8_t dev_specific_param = 0;
 +
 +    dbd = (r->req.cmd.buf[1] & 0x8) != 0;
 +    if (!dbd) {
 +        return -1;
 +    }
 +
 +    page = r->req.cmd.buf[2] & 0x3f;
 +    page_control = (r->req.cmd.buf[2] & 0xc0) >> 6;
 +
 +    trace_ufs_scsi_emulate_mode_sense((r->req.cmd.buf[0] == MODE_SENSE) ? 6 :
 +                                                                          10,
 +                                      page, r->req.cmd.xfer, page_control);
 +    memset(outbuf, 0, r->req.cmd.xfer);
 +    p = outbuf;
 +
 +    if (!blk_is_writable(lu->qdev.conf.blk)) {
 +        dev_specific_param |= 0x80; /* Readonly.  */
 +    }
 +
 +    p[2] = 0; /* Medium type.  */
 +    p[3] = dev_specific_param;
 +    p[6] = p[7] = 0; /* Block descriptor length.  */
 +    p += 8;
 +
 +    if (page_control == 3) {
 +        /* Saved Values */
 +        scsi_check_condition(r, SENSE_CODE(SAVING_PARAMS_NOT_SUPPORTED));
 +        return -1;
 +    }
 +
 +    if (page == 0x3f) {
 +        for (page = 0; page <= 0x3e; page++) {
 +            mode_sense_page(lu, page, &p, page_control);
 +        }
 +    } else {
 +        ret = mode_sense_page(lu, page, &p, page_control);
 +        if (ret == -1) {
 +            return -1;
 +        }
 +    }
 +
 +    buflen = p - outbuf;
 +    /*
 +     * The mode data length field specifies the length in bytes of the
 +     * following data that is available to be transferred. The mode data
 +     * length does not include itself.
 +     */
 +    outbuf[0] = ((buflen - 2) >> 8) & 0xff;
 +    outbuf[1] = (buflen - 2) & 0xff;
 +    return buflen;
 +}
 +
 +/*
 + * scsi_handle_rw_error has two return values.  False means that the error
 + * must be ignored, true means that the error has been processed and the
 + * caller should not do anything else for this request.  Note that
 + * scsi_handle_rw_error always manages its reference counts, independent
 + * of the return value.
 + */
 +static bool scsi_handle_rw_error(UfsSCSIReq *r, int ret, bool acct_failed)
 +{
 +    bool is_read = (r->req.cmd.mode == SCSI_XFER_FROM_DEV);
 +    UfsLu *lu = DO_UPCAST(UfsLu, qdev, r->req.dev);
 +    SCSISense sense = SENSE_CODE(NO_SENSE);
 +    int error = 0;
 +    bool req_has_sense = false;
 +    BlockErrorAction action;
 +    int status;
 +
 +    if (ret < 0) {
 +        status = scsi_sense_from_errno(-ret, &sense);
 +        error = -ret;
 +    } else {
 +        /* A passthrough command has completed with nonzero status.  */
 +        status = ret;
 +        if (status == CHECK_CONDITION) {
 +            req_has_sense = true;
 +            error = scsi_sense_buf_to_errno(r->req.sense, sizeof(r->req.sense));
 +        } else {
 +            error = EINVAL;
 +        }
 +    }
 +
 +    /*
 +     * Check whether the error has to be handled by the guest or should
 +     * rather follow the rerror=/werror= settings.  Guest-handled errors
 +     * are usually retried immediately, so do not post them to QMP and
 +     * do not account them as failed I/O.
 +     */
 +    if (req_has_sense && scsi_sense_buf_is_guest_recoverable(
 +                             r->req.sense, sizeof(r->req.sense))) {
 +        action = BLOCK_ERROR_ACTION_REPORT;
 +        acct_failed = false;
 +    } else {
 +        action = blk_get_error_action(lu->qdev.conf.blk, is_read, error);
 +        blk_error_action(lu->qdev.conf.blk, action, is_read, error);
 +    }
 +
 +    switch (action) {
 +    case BLOCK_ERROR_ACTION_REPORT:
 +        if (acct_failed) {
 +            block_acct_failed(blk_get_stats(lu->qdev.conf.blk), &r->acct);
 +        }
 +        if (!req_has_sense && status == CHECK_CONDITION) {
 +            scsi_req_build_sense(&r->req, sense);
 +        }
 +        scsi_req_complete(&r->req, status);
 +        return true;
 +
 +    case BLOCK_ERROR_ACTION_IGNORE:
 +        return false;
 +
 +    case BLOCK_ERROR_ACTION_STOP:
 +        scsi_req_retry(&r->req);
 +        return true;
 +
 +    default:
 +        g_assert_not_reached();
 +    }
 +}
 +
 +static bool ufs_scsi_req_check_error(UfsSCSIReq *r, int ret, bool acct_failed)
 +{
 +    if (r->req.io_canceled) {
 +        scsi_req_cancel_complete(&r->req);
 +        return true;
 +    }
 +
 +    if (ret < 0) {
 +        return scsi_handle_rw_error(r, ret, acct_failed);
 +    }
 +
 +    return false;
 +}
 +
 +static void scsi_aio_complete(void *opaque, int ret)
 +{
 +    UfsSCSIReq *r = (UfsSCSIReq *)opaque;
 +    UfsLu *lu = DO_UPCAST(UfsLu, qdev, r->req.dev);
 +
 +    assert(r->req.aiocb != NULL);
 +    r->req.aiocb = NULL;
 +    aio_context_acquire(blk_get_aio_context(lu->qdev.conf.blk));
 +    if (ufs_scsi_req_check_error(r, ret, true)) {
 +        goto done;
 +    }
 +
 +    block_acct_done(blk_get_stats(lu->qdev.conf.blk), &r->acct);
 +    scsi_req_complete(&r->req, GOOD);
 +
 +done:
 +    aio_context_release(blk_get_aio_context(lu->qdev.conf.blk));
 +    scsi_req_unref(&r->req);
 +}
 +
 +static int32_t ufs_scsi_emulate_command(SCSIRequest *req, uint8_t *buf)
 +{
 +    UfsSCSIReq *r = DO_UPCAST(UfsSCSIReq, req, req);
 +    UfsLu *lu = DO_UPCAST(UfsLu, qdev, req->dev);
 +    uint32_t last_block = 0;
 +    uint8_t *outbuf;
 +    int buflen;
 +
 +    switch (req->cmd.buf[0]) {
 +    case INQUIRY:
 +    case MODE_SENSE_10:
 +    case START_STOP:
 +    case REQUEST_SENSE:
 +        break;
 +
 +    default:
 +        if (!blk_is_available(lu->qdev.conf.blk)) {
 +            scsi_check_condition(r, SENSE_CODE(NO_MEDIUM));
 +            return 0;
 +        }
 +        break;
 +    }
 +
 +    /*
 +     * FIXME: we shouldn't return anything bigger than 4k, but the code
 +     * requires the buffer to be as big as req->cmd.xfer in several
 +     * places.  So, do not allow CDBs with a very large ALLOCATION
 +     * LENGTH.  The real fix would be to modify scsi_read_data and
 +     * dma_buf_read, so that they return data beyond the buflen
 +     * as all zeros.
 +     */
 +    if (req->cmd.xfer > 65536) {
 +        goto illegal_request;
 +    }
 +    r->buflen = MAX(4096, req->cmd.xfer);
 +
 +    if (!r->iov.iov_base) {
 +        r->iov.iov_base = blk_blockalign(lu->qdev.conf.blk, r->buflen);
 +    }
 +
 +    outbuf = r->iov.iov_base;
 +    memset(outbuf, 0, r->buflen);
 +    switch (req->cmd.buf[0]) {
 +    case TEST_UNIT_READY:
 +        assert(blk_is_available(lu->qdev.conf.blk));
 +        break;
 +    case INQUIRY:
 +        buflen = ufs_scsi_emulate_inquiry(req, outbuf, r->buflen);
 +        if (buflen < 0) {
 +            goto illegal_request;
 +        }
 +        break;
 +    case MODE_SENSE_10:
 +        buflen = ufs_scsi_emulate_mode_sense(r, outbuf);
 +        if (buflen < 0) {
 +            goto illegal_request;
 +        }
 +        break;
 +    case READ_CAPACITY_10:
 +        /* The normal LEN field for this command is zero.  */
 +        memset(outbuf, 0, 8);
 +        if (lu->qdev.max_lba > 0) {
 +            last_block = lu->qdev.max_lba - 1;
 +        };
 +        outbuf[0] = (last_block >> 24) & 0xff;
 +        outbuf[1] = (last_block >> 16) & 0xff;
 +        outbuf[2] = (last_block >> 8) & 0xff;
 +        outbuf[3] = last_block & 0xff;
 +        outbuf[4] = (lu->qdev.blocksize >> 24) & 0xff;
 +        outbuf[5] = (lu->qdev.blocksize >> 16) & 0xff;
 +        outbuf[6] = (lu->qdev.blocksize >> 8) & 0xff;
 +        outbuf[7] = lu->qdev.blocksize & 0xff;
 +        break;
 +    case REQUEST_SENSE:
 +        /* Just return "NO SENSE".  */
 +        buflen = scsi_convert_sense(NULL, 0, outbuf, r->buflen,
 +                                    (req->cmd.buf[1] & 1) == 0);
 +        if (buflen < 0) {
 +            goto illegal_request;
 +        }
 +        break;
 +    case SYNCHRONIZE_CACHE:
 +        /* The request is used as the AIO opaque value, so add a ref.  */
 +        scsi_req_ref(&r->req);
 +        block_acct_start(blk_get_stats(lu->qdev.conf.blk), &r->acct, 0,
 +                         BLOCK_ACCT_FLUSH);
 +        r->req.aiocb = blk_aio_flush(lu->qdev.conf.blk, scsi_aio_complete, r);
 +        return 0;
 +    case VERIFY_10:
 +        trace_ufs_scsi_emulate_command_VERIFY((req->cmd.buf[1] >> 1) & 3);
 +        if (req->cmd.buf[1] & 6) {
 +            goto illegal_request;
 +        }
 +        break;
 +    case SERVICE_ACTION_IN_16:
 +        /* Service Action In subcommands. */
 +        if ((req->cmd.buf[1] & 31) == SAI_READ_CAPACITY_16) {
 +            trace_ufs_scsi_emulate_command_SAI_16();
 +            memset(outbuf, 0, req->cmd.xfer);
 +
 +            if (lu->qdev.max_lba > 0) {
 +                last_block = lu->qdev.max_lba - 1;
 +            };
 +            outbuf[0] = 0;
 +            outbuf[1] = 0;
 +            outbuf[2] = 0;
 +            outbuf[3] = 0;
 +            outbuf[4] = (last_block >> 24) & 0xff;
 +            outbuf[5] = (last_block >> 16) & 0xff;
 +            outbuf[6] = (last_block >> 8) & 0xff;
 +            outbuf[7] = last_block & 0xff;
 +            outbuf[8] = (lu->qdev.blocksize >> 24) & 0xff;
 +            outbuf[9] = (lu->qdev.blocksize >> 16) & 0xff;
 +            outbuf[10] = (lu->qdev.blocksize >> 8) & 0xff;
 +            outbuf[11] = lu->qdev.blocksize & 0xff;
 +            outbuf[12] = 0;
 +            outbuf[13] = get_physical_block_exp(&lu->qdev.conf);
 +
 +            if (lu->unit_desc.provisioning_type == 2 ||
 +                lu->unit_desc.provisioning_type == 3) {
 +                outbuf[14] = 0x80;
 +            }
 +            /* Protection, exponent and lowest lba field left blank. */
 +            break;
 +        }
 +        trace_ufs_scsi_emulate_command_SAI_unsupported();
 +        goto illegal_request;
 +    case MODE_SELECT_10:
 +        trace_ufs_scsi_emulate_command_MODE_SELECT_10(r->req.cmd.xfer);
 +        break;
 +    case START_STOP:
 +        /*
 +         * TODO: START_STOP is not yet implemented. It always returns success.
 +         * Revisit it when ufs power management is implemented.
 +         */
 +        trace_ufs_scsi_emulate_command_START_STOP();
 +        break;
 +    case FORMAT_UNIT:
 +        trace_ufs_scsi_emulate_command_FORMAT_UNIT();
 +        break;
 +    case SEND_DIAGNOSTIC:
 +        trace_ufs_scsi_emulate_command_SEND_DIAGNOSTIC();
 +        break;
 +    default:
 +        trace_ufs_scsi_emulate_command_UNKNOWN(buf[0],
 +                                               scsi_command_name(buf[0]));
 +        scsi_check_condition(r, SENSE_CODE(INVALID_OPCODE));
 +        return 0;
 +    }
 +    assert(!r->req.aiocb);
 +    r->iov.iov_len = MIN(r->buflen, req->cmd.xfer);
 +    if (r->iov.iov_len == 0) {
 +        scsi_req_complete(&r->req, GOOD);
 +    }
 +    if (r->req.cmd.mode == SCSI_XFER_TO_DEV) {
 +        assert(r->iov.iov_len == req->cmd.xfer);
 +        return -r->iov.iov_len;
 +    } else {
 +        return r->iov.iov_len;
 +    }
 +
 +illegal_request:
 +    if (r->req.status == -1) {
 +        scsi_check_condition(r, SENSE_CODE(INVALID_FIELD));
 +    }
 +    return 0;
 +}
 +
 +static void ufs_scsi_emulate_read_data(SCSIRequest *req)
 +{
 +    UfsSCSIReq *r = DO_UPCAST(UfsSCSIReq, req, req);
 +    int buflen = r->iov.iov_len;
 +
 +    if (buflen) {
 +        trace_ufs_scsi_emulate_read_data(buflen);
 +        r->iov.iov_len = 0;
 +        r->started = true;
 +        scsi_req_data(&r->req, buflen);
 +        return;
 +    }
 +
 +    /* This also clears the sense buffer for REQUEST SENSE.  */
 +    scsi_req_complete(&r->req, GOOD);
 +}
 +
 +static int ufs_scsi_check_mode_select(UfsLu *lu, int page, uint8_t *inbuf,
 +                                      int inlen)
 +{
 +    uint8_t mode_current[SCSI_MAX_MODE_LEN];
 +    uint8_t mode_changeable[SCSI_MAX_MODE_LEN];
 +    uint8_t *p;
 +    int len, expected_len, changeable_len, i;
 +
 +    /*
 +     * The input buffer does not include the page header, so it is
 +     * off by 2 bytes.
 +     */
 +    expected_len = inlen + 2;
 +    if (expected_len > SCSI_MAX_MODE_LEN) {
 +        return -1;
 +    }
 +
 +    /* MODE_PAGE_ALLS is only valid for MODE SENSE commands */
 +    if (page == MODE_PAGE_ALLS) {
 +        return -1;
 +    }
 +
 +    p = mode_current;
 +    memset(mode_current, 0, inlen + 2);
 +    len = mode_sense_page(lu, page, &p, 0);
 +    if (len < 0 || len != expected_len) {
 +        return -1;
 +    }
 +
 +    p = mode_changeable;
 +    memset(mode_changeable, 0, inlen + 2);
 +    changeable_len = mode_sense_page(lu, page, &p, 1);
 +    assert(changeable_len == len);
 +
 +    /*
 +     * Check that unchangeable bits are the same as what MODE SENSE
 +     * would return.
 +     */
 +    for (i = 2; i < len; i++) {
 +        if (((mode_current[i] ^ inbuf[i - 2]) & ~mode_changeable[i]) != 0) {
 +            return -1;
 +        }
 +    }
 +    return 0;
 +}
 +
 +static void ufs_scsi_apply_mode_select(UfsLu *lu, int page, uint8_t *p)
 +{
 +    switch (page) {
 +    case MODE_PAGE_CACHING:
 +        blk_set_enable_write_cache(lu->qdev.conf.blk, (p[0] & 4) != 0);
 +        break;
 +
 +    default:
 +        break;
 +    }
 +}
 +
 +static int mode_select_pages(UfsSCSIReq *r, uint8_t *p, int len, bool change)
 +{
 +    UfsLu *lu = DO_UPCAST(UfsLu, qdev, r->req.dev);
 +
 +    while (len > 0) {
 +        int page, page_len;
 +
 +        page = p[0] & 0x3f;
 +        if (p[0] & 0x40) {
 +            goto invalid_param;
 +        } else {
 +            if (len < 2) {
 +                goto invalid_param_len;
 +            }
 +            page_len = p[1];
 +            p += 2;
 +            len -= 2;
 +        }
 +
 +        if (page_len > len) {
 +            goto invalid_param_len;
 +        }
 +
 +        if (!change) {
 +            if (ufs_scsi_check_mode_select(lu, page, p, page_len) < 0) {
 +                goto invalid_param;
 +            }
 +        } else {
 +            ufs_scsi_apply_mode_select(lu, page, p);
 +        }
 +
 +        p += page_len;
 +        len -= page_len;
 +    }
 +    return 0;
 +
 +invalid_param:
 +    scsi_check_condition(r, SENSE_CODE(INVALID_PARAM));
 +    return -1;
 +
 +invalid_param_len:
 +    scsi_check_condition(r, SENSE_CODE(INVALID_PARAM_LEN));
 +    return -1;
 +}
 +
 +static void ufs_scsi_emulate_mode_select(UfsSCSIReq *r, uint8_t *inbuf)
 +{
 +    UfsLu *lu = DO_UPCAST(UfsLu, qdev, r->req.dev);
 +    uint8_t *p = inbuf;
 +    int len = r->req.cmd.xfer;
 +    int hdr_len = 8;
 +    int bd_len;
 +    int pass;
 +
 +    /* We only support PF=1, SP=0.  */
 +    if ((r->req.cmd.buf[1] & 0x11) != 0x10) {
 +        goto invalid_field;
 +    }
 +
 +    if (len < hdr_len) {
 +        goto invalid_param_len;
 +    }
 +
 +    bd_len = lduw_be_p(&p[6]);
 +    if (bd_len != 0) {
 +        goto invalid_param;
 +    }
 +
 +    len -= hdr_len;
 +    p += hdr_len;
 +
 +    /* Ensure no change is made if there is an error!  */
 +    for (pass = 0; pass < 2; pass++) {
 +        if (mode_select_pages(r, p, len, pass == 1) < 0) {
 +            assert(pass == 0);
 +            return;
 +        }
 +    }
 +
 +    if (!blk_enable_write_cache(lu->qdev.conf.blk)) {
 +        /* The request is used as the AIO opaque value, so add a ref.  */
 +        scsi_req_ref(&r->req);
 +        block_acct_start(blk_get_stats(lu->qdev.conf.blk), &r->acct, 0,
 +                         BLOCK_ACCT_FLUSH);
 +        r->req.aiocb = blk_aio_flush(lu->qdev.conf.blk, scsi_aio_complete, r);
 +        return;
 +    }
 +
 +    scsi_req_complete(&r->req, GOOD);
 +    return;
 +
 +invalid_param:
 +    scsi_check_condition(r, SENSE_CODE(INVALID_PARAM));
 +    return;
 +
 +invalid_param_len:
 +    scsi_check_condition(r, SENSE_CODE(INVALID_PARAM_LEN));
 +    return;
 +
 +invalid_field:
 +    scsi_check_condition(r, SENSE_CODE(INVALID_FIELD));
 +}
 +
 +/* block_num and nb_blocks expected to be in qdev blocksize */
 +static inline bool check_lba_range(UfsLu *lu, uint64_t block_num,
 +                                   uint32_t nb_blocks)
 +{
 +    /*
 +     * The first line tests that no overflow happens when computing the last
 +     * block.  The second line tests that the last accessed block is in
 +     * range.
 +     *
 +     * Careful, the computations should not underflow for nb_blocks == 0,
 +     * and a 0-block read to the first LBA beyond the end of device is
 +     * valid.
 +     */
 +    return (block_num <= block_num + nb_blocks &&
 +            block_num + nb_blocks <= lu->qdev.max_lba + 1);
 +}
 +
 +static void ufs_scsi_emulate_write_data(SCSIRequest *req)
 +{
 +    UfsSCSIReq *r = DO_UPCAST(UfsSCSIReq, req, req);
 +
 +    if (r->iov.iov_len) {
 +        int buflen = r->iov.iov_len;
 +        trace_ufs_scsi_emulate_write_data(buflen);
 +        r->iov.iov_len = 0;
 +        scsi_req_data(&r->req, buflen);
 +        return;
 +    }
 +
 +    switch (req->cmd.buf[0]) {
 +    case MODE_SELECT_10:
 +        /* This also clears the sense buffer for REQUEST SENSE.  */
 +        ufs_scsi_emulate_mode_select(r, r->iov.iov_base);
 +        break;
 +    default:
 +        abort();
 +    }
 +}
 +
 +/* Return a pointer to the data buffer.  */
 +static uint8_t *ufs_scsi_get_buf(SCSIRequest *req)
 +{
 +    UfsSCSIReq *r = DO_UPCAST(UfsSCSIReq, req, req);
 +
 +    return (uint8_t *)r->iov.iov_base;
 +}
 +
 +static int32_t ufs_scsi_dma_command(SCSIRequest *req, uint8_t *buf)
 +{
 +    UfsSCSIReq *r = DO_UPCAST(UfsSCSIReq, req, req);
 +    UfsLu *lu = DO_UPCAST(UfsLu, qdev, req->dev);
 +    uint32_t len;
 +    uint8_t command;
 +
 +    command = buf[0];
 +
 +    if (!blk_is_available(lu->qdev.conf.blk)) {
 +        scsi_check_condition(r, SENSE_CODE(NO_MEDIUM));
 +        return 0;
 +    }
 +
 +    len = scsi_data_cdb_xfer(r->req.cmd.buf);
 +    switch (command) {
 +    case READ_6:
 +    case READ_10:
 +        trace_ufs_scsi_dma_command_READ(r->req.cmd.lba, len);
 +        if (r->req.cmd.buf[1] & 0xe0) {
 +            goto illegal_request;
 +        }
 +        if (!check_lba_range(lu, r->req.cmd.lba, len)) {
 +            goto illegal_lba;
 +        }
 +        r->sector = r->req.cmd.lba * (lu->qdev.blocksize / BDRV_SECTOR_SIZE);
 +        r->sector_count = len * (lu->qdev.blocksize / BDRV_SECTOR_SIZE);
 +        break;
 +    case WRITE_6:
 +    case WRITE_10:
 +        trace_ufs_scsi_dma_command_WRITE(r->req.cmd.lba, len);
 +        if (!blk_is_writable(lu->qdev.conf.blk)) {
 +            scsi_check_condition(r, SENSE_CODE(WRITE_PROTECTED));
 +            return 0;
 +        }
 +        if (r->req.cmd.buf[1] & 0xe0) {
 +            goto illegal_request;
 +        }
 +        if (!check_lba_range(lu, r->req.cmd.lba, len)) {
 +            goto illegal_lba;
 +        }
 +        r->sector = r->req.cmd.lba * (lu->qdev.blocksize / BDRV_SECTOR_SIZE);
 +        r->sector_count = len * (lu->qdev.blocksize / BDRV_SECTOR_SIZE);
 +        break;
 +    default:
 +        abort();
 +    illegal_request:
 +        scsi_check_condition(r, SENSE_CODE(INVALID_FIELD));
 +        return 0;
 +    illegal_lba:
 +        scsi_check_condition(r, SENSE_CODE(LBA_OUT_OF_RANGE));
 +        return 0;
 +    }
 +    r->need_fua_emulation = ((r->req.cmd.buf[1] & 8) != 0);
 +    if (r->sector_count == 0) {
 +        scsi_req_complete(&r->req, GOOD);
 +    }
 +    assert(r->iov.iov_len == 0);
 +    if (r->req.cmd.mode == SCSI_XFER_TO_DEV) {
 +        return -r->sector_count * BDRV_SECTOR_SIZE;
 +    } else {
 +        return r->sector_count * BDRV_SECTOR_SIZE;
 +    }
 +}
 +
 +static void scsi_write_do_fua(UfsSCSIReq *r)
 +{
 +    UfsLu *lu = DO_UPCAST(UfsLu, qdev, r->req.dev);
 +
 +    assert(r->req.aiocb == NULL);
 +    assert(!r->req.io_canceled);
 +
 +    if (r->need_fua_emulation) {
 +        block_acct_start(blk_get_stats(lu->qdev.conf.blk), &r->acct, 0,
 +                         BLOCK_ACCT_FLUSH);
 +        r->req.aiocb = blk_aio_flush(lu->qdev.conf.blk, scsi_aio_complete, r);
 +        return;
 +    }
 +
 +    scsi_req_complete(&r->req, GOOD);
 +    scsi_req_unref(&r->req);
 +}
 +
 +static void scsi_dma_complete_noio(UfsSCSIReq *r, int ret)
 +{
 +    assert(r->req.aiocb == NULL);
 +    if (ufs_scsi_req_check_error(r, ret, false)) {
 +        goto done;
 +    }
 +
 +    r->sector += r->sector_count;
 +    r->sector_count = 0;
 +    if (r->req.cmd.mode == SCSI_XFER_TO_DEV) {
 +        scsi_write_do_fua(r);
 +        return;
 +    } else {
 +        scsi_req_complete(&r->req, GOOD);
 +    }
 +
 +done:
 +    scsi_req_unref(&r->req);
 +}
 +
 +static void scsi_dma_complete(void *opaque, int ret)
 +{
 +    UfsSCSIReq *r = (UfsSCSIReq *)opaque;
 +    UfsLu *lu = DO_UPCAST(UfsLu, qdev, r->req.dev);
 +
 +    assert(r->req.aiocb != NULL);
 +    r->req.aiocb = NULL;
 +
 +    aio_context_acquire(blk_get_aio_context(lu->qdev.conf.blk));
 +    if (ret < 0) {
 +        block_acct_failed(blk_get_stats(lu->qdev.conf.blk), &r->acct);
 +    } else {
 +        block_acct_done(blk_get_stats(lu->qdev.conf.blk), &r->acct);
 +    }
 +    scsi_dma_complete_noio(r, ret);
 +    aio_context_release(blk_get_aio_context(lu->qdev.conf.blk));
 +}
 +
 +static BlockAIOCB *scsi_dma_readv(int64_t offset, QEMUIOVector *iov,
 +                                  BlockCompletionFunc *cb, void *cb_opaque,
 +                                  void *opaque)
 +{
 +    UfsSCSIReq *r = opaque;
 +    UfsLu *lu = DO_UPCAST(UfsLu, qdev, r->req.dev);
 +    return blk_aio_preadv(lu->qdev.conf.blk, offset, iov, 0, cb, cb_opaque);
 +}
 +
 +static void scsi_init_iovec(UfsSCSIReq *r, size_t size)
 +{
 +    UfsLu *lu = DO_UPCAST(UfsLu, qdev, r->req.dev);
 +
 +    if (!r->iov.iov_base) {
 +        r->buflen = size;
 +        r->iov.iov_base = blk_blockalign(lu->qdev.conf.blk, r->buflen);
 +    }
 +    r->iov.iov_len = MIN(r->sector_count * BDRV_SECTOR_SIZE, r->buflen);
 +    qemu_iovec_init_external(&r->qiov, &r->iov, 1);
 +}
 +
 +static void scsi_read_complete_noio(UfsSCSIReq *r, int ret)
 +{
 +    uint32_t n;
 +
 +    assert(r->req.aiocb == NULL);
 +    if (ufs_scsi_req_check_error(r, ret, false)) {
 +        goto done;
 +    }
 +
 +    n = r->qiov.size / BDRV_SECTOR_SIZE;
 +    r->sector += n;
 +    r->sector_count -= n;
 +    scsi_req_data(&r->req, r->qiov.size);
 +
 +done:
 +    scsi_req_unref(&r->req);
 +}
 +
 +static void scsi_read_complete(void *opaque, int ret)
 +{
 +    UfsSCSIReq *r = (UfsSCSIReq *)opaque;
 +    UfsLu *lu = DO_UPCAST(UfsLu, qdev, r->req.dev);
 +
 +    assert(r->req.aiocb != NULL);
 +    r->req.aiocb = NULL;
 +    trace_ufs_scsi_read_data_count(r->sector_count);
 +    aio_context_acquire(blk_get_aio_context(lu->qdev.conf.blk));
 +    if (ret < 0) {
 +        block_acct_failed(blk_get_stats(lu->qdev.conf.blk), &r->acct);
 +    } else {
 +        block_acct_done(blk_get_stats(lu->qdev.conf.blk), &r->acct);
 +        trace_ufs_scsi_read_complete(r->req.tag, r->qiov.size);
 +    }
 +    scsi_read_complete_noio(r, ret);
 +    aio_context_release(blk_get_aio_context(lu->qdev.conf.blk));
 +}
 +
 +/* Actually issue a read to the block device.  */
 +static void scsi_do_read(UfsSCSIReq *r, int ret)
 +{
 +    UfsLu *lu = DO_UPCAST(UfsLu, qdev, r->req.dev);
 +
 +    assert(r->req.aiocb == NULL);
 +    if (ufs_scsi_req_check_error(r, ret, false)) {
 +        goto done;
 +    }
 +
 +    /* The request is used as the AIO opaque value, so add a ref.  */
 +    scsi_req_ref(&r->req);
 +
 +    if (r->req.sg) {
 +        dma_acct_start(lu->qdev.conf.blk, &r->acct, r->req.sg, BLOCK_ACCT_READ);
 +        r->req.residual -= r->req.sg->size;
 +        r->req.aiocb = dma_blk_io(
 +            blk_get_aio_context(lu->qdev.conf.blk), r->req.sg,
 +            r->sector << BDRV_SECTOR_BITS, BDRV_SECTOR_SIZE, scsi_dma_readv, r,
 +            scsi_dma_complete, r, DMA_DIRECTION_FROM_DEVICE);
 +    } else {
 +        scsi_init_iovec(r, SCSI_DMA_BUF_SIZE);
 +        block_acct_start(blk_get_stats(lu->qdev.conf.blk), &r->acct,
 +                         r->qiov.size, BLOCK_ACCT_READ);
 +        r->req.aiocb = scsi_dma_readv(r->sector << BDRV_SECTOR_BITS, &r->qiov,
 +                                      scsi_read_complete, r, r);
 +    }
 +
 +done:
 +    scsi_req_unref(&r->req);
 +}
 +
 +static void scsi_do_read_cb(void *opaque, int ret)
 +{
 +    UfsSCSIReq *r = (UfsSCSIReq *)opaque;
 +    UfsLu *lu = DO_UPCAST(UfsLu, qdev, r->req.dev);
 +
 +    assert(r->req.aiocb != NULL);
 +    r->req.aiocb = NULL;
 +
 +    aio_context_acquire(blk_get_aio_context(lu->qdev.conf.blk));
 +    if (ret < 0) {
 +        block_acct_failed(blk_get_stats(lu->qdev.conf.blk), &r->acct);
 +    } else {
 +        block_acct_done(blk_get_stats(lu->qdev.conf.blk), &r->acct);
 +    }
 +    scsi_do_read(opaque, ret);
 +    aio_context_release(blk_get_aio_context(lu->qdev.conf.blk));
 +}
 +
 +/* Read more data from scsi device into buffer.  */
 +static void scsi_read_data(SCSIRequest *req)
 +{
 +    UfsSCSIReq *r = DO_UPCAST(UfsSCSIReq, req, req);
 +    UfsLu *lu = DO_UPCAST(UfsLu, qdev, r->req.dev);
 +    bool first;
 +
 +    trace_ufs_scsi_read_data_count(r->sector_count);
 +    if (r->sector_count == 0) {
 +        /* This also clears the sense buffer for REQUEST SENSE.  */
 +        scsi_req_complete(&r->req, GOOD);
 +        return;
 +    }
 +
 +    /* No data transfer may already be in progress */
 +    assert(r->req.aiocb == NULL);
 +
 +    /* The request is used as the AIO opaque value, so add a ref.  */
 +    scsi_req_ref(&r->req);
 +    if (r->req.cmd.mode == SCSI_XFER_TO_DEV) {
 +        trace_ufs_scsi_read_data_invalid();
 +        scsi_read_complete_noio(r, -EINVAL);
 +        return;
 +    }
 +
 +    if (!blk_is_available(req->dev->conf.blk)) {
 +        scsi_read_complete_noio(r, -ENOMEDIUM);
 +        return;
 +    }
 +
 +    first = !r->started;
 +    r->started = true;
 +    if (first && r->need_fua_emulation) {
 +        block_acct_start(blk_get_stats(lu->qdev.conf.blk), &r->acct, 0,
 +                         BLOCK_ACCT_FLUSH);
 +        r->req.aiocb = blk_aio_flush(lu->qdev.conf.blk, scsi_do_read_cb, r);
 +    } else {
 +        scsi_do_read(r, 0);
 +    }
 +}
 +
 +static void scsi_write_complete_noio(UfsSCSIReq *r, int ret)
 +{
 +    uint32_t n;
 +
 +    assert(r->req.aiocb == NULL);
 +    if (ufs_scsi_req_check_error(r, ret, false)) {
 +        goto done;
 +    }
 +
 +    n = r->qiov.size / BDRV_SECTOR_SIZE;
 +    r->sector += n;
 +    r->sector_count -= n;
 +    if (r->sector_count == 0) {
 +        scsi_write_do_fua(r);
 +        return;
 +    } else {
 +        scsi_init_iovec(r, SCSI_DMA_BUF_SIZE);
 +        trace_ufs_scsi_write_complete_noio(r->req.tag, r->qiov.size);
 +        scsi_req_data(&r->req, r->qiov.size);
 +    }
 +
 +done:
 +    scsi_req_unref(&r->req);
 +}
 +
 +static void scsi_write_complete(void *opaque, int ret)
 +{
 +    UfsSCSIReq *r = (UfsSCSIReq *)opaque;
 +    UfsLu *lu = DO_UPCAST(UfsLu, qdev, r->req.dev);
 +
 +    assert(r->req.aiocb != NULL);
 +    r->req.aiocb = NULL;
 +
 +    aio_context_acquire(blk_get_aio_context(lu->qdev.conf.blk));
 +    if (ret < 0) {
 +        block_acct_failed(blk_get_stats(lu->qdev.conf.blk), &r->acct);
 +    } else {
 +        block_acct_done(blk_get_stats(lu->qdev.conf.blk), &r->acct);
 +    }
 +    scsi_write_complete_noio(r, ret);
 +    aio_context_release(blk_get_aio_context(lu->qdev.conf.blk));
 +}
 +
 +static BlockAIOCB *scsi_dma_writev(int64_t offset, QEMUIOVector *iov,
 +                                   BlockCompletionFunc *cb, void *cb_opaque,
 +                                   void *opaque)
 +{
 +    UfsSCSIReq *r = opaque;
 +    UfsLu *lu = DO_UPCAST(UfsLu, qdev, r->req.dev);
 +    return blk_aio_pwritev(lu->qdev.conf.blk, offset, iov, 0, cb, cb_opaque);
 +}
 +
 +static void scsi_write_data(SCSIRequest *req)
 +{
 +    UfsSCSIReq *r = DO_UPCAST(UfsSCSIReq, req, req);
 +    UfsLu *lu = DO_UPCAST(UfsLu, qdev, r->req.dev);
 +
 +    /* No data transfer may already be in progress */
 +    assert(r->req.aiocb == NULL);
 +
 +    /* The request is used as the AIO opaque value, so add a ref.  */
 +    scsi_req_ref(&r->req);
 +    if (r->req.cmd.mode != SCSI_XFER_TO_DEV) {
 +        trace_ufs_scsi_write_data_invalid();
 +        scsi_write_complete_noio(r, -EINVAL);
 +        return;
 +    }
 +
 +    if (!r->req.sg && !r->qiov.size) {
 +        /* Called for the first time.  Ask the driver to send us more data.  */
 +        r->started = true;
 +        scsi_write_complete_noio(r, 0);
 +        return;
 +    }
 +    if (!blk_is_available(req->dev->conf.blk)) {
 +        scsi_write_complete_noio(r, -ENOMEDIUM);
 +        return;
 +    }
 +
 +    if (r->req.sg) {
 +        dma_acct_start(lu->qdev.conf.blk, &r->acct, r->req.sg,
 +                       BLOCK_ACCT_WRITE);
 +        r->req.residual -= r->req.sg->size;
 +        r->req.aiocb = dma_blk_io(
 +            blk_get_aio_context(lu->qdev.conf.blk), r->req.sg,
 +            r->sector << BDRV_SECTOR_BITS, BDRV_SECTOR_SIZE, scsi_dma_writev, r,
 +            scsi_dma_complete, r, DMA_DIRECTION_TO_DEVICE);
 +    } else {
 +        block_acct_start(blk_get_stats(lu->qdev.conf.blk), &r->acct,
 +                         r->qiov.size, BLOCK_ACCT_WRITE);
 +        r->req.aiocb = scsi_dma_writev(r->sector << BDRV_SECTOR_BITS, &r->qiov,
 +                                       scsi_write_complete, r, r);
 +    }
 +}
 +
 +static const SCSIReqOps ufs_scsi_emulate_reqops = {
 +    .size = sizeof(UfsSCSIReq),
 +    .free_req = ufs_scsi_free_request,
 +    .send_command = ufs_scsi_emulate_command,
 +    .read_data = ufs_scsi_emulate_read_data,
 +    .write_data = ufs_scsi_emulate_write_data,
 +    .get_buf = ufs_scsi_get_buf,
 +};
 +
 +static const SCSIReqOps ufs_scsi_dma_reqops = {
 +    .size = sizeof(UfsSCSIReq),
 +    .free_req = ufs_scsi_free_request,
 +    .send_command = ufs_scsi_dma_command,
 +    .read_data = scsi_read_data,
 +    .write_data = scsi_write_data,
 +    .get_buf = ufs_scsi_get_buf,
 +};
 +
 +/*
 + * Following commands are not yet supported
 + * PRE_FETCH(10),
 + * UNMAP,
 + * WRITE_BUFFER, READ_BUFFER,
 + * SECURITY_PROTOCOL_IN, SECURITY_PROTOCOL_OUT
 + */
 +static const SCSIReqOps *const ufs_scsi_reqops_dispatch[256] = {
 +    [TEST_UNIT_READY] = &ufs_scsi_emulate_reqops,
 +    [INQUIRY] = &ufs_scsi_emulate_reqops,
 +    [MODE_SENSE_10] = &ufs_scsi_emulate_reqops,
 +    [START_STOP] = &ufs_scsi_emulate_reqops,
 +    [READ_CAPACITY_10] = &ufs_scsi_emulate_reqops,
 +    [REQUEST_SENSE] = &ufs_scsi_emulate_reqops,
 +    [SYNCHRONIZE_CACHE] = &ufs_scsi_emulate_reqops,
 +    [MODE_SELECT_10] = &ufs_scsi_emulate_reqops,
 +    [VERIFY_10] = &ufs_scsi_emulate_reqops,
 +    [FORMAT_UNIT] = &ufs_scsi_emulate_reqops,
 +    [SERVICE_ACTION_IN_16] = &ufs_scsi_emulate_reqops,
 +    [SEND_DIAGNOSTIC] = &ufs_scsi_emulate_reqops,
 +
 +    [READ_6] = &ufs_scsi_dma_reqops,
 +    [READ_10] = &ufs_scsi_dma_reqops,
 +    [WRITE_6] = &ufs_scsi_dma_reqops,
 +    [WRITE_10] = &ufs_scsi_dma_reqops,
 +};
 +
 +static SCSIRequest *scsi_new_request(SCSIDevice *dev, uint32_t tag,
 +                                     uint32_t lun, uint8_t *buf,
 +                                     void *hba_private)
 +{
 +    UfsLu *lu = DO_UPCAST(UfsLu, qdev, dev);
 +    SCSIRequest *req;
 +    const SCSIReqOps *ops;
 +    uint8_t command;
 +
 +    command = buf[0];
 +    ops = ufs_scsi_reqops_dispatch[command];
 +    if (!ops) {
 +        ops = &ufs_scsi_emulate_reqops;
 +    }
 +    req = scsi_req_alloc(ops, &lu->qdev, tag, lun, hba_private);
 +
 +    return req;
 +}
 +
 +static Property ufs_lu_props[] = {
 +    DEFINE_PROP_DRIVE("drive", UfsLu, qdev.conf.blk),
 +    DEFINE_PROP_END_OF_LIST(),
 +};
 +
 +static bool ufs_lu_brdv_init(UfsLu *lu, Error **errp)
 +{
 +    SCSIDevice *dev = &lu->qdev;
 +    bool read_only;
 +
 +    if (!lu->qdev.conf.blk) {
 +        error_setg(errp, "drive property not set");
 +        return false;
 +    }
 +
 +    if (!blkconf_blocksizes(&lu->qdev.conf, errp)) {
 +        return false;
 +    }
 +
 +    if (blk_get_aio_context(lu->qdev.conf.blk) != qemu_get_aio_context() &&
 +        !lu->qdev.hba_supports_iothread) {
 +        error_setg(errp, "HBA does not support iothreads");
 +        return false;
 +    }
 +
 +    read_only = !blk_supports_write_perm(lu->qdev.conf.blk);
 +
 +    if (!blkconf_apply_backend_options(&dev->conf, read_only,
 +                                       dev->type == TYPE_DISK, errp)) {
 +        return false;
 +    }
 +
 +    if (blk_is_sg(lu->qdev.conf.blk)) {
 +        error_setg(errp, "unwanted /dev/sg*");
 +        return false;
 +    }
 +
 +    blk_iostatus_enable(lu->qdev.conf.blk);
 +    return true;
 +}
 +
 +static bool ufs_add_lu(UfsHc *u, UfsLu *lu, Error **errp)
 +{
 +    BlockBackend *blk = lu->qdev.conf.blk;
 +    int64_t brdv_len = blk_getlength(blk);
 +    uint64_t raw_dev_cap =
 +        be64_to_cpu(u->geometry_desc.total_raw_device_capacity);
 +
 +    if (u->device_desc.number_lu >= UFS_MAX_LUS) {
 +        error_setg(errp, "ufs host controller has too many logical units.");
 +        return false;
 +    }
 +
 +    if (u->lus[lu->lun] != NULL) {
 +        error_setg(errp, "ufs logical unit %d already exists.", lu->lun);
 +        return false;
 +    }
 +
 +    u->lus[lu->lun] = lu;
 +    u->device_desc.number_lu++;
 +    raw_dev_cap += (brdv_len >> UFS_GEOMETRY_CAPACITY_SHIFT);
 +    u->geometry_desc.total_raw_device_capacity = cpu_to_be64(raw_dev_cap);
 +    return true;
 +}
 +
 +static inline uint8_t ufs_log2(uint64_t input)
 +{
 +    int log = 0;
 +    while (input >>= 1) {
 +        log++;
 +    }
 +    return log;
 +}
 +
 +static void ufs_init_lu(UfsLu *lu)
 +{
 +    BlockBackend *blk = lu->qdev.conf.blk;
 +    int64_t brdv_len = blk_getlength(blk);
 +
 +    lu->lun = lu->qdev.lun;
 +    memset(&lu->unit_desc, 0, sizeof(lu->unit_desc));
 +    lu->unit_desc.length = sizeof(UnitDescriptor);
 +    lu->unit_desc.descriptor_idn = QUERY_DESC_IDN_UNIT;
 +    lu->unit_desc.lu_enable = 0x01;
 +    lu->unit_desc.logical_block_size = ufs_log2(lu->qdev.blocksize);
 +    lu->unit_desc.unit_index = lu->qdev.lun;
 +    lu->unit_desc.logical_block_count =
 +        cpu_to_be64(brdv_len / (1 << lu->unit_desc.logical_block_size));
 +}
 +
 +static bool ufs_lu_check_constraints(UfsLu *lu, Error **errp)
 +{
 +    if (!lu->qdev.conf.blk) {
 +        error_setg(errp, "drive property not set");
 +        return false;
 +    }
 +
 +    if (lu->qdev.channel != 0) {
 +        error_setg(errp, "ufs logical unit does not support channel");
 +        return false;
 +    }
 +
 +    if (lu->qdev.lun >= UFS_MAX_LUS) {
 +        error_setg(errp, "lun must be between 1 and %d", UFS_MAX_LUS - 1);
 +        return false;
 +    }
 +
 +    return true;
 +}
 +
 +static void ufs_lu_realize(SCSIDevice *dev, Error **errp)
 +{
 +    UfsLu *lu = DO_UPCAST(UfsLu, qdev, dev);
 +    BusState *s = qdev_get_parent_bus(&dev->qdev);
 +    UfsHc *u = UFS(s->parent);
 +    AioContext *ctx = NULL;
 +    uint64_t nb_sectors, nb_blocks;
 +
 +    if (!ufs_lu_check_constraints(lu, errp)) {
 +        return;
 +    }
 +
 +    if (lu->qdev.conf.blk) {
 +        ctx = blk_get_aio_context(lu->qdev.conf.blk);
 +        aio_context_acquire(ctx);
 +        if (!blkconf_blocksizes(&lu->qdev.conf, errp)) {
 +            goto out;
 +        }
 +    }
 +    lu->qdev.blocksize = UFS_BLOCK_SIZE;
 +    blk_get_geometry(lu->qdev.conf.blk, &nb_sectors);
 +    nb_blocks = nb_sectors / (lu->qdev.blocksize / BDRV_SECTOR_SIZE);
 +    if (nb_blocks > UINT32_MAX) {
 +        nb_blocks = UINT32_MAX;
 +    }
 +    lu->qdev.max_lba = nb_blocks;
 +    lu->qdev.type = TYPE_DISK;
 +
 +    ufs_init_lu(lu);
 +    if (!ufs_add_lu(u, lu, errp)) {
 +        goto out;
 +    }
 +
 +    ufs_lu_brdv_init(lu, errp);
 +out:
 +    if (ctx) {
 +        aio_context_release(ctx);
 +    }
 +}
 +
 +static void ufs_lu_unrealize(SCSIDevice *dev)
 +{
 +    UfsLu *lu = DO_UPCAST(UfsLu, qdev, dev);
 +
 +    blk_drain(lu->qdev.conf.blk);
 +}
 +
 +static void ufs_wlu_realize(DeviceState *qdev, Error **errp)
 +{
 +    UfsWLu *wlu = UFSWLU(qdev);
 +    SCSIDevice *dev = &wlu->qdev;
 +
 +    if (!is_wlun(dev->lun)) {
 +        error_setg(errp, "not well-known logical unit number");
 +        return;
 +    }
 +
 +    QTAILQ_INIT(&dev->requests);
 +}
 +
 +static void ufs_lu_class_init(ObjectClass *oc, void *data)
 +{
 +    DeviceClass *dc = DEVICE_CLASS(oc);
 +    SCSIDeviceClass *sc = SCSI_DEVICE_CLASS(oc);
 +
 +    sc->realize = ufs_lu_realize;
 +    sc->unrealize = ufs_lu_unrealize;
 +    sc->alloc_req = scsi_new_request;
 +    dc->bus_type = TYPE_UFS_BUS;
 +    device_class_set_props(dc, ufs_lu_props);
 +    dc->desc = "Virtual UFS logical unit";
 +}
 +
 +static void ufs_wlu_class_init(ObjectClass *oc, void *data)
 +{
 +    DeviceClass *dc = DEVICE_CLASS(oc);
 +    SCSIDeviceClass *sc = SCSI_DEVICE_CLASS(oc);
 +
 +    /*
 +     * The realize() function of TYPE_SCSI_DEVICE causes a segmentation fault
 +     * if a block drive does not exist. Define a new realize function for
 +     * well-known LUs that do not have a block drive.
 +     */
 +    dc->realize = ufs_wlu_realize;
 +    sc->alloc_req = scsi_new_request;
 +    dc->bus_type = TYPE_UFS_BUS;
 +    dc->desc = "Virtual UFS well-known logical unit";
 +}
 +
 +static const TypeInfo ufs_lu_info = {
 +    .name = TYPE_UFS_LU,
 +    .parent = TYPE_SCSI_DEVICE,
 +    .class_init = ufs_lu_class_init,
 +    .instance_size = sizeof(UfsLu),
 +};
 +
 +static const TypeInfo ufs_wlu_info = {
 +    .name = TYPE_UFS_WLU,
 +    .parent = TYPE_SCSI_DEVICE,
 +    .class_init = ufs_wlu_class_init,
 +    .instance_size = sizeof(UfsWLu),
 +};
 +
 +static void ufs_lu_register_types(void)
 +{
 +    type_register_static(&ufs_lu_info);
 +    type_register_static(&ufs_wlu_info);
 +}
 +
 +type_init(ufs_lu_register_types)
 diff --git a/hw/ufs/ufs.c b/hw/ufs/ufs.c
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/ufs/ufs.c
 +++ b/hw/ufs/ufs.c
@@ -XXX,XX +XXX,XX @@
   * SPDX-License-Identifier: GPL-2.0-or-later
   */
 +/**
 + * Reference Specs: https://www.jedec.org/, 3.1
 + *
 + * Usage
 + * -----
 + *
 + * Add options:
 + *      -drive file=<file>,if=none,id=<drive_id>
 + *      -device ufs,serial=<serial>,id=<bus_name>, \
 + *              nutrs=<N[optional]>,nutmrs=<N[optional]>
 + *      -device ufs-lu,drive=<drive_id>,bus=<bus_name>
 + */
 +
  #include "qemu/osdep.h"
  #include "qapi/error.h"
  #include "migration/vmstate.h"
@@ -XXX,XX +XXX,XX @@ static const MemoryRegionOps ufs_mmio_ops = {
      },
  };
 +static QEMUSGList *ufs_get_sg_list(SCSIRequest *scsi_req)
 +{
 +    UfsRequest *req = scsi_req->hba_private;
 +    return req->sg;
 +}
 +
 +static void ufs_build_upiu_sense_data(UfsRequest *req, SCSIRequest *scsi_req)
 +{
 +    req->rsp_upiu.sr.sense_data_len = cpu_to_be16(scsi_req->sense_len);
 +    assert(scsi_req->sense_len <= SCSI_SENSE_LEN);
 +    memcpy(req->rsp_upiu.sr.sense_data, scsi_req->sense, scsi_req->sense_len);
 +}
 +
  static void ufs_build_upiu_header(UfsRequest *req, uint8_t trans_type,
                                    uint8_t flags, uint8_t response,
                                    uint8_t scsi_status,
@@ -XXX,XX +XXX,XX @@ static void ufs_build_upiu_header(UfsRequest *req, uint8_t trans_type,
      req->rsp_upiu.header.data_segment_length = cpu_to_be16(data_segment_length);
  }
 +static void ufs_scsi_command_complete(SCSIRequest *scsi_req, size_t resid)
 +{
 +    UfsRequest *req = scsi_req->hba_private;
 +    int16_t status = scsi_req->status;
 +    uint32_t expected_len = be32_to_cpu(req->req_upiu.sc.exp_data_transfer_len);
 +    uint32_t transfered_len = scsi_req->cmd.xfer - resid;
 +    uint8_t flags = 0, response = COMMAND_RESULT_SUCESS;
 +    uint16_t data_segment_length;
 +
 +    if (expected_len > transfered_len) {
 +        req->rsp_upiu.sr.residual_transfer_count =
 +            cpu_to_be32(expected_len - transfered_len);
 +        flags |= UFS_UPIU_FLAG_UNDERFLOW;
 +    } else if (expected_len < transfered_len) {
 +        req->rsp_upiu.sr.residual_transfer_count =
 +            cpu_to_be32(transfered_len - expected_len);
 +        flags |= UFS_UPIU_FLAG_OVERFLOW;
 +    }
 +
 +    if (status != 0) {
 +        ufs_build_upiu_sense_data(req, scsi_req);
 +        response = COMMAND_RESULT_FAIL;
 +    }
 +
 +    data_segment_length = cpu_to_be16(scsi_req->sense_len +
 +                                      sizeof(req->rsp_upiu.sr.sense_data_len));
 +    ufs_build_upiu_header(req, UPIU_TRANSACTION_RESPONSE, flags, response,
 +                          status, data_segment_length);
 +
 +    ufs_complete_req(req, UFS_REQUEST_SUCCESS);
 +
 +    scsi_req->hba_private = NULL;
 +    scsi_req_unref(scsi_req);
 +}
 +
 +static const struct SCSIBusInfo ufs_scsi_info = {
 +    .tcq = true,
 +    .max_target = 0,
 +    .max_lun = UFS_MAX_LUS,
 +    .max_channel = 0,
 +
 +    .get_sg_list = ufs_get_sg_list,
 +    .complete = ufs_scsi_command_complete,
 +};
 +
 +static UfsReqResult ufs_exec_scsi_cmd(UfsRequest *req)
 +{
 +    UfsHc *u = req->hc;
 +    uint8_t lun = req->req_upiu.header.lun;
 +    uint8_t task_tag = req->req_upiu.header.task_tag;
 +    SCSIDevice *dev = NULL;
 +
 +    trace_ufs_exec_scsi_cmd(req->slot, lun, req->req_upiu.sc.cdb[0]);
 +
 +    if (!is_wlun(lun)) {
 +        if (lun >= u->device_desc.number_lu) {
 +            trace_ufs_err_scsi_cmd_invalid_lun(lun);
 +            return UFS_REQUEST_FAIL;
 +        } else if (u->lus[lun] == NULL) {
 +            trace_ufs_err_scsi_cmd_invalid_lun(lun);
 +            return UFS_REQUEST_FAIL;
 +        }
 +    }
 +
 +    switch (lun) {
 +    case UFS_UPIU_REPORT_LUNS_WLUN:
 +        dev = &u->report_wlu->qdev;
 +        break;
 +    case UFS_UPIU_UFS_DEVICE_WLUN:
 +        dev = &u->dev_wlu->qdev;
 +        break;
 +    case UFS_UPIU_BOOT_WLUN:
 +        dev = &u->boot_wlu->qdev;
 +        break;
 +    case UFS_UPIU_RPMB_WLUN:
 +        dev = &u->rpmb_wlu->qdev;
 +        break;
 +    default:
 +        dev = &u->lus[lun]->qdev;
 +    }
 +
 +    SCSIRequest *scsi_req = scsi_req_new(
 +        dev, task_tag, lun, req->req_upiu.sc.cdb, UFS_CDB_SIZE, req);
 +
 +    uint32_t len = scsi_req_enqueue(scsi_req);
 +    if (len) {
 +        scsi_req_continue(scsi_req);
 +    }
 +
 +    return UFS_REQUEST_NO_COMPLETE;
 +}
 +
  static UfsReqResult ufs_exec_nop_cmd(UfsRequest *req)
  {
-     extra_blocks=$1
+     trace_ufs_exec_nop_cmd(req->slot);
--    img_size=$2
+@@ -XXX,XX +XXX,XX @@ static const RpmbUnitDescriptor rpmb_unit_desc = {
-+    min_blocks=$2
-+    img_size=$3
+ static QueryRespCode ufs_read_unit_desc(UfsRequest *req)
+ {
--    sed -e "s/blocks=$extra_blocks\\(\$\\|[^0-9]\\)/nothing allocated/" \
++    UfsHc *u = req->hc;
--        -e "s/blocks=$((extra_blocks + img_size / 512))\\(\$\\|[^0-9]\\)/everything allocated/"
+     uint8_t lun = req->req_upiu.qr.index;
-+    sed -e "s/blocks=$min_blocks\\(\$\\|[^0-9]\\)/min allocation/" \
-+        -e "s/blocks=$((extra_blocks + img_size / 512))\\(\$\\|[^0-9]\\)/max allocation/"
+-    if (lun != UFS_UPIU_RPMB_WLUN && lun > UFS_MAX_LUS) {
 +    if (lun != UFS_UPIU_RPMB_WLUN &&
 +        (lun > UFS_MAX_LUS || u->lus[lun] == NULL)) {
          trace_ufs_err_query_invalid_index(req->req_upiu.qr.opcode, lun);
          return QUERY_RESULT_INVALID_INDEX;
      }
@@ -XXX,XX +XXX,XX @@ static QueryRespCode ufs_read_unit_desc(UfsRequest *req)
      if (lun == UFS_UPIU_RPMB_WLUN) {
          memcpy(&req->rsp_upiu.qr.data, &rpmb_unit_desc, rpmb_unit_desc.length);
      } else {
 -        /* unit descriptor is not yet supported */
 -        return QUERY_RESULT_INVALID_INDEX;
 +        memcpy(&req->rsp_upiu.qr.data, &u->lus[lun]->unit_desc,
 +               sizeof(u->lus[lun]->unit_desc));
      }
      return QUERY_RESULT_SUCCESS;
@@ -XXX,XX +XXX,XX @@ static void ufs_exec_req(UfsRequest *req)
          req_result = ufs_exec_nop_cmd(req);
          break;
      case UPIU_TRANSACTION_COMMAND:
 -        /* Not yet implemented */
 -        req_result = UFS_REQUEST_FAIL;
 +        req_result = ufs_exec_scsi_cmd(req);
          break;
      case UPIU_TRANSACTION_QUERY_REQ:
          req_result = ufs_exec_query_cmd(req);
@@ -XXX,XX +XXX,XX @@ static void ufs_exec_req(UfsRequest *req)
          req_result = UFS_REQUEST_FAIL;
      }
 -    ufs_complete_req(req, req_result);
 +    /*
 +     * The ufs_complete_req for scsi commands is handled by the
 +     * ufs_scsi_command_complete() callback function. Therefore, to avoid
 +     * duplicate processing, ufs_complete_req() is not called for scsi commands.
 +     */
 +    if (req_result != UFS_REQUEST_NO_COMPLETE) {
 +        ufs_complete_req(req, req_result);
 +    }
  }
- # get standard environment, filters and checks
+ static void ufs_process_req(void *opaque)
-@@ -XXX,XX +XXX,XX @@ size=$((1 * 1024 * 1024))
+@@ -XXX,XX +XXX,XX @@ static void ufs_init_hc(UfsHc *u)
- touch "$TEST_DIR/empty"
+     u->flags.permanently_disable_fw_update = 1;
- extra_blocks=$(stat -c '%b' "$TEST_DIR/empty")
+ }
-+# We always write the first byte; check how many blocks this filesystem
++static bool ufs_init_wlu(UfsHc *u, UfsWLu **wlu, uint8_t wlun, Error **errp)
-+# allocates to match empty image alloation.
++{
-+printf "\0" > "$TEST_DIR/empty"
++    UfsWLu *new_wlu = UFSWLU(qdev_new(TYPE_UFS_WLU));
-+min_blocks=$(stat -c '%b' "$TEST_DIR/empty")
++
-+
++    qdev_prop_set_uint32(DEVICE(new_wlu), "lun", wlun);
- echo
++
- echo "== creating image with default preallocation =="
++    /*
- _make_test_img $size | _filter_imgfmt
++     * The well-known lu shares the same bus as the normal lu. If the well-known
--stat -c "size=%s, blocks=%b" $TEST_IMG | _filter_blocks $extra_blocks $size
++     * lu writes the same channel value as the normal lu, the report will be
-+stat -c "size=%s, blocks=%b" $TEST_IMG | _filter_blocks $extra_blocks $min_blocks $size
++     * made not only for the normal lu but also for the well-known lu at
++     * REPORT_LUN time. To prevent this, the channel value of normal lu is fixed
- for mode in off full falloc; do
++     * to 0 and the channel value of well-known lu is fixed to 1.
-     echo
++     */
-     echo "== creating image with preallocation $mode =="
++    qdev_prop_set_uint32(DEVICE(new_wlu), "channel", 1);
-     IMGOPTS=preallocation=$mode _make_test_img $size | _filter_imgfmt
++    if (!qdev_realize_and_unref(DEVICE(new_wlu), BUS(&u->bus), errp)) {
--    stat -c "size=%s, blocks=%b" $TEST_IMG | _filter_blocks $extra_blocks $size
++        return false;
-+    stat -c "size=%s, blocks=%b" $TEST_IMG | _filter_blocks $extra_blocks $min_blocks $size
++    }
- done
++
++    *wlu = new_wlu;
- # success, all done
++    return true;
-diff --git a/tests/qemu-iotests/175.out b/tests/qemu-iotests/175.out
++}
 +
  static void ufs_realize(PCIDevice *pci_dev, Error **errp)
  {
      UfsHc *u = UFS(pci_dev);
@@ -XXX,XX +XXX,XX @@ static void ufs_realize(PCIDevice *pci_dev, Error **errp)
          return;
      }
 +    qbus_init(&u->bus, sizeof(UfsBus), TYPE_UFS_BUS, &pci_dev->qdev,
 +              u->parent_obj.qdev.id);
 +    u->bus.parent_bus.info = &ufs_scsi_info;
 +
      ufs_init_state(u);
      ufs_init_hc(u);
      ufs_init_pci(u, pci_dev);
 +
 +    if (!ufs_init_wlu(u, &u->report_wlu, UFS_UPIU_REPORT_LUNS_WLUN, errp)) {
 +        return;
 +    }
 +
 +    if (!ufs_init_wlu(u, &u->dev_wlu, UFS_UPIU_UFS_DEVICE_WLUN, errp)) {
 +        return;
 +    }
 +
 +    if (!ufs_init_wlu(u, &u->boot_wlu, UFS_UPIU_BOOT_WLUN, errp)) {
 +        return;
 +    }
 +
 +    if (!ufs_init_wlu(u, &u->rpmb_wlu, UFS_UPIU_RPMB_WLUN, errp)) {
 +        return;
 +    }
  }
  static void ufs_exit(PCIDevice *pci_dev)
  {
      UfsHc *u = UFS(pci_dev);
 +    if (u->dev_wlu) {
 +        object_unref(OBJECT(u->dev_wlu));
 +        u->dev_wlu = NULL;
 +    }
 +
 +    if (u->report_wlu) {
 +        object_unref(OBJECT(u->report_wlu));
 +        u->report_wlu = NULL;
 +    }
 +
 +    if (u->rpmb_wlu) {
 +        object_unref(OBJECT(u->rpmb_wlu));
 +        u->rpmb_wlu = NULL;
 +    }
 +
 +    if (u->boot_wlu) {
 +        object_unref(OBJECT(u->boot_wlu));
 +        u->boot_wlu = NULL;
 +    }
 +
      qemu_bh_delete(u->doorbell_bh);
      qemu_bh_delete(u->complete_bh);
@@ -XXX,XX +XXX,XX @@ static void ufs_class_init(ObjectClass *oc, void *data)
      dc->vmsd = &ufs_vmstate;
  }
 +static bool ufs_bus_check_address(BusState *qbus, DeviceState *qdev,
 +                                  Error **errp)
 +{
 +    SCSIDevice *dev = SCSI_DEVICE(qdev);
 +    UfsBusClass *ubc = UFS_BUS_GET_CLASS(qbus);
 +    UfsHc *u = UFS(qbus->parent);
 +
 +    if (strcmp(object_get_typename(OBJECT(dev)), TYPE_UFS_WLU) == 0) {
 +        if (dev->lun != UFS_UPIU_REPORT_LUNS_WLUN &&
 +            dev->lun != UFS_UPIU_UFS_DEVICE_WLUN &&
 +            dev->lun != UFS_UPIU_BOOT_WLUN && dev->lun != UFS_UPIU_RPMB_WLUN) {
 +            error_setg(errp, "bad well-known lun: %d", dev->lun);
 +            return false;
 +        }
 +
 +        if ((dev->lun == UFS_UPIU_REPORT_LUNS_WLUN && u->report_wlu != NULL) ||
 +            (dev->lun == UFS_UPIU_UFS_DEVICE_WLUN && u->dev_wlu != NULL) ||
 +            (dev->lun == UFS_UPIU_BOOT_WLUN && u->boot_wlu != NULL) ||
 +            (dev->lun == UFS_UPIU_RPMB_WLUN && u->rpmb_wlu != NULL)) {
 +            error_setg(errp, "well-known lun %d already exists", dev->lun);
 +            return false;
 +        }
 +
 +        return true;
 +    }
 +
 +    if (strcmp(object_get_typename(OBJECT(dev)), TYPE_UFS_LU) != 0) {
 +        error_setg(errp, "%s cannot be connected to ufs-bus",
 +                   object_get_typename(OBJECT(dev)));
 +        return false;
 +    }
 +
 +    return ubc->parent_check_address(qbus, qdev, errp);
 +}
 +
 +static void ufs_bus_class_init(ObjectClass *class, void *data)
 +{
 +    BusClass *bc = BUS_CLASS(class);
 +    UfsBusClass *ubc = UFS_BUS_CLASS(class);
 +    ubc->parent_check_address = bc->check_address;
 +    bc->check_address = ufs_bus_check_address;
 +}
 +
  static const TypeInfo ufs_info = {
      .name = TYPE_UFS,
      .parent = TYPE_PCI_DEVICE,
@@ -XXX,XX +XXX,XX @@ static const TypeInfo ufs_info = {
      .interfaces = (InterfaceInfo[]){ { INTERFACE_PCIE_DEVICE }, {} },
  };
 +static const TypeInfo ufs_bus_info = {
 +    .name = TYPE_UFS_BUS,
 +    .parent = TYPE_SCSI_BUS,
 +    .class_init = ufs_bus_class_init,
 +    .class_size = sizeof(UfsBusClass),
 +    .instance_size = sizeof(UfsBus),
 +};
 +
  static void ufs_register_types(void)
  {
      type_register_static(&ufs_info);
 +    type_register_static(&ufs_bus_info);
  }
  type_init(ufs_register_types)
 diff --git a/hw/ufs/meson.build b/hw/ufs/meson.build
 index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/175.out
+--- a/hw/ufs/meson.build
-+++ b/tests/qemu-iotests/175.out
++++ b/hw/ufs/meson.build
-@@ -XXX,XX +XXX,XX @@ QA output created by 175
+@@ -1 +1 @@
+-system_ss.add(when: 'CONFIG_UFS_PCI', if_true: files('ufs.c'))
- == creating image with default preallocation ==
++system_ss.add(when: 'CONFIG_UFS_PCI', if_true: files('ufs.c', 'lu.c'))
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576
+diff --git a/hw/ufs/trace-events b/hw/ufs/trace-events
 -size=1048576, nothing allocated
 +size=1048576, min allocation
  == creating image with preallocation off ==
  Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576 preallocation=off
 -size=1048576, nothing allocated
 +size=1048576, min allocation
  == creating image with preallocation full ==
  Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576 preallocation=full
 -size=1048576, everything allocated
 +size=1048576, max allocation
  == creating image with preallocation falloc ==
  Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576 preallocation=falloc
 -size=1048576, everything allocated
 +size=1048576, max allocation
   *** done
 diff --git a/tests/qemu-iotests/178.out.qcow2 b/tests/qemu-iotests/178.out.qcow2
 index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/178.out.qcow2
+--- a/hw/ufs/trace-events
-+++ b/tests/qemu-iotests/178.out.qcow2
++++ b/hw/ufs/trace-events
-@@ -XXX,XX +XXX,XX @@ converted image file size in bytes: 196608
+@@ -XXX,XX +XXX,XX @@ ufs_exec_scsi_cmd(uint32_t slot, uint8_t lun, uint8_t opcode) "slot %"PRIu32", l
- == raw input image with data (human) ==
+ ufs_exec_query_cmd(uint32_t slot, uint8_t opcode) "slot %"PRIu32", opcode 0x%"PRIx8""
+ ufs_process_uiccmd(uint32_t uiccmd, uint32_t ucmdarg1, uint32_t ucmdarg2, uint32_t ucmdarg3) "uiccmd 0x%"PRIx32", ucmdarg1 0x%"PRIx32", ucmdarg2 0x%"PRIx32", ucmdarg3 0x%"PRIx32""
- Formatting 'TEST_DIR/t.qcow2', fmt=IMGFMT size=1073741824
--required size: 393216
++# lu.c
-+required size: 458752
++ufs_scsi_check_condition(uint32_t tag, uint8_t key, uint8_t asc, uint8_t ascq) "Command complete tag=0x%x sense=%d/%d/%d"
- fully allocated size: 1074135040
++ufs_scsi_read_complete(uint32_t tag, size_t size) "Data ready tag=0x%x len=%zd"
- wrote 512/512 bytes at offset 512
++ufs_scsi_read_data_count(uint32_t sector_count) "Read sector_count=%d"
-bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
++ufs_scsi_read_data_invalid(void) "Data transfer direction invalid"
-@@ -XXX,XX +XXX,XX @@ converted image file size in bytes: 196608
++ufs_scsi_write_complete_noio(uint32_t tag, size_t size) "Write complete tag=0x%x more=%zd"
++ufs_scsi_write_data_invalid(void) "Data transfer direction invalid"
- Formatting 'TEST_DIR/t.qcow2', fmt=IMGFMT size=1073741824
++ufs_scsi_emulate_vpd_page_00(size_t xfer) "Inquiry EVPD[Supported pages] buffer size %zd"
- {
++ufs_scsi_emulate_vpd_page_80_not_supported(void) "Inquiry EVPD[Serial number] not supported"
--    "required": 393216,
++ufs_scsi_emulate_vpd_page_80(size_t xfer) "Inquiry EVPD[Serial number] buffer size %zd"
-+    "required": 458752,
++ufs_scsi_emulate_vpd_page_87(size_t xfer) "Inquiry EVPD[Mode Page Policy] buffer size %zd"
-     "fully-allocated": 1074135040
++ufs_scsi_emulate_mode_sense(int cmd, int page, size_t xfer, int control) "Mode Sense(%d) (page %d, xfer %zd, page_control %d)"
- }
++ufs_scsi_emulate_read_data(int buflen) "Read buf_len=%d"
- wrote 512/512 bytes at offset 512
++ufs_scsi_emulate_write_data(int buflen) "Write buf_len=%d"
-diff --git a/tests/qemu-iotests/221.out b/tests/qemu-iotests/221.out
++ufs_scsi_emulate_command_START_STOP(void) "START STOP UNIT"
-index XXXXXXX..XXXXXXX 100644
++ufs_scsi_emulate_command_FORMAT_UNIT(void) "FORMAT UNIT"
---- a/tests/qemu-iotests/221.out
++ufs_scsi_emulate_command_SEND_DIAGNOSTIC(void) "SEND DIAGNOSTIC"
-+++ b/tests/qemu-iotests/221.out
++ufs_scsi_emulate_command_SAI_16(void) "SAI READ CAPACITY(16)"
-@@ -XXX,XX +XXX,XX @@ QA output created by 221
++ufs_scsi_emulate_command_SAI_unsupported(void) "Unsupported Service Action In"
- === Check mapping of unaligned raw image ===
++ufs_scsi_emulate_command_MODE_SELECT_10(size_t xfer) "Mode Select(10) (len %zd)"
++ufs_scsi_emulate_command_VERIFY(int bytchk) "Verify (bytchk %d)"
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=65537
++ufs_scsi_emulate_command_UNKNOWN(int cmd, const char *name) "Unknown SCSI command (0x%2.2x=%s)"
--[{ "start": 0, "length": 66048, "depth": 0, "zero": true, "data": false, "offset": OFFSET}]
++ufs_scsi_dma_command_READ(uint64_t lba, uint32_t len) "Read (block %" PRIu64 ", count %u)"
--[{ "start": 0, "length": 66048, "depth": 0, "zero": true, "data": false, "offset": OFFSET}]
++ufs_scsi_dma_command_WRITE(uint64_t lba, int len) "Write (block %" PRIu64 ", count %u)"
-+[{ "start": 0, "length": 4096, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
++
-+{ "start": 4096, "length": 61952, "depth": 0, "zero": true, "data": false, "offset": OFFSET}]
+ # error condition
-+[{ "start": 0, "length": 4096, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+ ufs_err_dma_read_utrd(uint32_t slot, uint64_t addr) "failed to read utrd. UTRLDBR slot %"PRIu32", UTRD dma addr %"PRIu64""
-+{ "start": 4096, "length": 61952, "depth": 0, "zero": true, "data": false, "offset": OFFSET}]
+ ufs_err_dma_read_req_upiu(uint32_t slot, uint64_t addr) "failed to read req upiu. UTRLDBR slot %"PRIu32", request upiu addr %"PRIu64""
  wrote 1/1 bytes at offset 65536
 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 -[{ "start": 0, "length": 65536, "depth": 0, "zero": true, "data": false, "offset": OFFSET},
 +[{ "start": 0, "length": 4096, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 4096, "length": 61440, "depth": 0, "zero": true, "data": false, "offset": OFFSET},
  { "start": 65536, "length": 1, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
  { "start": 65537, "length": 511, "depth": 0, "zero": true, "data": false, "offset": OFFSET}]
 -[{ "start": 0, "length": 65536, "depth": 0, "zero": true, "data": false, "offset": OFFSET},
 +[{ "start": 0, "length": 4096, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 4096, "length": 61440, "depth": 0, "zero": true, "data": false, "offset": OFFSET},
  { "start": 65536, "length": 1, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
  { "start": 65537, "length": 511, "depth": 0, "zero": true, "data": false, "offset": OFFSET}]
  *** done
 diff --git a/tests/qemu-iotests/253.out b/tests/qemu-iotests/253.out
 index XXXXXXX..XXXXXXX 100644
 --- a/tests/qemu-iotests/253.out
 +++ b/tests/qemu-iotests/253.out
@@ -XXX,XX +XXX,XX @@ QA output created by 253
  === Check mapping of unaligned raw image ===
  Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048575
 -[{ "start": 0, "length": 1048576, "depth": 0, "zero": true, "data": false, "offset": OFFSET}]
 -[{ "start": 0, "length": 1048576, "depth": 0, "zero": true, "data": false, "offset": OFFSET}]
 +[{ "start": 0, "length": 4096, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 4096, "length": 1044480, "depth": 0, "zero": true, "data": false, "offset": OFFSET}]
 +[{ "start": 0, "length": 4096, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 4096, "length": 1044480, "depth": 0, "zero": true, "data": false, "offset": OFFSET}]
  wrote 65535/65535 bytes at offset 983040
 .999 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 -[{ "start": 0, "length": 983040, "depth": 0, "zero": true, "data": false, "offset": OFFSET},
 +[{ "start": 0, "length": 4096, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 4096, "length": 978944, "depth": 0, "zero": true, "data": false, "offset": OFFSET},
  { "start": 983040, "length": 65536, "depth": 0, "zero": false, "data": true, "offset": OFFSET}]
 -[{ "start": 0, "length": 983040, "depth": 0, "zero": true, "data": false, "offset": OFFSET},
 +[{ "start": 0, "length": 4096, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 +{ "start": 4096, "length": 978944, "depth": 0, "zero": true, "data": false, "offset": OFFSET},
  { "start": 983040, "length": 65536, "depth": 0, "zero": false, "data": true, "offset": OFFSET}]
  *** done
 --
-.21.0
+.41.0

-[Qemu-devel] [PULL 15/15] iotests: Unify cache mode quoting
+[PULL v2 4/8] tests/qtest: Introduce tests for UFS
-From: Nir Soffer <nirsof@gmail.com>
+From: Jeuk Kim <jeuk20.kim@gmail.com>
-Quoting cache mode is not needed, and most tests use unquoted values.
+This patch includes the following tests
-Unify all test to use the same style.
+  Test mmio read
   Test ufs device initialization and ufs-lu recognition
   Test I/O (Performs a write followed by a read to verify)
-Message-id: 20190827173432.7656-1-nsoffer@redhat.com
+Signed-off-by: Jeuk Kim <jeuk20.kim@samsung.com>
-Signed-off-by: Nir Soffer <nsoffer@redhat.com>
+Acked-by: Thomas Huth <thuth@redhat.com>
-Signed-off-by: Max Reitz <mreitz@redhat.com>
+Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
 Message-id: af6b8d54c049490b3533a784a0aeac4798bb9217.1691062912.git.jeuk20.kim@samsung.com
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 ---
- tests/qemu-iotests/026 | 4 ++--
+ MAINTAINERS             |   1 +
- tests/qemu-iotests/039 | 4 ++--
+ tests/qtest/ufs-test.c  | 584 ++++++++++++++++++++++++++++++++++++++++
- tests/qemu-iotests/052 | 2 +-
+ tests/qtest/meson.build |   1 +
- tests/qemu-iotests/091 | 4 ++--
+files changed, 586 insertions(+)
-files changed, 7 insertions(+), 7 deletions(-)
+ create mode 100644 tests/qtest/ufs-test.c
-diff --git a/tests/qemu-iotests/026 b/tests/qemu-iotests/026
+diff --git a/MAINTAINERS b/MAINTAINERS
-index XXXXXXX..XXXXXXX 100755
+index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/026
+--- a/MAINTAINERS
-+++ b/tests/qemu-iotests/026
++++ b/MAINTAINERS
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
+@@ -XXX,XX +XXX,XX @@ M: Jeuk Kim <jeuk20.kim@samsung.com>
- # Currently only qcow2 supports rebasing
+ S: Supported
- _supported_fmt qcow2
+ F: hw/ufs/*
- _supported_proto file
+ F: include/block/ufs.h
--_default_cache_mode "writethrough"
++F: tests/qtest/ufs-test.c
--_supported_cache_modes "writethrough" "none"
-+_default_cache_mode writethrough
+ megasas
-+_supported_cache_modes writethrough none
+ M: Hannes Reinecke <hare@suse.com>
- # The refcount table tests expect a certain minimum width for refcount entries
+diff --git a/tests/qtest/ufs-test.c b/tests/qtest/ufs-test.c
- # (so that the refcount table actually needs to grow); that minimum is 16 bits,
+new file mode 100644
- # being the default refcount entry width.
+index XXXXXXX..XXXXXXX
-diff --git a/tests/qemu-iotests/039 b/tests/qemu-iotests/039
+--- /dev/null
-index XXXXXXX..XXXXXXX 100755
++++ b/tests/qtest/ufs-test.c
---- a/tests/qemu-iotests/039
+@@ -XXX,XX +XXX,XX @@
-+++ b/tests/qemu-iotests/039
++/*
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
++ * QTest testcase for UFS
- _supported_fmt qcow2
++ *
- _supported_proto file
++ * Copyright (c) 2023 Samsung Electronics Co., Ltd. All rights reserved.
- _supported_os Linux
++ *
--_default_cache_mode "writethrough"
++ * SPDX-License-Identifier: GPL-2.0-or-later
--_supported_cache_modes "writethrough"
++ */
-+_default_cache_mode writethrough
++
-+_supported_cache_modes writethrough
++#include "qemu/osdep.h"
++#include "qemu/module.h"
- size=128M
++#include "qemu/units.h"
++#include "libqtest.h"
-diff --git a/tests/qemu-iotests/052 b/tests/qemu-iotests/052
++#include "libqos/qgraph.h"
-index XXXXXXX..XXXXXXX 100755
++#include "libqos/pci.h"
---- a/tests/qemu-iotests/052
++#include "scsi/constants.h"
-+++ b/tests/qemu-iotests/052
++#include "include/block/ufs.h"
-@@ -XXX,XX +XXX,XX @@ _supported_fmt generic
++
- _supported_proto file
++/* Test images sizes in Bytes */
++#define TEST_IMAGE_SIZE (64 * 1024 * 1024)
- # Don't do O_DIRECT on tmpfs
++/* Timeout for various operations, in seconds. */
--_supported_cache_modes "writeback" "writethrough" "unsafe"
++#define TIMEOUT_SECONDS 10
-+_supported_cache_modes writeback writethrough unsafe
++/* Maximum PRD entry count */
++#define MAX_PRD_ENTRY_COUNT 10
- size=128M
++#define PRD_ENTRY_DATA_SIZE 4096
- _make_test_img $size
++/* Constants to build upiu */
-diff --git a/tests/qemu-iotests/091 b/tests/qemu-iotests/091
++#define UTP_COMMAND_DESCRIPTOR_SIZE 4096
-index XXXXXXX..XXXXXXX 100755
++#define UTP_RESPONSE_UPIU_OFFSET 1024
---- a/tests/qemu-iotests/091
++#define UTP_PRDT_UPIU_OFFSET 2048
-+++ b/tests/qemu-iotests/091
++
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
++typedef struct QUfs QUfs;
- _supported_fmt qcow2
++
- _supported_proto file
++struct QUfs {
- _supported_os Linux
++    QOSGraphObject obj;
--_default_cache_mode "none"
++    QPCIDevice dev;
--_supported_cache_modes "writethrough" "none" "writeback"
++    QPCIBar bar;
-+_default_cache_mode none
++
-+_supported_cache_modes writethrough none writeback
++    uint64_t utrlba;
++    uint64_t utmrlba;
- size=1G
++    uint64_t cmd_desc_addr;
++    uint64_t data_buffer_addr;
 +
 +    bool enabled;
 +};
 +
 +static inline uint32_t ufs_rreg(QUfs *ufs, size_t offset)
 +{
 +    return qpci_io_readl(&ufs->dev, ufs->bar, offset);
 +}
 +
 +static inline void ufs_wreg(QUfs *ufs, size_t offset, uint32_t value)
 +{
 +    qpci_io_writel(&ufs->dev, ufs->bar, offset, value);
 +}
 +
 +static void ufs_wait_for_irq(QUfs *ufs)
 +{
 +    uint64_t end_time;
 +    uint32_t is;
 +    /* Wait for device to reset as the linux driver does. */
 +    end_time = g_get_monotonic_time() + TIMEOUT_SECONDS * G_TIME_SPAN_SECOND;
 +    do {
 +        qtest_clock_step(ufs->dev.bus->qts, 100);
 +        is = ufs_rreg(ufs, A_IS);
 +    } while (is == 0 && g_get_monotonic_time() < end_time);
 +}
 +
 +static UtpTransferReqDesc ufs_build_req_utrd(uint64_t cmd_desc_addr,
 +                                             uint8_t slot,
 +                                             uint32_t data_direction,
 +                                             uint16_t prd_table_length)
 +{
 +    UtpTransferReqDesc req = { 0 };
 +    uint64_t command_desc_base_addr =
 +        cmd_desc_addr + slot * UTP_COMMAND_DESCRIPTOR_SIZE;
 +
 +    req.header.dword_0 =
 +        cpu_to_le32(1 << 28 | data_direction | UTP_REQ_DESC_INT_CMD);
 +    req.header.dword_2 = cpu_to_le32(OCS_INVALID_COMMAND_STATUS);
 +
 +    req.command_desc_base_addr_hi = cpu_to_le32(command_desc_base_addr >> 32);
 +    req.command_desc_base_addr_lo =
 +        cpu_to_le32(command_desc_base_addr & 0xffffffff);
 +    req.response_upiu_offset =
 +        cpu_to_le16(UTP_RESPONSE_UPIU_OFFSET / sizeof(uint32_t));
 +    req.response_upiu_length = cpu_to_le16(sizeof(UtpUpiuRsp));
 +    req.prd_table_offset = cpu_to_le16(UTP_PRDT_UPIU_OFFSET / sizeof(uint32_t));
 +    req.prd_table_length = cpu_to_le16(prd_table_length);
 +    return req;
 +}
 +
 +static void ufs_send_nop_out(QUfs *ufs, uint8_t slot,
 +                             UtpTransferReqDesc *utrd_out, UtpUpiuRsp *rsp_out)
 +{
 +    /* Build up utp transfer request descriptor */
 +    UtpTransferReqDesc utrd =
 +        ufs_build_req_utrd(ufs->cmd_desc_addr, slot, UTP_NO_DATA_TRANSFER, 0);
 +    uint64_t utrd_addr = ufs->utrlba + slot * sizeof(UtpTransferReqDesc);
 +    uint64_t req_upiu_addr =
 +        ufs->cmd_desc_addr + slot * UTP_COMMAND_DESCRIPTOR_SIZE;
 +    uint64_t rsp_upiu_addr = req_upiu_addr + UTP_RESPONSE_UPIU_OFFSET;
 +    qtest_memwrite(ufs->dev.bus->qts, utrd_addr, &utrd, sizeof(utrd));
 +
 +    /* Build up request upiu */
 +    UtpUpiuReq req_upiu = { 0 };
 +    req_upiu.header.trans_type = UPIU_TRANSACTION_NOP_OUT;
 +    req_upiu.header.task_tag = slot;
 +    qtest_memwrite(ufs->dev.bus->qts, req_upiu_addr, &req_upiu,
 +                   sizeof(req_upiu));
 +
 +    /* Ring Doorbell */
 +    ufs_wreg(ufs, A_UTRLDBR, 1);
 +    ufs_wait_for_irq(ufs);
 +    g_assert_true(FIELD_EX32(ufs_rreg(ufs, A_IS), IS, UTRCS));
 +    ufs_wreg(ufs, A_IS, FIELD_DP32(0, IS, UTRCS, 1));
 +
 +    qtest_memread(ufs->dev.bus->qts, utrd_addr, utrd_out, sizeof(*utrd_out));
 +    qtest_memread(ufs->dev.bus->qts, rsp_upiu_addr, rsp_out, sizeof(*rsp_out));
 +}
 +
 +static void ufs_send_query(QUfs *ufs, uint8_t slot, uint8_t query_function,
 +                           uint8_t query_opcode, uint8_t idn, uint8_t index,
 +                           UtpTransferReqDesc *utrd_out, UtpUpiuRsp *rsp_out)
 +{
 +    /* Build up utp transfer request descriptor */
 +    UtpTransferReqDesc utrd =
 +        ufs_build_req_utrd(ufs->cmd_desc_addr, slot, UTP_NO_DATA_TRANSFER, 0);
 +    uint64_t utrd_addr = ufs->utrlba + slot * sizeof(UtpTransferReqDesc);
 +    uint64_t req_upiu_addr =
 +        ufs->cmd_desc_addr + slot * UTP_COMMAND_DESCRIPTOR_SIZE;
 +    uint64_t rsp_upiu_addr = req_upiu_addr + UTP_RESPONSE_UPIU_OFFSET;
 +    qtest_memwrite(ufs->dev.bus->qts, utrd_addr, &utrd, sizeof(utrd));
 +
 +    /* Build up request upiu */
 +    UtpUpiuReq req_upiu = { 0 };
 +    req_upiu.header.trans_type = UPIU_TRANSACTION_QUERY_REQ;
 +    req_upiu.header.query_func = query_function;
 +    req_upiu.header.task_tag = slot;
 +    /*
 +     * QEMU UFS does not currently support Write descriptor and Write attribute,
 +     * so the value of data_segment_length is always 0.
 +     */
 +    req_upiu.header.data_segment_length = 0;
 +    req_upiu.qr.opcode = query_opcode;
 +    req_upiu.qr.idn = idn;
 +    req_upiu.qr.index = index;
 +    qtest_memwrite(ufs->dev.bus->qts, req_upiu_addr, &req_upiu,
 +                   sizeof(req_upiu));
 +
 +    /* Ring Doorbell */
 +    ufs_wreg(ufs, A_UTRLDBR, 1);
 +    ufs_wait_for_irq(ufs);
 +    g_assert_true(FIELD_EX32(ufs_rreg(ufs, A_IS), IS, UTRCS));
 +    ufs_wreg(ufs, A_IS, FIELD_DP32(0, IS, UTRCS, 1));
 +
 +    qtest_memread(ufs->dev.bus->qts, utrd_addr, utrd_out, sizeof(*utrd_out));
 +    qtest_memread(ufs->dev.bus->qts, rsp_upiu_addr, rsp_out, sizeof(*rsp_out));
 +}
 +
 +static void ufs_send_scsi_command(QUfs *ufs, uint8_t slot, uint8_t lun,
 +                                  const uint8_t *cdb, const uint8_t *data_in,
 +                                  size_t data_in_len, uint8_t *data_out,
 +                                  size_t data_out_len,
 +                                  UtpTransferReqDesc *utrd_out,
 +                                  UtpUpiuRsp *rsp_out)
 +
 +{
 +    /* Build up PRDT */
 +    UfshcdSgEntry entries[MAX_PRD_ENTRY_COUNT] = {
 +        0,
 +    };
 +    uint8_t flags;
 +    uint16_t prd_table_length, i;
 +    uint32_t data_direction, data_len;
 +    uint64_t req_upiu_addr =
 +        ufs->cmd_desc_addr + slot * UTP_COMMAND_DESCRIPTOR_SIZE;
 +    uint64_t prdt_addr = req_upiu_addr + UTP_PRDT_UPIU_OFFSET;
 +
 +    g_assert_true(data_in_len < MAX_PRD_ENTRY_COUNT * PRD_ENTRY_DATA_SIZE);
 +    g_assert_true(data_out_len < MAX_PRD_ENTRY_COUNT * PRD_ENTRY_DATA_SIZE);
 +    if (data_in_len > 0) {
 +        g_assert_nonnull(data_in);
 +        data_direction = UTP_HOST_TO_DEVICE;
 +        data_len = data_in_len;
 +        flags = UPIU_CMD_FLAGS_WRITE;
 +    } else if (data_out_len > 0) {
 +        g_assert_nonnull(data_out);
 +        data_direction = UTP_DEVICE_TO_HOST;
 +        data_len = data_out_len;
 +        flags = UPIU_CMD_FLAGS_READ;
 +    } else {
 +        data_direction = UTP_NO_DATA_TRANSFER;
 +        data_len = 0;
 +        flags = UPIU_CMD_FLAGS_NONE;
 +    }
 +    prd_table_length = DIV_ROUND_UP(data_len, PRD_ENTRY_DATA_SIZE);
 +
 +    qtest_memset(ufs->dev.bus->qts, ufs->data_buffer_addr, 0,
 +                 MAX_PRD_ENTRY_COUNT * PRD_ENTRY_DATA_SIZE);
 +    if (data_in_len) {
 +        qtest_memwrite(ufs->dev.bus->qts, ufs->data_buffer_addr, data_in,
 +                       data_in_len);
 +    }
 +
 +    for (i = 0; i < prd_table_length; i++) {
 +        entries[i].addr =
 +            cpu_to_le64(ufs->data_buffer_addr + i * sizeof(UfshcdSgEntry));
 +        if (i + 1 != prd_table_length) {
 +            entries[i].size = cpu_to_le32(PRD_ENTRY_DATA_SIZE - 1);
 +        } else {
 +            entries[i].size = cpu_to_le32(
 +                data_len - (PRD_ENTRY_DATA_SIZE * (prd_table_length - 1)) - 1);
 +        }
 +    }
 +    qtest_memwrite(ufs->dev.bus->qts, prdt_addr, entries,
 +                   prd_table_length * sizeof(UfshcdSgEntry));
 +
 +    /* Build up utp transfer request descriptor */
 +    UtpTransferReqDesc utrd = ufs_build_req_utrd(
 +        ufs->cmd_desc_addr, slot, data_direction, prd_table_length);
 +    uint64_t utrd_addr = ufs->utrlba + slot * sizeof(UtpTransferReqDesc);
 +    uint64_t rsp_upiu_addr = req_upiu_addr + UTP_RESPONSE_UPIU_OFFSET;
 +    qtest_memwrite(ufs->dev.bus->qts, utrd_addr, &utrd, sizeof(utrd));
 +
 +    /* Build up request upiu */
 +    UtpUpiuReq req_upiu = { 0 };
 +    req_upiu.header.trans_type = UPIU_TRANSACTION_COMMAND;
 +    req_upiu.header.flags = flags;
 +    req_upiu.header.lun = lun;
 +    req_upiu.header.task_tag = slot;
 +    req_upiu.sc.exp_data_transfer_len = cpu_to_be32(data_len);
 +    memcpy(req_upiu.sc.cdb, cdb, UFS_CDB_SIZE);
 +    qtest_memwrite(ufs->dev.bus->qts, req_upiu_addr, &req_upiu,
 +                   sizeof(req_upiu));
 +
 +    /* Ring Doorbell */
 +    ufs_wreg(ufs, A_UTRLDBR, 1);
 +    ufs_wait_for_irq(ufs);
 +    g_assert_true(FIELD_EX32(ufs_rreg(ufs, A_IS), IS, UTRCS));
 +    ufs_wreg(ufs, A_IS, FIELD_DP32(0, IS, UTRCS, 1));
 +
 +    qtest_memread(ufs->dev.bus->qts, utrd_addr, utrd_out, sizeof(*utrd_out));
 +    qtest_memread(ufs->dev.bus->qts, rsp_upiu_addr, rsp_out, sizeof(*rsp_out));
 +    if (data_out_len) {
 +        qtest_memread(ufs->dev.bus->qts, ufs->data_buffer_addr, data_out,
 +                      data_out_len);
 +    }
 +}
 +
 +/**
 + * Initialize Ufs host controller and logical unit.
 + * After running this function, you can make a transfer request to the UFS.
 + */
 +static void ufs_init(QUfs *ufs, QGuestAllocator *alloc)
 +{
 +    uint64_t end_time;
 +    uint32_t nutrs, nutmrs;
 +    uint32_t hcs, is, ucmdarg2, cap;
 +    uint32_t hce = 0, ie = 0;
 +    UtpTransferReqDesc utrd;
 +    UtpUpiuRsp rsp_upiu;
 +
 +    ufs->bar = qpci_iomap(&ufs->dev, 0, NULL);
 +    qpci_device_enable(&ufs->dev);
 +
 +    /* Start host controller initialization */
 +    hce = FIELD_DP32(hce, HCE, HCE, 1);
 +    ufs_wreg(ufs, A_HCE, hce);
 +
 +    /* Wait for device to reset */
 +    end_time = g_get_monotonic_time() + TIMEOUT_SECONDS * G_TIME_SPAN_SECOND;
 +    do {
 +        qtest_clock_step(ufs->dev.bus->qts, 100);
 +        hce = FIELD_EX32(ufs_rreg(ufs, A_HCE), HCE, HCE);
 +    } while (hce == 0 && g_get_monotonic_time() < end_time);
 +    g_assert_cmpuint(hce, ==, 1);
 +
 +    /* Enable interrupt */
 +    ie = FIELD_DP32(ie, IE, UCCE, 1);
 +    ie = FIELD_DP32(ie, IE, UHESE, 1);
 +    ie = FIELD_DP32(ie, IE, UHXSE, 1);
 +    ie = FIELD_DP32(ie, IE, UPMSE, 1);
 +    ufs_wreg(ufs, A_IE, ie);
 +
 +    /* Send DME_LINK_STARTUP uic command */
 +    hcs = ufs_rreg(ufs, A_HCS);
 +    g_assert_true(FIELD_EX32(hcs, HCS, UCRDY));
 +
 +    ufs_wreg(ufs, A_UCMDARG1, 0);
 +    ufs_wreg(ufs, A_UCMDARG2, 0);
 +    ufs_wreg(ufs, A_UCMDARG3, 0);
 +    ufs_wreg(ufs, A_UICCMD, UIC_CMD_DME_LINK_STARTUP);
 +
 +    is = ufs_rreg(ufs, A_IS);
 +    g_assert_true(FIELD_EX32(is, IS, UCCS));
 +    ufs_wreg(ufs, A_IS, FIELD_DP32(0, IS, UCCS, 1));
 +
 +    ucmdarg2 = ufs_rreg(ufs, A_UCMDARG2);
 +    g_assert_cmpuint(ucmdarg2, ==, 0);
 +    is = ufs_rreg(ufs, A_IS);
 +    g_assert_cmpuint(is, ==, 0);
 +    hcs = ufs_rreg(ufs, A_HCS);
 +    g_assert_true(FIELD_EX32(hcs, HCS, DP));
 +    g_assert_true(FIELD_EX32(hcs, HCS, UTRLRDY));
 +    g_assert_true(FIELD_EX32(hcs, HCS, UTMRLRDY));
 +    g_assert_true(FIELD_EX32(hcs, HCS, UCRDY));
 +
 +    /* Enable all interrupt functions */
 +    ie = FIELD_DP32(ie, IE, UTRCE, 1);
 +    ie = FIELD_DP32(ie, IE, UEE, 1);
 +    ie = FIELD_DP32(ie, IE, UPMSE, 1);
 +    ie = FIELD_DP32(ie, IE, UHXSE, 1);
 +    ie = FIELD_DP32(ie, IE, UHESE, 1);
 +    ie = FIELD_DP32(ie, IE, UTMRCE, 1);
 +    ie = FIELD_DP32(ie, IE, UCCE, 1);
 +    ie = FIELD_DP32(ie, IE, DFEE, 1);
 +    ie = FIELD_DP32(ie, IE, HCFEE, 1);
 +    ie = FIELD_DP32(ie, IE, SBFEE, 1);
 +    ie = FIELD_DP32(ie, IE, CEFEE, 1);
 +    ufs_wreg(ufs, A_IE, ie);
 +    ufs_wreg(ufs, A_UTRIACR, 0);
 +
 +    /* Enable tranfer request and task management request */
 +    cap = ufs_rreg(ufs, A_CAP);
 +    nutrs = FIELD_EX32(cap, CAP, NUTRS) + 1;
 +    nutmrs = FIELD_EX32(cap, CAP, NUTMRS) + 1;
 +    ufs->cmd_desc_addr =
 +        guest_alloc(alloc, nutrs * UTP_COMMAND_DESCRIPTOR_SIZE);
 +    ufs->data_buffer_addr =
 +        guest_alloc(alloc, MAX_PRD_ENTRY_COUNT * PRD_ENTRY_DATA_SIZE);
 +    ufs->utrlba = guest_alloc(alloc, nutrs * sizeof(UtpTransferReqDesc));
 +    ufs->utmrlba = guest_alloc(alloc, nutmrs * sizeof(UtpTaskReqDesc));
 +
 +    ufs_wreg(ufs, A_UTRLBA, ufs->utrlba & 0xffffffff);
 +    ufs_wreg(ufs, A_UTRLBAU, ufs->utrlba >> 32);
 +    ufs_wreg(ufs, A_UTMRLBA, ufs->utmrlba & 0xffffffff);
 +    ufs_wreg(ufs, A_UTMRLBAU, ufs->utmrlba >> 32);
 +    ufs_wreg(ufs, A_UTRLRSR, 1);
 +    ufs_wreg(ufs, A_UTMRLRSR, 1);
 +
 +    /* Send nop out to test transfer request */
 +    ufs_send_nop_out(ufs, 0, &utrd, &rsp_upiu);
 +    g_assert_cmpuint(le32_to_cpu(utrd.header.dword_2), ==, OCS_SUCCESS);
 +
 +    /* Set fDeviceInit flag via query request */
 +    ufs_send_query(ufs, 0, UPIU_QUERY_FUNC_STANDARD_WRITE_REQUEST,
 +                   UPIU_QUERY_OPCODE_SET_FLAG, QUERY_FLAG_IDN_FDEVICEINIT, 0,
 +                   &utrd, &rsp_upiu);
 +    g_assert_cmpuint(le32_to_cpu(utrd.header.dword_2), ==, OCS_SUCCESS);
 +
 +    /* Wait for device to reset */
 +    end_time = g_get_monotonic_time() + TIMEOUT_SECONDS * G_TIME_SPAN_SECOND;
 +    do {
 +        qtest_clock_step(ufs->dev.bus->qts, 100);
 +        ufs_send_query(ufs, 0, UPIU_QUERY_FUNC_STANDARD_READ_REQUEST,
 +                       UPIU_QUERY_OPCODE_READ_FLAG, QUERY_FLAG_IDN_FDEVICEINIT,
 +                       0, &utrd, &rsp_upiu);
 +    } while (be32_to_cpu(rsp_upiu.qr.value) != 0 &&
 +             g_get_monotonic_time() < end_time);
 +    g_assert_cmpuint(be32_to_cpu(rsp_upiu.qr.value), ==, 0);
 +
 +    ufs->enabled = true;
 +}
 +
 +static void ufs_exit(QUfs *ufs, QGuestAllocator *alloc)
 +{
 +    if (ufs->enabled) {
 +        guest_free(alloc, ufs->utrlba);
 +        guest_free(alloc, ufs->utmrlba);
 +        guest_free(alloc, ufs->cmd_desc_addr);
 +        guest_free(alloc, ufs->data_buffer_addr);
 +    }
 +
 +    qpci_iounmap(&ufs->dev, ufs->bar);
 +}
 +
 +static void *ufs_get_driver(void *obj, const char *interface)
 +{
 +    QUfs *ufs = obj;
 +
 +    if (!g_strcmp0(interface, "pci-device")) {
 +        return &ufs->dev;
 +    }
 +
 +    fprintf(stderr, "%s not present in ufs\n", interface);
 +    g_assert_not_reached();
 +}
 +
 +static void *ufs_create(void *pci_bus, QGuestAllocator *alloc, void *addr)
 +{
 +    QUfs *ufs = g_new0(QUfs, 1);
 +    QPCIBus *bus = pci_bus;
 +
 +    qpci_device_init(&ufs->dev, bus, addr);
 +    ufs->obj.get_driver = ufs_get_driver;
 +
 +    return &ufs->obj;
 +}
 +
 +static void ufstest_reg_read(void *obj, void *data, QGuestAllocator *alloc)
 +{
 +    QUfs *ufs = obj;
 +    uint32_t cap;
 +
 +    ufs->bar = qpci_iomap(&ufs->dev, 0, NULL);
 +    qpci_device_enable(&ufs->dev);
 +
 +    cap = ufs_rreg(ufs, A_CAP);
 +    g_assert_cmpuint(FIELD_EX32(cap, CAP, NUTRS), ==, 31);
 +    g_assert_cmpuint(FIELD_EX32(cap, CAP, NUTMRS), ==, 7);
 +    g_assert_cmpuint(FIELD_EX32(cap, CAP, 64AS), ==, 1);
 +
 +    qpci_iounmap(&ufs->dev, ufs->bar);
 +}
 +
 +static void ufstest_init(void *obj, void *data, QGuestAllocator *alloc)
 +{
 +    QUfs *ufs = obj;
 +
 +    uint8_t buf[4096] = { 0 };
 +    const uint8_t report_luns_cdb[UFS_CDB_SIZE] = {
 +        /* allocation length 4096 */
 +        REPORT_LUNS, 0x00, 0x00, 0x00, 0x00, 0x00,
 +        0x00,        0x00, 0x10, 0x00, 0x00, 0x00
 +    };
 +    const uint8_t test_unit_ready_cdb[UFS_CDB_SIZE] = {
 +        TEST_UNIT_READY,
 +    };
 +    UtpTransferReqDesc utrd;
 +    UtpUpiuRsp rsp_upiu;
 +
 +    ufs_init(ufs, alloc);
 +
 +    /* Check REPORT_LUNS */
 +    ufs_send_scsi_command(ufs, 0, 0, report_luns_cdb, NULL, 0, buf, sizeof(buf),
 +                          &utrd, &rsp_upiu);
 +    g_assert_cmpuint(le32_to_cpu(utrd.header.dword_2), ==, OCS_SUCCESS);
 +    g_assert_cmpuint(rsp_upiu.header.scsi_status, ==, GOOD);
 +    /* LUN LIST LENGTH should be 8, in big endian */
 +    g_assert_cmpuint(buf[3], ==, 8);
 +    /* There is one logical unit whose lun is 0 */
 +    g_assert_cmpuint(buf[9], ==, 0);
 +
 +    /* Check TEST_UNIT_READY */
 +    ufs_send_scsi_command(ufs, 0, 0, test_unit_ready_cdb, NULL, 0, NULL, 0,
 +                          &utrd, &rsp_upiu);
 +    g_assert_cmpuint(le32_to_cpu(utrd.header.dword_2), ==, OCS_SUCCESS);
 +    g_assert_cmpuint(rsp_upiu.header.scsi_status, ==, GOOD);
 +
 +    ufs_exit(ufs, alloc);
 +}
 +
 +static void ufstest_read_write(void *obj, void *data, QGuestAllocator *alloc)
 +{
 +    QUfs *ufs = obj;
 +    uint8_t read_buf[4096] = { 0 };
 +    uint8_t write_buf[4096] = { 0 };
 +    const uint8_t read_capacity_cdb[UFS_CDB_SIZE] = {
 +        /* allocation length 4096 */
 +        SERVICE_ACTION_IN_16,
 +        SAI_READ_CAPACITY_16,
 +        0x00,
 +        0x00,
 +        0x00,
 +        0x00,
 +        0x00,
 +        0x00,
 +        0x00,
 +        0x00,
 +        0x00,
 +        0x00,
 +        0x10,
 +        0x00,
 +        0x00,
 +        0x00
 +    };
 +    const uint8_t read_cdb[UFS_CDB_SIZE] = {
 +        /* READ(10) to LBA 0, transfer length 1 */
 +        READ_10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00
 +    };
 +    const uint8_t write_cdb[UFS_CDB_SIZE] = {
 +        /* WRITE(10) to LBA 0, transfer length 1 */
 +        WRITE_10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00
 +    };
 +    uint32_t block_size;
 +    UtpTransferReqDesc utrd;
 +    UtpUpiuRsp rsp_upiu;
 +
 +    ufs_init(ufs, alloc);
 +
 +    /* Read capacity */
 +    ufs_send_scsi_command(ufs, 0, 1, read_capacity_cdb, NULL, 0, read_buf,
 +                          sizeof(read_buf), &utrd, &rsp_upiu);
 +    g_assert_cmpuint(le32_to_cpu(utrd.header.dword_2), ==, OCS_SUCCESS);
 +    g_assert_cmpuint(rsp_upiu.header.scsi_status, ==, COMMAND_RESULT_SUCESS);
 +    block_size = ldl_be_p(&read_buf[8]);
 +    g_assert_cmpuint(block_size, ==, 4096);
 +
 +    /* Write data */
 +    memset(write_buf, rand() % 255 + 1, block_size);
 +    ufs_send_scsi_command(ufs, 0, 1, write_cdb, write_buf, block_size, NULL, 0,
 +                          &utrd, &rsp_upiu);
 +    g_assert_cmpuint(le32_to_cpu(utrd.header.dword_2), ==, OCS_SUCCESS);
 +    g_assert_cmpuint(rsp_upiu.header.scsi_status, ==, COMMAND_RESULT_SUCESS);
 +
 +    /* Read data and verify */
 +    ufs_send_scsi_command(ufs, 0, 1, read_cdb, NULL, 0, read_buf, block_size,
 +                          &utrd, &rsp_upiu);
 +    g_assert_cmpuint(le32_to_cpu(utrd.header.dword_2), ==, OCS_SUCCESS);
 +    g_assert_cmpuint(rsp_upiu.header.scsi_status, ==, COMMAND_RESULT_SUCESS);
 +    g_assert_cmpint(memcmp(read_buf, write_buf, block_size), ==, 0);
 +
 +    ufs_exit(ufs, alloc);
 +}
 +
 +static void drive_destroy(void *path)
 +{
 +    unlink(path);
 +    g_free(path);
 +    qos_invalidate_command_line();
 +}
 +
 +static char *drive_create(void)
 +{
 +    int fd, ret;
 +    char *t_path;
 +
 +    /* Create a temporary raw image */
 +    fd = g_file_open_tmp("qtest-ufs.XXXXXX", &t_path, NULL);
 +    g_assert_cmpint(fd, >=, 0);
 +    ret = ftruncate(fd, TEST_IMAGE_SIZE);
 +    g_assert_cmpint(ret, ==, 0);
 +    close(fd);
 +
 +    g_test_queue_destroy(drive_destroy, t_path);
 +    return t_path;
 +}
 +
 +static void *ufs_blk_test_setup(GString *cmd_line, void *arg)
 +{
 +    char *tmp_path = drive_create();
 +
 +    g_string_append_printf(cmd_line,
 +                           " -blockdev file,filename=%s,node-name=drv1 "
 +                           "-device ufs-lu,bus=ufs0,drive=drv1,lun=1 ",
 +                           tmp_path);
 +
 +    return arg;
 +}
 +
 +static void ufs_register_nodes(void)
 +{
 +    const char *arch;
 +    QOSGraphEdgeOptions edge_opts = {
 +        .before_cmd_line = "-blockdev null-co,node-name=drv0,read-zeroes=on",
 +        .after_cmd_line = "-device ufs-lu,bus=ufs0,drive=drv0,lun=0",
 +        .extra_device_opts = "addr=04.0,id=ufs0,nutrs=32,nutmrs=8"
 +    };
 +
 +    QOSGraphTestOptions io_test_opts = {
 +        .before = ufs_blk_test_setup,
 +    };
 +
 +    add_qpci_address(&edge_opts, &(QPCIAddress){ .devfn = QPCI_DEVFN(4, 0) });
 +
 +    qos_node_create_driver("ufs", ufs_create);
 +    qos_node_consumes("ufs", "pci-bus", &edge_opts);
 +    qos_node_produces("ufs", "pci-device");
 +
 +    qos_add_test("reg-read", "ufs", ufstest_reg_read, NULL);
 +
 +    /*
 +     * Check architecture
 +     * TODO: Enable ufs io tests for ppc64
 +     */
 +    arch = qtest_get_arch();
 +    if (!strcmp(arch, "ppc64")) {
 +        g_test_message("Skipping ufs io tests for ppc64");
 +        return;
 +    }
 +    qos_add_test("init", "ufs", ufstest_init, NULL);
 +    qos_add_test("read-write", "ufs", ufstest_read_write, &io_test_opts);
 +}
 +
 +libqos_init(ufs_register_nodes);
 diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/tests/qtest/meson.build
 +++ b/tests/qtest/meson.build
@@ -XXX,XX +XXX,XX @@ qos_test_ss.add(
    'virtio-iommu-test.c',
    'vmxnet3-test.c',
    'igb-test.c',
 +  'ufs-test.c',
  )
  if config_all_devices.has_key('CONFIG_VIRTIO_SERIAL')
 --
-.21.0
+.41.0

-[Qemu-devel] [PULL 04/15] iotests: Test allocate_first_block() with O_DIRECT
+[PULL v2 5/8] block-migration: Ensure we don't crash during migration cleanup
-From: Nir Soffer <nirsof@gmail.com>
+From: Fabiano Rosas <farosas@suse.de>
-Using block_resize we can test allocate_first_block() with file
+We can fail the blk_insert_bs() at init_blk_migration(), leaving the
-descriptor opened with O_DIRECT, ensuring that it works for any size
+BlkMigDevState without a dirty_bitmap and BlockDriverState. Account
-larger than 4096 bytes.
+for the possibly missing elements when doing cleanup.
-Testing smaller sizes is tricky as the result depends on the filesystem
+Fix the following crashes:
 used for testing. For example on NFS any size will work since O_DIRECT
 does not require any alignment.
-Signed-off-by: Nir Soffer <nsoffer@redhat.com>
+Thread 1 "qemu-system-x86" received signal SIGSEGV, Segmentation fault.
-Reviewed-by: Max Reitz <mreitz@redhat.com>
+x0000555555ec83ef in bdrv_release_dirty_bitmap (bitmap=0x0) at ../block/dirty-bitmap.c:359
-Message-id: 20190827010528.8818-3-nsoffer@redhat.com
+BlockDriverState *bs = bitmap->bs;
-Signed-off-by: Max Reitz <mreitz@redhat.com>
+ #0  0x0000555555ec83ef in bdrv_release_dirty_bitmap (bitmap=0x0) at ../block/dirty-bitmap.c:359
  #1  0x0000555555bba331 in unset_dirty_tracking () at ../migration/block.c:371
  #2  0x0000555555bbad98 in block_migration_cleanup_bmds () at ../migration/block.c:681
 Thread 1 "qemu-system-x86" received signal SIGSEGV, Segmentation fault.
 x0000555555e971ff in bdrv_op_unblock (bs=0x0, op=BLOCK_OP_TYPE_BACKUP_SOURCE, reason=0x0) at ../block.c:7073
 QLIST_FOREACH_SAFE(blocker, &bs->op_blockers[op], list, next) {
  #0  0x0000555555e971ff in bdrv_op_unblock (bs=0x0, op=BLOCK_OP_TYPE_BACKUP_SOURCE, reason=0x0) at ../block.c:7073
  #1  0x0000555555e9734a in bdrv_op_unblock_all (bs=0x0, reason=0x0) at ../block.c:7095
  #2  0x0000555555bbae13 in block_migration_cleanup_bmds () at ../migration/block.c:690
 Signed-off-by: Fabiano Rosas <farosas@suse.de>
 Message-id: 20230731203338.27581-1-farosas@suse.de
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 ---
- tests/qemu-iotests/175     | 28 ++++++++++++++++++++++++++++
+ migration/block.c | 11 +++++++++--
- tests/qemu-iotests/175.out |  8 ++++++++
+file changed, 9 insertions(+), 2 deletions(-)
 files changed, 36 insertions(+)
-diff --git a/tests/qemu-iotests/175 b/tests/qemu-iotests/175
+diff --git a/migration/block.c b/migration/block.c
-index XXXXXXX..XXXXXXX 100755
+index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/175
+--- a/migration/block.c
-+++ b/tests/qemu-iotests/175
++++ b/migration/block.c
-@@ -XXX,XX +XXX,XX @@ _filter_blocks()
+@@ -XXX,XX +XXX,XX @@ static void unset_dirty_tracking(void)
-         -e "s/blocks=$((extra_blocks + img_size / 512))\\(\$\\|[^0-9]\\)/max allocation/"
+     BlkMigDevState *bmds;
      QSIMPLEQ_FOREACH(bmds, &block_mig_state.bmds_list, entry) {
 -        bdrv_release_dirty_bitmap(bmds->dirty_bitmap);
 +        if (bmds->dirty_bitmap) {
 +            bdrv_release_dirty_bitmap(bmds->dirty_bitmap);
 +        }
      }
  }
-+# Resize image using block_resize.
+@@ -XXX,XX +XXX,XX @@ static int64_t get_remaining_dirty(void)
-+# Parameter 1: image path
+ static void block_migration_cleanup_bmds(void)
-+# Parameter 2: new size
+ {
-+_block_resize()
+     BlkMigDevState *bmds;
-+{
++    BlockDriverState *bs;
-+    local path=$1
+     AioContext *ctx;
-+    local size=$2
      unset_dirty_tracking();
      while ((bmds = QSIMPLEQ_FIRST(&block_mig_state.bmds_list)) != NULL) {
          QSIMPLEQ_REMOVE_HEAD(&block_mig_state.bmds_list, entry);
 -        bdrv_op_unblock_all(blk_bs(bmds->blk), bmds->blocker);
 +
-+    $QEMU -qmp stdio -nographic -nodefaults \
++        bs = blk_bs(bmds->blk);
-+        -blockdev file,node-name=file,filename=$path,cache.direct=on \
++        if (bs) {
-+        <<EOF
++            bdrv_op_unblock_all(bs, bmds->blocker);
-+{'execute': 'qmp_capabilities'}
++        }
-+{'execute': 'block_resize', 'arguments': {'node-name': 'file', 'size': $size}}
+         error_free(bmds->blocker);
-+{'execute': 'quit'}
-+EOF
+         /* Save ctx, because bmds->blk can disappear during blk_unref.  */
 +}
 +
  # get standard environment, filters and checks
  . ./common.rc
  . ./common.filter
@@ -XXX,XX +XXX,XX @@ _supported_fmt raw
  _supported_proto file
  _supported_os Linux
 +_default_cache_mode none
 +_supported_cache_modes none directsync
 +
  size=$((1 * 1024 * 1024))
  touch "$TEST_DIR/empty"
@@ -XXX,XX +XXX,XX @@ for mode in off full falloc; do
      stat -c "size=%s, blocks=%b" $TEST_IMG | _filter_blocks $extra_blocks $min_blocks $size
  done
 +for new_size in 4096 1048576; do
 +    echo
 +    echo "== resize empty image with block_resize =="
 +    _make_test_img 0 | _filter_imgfmt
 +    _block_resize $TEST_IMG $new_size >/dev/null
 +    stat -c "size=%s, blocks=%b" $TEST_IMG | _filter_blocks $extra_blocks $min_blocks $new_size
 +done
 +
  # success, all done
  echo "*** done"
  rm -f $seq.full
 diff --git a/tests/qemu-iotests/175.out b/tests/qemu-iotests/175.out
 index XXXXXXX..XXXXXXX 100644
 --- a/tests/qemu-iotests/175.out
 +++ b/tests/qemu-iotests/175.out
@@ -XXX,XX +XXX,XX @@ size=1048576, max allocation
  == creating image with preallocation falloc ==
  Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576 preallocation=falloc
  size=1048576, max allocation
 +
 +== resize empty image with block_resize ==
 +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=0
 +size=4096, min allocation
 +
 +== resize empty image with block_resize ==
 +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=0
 +size=1048576, min allocation
   *** done
 --
-.21.0
+.41.0

-[Qemu-devel] [PULL 02/15] block: fix permission update in bdrv_replace_node
+[PULL v2 6/8] block: add subcluster_size field to BlockDriverInfo
-From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
+From: Andrey Drobyshev <andrey.drobyshev@virtuozzo.com>
-It's wrong to OR shared permissions. It may lead to crash on further
+This is going to be used in the subsequent commit as requests alignment
-permission updates.
+(in particular, during copy-on-read).  This value only makes sense for
-Also, no needs to consider previously calculated permissions, as at
+the formats which support subclusters (currently QCOW2 only).  If this
-this point we already bind all new parents and bdrv_get_cumulative_perm
+field isn't set by driver's own bdrv_get_info() implementation, we
-result is enough. So fix the bug by just set permissions by
+simply set it equal to the cluster size thus treating each cluster as
-bdrv_get_cumulative_perm result.
+having a single subcluster.
-Bug was introduced in long ago 234ac1a9025, in 2.9.
+Reviewed-by: Eric Blake <eblake@redhat.com>
 Reviewed-by: Denis V. Lunev <den@openvz.org>
 Signed-off-by: Andrey Drobyshev <andrey.drobyshev@virtuozzo.com>
 Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 Message-ID: <20230711172553.234055-2-andrey.drobyshev@virtuozzo.com>
 ---
  include/block/block-common.h | 5 +++++
  block.c                      | 7 +++++++
  block/qcow2.c                | 1 +
 files changed, 13 insertions(+)
-Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
+diff --git a/include/block/block-common.h b/include/block/block-common.h
-Message-id: 20190824100740.61635-1-vsementsov@virtuozzo.com
+index XXXXXXX..XXXXXXX 100644
-Signed-off-by: Max Reitz <mreitz@redhat.com>
+--- a/include/block/block-common.h
----
++++ b/include/block/block-common.h
- block.c | 5 ++---
+@@ -XXX,XX +XXX,XX @@ typedef struct BlockZoneWps {
-file changed, 2 insertions(+), 3 deletions(-)
+ typedef struct BlockDriverInfo {
+     /* in bytes, 0 if irrelevant */
      int cluster_size;
 +    /*
 +     * A fraction of cluster_size, if supported (currently QCOW2 only); if
 +     * disabled or unsupported, set equal to cluster_size.
 +     */
 +    int subcluster_size;
      /* offset at which the VM state can be saved (0 if not possible) */
      int64_t vm_state_offset;
      bool is_dirty;
 diff --git a/block.c b/block.c
 index XXXXXXX..XXXXXXX 100644
 --- a/block.c
 +++ b/block.c
-@@ -XXX,XX +XXX,XX @@ void bdrv_replace_node(BlockDriverState *from, BlockDriverState *to,
+@@ -XXX,XX +XXX,XX @@ int coroutine_fn bdrv_co_get_info(BlockDriverState *bs, BlockDriverInfo *bdi)
      }
      memset(bdi, 0, sizeof(*bdi));
      ret = drv->bdrv_co_get_info(bs, bdi);
 +    if (bdi->subcluster_size == 0) {
 +        /*
 +         * If the driver left this unset, subclusters are not supported.
 +         * Then it is safe to treat each cluster as having only one subcluster.
 +         */
 +        bdi->subcluster_size = bdi->cluster_size;
 +    }
      if (ret < 0) {
          return ret;
      }
 diff --git a/block/qcow2.c b/block/qcow2.c
 index XXXXXXX..XXXXXXX 100644
 --- a/block/qcow2.c
 +++ b/block/qcow2.c
@@ -XXX,XX +XXX,XX @@ qcow2_co_get_info(BlockDriverState *bs, BlockDriverInfo *bdi)
  {
-     BdrvChild *c, *next;
+     BDRVQcow2State *s = bs->opaque;
-     GSList *list = NULL, *p;
+     bdi->cluster_size = s->cluster_size;
--    uint64_t old_perm, old_shared;
++    bdi->subcluster_size = s->subcluster_size;
-     uint64_t perm = 0, shared = BLK_PERM_ALL;
+     bdi->vm_state_offset = qcow2_vm_state_offset(s);
-     int ret;
+     bdi->is_dirty = s->incompatible_features & QCOW2_INCOMPAT_DIRTY;
+     return 0;
@@ -XXX,XX +XXX,XX @@ void bdrv_replace_node(BlockDriverState *from, BlockDriverState *to,
          bdrv_unref(from);
      }
 -    bdrv_get_cumulative_perm(to, &old_perm, &old_shared);
 -    bdrv_set_perm(to, old_perm | perm, old_shared | shared);
 +    bdrv_get_cumulative_perm(to, &perm, &shared);
 +    bdrv_set_perm(to, perm, shared);
  out:
      g_slist_free(list);
 --
-.21.0
+.41.0

-[Qemu-devel] [PULL 05/15] iotests: Fix _filter_img_create()
+Deleted patch
-fe646693acc changed qemu-img create's output so that it no longer prints
-single quotes around parameter values.  The subformat and adapter_type
-filters in _filter_img_create() have never been adapted to that change.
-Fixes: fe646693acc13ac48b98435d14149ab04dc597bc
-Signed-off-by: Max Reitz <mreitz@redhat.com>
-Reviewed-by: John Snow <jsnow@redhat.com>
-Message-id: 20190815153638.4600-2-mreitz@redhat.com
-Reviewed-by: John Snow <jsnow@redhat.com>
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- tests/qemu-iotests/059.out       | 16 ++++++++--------
- tests/qemu-iotests/common.filter |  4 ++--
-files changed, 10 insertions(+), 10 deletions(-)
-diff --git a/tests/qemu-iotests/059.out b/tests/qemu-iotests/059.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/059.out
-+++ b/tests/qemu-iotests/059.out
-@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
- qemu-io: can't open device TEST_DIR/t.vmdk: L1 size too big
- === Testing monolithicFlat creation and opening ===
--Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=2147483648 subformat=monolithicFlat
-+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=2147483648
- image: TEST_DIR/t.IMGFMT
- file format: IMGFMT
- virtual size: 2 GiB (2147483648 bytes)
- === Testing monolithicFlat with zeroed_grain ===
- qemu-img: TEST_DIR/t.IMGFMT: Flat image can't enable zeroed grain
--Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=2147483648 subformat=monolithicFlat
-+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=2147483648
- === Testing big twoGbMaxExtentFlat ===
--Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824000 subformat=twoGbMaxExtentFlat
-+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824000
- image: TEST_DIR/t.vmdk
- file format: vmdk
- virtual size: 0.977 TiB (1073741824000 bytes)
-@@ -XXX,XX +XXX,XX @@ Format specific information:
- qemu-img: Could not open 'TEST_DIR/t.IMGFMT': Invalid extent line: RW 12582912 VMFS "dummy.IMGFMT" 1
- === Testing truncated sparse ===
--Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=107374182400 subformat=monolithicSparse
-+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=107374182400
- qemu-img: Could not open 'TEST_DIR/t.IMGFMT': File truncated, expecting at least 13172736 bytes
- === Converting to streamOptimized from image with small cluster size===
-@@ -XXX,XX +XXX,XX @@ wrote 512/512 bytes at offset 10240
-bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
- === Testing monolithicFlat with internally generated JSON file name ===
--Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 subformat=monolithicFlat
-+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
- qemu-io: can't open: Cannot use relative extent paths with VMDK descriptor file 'json:{"image": {"driver": "file", "filename": "TEST_DIR/t.IMGFMT"}, "driver": "blkdebug", "inject-error.0.event": "read_aio"}'
- === Testing version 3 ===
-@@ -XXX,XX +XXX,XX @@ read 512/512 bytes at offset 64931328
-bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
- === Testing 4TB monolithicFlat creation and IO ===
--Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=4398046511104 subformat=monolithicFlat
-+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=4398046511104
- image: TEST_DIR/t.IMGFMT
- file format: IMGFMT
- virtual size: 4 TiB (4398046511104 bytes)
-@@ -XXX,XX +XXX,XX @@ read 1024/1024 bytes at offset 966367641600
-KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
- === Testing qemu-img map on extents ===
--Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=33285996544 subformat=monolithicSparse
-+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=33285996544
- wrote 1024/1024 bytes at offset 65024
-KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
- wrote 1024/1024 bytes at offset 2147483136
-@@ -XXX,XX +XXX,XX @@ Offset          Length          Mapped to       File
-0x20000         0x3f0000        TEST_DIR/t.vmdk
-x7fff0000      0x20000         0x410000        TEST_DIR/t.vmdk
-x140000000     0x10000         0x430000        TEST_DIR/t.vmdk
--Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=33285996544 subformat=twoGbMaxExtentSparse
-+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=33285996544
- wrote 1024/1024 bytes at offset 65024
-KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
- wrote 1024/1024 bytes at offset 2147483136
-diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.filter
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/common.filter
-+++ b/tests/qemu-iotests/common.filter
-@@ -XXX,XX +XXX,XX @@ _filter_img_create()
-         -e "s# compat6=\\(on\\|off\\)##g" \
-         -e "s# static=\\(on\\|off\\)##g" \
-         -e "s# zeroed_grain=\\(on\\|off\\)##g" \
--        -e "s# subformat='[^']*'##g" \
--        -e "s# adapter_type='[^']*'##g" \
-+        -e "s# subformat=[^ ]*##g" \
-+        -e "s# adapter_type=[^ ]*##g" \
-         -e "s# hwversion=[^ ]*##g" \
-         -e "s# lazy_refcounts=\\(on\\|off\\)##g" \
-         -e "s# block_size=[0-9]\\+##g" \
---
-.21.0

-[Qemu-devel] [PULL 06/15] vmdk: Use bdrv_dirname() for relative extent paths
+[PULL v2 7/8] block/io: align requests to subcluster_size
-This makes iotest 033 pass with e.g. subformat=monolithicFlat.  It also
+From: Andrey Drobyshev <andrey.drobyshev@virtuozzo.com>
-turns a former error in 059 into success.
+When target image is using subclusters, and we align the request during
-Signed-off-by: Max Reitz <mreitz@redhat.com>
+copy-on-read, it makes sense to align to subcluster_size rather than
-Message-id: 20190815153638.4600-3-mreitz@redhat.com
+cluster_size.  Otherwise we end up with unnecessary allocations.
-Reviewed-by: John Snow <jsnow@redhat.com>
-Signed-off-by: Max Reitz <mreitz@redhat.com>
+This commit renames bdrv_round_to_clusters() to bdrv_round_to_subclusters()
 and utilizes subcluster_size field of BlockDriverInfo to make necessary
 alignments.  It affects copy-on-read as well as mirror job (which is
 using bdrv_round_to_clusters()).
 This change also fixes the following bug with failing assert (covered by
 the test in the subsequent commit):
 qemu-img create -f qcow2 base.qcow2 64K
 qemu-img create -f qcow2 -o extended_l2=on,backing_file=base.qcow2,backing_fmt=qcow2 img.qcow2 64K
 qemu-io -c "write -P 0xaa 0 2K" img.qcow2
 qemu-io -C -c "read -P 0x00 2K 62K" img.qcow2
 qemu-io: ../block/io.c:1236: bdrv_co_do_copy_on_readv: Assertion `skip_bytes < pnum' failed.
 Reviewed-by: Eric Blake <eblake@redhat.com>
 Reviewed-by: Denis V. Lunev <den@openvz.org>
 Signed-off-by: Andrey Drobyshev <andrey.drobyshev@virtuozzo.com>
 Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 Message-ID: <20230711172553.234055-3-andrey.drobyshev@virtuozzo.com>
 ---
- block/vmdk.c               | 54 ++++++++++++++++++++++++--------------
+ include/block/block-io.h |  8 +++----
- tests/qemu-iotests/059     |  7 +++--
+ block/io.c               | 50 ++++++++++++++++++++--------------------
- tests/qemu-iotests/059.out |  4 ++-
+ block/mirror.c           |  8 +++----
-files changed, 42 insertions(+), 23 deletions(-)
+files changed, 33 insertions(+), 33 deletions(-)
-diff --git a/block/vmdk.c b/block/vmdk.c
+diff --git a/include/block/block-io.h b/include/block/block-io.h
 index XXXXXXX..XXXXXXX 100644
---- a/block/vmdk.c
+--- a/include/block/block-io.h
-+++ b/block/vmdk.c
++++ b/include/block/block-io.h
-@@ -XXX,XX +XXX,XX @@ static const char *next_line(const char *s)
+@@ -XXX,XX +XXX,XX @@ bdrv_get_info(BlockDriverState *bs, BlockDriverInfo *bdi);
  ImageInfoSpecific *bdrv_get_specific_info(BlockDriverState *bs,
                                            Error **errp);
  BlockStatsSpecific *bdrv_get_specific_stats(BlockDriverState *bs);
 -void bdrv_round_to_clusters(BlockDriverState *bs,
 -                            int64_t offset, int64_t bytes,
 -                            int64_t *cluster_offset,
 -                            int64_t *cluster_bytes);
 +void bdrv_round_to_subclusters(BlockDriverState *bs,
 +                               int64_t offset, int64_t bytes,
 +                               int64_t *cluster_offset,
 +                               int64_t *cluster_bytes);
  void bdrv_get_backing_filename(BlockDriverState *bs,
                                 char *filename, int filename_size);
 diff --git a/block/io.c b/block/io.c
 index XXXXXXX..XXXXXXX 100644
 --- a/block/io.c
 +++ b/block/io.c
@@ -XXX,XX +XXX,XX @@ BdrvTrackedRequest *coroutine_fn bdrv_co_get_self_request(BlockDriverState *bs)
  }
- static int vmdk_parse_extents(const char *desc, BlockDriverState *bs,
+ /**
--                              const char *desc_file_path, QDict *options,
+- * Round a region to cluster boundaries
--                              Error **errp)
++ * Round a region to subcluster (if supported) or cluster boundaries
-+                              QDict *options, Error **errp)
+  */
  void coroutine_fn GRAPH_RDLOCK
 -bdrv_round_to_clusters(BlockDriverState *bs, int64_t offset, int64_t bytes,
 -                       int64_t *cluster_offset, int64_t *cluster_bytes)
 +bdrv_round_to_subclusters(BlockDriverState *bs, int64_t offset, int64_t bytes,
 +                          int64_t *align_offset, int64_t *align_bytes)
  {
+     BlockDriverInfo bdi;
+     IO_CODE();
+-    if (bdrv_co_get_info(bs, &bdi) < 0 || bdi.cluster_size == 0) {
+-        *cluster_offset = offset;
+-        *cluster_bytes = bytes;
++    if (bdrv_co_get_info(bs, &bdi) < 0 || bdi.subcluster_size == 0) {
++        *align_offset = offset;
++        *align_bytes = bytes;
+     } else {
+-        int64_t c = bdi.cluster_size;
+-        *cluster_offset = QEMU_ALIGN_DOWN(offset, c);
+-        *cluster_bytes = QEMU_ALIGN_UP(offset - *cluster_offset + bytes, c);
++        int64_t c = bdi.subcluster_size;
++        *align_offset = QEMU_ALIGN_DOWN(offset, c);
++        *align_bytes = QEMU_ALIGN_UP(offset - *align_offset + bytes, c);
+     }
+ }
+@@ -XXX,XX +XXX,XX @@ bdrv_co_do_copy_on_readv(BdrvChild *child, int64_t offset, int64_t bytes,
+     void *bounce_buffer = NULL;
+     BlockDriver *drv = bs->drv;
+-    int64_t cluster_offset;
+-    int64_t cluster_bytes;
++    int64_t align_offset;
++    int64_t align_bytes;
+     int64_t skip_bytes;
      int ret;
-     int matches;
+     int max_transfer = MIN_NON_ZERO(bs->bl.max_transfer,
-@@ -XXX,XX +XXX,XX @@ static int vmdk_parse_extents(const char *desc, BlockDriverState *bs,
+@@ -XXX,XX +XXX,XX @@ bdrv_co_do_copy_on_readv(BdrvChild *child, int64_t offset, int64_t bytes,
-     const char *p, *np;
+      * BDRV_REQUEST_MAX_BYTES (even when the original read did not), which
-     int64_t sectors = 0;
+      * is one reason we loop rather than doing it all at once.
-     int64_t flat_offset;
+      */
-+    char *desc_file_dir = NULL;
+-    bdrv_round_to_clusters(bs, offset, bytes, &cluster_offset, &cluster_bytes);
-     char *extent_path;
+-    skip_bytes = offset - cluster_offset;
-     BdrvChild *extent_file;
++    bdrv_round_to_subclusters(bs, offset, bytes, &align_offset, &align_bytes);
-     BDRVVmdkState *s = bs->opaque;
++    skip_bytes = offset - align_offset;
-@@ -XXX,XX +XXX,XX @@ static int vmdk_parse_extents(const char *desc, BlockDriverState *bs,
-             continue;
+     trace_bdrv_co_do_copy_on_readv(bs, offset, bytes,
 -                                   cluster_offset, cluster_bytes);
 +                                   align_offset, align_bytes);
 -    while (cluster_bytes) {
 +    while (align_bytes) {
          int64_t pnum;
          if (skip_write) {
              ret = 1; /* "already allocated", so nothing will be copied */
 -            pnum = MIN(cluster_bytes, max_transfer);
 +            pnum = MIN(align_bytes, max_transfer);
          } else {
 -            ret = bdrv_is_allocated(bs, cluster_offset,
 -                                    MIN(cluster_bytes, max_transfer), &pnum);
 +            ret = bdrv_is_allocated(bs, align_offset,
 +                                    MIN(align_bytes, max_transfer), &pnum);
              if (ret < 0) {
                  /*
                   * Safe to treat errors in querying allocation as if
                   * unallocated; we'll probably fail again soon on the
                   * read, but at least that will set a decent errno.
                   */
 -                pnum = MIN(cluster_bytes, max_transfer);
 +                pnum = MIN(align_bytes, max_transfer);
              }
              /* Stop at EOF if the image ends in the middle of the cluster */
@@ -XXX,XX +XXX,XX @@ bdrv_co_do_copy_on_readv(BdrvChild *child, int64_t offset, int64_t bytes,
              /* Must copy-on-read; use the bounce buffer */
              pnum = MIN(pnum, MAX_BOUNCE_BUFFER);
              if (!bounce_buffer) {
 -                int64_t max_we_need = MAX(pnum, cluster_bytes - pnum);
 +                int64_t max_we_need = MAX(pnum, align_bytes - pnum);
                  int64_t max_allowed = MIN(max_transfer, MAX_BOUNCE_BUFFER);
                  int64_t bounce_buffer_len = MIN(max_we_need, max_allowed);
@@ -XXX,XX +XXX,XX @@ bdrv_co_do_copy_on_readv(BdrvChild *child, int64_t offset, int64_t bytes,
              }
              qemu_iovec_init_buf(&local_qiov, bounce_buffer, pnum);
 -            ret = bdrv_driver_preadv(bs, cluster_offset, pnum,
 +            ret = bdrv_driver_preadv(bs, align_offset, pnum,
                                       &local_qiov, 0, 0);
              if (ret < 0) {
                  goto err;
@@ -XXX,XX +XXX,XX @@ bdrv_co_do_copy_on_readv(BdrvChild *child, int64_t offset, int64_t bytes,
                  /* FIXME: Should we (perhaps conditionally) be setting
                   * BDRV_REQ_MAY_UNMAP, if it will allow for a sparser copy
                   * that still correctly reads as zero? */
 -                ret = bdrv_co_do_pwrite_zeroes(bs, cluster_offset, pnum,
 +                ret = bdrv_co_do_pwrite_zeroes(bs, align_offset, pnum,
                                                 BDRV_REQ_WRITE_UNCHANGED);
              } else {
                  /* This does not change the data on the disk, it is not
                   * necessary to flush even in cache=writethrough mode.
                   */
 -                ret = bdrv_driver_pwritev(bs, cluster_offset, pnum,
 +                ret = bdrv_driver_pwritev(bs, align_offset, pnum,
                                            &local_qiov, 0,
                                            BDRV_REQ_WRITE_UNCHANGED);
              }
@@ -XXX,XX +XXX,XX @@ bdrv_co_do_copy_on_readv(BdrvChild *child, int64_t offset, int64_t bytes,
              }
          }
--        if (!path_is_absolute(fname) && !path_has_protocol(fname) &&
+-        cluster_offset += pnum;
--            !desc_file_path[0])
+-        cluster_bytes -= pnum;
--        {
++        align_offset += pnum;
--            bdrv_refresh_filename(bs->file->bs);
++        align_bytes -= pnum;
--            error_setg(errp, "Cannot use relative extent paths with VMDK "
+         progress += pnum - skip_bytes;
--                       "descriptor file '%s'", bs->file->bs->filename);
+         skip_bytes = 0;
 -            return -EINVAL;
 -        }
 +        if (path_is_absolute(fname)) {
 +            extent_path = g_strdup(fname);
 +        } else {
 +            if (!desc_file_dir) {
 +                desc_file_dir = bdrv_dirname(bs->file->bs, errp);
 +                if (!desc_file_dir) {
 +                    bdrv_refresh_filename(bs->file->bs);
 +                    error_prepend(errp, "Cannot use relative paths with VMDK "
 +                                  "descriptor file '%s': ",
 +                                  bs->file->bs->filename);
 +                    ret = -EINVAL;
 +                    goto out;
 +                }
 +            }
 -        extent_path = path_combine(desc_file_path, fname);
 +            extent_path = g_strconcat(desc_file_dir, fname, NULL);
 +        }
          ret = snprintf(extent_opt_prefix, 32, "extents.%d", s->num_extents);
          assert(ret < 32);
@@ -XXX,XX +XXX,XX @@ static int vmdk_parse_extents(const char *desc, BlockDriverState *bs,
          g_free(extent_path);
          if (local_err) {
              error_propagate(errp, local_err);
 -            return -EINVAL;
 +            ret = -EINVAL;
 +            goto out;
          }
          /* save to extents array */
@@ -XXX,XX +XXX,XX @@ static int vmdk_parse_extents(const char *desc, BlockDriverState *bs,
 , 0, 0, 0, 0, &extent, errp);
              if (ret < 0) {
                  bdrv_unref_child(bs, extent_file);
 -                return ret;
 +                goto out;
              }
              extent->flat_start_offset = flat_offset << 9;
          } else if (!strcmp(type, "SPARSE") || !strcmp(type, "VMFSSPARSE")) {
@@ -XXX,XX +XXX,XX @@ static int vmdk_parse_extents(const char *desc, BlockDriverState *bs,
              g_free(buf);
              if (ret) {
                  bdrv_unref_child(bs, extent_file);
 -                return ret;
 +                goto out;
              }
              extent = &s->extents[s->num_extents - 1];
          } else if (!strcmp(type, "SESPARSE")) {
              ret = vmdk_open_se_sparse(bs, extent_file, bs->open_flags, errp);
              if (ret) {
                  bdrv_unref_child(bs, extent_file);
 -                return ret;
 +                goto out;
              }
              extent = &s->extents[s->num_extents - 1];
          } else {
              error_setg(errp, "Unsupported extent type '%s'", type);
              bdrv_unref_child(bs, extent_file);
 -            return -ENOTSUP;
 +            ret = -ENOTSUP;
 +            goto out;
          }
          extent->type = g_strdup(type);
      }
--    return 0;
+diff --git a/block/mirror.c b/block/mirror.c
-+
+index XXXXXXX..XXXXXXX 100644
-+    ret = 0;
+--- a/block/mirror.c
-+    goto out;
++++ b/block/mirror.c
+@@ -XXX,XX +XXX,XX @@ static int coroutine_fn mirror_cow_align(MirrorBlockJob *s, int64_t *offset,
- invalid:
+     need_cow |= !test_bit((*offset + *bytes - 1) / s->granularity,
-     np = next_line(p);
+                           s->cow_bitmap);
-@@ -XXX,XX +XXX,XX @@ invalid:
+     if (need_cow) {
-         np--;
+-        bdrv_round_to_clusters(blk_bs(s->target), *offset, *bytes,
 -                               &align_offset, &align_bytes);
 +        bdrv_round_to_subclusters(blk_bs(s->target), *offset, *bytes,
 +                                  &align_offset, &align_bytes);
      }
-     error_setg(errp, "Invalid extent line: %.*s", (int)(np - p), p);
--    return -EINVAL;
+     if (align_bytes > max_bytes) {
-+    ret = -EINVAL;
+@@ -XXX,XX +XXX,XX @@ static void coroutine_fn mirror_iteration(MirrorBlockJob *s)
-+
+             int64_t target_offset;
-+out:
+             int64_t target_bytes;
-+    g_free(desc_file_dir);
+             WITH_GRAPH_RDLOCK_GUARD() {
-+    return ret;
+-                bdrv_round_to_clusters(blk_bs(s->target), offset, io_bytes,
- }
+-                                       &target_offset, &target_bytes);
++                bdrv_round_to_subclusters(blk_bs(s->target), offset, io_bytes,
- static int vmdk_open_desc_file(BlockDriverState *bs, int flags, char *buf,
++                                          &target_offset, &target_bytes);
-@@ -XXX,XX +XXX,XX @@ static int vmdk_open_desc_file(BlockDriverState *bs, int flags, char *buf,
+             }
-     }
+             if (target_offset == offset &&
-     s->create_type = g_strdup(ct);
+                 target_bytes == io_bytes) {
      s->desc_offset = 0;
 -    ret = vmdk_parse_extents(buf, bs, bs->file->bs->exact_filename, options,
 -                             errp);
 +    ret = vmdk_parse_extents(buf, bs, options, errp);
  exit:
      return ret;
  }
 diff --git a/tests/qemu-iotests/059 b/tests/qemu-iotests/059
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/059
 +++ b/tests/qemu-iotests/059
@@ -XXX,XX +XXX,XX @@ $QEMU_IMG convert -f qcow2 -O vmdk -o subformat=streamOptimized "$TEST_IMG.qcow2
  echo
  echo "=== Testing monolithicFlat with internally generated JSON file name ==="
 +# Should work, because bdrv_dirname() works fine with blkdebug
  IMGOPTS="subformat=monolithicFlat" _make_test_img 64M
 -$QEMU_IO -c "open -o driver=$IMGFMT,file.driver=blkdebug,file.image.filename=$TEST_IMG,file.inject-error.0.event=read_aio" 2>&1 \
 -    | _filter_testdir | _filter_imgfmt
 +$QEMU_IO -c "open -o driver=$IMGFMT,file.driver=blkdebug,file.image.filename=$TEST_IMG,file.inject-error.0.event=read_aio" \
 +         -c info \
 +    2>&1 \
 +    | _filter_testdir | _filter_imgfmt | _filter_img_info
  _cleanup_test_img
  echo
 diff --git a/tests/qemu-iotests/059.out b/tests/qemu-iotests/059.out
 index XXXXXXX..XXXXXXX 100644
 --- a/tests/qemu-iotests/059.out
 +++ b/tests/qemu-iotests/059.out
@@ -XXX,XX +XXX,XX @@ wrote 512/512 bytes at offset 10240
  === Testing monolithicFlat with internally generated JSON file name ===
  Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
 -qemu-io: can't open: Cannot use relative extent paths with VMDK descriptor file 'json:{"image": {"driver": "file", "filename": "TEST_DIR/t.IMGFMT"}, "driver": "blkdebug", "inject-error.0.event": "read_aio"}'
 +format name: IMGFMT
 +cluster size: 0 bytes
 +vm state offset: 0 bytes
  === Testing version 3 ===
  image: TEST_DIR/iotest-version3.IMGFMT
 --
-.21.0
+.41.0

-[Qemu-devel] [PULL 07/15] iotests: Keep testing broken relative extent paths
+Deleted patch
-We had a test for a case where relative extent paths did not work, but
-unfortunately we just fixed the underlying problem, so it works now.
-This patch adds a new test case that still fails.
-Signed-off-by: Max Reitz <mreitz@redhat.com>
-Reviewed-by: John Snow <jsnow@redhat.com>
-Message-id: 20190815153638.4600-4-mreitz@redhat.com
-Reviewed-by: John Snow <jsnow@redhat.com>
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- tests/qemu-iotests/059     | 27 +++++++++++++++++++++++++++
- tests/qemu-iotests/059.out |  4 ++++
-files changed, 31 insertions(+)
-diff --git a/tests/qemu-iotests/059 b/tests/qemu-iotests/059
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/059
-+++ b/tests/qemu-iotests/059
-@@ -XXX,XX +XXX,XX @@ $QEMU_IMG convert -f qcow2 -O vmdk -o subformat=streamOptimized "$TEST_IMG.qcow2
- echo
- echo "=== Testing monolithicFlat with internally generated JSON file name ==="
-+
-+echo '--- blkdebug ---'
- # Should work, because bdrv_dirname() works fine with blkdebug
- IMGOPTS="subformat=monolithicFlat" _make_test_img 64M
- $QEMU_IO -c "open -o driver=$IMGFMT,file.driver=blkdebug,file.image.filename=$TEST_IMG,file.inject-error.0.event=read_aio" \
-@@ -XXX,XX +XXX,XX @@ $QEMU_IO -c "open -o driver=$IMGFMT,file.driver=blkdebug,file.image.filename=$TE
-     | _filter_testdir | _filter_imgfmt | _filter_img_info
- _cleanup_test_img
-+echo '--- quorum ---'
-+# Should not work, because bdrv_dirname() does not work with quorum
-+IMGOPTS="subformat=monolithicFlat" _make_test_img 64M
-+cp "$TEST_IMG" "$TEST_IMG.orig"
-+
-+filename="json:{
-+    \"driver\": \"$IMGFMT\",
-+    \"file\": {
-+        \"driver\": \"quorum\",
-+        \"children\": [ {
-+            \"driver\": \"file\",
-+            \"filename\": \"$TEST_IMG\"
-+        }, {
-+            \"driver\": \"file\",
-+            \"filename\": \"$TEST_IMG.orig\"
-+        } ],
-+        \"vote-threshold\": 1
-+    } }"
-+
-+filename=$(echo "$filename" | tr '\n' ' ' | sed -e 's/\s\+/ /g')
-+$QEMU_IMG info "$filename" 2>&1 \
-+    | sed -e "s/'json:[^']*'/\$QUORUM_FILE/g" \
-+    | _filter_testdir | _filter_imgfmt | _filter_img_info
-+
-+
- echo
- echo "=== Testing version 3 ==="
- _use_sample_img iotest-version3.vmdk.bz2
-diff --git a/tests/qemu-iotests/059.out b/tests/qemu-iotests/059.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/059.out
-+++ b/tests/qemu-iotests/059.out
-@@ -XXX,XX +XXX,XX @@ wrote 512/512 bytes at offset 10240
-bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
- === Testing monolithicFlat with internally generated JSON file name ===
-+--- blkdebug ---
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
- format name: IMGFMT
- cluster size: 0 bytes
- vm state offset: 0 bytes
-+--- quorum ---
-+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
-+qemu-img: Could not open $QUORUM_FILE: Cannot use relative paths with VMDK descriptor file $QUORUM_FILE: Cannot generate a base directory for quorum nodes
- === Testing version 3 ===
- image: TEST_DIR/iotest-version3.IMGFMT
---
-.21.0

-[Qemu-devel] [PULL 08/15] vmdk: Reject invalid compressed writes
+Deleted patch
-Compressed writes generally have to write full clusters, not just in
-theory but also in practice when it comes to vmdk's streamOptimized
-subformat.  It currently is just silently broken for writes with
-non-zero in-cluster offsets:
-$ qemu-img create -f vmdk -o subformat=streamOptimized foo.vmdk 1M
-$ qemu-io -c 'write 4k 4k' -c 'read 4k 4k' foo.vmdk
-wrote 4096/4096 bytes at offset 4096
-KiB, 1 ops; 00.01 sec (443.724 KiB/sec and 110.9309 ops/sec)
-read failed: Invalid argument
-(The technical reason is that vmdk_write_extent() just writes the
-incomplete compressed data actually to offset 4k.  When reading the
-data, vmdk_read_extent() looks at offset 0 and finds the compressed data
-size to be 0, because that is what it reads from there.  This yields an
-error.)
-For incomplete writes with zero in-cluster offsets, the error path when
-reading the rest of the cluster is a bit different, but the result is
-the same:
-$ qemu-img create -f vmdk -o subformat=streamOptimized foo.vmdk 1M
-$ qemu-io -c 'write 0k 4k' -c 'read 4k 4k' foo.vmdk
-wrote 4096/4096 bytes at offset 0
-KiB, 1 ops; 00.01 sec (362.641 KiB/sec and 90.6603 ops/sec)
-read failed: Invalid argument
-(Here, vmdk_read_extent() finds the data and then sees that the
-uncompressed data is short.)
-It is better to reject invalid writes than to make the user believe they
-might have succeeded and then fail when trying to read it back.
-Signed-off-by: Max Reitz <mreitz@redhat.com>
-Reviewed-by: John Snow <jsnow@redhat.com>
-Message-id: 20190815153638.4600-5-mreitz@redhat.com
-Reviewed-by: John Snow <jsnow@redhat.com>
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- block/vmdk.c | 10 ++++++++++
-file changed, 10 insertions(+)
-diff --git a/block/vmdk.c b/block/vmdk.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/vmdk.c
-+++ b/block/vmdk.c
-@@ -XXX,XX +XXX,XX @@ static int vmdk_write_extent(VmdkExtent *extent, int64_t cluster_offset,
-     if (extent->compressed) {
-         void *compressed_data;
-+        /* Only whole clusters */
-+        if (offset_in_cluster ||
-+            n_bytes > (extent->cluster_sectors * SECTOR_SIZE) ||
-+            (n_bytes < (extent->cluster_sectors * SECTOR_SIZE) &&
-+             offset + n_bytes != extent->end_sector * SECTOR_SIZE))
-+        {
-+            ret = -EINVAL;
-+            goto out;
-+        }
-+
-         if (!extent->has_marker) {
-             ret = -EINVAL;
-             goto out;
---
-.21.0

-[Qemu-devel] [PULL 09/15] iotests: Disable broken streamOptimized tests
+[PULL v2 8/8] tests/qemu-iotests/197: add testcase for CoR with subclusters
-streamOptimized does not support writes that do not span exactly one
+From: Andrey Drobyshev <andrey.drobyshev@virtuozzo.com>
 cluster.  Furthermore, it cannot rewrite already allocated clusters.
 As such, many iotests do not work with it.  Disable them.
-Signed-off-by: Max Reitz <mreitz@redhat.com>
+Add testcase which checks that allocations during copy-on-read are
-Message-id: 20190815153638.4600-6-mreitz@redhat.com
+performed on the subcluster basis when subclusters are enabled in target
-Reviewed-by: John Snow <jsnow@redhat.com>
+image.
-Signed-off-by: Max Reitz <mreitz@redhat.com>
 This testcase also triggers the following assert with previous commit
 not being applied, so we check that as well:
 qemu-io: ../block/io.c:1236: bdrv_co_do_copy_on_readv: Assertion `skip_bytes < pnum' failed.
 Reviewed-by: Eric Blake <eblake@redhat.com>
 Reviewed-by: Denis V. Lunev <den@openvz.org>
 Signed-off-by: Andrey Drobyshev <andrey.drobyshev@virtuozzo.com>
 Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 Message-ID: <20230711172553.234055-4-andrey.drobyshev@virtuozzo.com>
 ---
- tests/qemu-iotests/002 | 1 +
+ tests/qemu-iotests/197     | 29 +++++++++++++++++++++++++++++
- tests/qemu-iotests/003 | 1 +
+ tests/qemu-iotests/197.out | 24 ++++++++++++++++++++++++
- tests/qemu-iotests/005 | 3 ++-
+files changed, 53 insertions(+)
  tests/qemu-iotests/009 | 1 +
  tests/qemu-iotests/010 | 1 +
  tests/qemu-iotests/011 | 1 +
  tests/qemu-iotests/017 | 3 ++-
  tests/qemu-iotests/018 | 3 ++-
  tests/qemu-iotests/019 | 3 ++-
  tests/qemu-iotests/020 | 3 ++-
  tests/qemu-iotests/027 | 1 +
  tests/qemu-iotests/032 | 1 +
  tests/qemu-iotests/033 | 1 +
  tests/qemu-iotests/034 | 3 ++-
  tests/qemu-iotests/037 | 3 ++-
  tests/qemu-iotests/063 | 3 ++-
  tests/qemu-iotests/072 | 1 +
  tests/qemu-iotests/105 | 3 ++-
  tests/qemu-iotests/197 | 1 +
  tests/qemu-iotests/215 | 1 +
  tests/qemu-iotests/251 | 1 +
 files changed, 30 insertions(+), 9 deletions(-)
-diff --git a/tests/qemu-iotests/002 b/tests/qemu-iotests/002
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/002
-+++ b/tests/qemu-iotests/002
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
- _supported_fmt generic
- _supported_proto generic
-+_unsupported_imgopts "subformat=streamOptimized"
- size=128M
-diff --git a/tests/qemu-iotests/003 b/tests/qemu-iotests/003
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/003
-+++ b/tests/qemu-iotests/003
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
- _supported_fmt generic
- _supported_proto generic
-+_unsupported_imgopts "subformat=streamOptimized"
- size=128M
- offset=67M
-diff --git a/tests/qemu-iotests/005 b/tests/qemu-iotests/005
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/005
-+++ b/tests/qemu-iotests/005
-@@ -XXX,XX +XXX,XX @@ _supported_fmt generic
- _supported_proto generic
- _supported_os Linux
- _unsupported_imgopts "subformat=twoGbMaxExtentFlat" \
--                     "subformat=twoGbMaxExtentSparse"
-+                     "subformat=twoGbMaxExtentSparse" \
-+                     "subformat=streamOptimized"
- # vpc is limited to 127GB, so we can't test it here
- if [ "$IMGFMT" = "vpc" ]; then
-diff --git a/tests/qemu-iotests/009 b/tests/qemu-iotests/009
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/009
-+++ b/tests/qemu-iotests/009
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
- _supported_fmt generic
- _supported_proto generic
-+_unsupported_imgopts "subformat=streamOptimized"
- size=6G
-diff --git a/tests/qemu-iotests/010 b/tests/qemu-iotests/010
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/010
-+++ b/tests/qemu-iotests/010
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
- _supported_fmt generic
- _supported_proto generic
-+_unsupported_imgopts "subformat=streamOptimized"
- size=6G
-diff --git a/tests/qemu-iotests/011 b/tests/qemu-iotests/011
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/011
-+++ b/tests/qemu-iotests/011
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
- _supported_fmt generic
- _supported_proto generic
-+_unsupported_imgopts "subformat=streamOptimized"
- size=6G
-diff --git a/tests/qemu-iotests/017 b/tests/qemu-iotests/017
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/017
-+++ b/tests/qemu-iotests/017
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
- _supported_fmt qcow qcow2 vmdk qed
- _supported_proto generic
- _unsupported_proto vxhs
--_unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat"
-+_unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat" \
-+                     "subformat=streamOptimized"
- TEST_OFFSETS="0 4294967296"
-diff --git a/tests/qemu-iotests/018 b/tests/qemu-iotests/018
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/018
-+++ b/tests/qemu-iotests/018
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
- _supported_fmt qcow qcow2 vmdk qed
- _supported_proto file
- _supported_os Linux
--_unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat"
-+_unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat" \
-+                     "streamOptimized"
- TEST_OFFSETS="0 4294967296"
-diff --git a/tests/qemu-iotests/019 b/tests/qemu-iotests/019
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/019
-+++ b/tests/qemu-iotests/019
-@@ -XXX,XX +XXX,XX @@ _supported_proto file
- _supported_os Linux
- _unsupported_imgopts "subformat=monolithicFlat" \
-                      "subformat=twoGbMaxExtentFlat" \
--                     "subformat=twoGbMaxExtentSparse"
-+                     "subformat=twoGbMaxExtentSparse" \
-+                     "subformat=streamOptimized"
- TEST_OFFSETS="0 4294967296"
- CLUSTER_SIZE=65536
-diff --git a/tests/qemu-iotests/020 b/tests/qemu-iotests/020
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/020
-+++ b/tests/qemu-iotests/020
-@@ -XXX,XX +XXX,XX @@ _supported_fmt qcow qcow2 vmdk qed
- _supported_proto file
- _unsupported_imgopts "subformat=monolithicFlat" \
-                      "subformat=twoGbMaxExtentFlat" \
--                     "subformat=twoGbMaxExtentSparse"
-+                     "subformat=twoGbMaxExtentSparse" \
-+                     "subformat=streamOptimized"
- TEST_OFFSETS="0 4294967296"
-diff --git a/tests/qemu-iotests/027 b/tests/qemu-iotests/027
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/027
-+++ b/tests/qemu-iotests/027
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
- _supported_fmt vmdk qcow qcow2 qed
- _supported_proto generic
-+_unsupported_imgopts "subformat=streamOptimized"
- size=128M
-diff --git a/tests/qemu-iotests/032 b/tests/qemu-iotests/032
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/032
-+++ b/tests/qemu-iotests/032
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
- # This works for any image format (though unlikely to segfault for raw)
- _supported_fmt generic
- _supported_proto generic
-+_unsupported_imgopts "subformat=streamOptimized"
- echo
- echo === Prepare image ===
-diff --git a/tests/qemu-iotests/033 b/tests/qemu-iotests/033
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/033
-+++ b/tests/qemu-iotests/033
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
- _supported_fmt generic
- _supported_proto generic
-+_unsupported_imgopts "subformat=streamOptimized"
- size=128M
-diff --git a/tests/qemu-iotests/034 b/tests/qemu-iotests/034
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/034
-+++ b/tests/qemu-iotests/034
-@@ -XXX,XX +XXX,XX @@ _supported_proto file
- _supported_os Linux
- _unsupported_imgopts "subformat=monolithicFlat" \
-                      "subformat=twoGbMaxExtentFlat" \
--                     "subformat=twoGbMaxExtentSparse"
-+                     "subformat=twoGbMaxExtentSparse" \
-+                     "subformat=streamOptimized"
- CLUSTER_SIZE=4k
- size=128M
-diff --git a/tests/qemu-iotests/037 b/tests/qemu-iotests/037
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/037
-+++ b/tests/qemu-iotests/037
-@@ -XXX,XX +XXX,XX @@ _supported_fmt qcow qcow2 vmdk qed
- _supported_proto file
- _unsupported_imgopts "subformat=monolithicFlat" \
-                      "subformat=twoGbMaxExtentFlat" \
--                     "subformat=twoGbMaxExtentSparse"
-+                     "subformat=twoGbMaxExtentSparse" \
-+                     "subformat=streamOptimized"
- CLUSTER_SIZE=4k
- size=128M
-diff --git a/tests/qemu-iotests/063 b/tests/qemu-iotests/063
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/063
-+++ b/tests/qemu-iotests/063
-@@ -XXX,XX +XXX,XX @@ _supported_fmt qcow qcow2 vmdk qed raw
- _supported_proto file
- _unsupported_imgopts "subformat=monolithicFlat" \
-                      "subformat=twoGbMaxExtentFlat" \
--                     "subformat=twoGbMaxExtentSparse"
-+                     "subformat=twoGbMaxExtentSparse" \
-+                     "subformat=streamOptimized"
- _make_test_img 4M
-diff --git a/tests/qemu-iotests/072 b/tests/qemu-iotests/072
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/072
-+++ b/tests/qemu-iotests/072
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
- _supported_fmt vpc vmdk vhdx vdi qed qcow2 qcow
- _supported_proto file
-+_unsupported_imgopts "subformat=streamOptimized"
- IMG_SIZE=64M
-diff --git a/tests/qemu-iotests/105 b/tests/qemu-iotests/105
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/105
-+++ b/tests/qemu-iotests/105
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
- _supported_fmt qcow2 vmdk vhdx qed
- _supported_proto generic
- _unsupported_imgopts "subformat=twoGbMaxExtentFlat" \
--                     "subformat=twoGbMaxExtentSparse"
-+                     "subformat=twoGbMaxExtentSparse" \
-+                     "subformat=streamOptimized"
- echo
- echo "creating large image"
 diff --git a/tests/qemu-iotests/197 b/tests/qemu-iotests/197
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/197
 +++ b/tests/qemu-iotests/197
-@@ -XXX,XX +XXX,XX @@ _supported_fmt generic
+@@ -XXX,XX +XXX,XX @@ $QEMU_IO -f qcow2 -C -c 'read 0 1024' "$TEST_WRAP" | _filter_qemu_io
- _supported_proto generic
+ $QEMU_IO -f qcow2 -c map "$TEST_WRAP"
- # LUKS support may be possible, but it complicates things.
+ _check_test_img
- _unsupported_fmt luks
-+_unsupported_imgopts "subformat=streamOptimized"
++echo
++echo '=== Copy-on-read with subclusters ==='
- echo
++echo
- echo '=== Copy-on-read ==='
++
-diff --git a/tests/qemu-iotests/215 b/tests/qemu-iotests/215
++# Create base and top images 64K (1 cluster) each.  Make subclusters enabled
-index XXXXXXX..XXXXXXX 100755
++# for the top image
---- a/tests/qemu-iotests/215
++_make_test_img 64K
-+++ b/tests/qemu-iotests/215
++IMGPROTO=file IMGFMT=qcow2 TEST_IMG_FILE="$TEST_WRAP" \
-@@ -XXX,XX +XXX,XX @@ _supported_fmt generic
++    _make_test_img --no-opts -o extended_l2=true -F "$IMGFMT" -b "$TEST_IMG" \
- _supported_proto generic
++    64K | _filter_img_create
- # LUKS support may be possible, but it complicates things.
++
- _unsupported_fmt luks
++$QEMU_IO -c "write -P 0xaa 0 64k" "$TEST_IMG" | _filter_qemu_io
-+_unsupported_imgopts "subformat=streamOptimized"
++
++# Allocate individual subclusters in the top image, and not the whole cluster
- echo
++$QEMU_IO -c "write -P 0xbb 28K 2K" -c "write -P 0xcc 34K 2K" "$TEST_WRAP" \
- echo '=== Copy-on-read ==='
++    | _filter_qemu_io
-diff --git a/tests/qemu-iotests/251 b/tests/qemu-iotests/251
++
-index XXXXXXX..XXXXXXX 100755
++# Only 2 subclusters should be allocated in the top image at this point
---- a/tests/qemu-iotests/251
++$QEMU_IMG map "$TEST_WRAP" | _filter_qemu_img_map
-+++ b/tests/qemu-iotests/251
++
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
++# Actual copy-on-read operation
- _supported_fmt generic
++$QEMU_IO -C -c "read -P 0xaa 30K 4K" "$TEST_WRAP" | _filter_qemu_io
- _supported_proto file
++
- _supported_os Linux
++# And here we should have 4 subclusters allocated right in the middle of the
-+_unsupported_imgopts "subformat=streamOptimized"
++# top image. Make sure the whole cluster remains unallocated
++$QEMU_IMG map "$TEST_WRAP" | _filter_qemu_img_map
- if [ "$IMGOPTSSYNTAX" = "true" ]; then
++
-     # We use json:{} filenames here, so we cannot work with additional options.
++_check_test_img
 +
  # success, all done
  echo '*** done'
  status=0
 diff --git a/tests/qemu-iotests/197.out b/tests/qemu-iotests/197.out
 index XXXXXXX..XXXXXXX 100644
 --- a/tests/qemu-iotests/197.out
 +++ b/tests/qemu-iotests/197.out
@@ -XXX,XX +XXX,XX @@ read 1024/1024 bytes at offset 0
 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 KiB (0x400) bytes     allocated at offset 0 bytes (0x0)
  No errors were found on the image.
 +
 +=== Copy-on-read with subclusters ===
 +
 +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=65536
 +Formatting 'TEST_DIR/t.wrap.IMGFMT', fmt=IMGFMT size=65536 backing_file=TEST_DIR/t.IMGFMT backing_fmt=IMGFMT
 +wrote 65536/65536 bytes at offset 0
 +64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 +wrote 2048/2048 bytes at offset 28672
 +2 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 +wrote 2048/2048 bytes at offset 34816
 +2 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 +Offset          Length          File
 +0               0x7000          TEST_DIR/t.IMGFMT
 +0x7000          0x800           TEST_DIR/t.wrap.IMGFMT
 +0x7800          0x1000          TEST_DIR/t.IMGFMT
 +0x8800          0x800           TEST_DIR/t.wrap.IMGFMT
 +0x9000          0x7000          TEST_DIR/t.IMGFMT
 +read 4096/4096 bytes at offset 30720
 +4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 +Offset          Length          File
 +0               0x7000          TEST_DIR/t.IMGFMT
 +0x7000          0x2000          TEST_DIR/t.wrap.IMGFMT
 +0x9000          0x7000          TEST_DIR/t.IMGFMT
 +No errors were found on the image.
  *** done
 --
-.21.0
+.41.0

-[Qemu-devel] [PULL 10/15] iotests: Disable 110 for vmdk.twoGbMaxExtentSparse
+Deleted patch
-The error message for the test case where we have a quorum node for
-which no directory name can be generated is different: For
-twoGbMaxExtentSparse, it complains that it cannot open the extent file.
-For other (sub)formats, it just notes that it cannot determine the
-backing file path.  Both are fine, but just disable twoGbMaxExtentSparse
-for simplicity's sake.
-Signed-off-by: Max Reitz <mreitz@redhat.com>
-Reviewed-by: John Snow <jsnow@redhat.com>
-Message-id: 20190815153638.4600-7-mreitz@redhat.com
-Reviewed-by: John Snow <jsnow@redhat.com>
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- tests/qemu-iotests/110 | 3 ++-
-file changed, 2 insertions(+), 1 deletion(-)
-diff --git a/tests/qemu-iotests/110 b/tests/qemu-iotests/110
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/110
-+++ b/tests/qemu-iotests/110
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
- # Any format supporting backing files
- _supported_fmt qed qcow qcow2 vmdk
- _supported_proto file
--_unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat"
-+_unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat" \
-+                     "subformat=twoGbMaxExtentSparse"
- TEST_IMG_REL=$(basename "$TEST_IMG")
---
-.21.0

-[Qemu-devel] [PULL 11/15] iotests: Disable 126 for flat vmdk subformats
+Deleted patch
-iotest 126 requires backing file support, which flat vmdks cannot offer.
-Skip this test for such subformats.
-Signed-off-by: Max Reitz <mreitz@redhat.com>
-Message-id: 20190815153638.4600-8-mreitz@redhat.com
-Reviewed-by: John Snow <jsnow@redhat.com>
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- tests/qemu-iotests/126 | 2 ++
-file changed, 2 insertions(+)
-diff --git a/tests/qemu-iotests/126 b/tests/qemu-iotests/126
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/126
-+++ b/tests/qemu-iotests/126
-@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
- # Needs backing file support
- _supported_fmt qcow qcow2 qed vmdk
-+_unsupported_imgopts "subformat=monolithicFlat" \
-+                     "subformat=twoGbMaxExtentFlat"
- # This is the default protocol (and we want to test the difference between
- # colons which separate a protocol prefix from the rest and colons which are
- # just part of the filename, so we cannot test protocols which require a prefix)
---
-.21.0

-[Qemu-devel] [PULL 12/15] file-posix: fix request_alignment typo
+Deleted patch
-From: Stefan Hajnoczi <stefanha@redhat.com>
-Fixes: a6b257a08e3d72219f03e461a52152672fec0612
-       ("file-posix: Handle undetectable alignment")
-Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
-Message-id: 20190827101328.4062-1-stefanha@redhat.com
-Reviewed-by: Thomas Huth <thuth@redhat.com>
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- block/file-posix.c | 2 +-
-file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/block/file-posix.c b/block/file-posix.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/file-posix.c
-+++ b/block/file-posix.c
-@@ -XXX,XX +XXX,XX @@ static void raw_probe_alignment(BlockDriverState *bs, int fd, Error **errp)
-         for (i = 0; i < ARRAY_SIZE(alignments); i++) {
-             align = alignments[i];
-             if (raw_is_io_aligned(fd, buf + align, max_align)) {
--                /* Fallback to request_aligment. */
-+                /* Fallback to request_alignment. */
-                 s->buf_align = (align != 1) ? align : bs->bl.request_alignment;
-                 break;
-             }
---
-.21.0

-[Qemu-devel] [PULL 14/15] tests/check-block: Skip iotests when sanitizers are enabled
+Deleted patch
-From: Thomas Huth <thuth@redhat.com>
-The sanitizers (especially the address sanitizer from Clang) are
-sometimes printing out warnings or false positives - this spoils
-the output of the iotests, causing some of the tests to fail.
-Thus let's skip the automatic iotests during "make check" when the
-user configured QEMU with --enable-sanitizers.
-Signed-off-by: Thomas Huth <thuth@redhat.com>
-Message-id: 20190823084203.29734-1-thuth@redhat.com
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- tests/check-block.sh | 5 +++++
-file changed, 5 insertions(+)
-diff --git a/tests/check-block.sh b/tests/check-block.sh
-index XXXXXXX..XXXXXXX 100755
---- a/tests/check-block.sh
-+++ b/tests/check-block.sh
-@@ -XXX,XX +XXX,XX @@ if grep -q "TARGET_GPROF=y" *-softmmu/config-target.mak 2>/dev/null ; then
-     exit 0
- fi
-+if grep -q "CFLAGS.*-fsanitize" config-host.mak 2>/dev/null ; then
-+    echo "Sanitizers are enabled ==> Not running the qemu-iotests."
-+    exit 0
-+fi
-+
- if [ -z "$(find . -name 'qemu-system-*' -print)" ]; then
-     echo "No qemu-system binary available ==> Not running the qemu-iotests."
-     exit 0
---
-.21.0

The following changes since commit 23919ddfd56135cad3cb468a8f54d5a595f024f4:

Merge remote-tracking branch 'remotes/aperard/tags/pull-xen-20190827' into staging (2019-08-27 15:52:36 +0100)

are available in the Git repository at:

https://github.com/XanClic/qemu.git tags/pull-block-2019-08-27

for you to fetch changes up to bb043c056cffcc2f3ce88bfdaf2e76e455c09e2c:

iotests: Unify cache mode quoting (2019-08-27 19:48:44 +0200)

----------------------------------------------------------------
Block patches:
- qemu-io now accepts a file to read a write pattern from
- Ensure that raw files have their first block allocated so we can probe
  the O_DIRECT alignment if necessary
- Various fixes

----------------------------------------------------------------
Denis Plotnikov (1):
  qemu-io: add pattern file for write command

Max Reitz (7):
  iotests: Fix _filter_img_create()
  vmdk: Use bdrv_dirname() for relative extent paths
  iotests: Keep testing broken relative extent paths
  vmdk: Reject invalid compressed writes
  iotests: Disable broken streamOptimized tests
  iotests: Disable 110 for vmdk.twoGbMaxExtentSparse
  iotests: Disable 126 for flat vmdk subformats

Nir Soffer (3):
  block: posix: Always allocate the first block
  iotests: Test allocate_first_block() with O_DIRECT
  iotests: Unify cache mode quoting

Stefan Hajnoczi (1):
  file-posix: fix request_alignment typo

Thomas Huth (2):
  iotests: Check for enabled drivers before testing them
  tests/check-block: Skip iotests when sanitizers are enabled

Vladimir Sementsov-Ogievskiy (1):
  block: fix permission update in bdrv_replace_node

block.c                                       |  5 +-
 block/file-posix.c                            | 53 +++++++++-
 block/vmdk.c                                  | 64 ++++++++----
 qemu-io-cmds.c                                | 99 +++++++++++++++++--
 tests/check-block.sh                          |  5 +
 tests/qemu-iotests/002                        |  1 +
 tests/qemu-iotests/003                        |  1 +
 tests/qemu-iotests/005                        |  3 +-
 tests/qemu-iotests/009                        |  1 +
 tests/qemu-iotests/010                        |  1 +
 tests/qemu-iotests/011                        |  1 +
 tests/qemu-iotests/017                        |  3 +-
 tests/qemu-iotests/018                        |  3 +-
 tests/qemu-iotests/019                        |  3 +-
 tests/qemu-iotests/020                        |  3 +-
 tests/qemu-iotests/026                        |  4 +-
 tests/qemu-iotests/027                        |  1 +
 tests/qemu-iotests/032                        |  1 +
 tests/qemu-iotests/033                        |  1 +
 tests/qemu-iotests/034                        |  3 +-
 tests/qemu-iotests/037                        |  3 +-
 tests/qemu-iotests/039                        |  4 +-
 tests/qemu-iotests/052                        |  2 +-
 tests/qemu-iotests/059                        | 34 ++++++-
 tests/qemu-iotests/059.out                    | 26 +++--
 tests/qemu-iotests/063                        |  3 +-
 tests/qemu-iotests/071                        |  1 +
 tests/qemu-iotests/072                        |  1 +
 tests/qemu-iotests/081                        |  4 +-
 tests/qemu-iotests/091                        |  4 +-
 tests/qemu-iotests/099                        |  1 +
 tests/qemu-iotests/105                        |  3 +-
 tests/qemu-iotests/110                        |  3 +-
 tests/qemu-iotests/120                        |  1 +
 tests/qemu-iotests/126                        |  2 +
 tests/qemu-iotests/{150.out => 150.out.qcow2} |  0
 tests/qemu-iotests/150.out.raw                | 12 +++
 tests/qemu-iotests/162                        |  4 +-
 tests/qemu-iotests/175                        | 47 +++++++--
 tests/qemu-iotests/175.out                    | 16 ++-
 tests/qemu-iotests/178.out.qcow2              |  4 +-
 tests/qemu-iotests/184                        |  1 +
 tests/qemu-iotests/186                        |  1 +
 tests/qemu-iotests/197                        |  1 +
 tests/qemu-iotests/215                        |  1 +
 tests/qemu-iotests/221.out                    | 12 ++-
 tests/qemu-iotests/251                        |  1 +
 tests/qemu-iotests/253.out                    | 12 ++-
 tests/qemu-iotests/common.filter              |  4 +-
 tests/qemu-iotests/common.rc                  | 14 +++
 50 files changed, 391 insertions(+), 87 deletions(-)
 rename tests/qemu-iotests/{150.out => 150.out.qcow2} (100%)
 create mode 100644 tests/qemu-iotests/150.out.raw

-- 
2.21.0

From: Denis Plotnikov <dplotnikov@virtuozzo.com>

The patch allows to provide a pattern file for write
command. There was no similar ability before.

Signed-off-by: Denis Plotnikov <dplotnikov@virtuozzo.com>
Message-id: 20190820164616.4072-1-dplotnikov@virtuozzo.com
Reviewed-by: Eric Blake <eblake@redhat.com>
[mreitz: Keep optstring in alphabetical order]
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 qemu-io-cmds.c | 99 +++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 93 insertions(+), 6 deletions(-)

diff --git a/qemu-io-cmds.c b/qemu-io-cmds.c
index XXXXXXX..XXXXXXX 100644
--- a/qemu-io-cmds.c
+++ b/qemu-io-cmds.c
@@ -XXX,XX +XXX,XX @@ static void qemu_io_free(void *p)
     qemu_vfree(p);
 }
 
+/*
+ * qemu_io_alloc_from_file()
+ *
+ * Allocates the buffer and populates it with the content of the given file
+ * up to @len bytes. If the file length is less than @len, then the buffer
+ * is populated with the file content cyclically.
+ *
+ * @blk - the block backend where the buffer content is going to be written to
+ * @len - the buffer length
+ * @file_name - the file to read the content from
+ *
+ * Returns: the buffer pointer on success
+ *          NULL on error
+ */
+static void *qemu_io_alloc_from_file(BlockBackend *blk, size_t len,
+                                     const char *file_name)
+{
+    char *buf, *buf_origin;
+    FILE *f = fopen(file_name, "r");
+    int pattern_len;
+
+    if (!f) {
+        perror(file_name);
+        return NULL;
+    }
+
+    if (qemuio_misalign) {
+        len += MISALIGN_OFFSET;
+    }
+
+    buf_origin = buf = blk_blockalign(blk, len);
+
+    if (qemuio_misalign) {
+        buf_origin += MISALIGN_OFFSET;
+        buf += MISALIGN_OFFSET;
+        len -= MISALIGN_OFFSET;
+    }
+
+    pattern_len = fread(buf_origin, 1, len, f);
+
+    if (ferror(f)) {
+        perror(file_name);
+        goto error;
+    }
+
+    if (pattern_len == 0) {
+        fprintf(stderr, "%s: file is empty\n", file_name);
+        goto error;
+    }
+
+    fclose(f);
+
+    if (len > pattern_len) {
+        len -= pattern_len;
+        buf += pattern_len;
+
+        while (len > 0) {
+            size_t len_to_copy = MIN(pattern_len, len);
+
+            memcpy(buf, buf_origin, len_to_copy);
+
+            len -= len_to_copy;
+            buf += len_to_copy;
+        }
+    }
+
+    return buf_origin;
+
+error:
+    qemu_io_free(buf_origin);
+    return NULL;
+}
+
 static void dump_buffer(const void *buffer, int64_t offset, int64_t len)
 {
     uint64_t i;
@@ -XXX,XX +XXX,XX @@ static void write_help(void)
 " -n, -- with -z, don't allow slow fallback\n"
 " -p, -- ignored for backwards compatibility\n"
 " -P, -- use different pattern to fill file\n"
+" -s, -- use a pattern file to fill the write buffer\n"
 " -C, -- report statistics in a machine parsable format\n"
 " -q, -- quiet mode, do not show I/O statistics\n"
 " -u, -- with -z, allow unmapping\n"
@@ -XXX,XX +XXX,XX @@ static const cmdinfo_t write_cmd = {
     .perm       = BLK_PERM_WRITE,
     .argmin     = 2,
     .argmax     = -1,
-    .args       = "[-bcCfnquz] [-P pattern] off len",
+    .args       = "[-bcCfnquz] [-P pattern | -s source_file] off len",
     .oneline    = "writes a number of bytes at a specified offset",
     .help       = write_help,
 };
@@ -XXX,XX +XXX,XX @@ static int write_f(BlockBackend *blk, int argc, char **argv)
 {
     struct timespec t1, t2;
     bool Cflag = false, qflag = false, bflag = false;
-    bool Pflag = false, zflag = false, cflag = false;
+    bool Pflag = false, zflag = false, cflag = false, sflag = false;
     int flags = 0;
     int c, cnt, ret;
     char *buf = NULL;
@@ -XXX,XX +XXX,XX @@ static int write_f(BlockBackend *blk, int argc, char **argv)
     /* Some compilers get confused and warn if this is not initialized.  */
     int64_t total = 0;
     int pattern = 0xcd;
+    const char *file_name = NULL;
 
-    while ((c = getopt(argc, argv, "bcCfnpP:quz")) != -1) {
+    while ((c = getopt(argc, argv, "bcCfnpP:qs:uz")) != -1) {
         switch (c) {
         case 'b':
             bflag = true;
@@ -XXX,XX +XXX,XX @@ static int write_f(BlockBackend *blk, int argc, char **argv)
         case 'q':
             qflag = true;
             break;
+        case 's':
+            sflag = true;
+            file_name = optarg;
+            break;
         case 'u':
             flags |= BDRV_REQ_MAY_UNMAP;
             break;
@@ -XXX,XX +XXX,XX @@ static int write_f(BlockBackend *blk, int argc, char **argv)
         return -EINVAL;
     }
 
-    if (zflag && Pflag) {
-        printf("-z and -P cannot be specified at the same time\n");
+    if (zflag + Pflag + sflag > 1) {
+        printf("Only one of -z, -P, and -s "
+               "can be specified at the same time\n");
         return -EINVAL;
     }
 
@@ -XXX,XX +XXX,XX @@ static int write_f(BlockBackend *blk, int argc, char **argv)
     }
 
     if (!zflag) {
-        buf = qemu_io_alloc(blk, count, pattern);
+        if (sflag) {
+            buf = qemu_io_alloc_from_file(blk, count, file_name);
+            if (!buf) {
+                return -EINVAL;
+            }
+        } else {
+            buf = qemu_io_alloc(blk, count, pattern);
+        }
     }
 
     clock_gettime(CLOCK_MONOTONIC, &t1);
-- 
2.21.0

From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>

It's wrong to OR shared permissions. It may lead to crash on further
permission updates.
Also, no needs to consider previously calculated permissions, as at
this point we already bind all new parents and bdrv_get_cumulative_perm
result is enough. So fix the bug by just set permissions by
bdrv_get_cumulative_perm result.

Bug was introduced in long ago 234ac1a9025, in 2.9.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-id: 20190824100740.61635-1-vsementsov@virtuozzo.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 block.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/block.c b/block.c
index XXXXXXX..XXXXXXX 100644
--- a/block.c
+++ b/block.c
@@ -XXX,XX +XXX,XX @@ void bdrv_replace_node(BlockDriverState *from, BlockDriverState *to,
 {
     BdrvChild *c, *next;
     GSList *list = NULL, *p;
-    uint64_t old_perm, old_shared;
     uint64_t perm = 0, shared = BLK_PERM_ALL;
     int ret;
 
@@ -XXX,XX +XXX,XX @@ void bdrv_replace_node(BlockDriverState *from, BlockDriverState *to,
         bdrv_unref(from);
     }
 
-    bdrv_get_cumulative_perm(to, &old_perm, &old_shared);
-    bdrv_set_perm(to, old_perm | perm, old_shared | shared);
+    bdrv_get_cumulative_perm(to, &perm, &shared);
+    bdrv_set_perm(to, perm, shared);
 
 out:
     g_slist_free(list);
-- 
2.21.0

From: Nir Soffer <nirsof@gmail.com>

When creating an image with preallocation "off" or "falloc", the first
block of the image is typically not allocated. When using Gluster
storage backed by XFS filesystem, reading this block using direct I/O
succeeds regardless of request length, fooling alignment detection.

In this case we fallback to a safe value (4096) instead of the optimal
value (512), which may lead to unneeded data copying when aligning
requests.  Allocating the first block avoids the fallback.

Since we allocate the first block even with preallocation=off, we no
longer create images with zero disk size:

$ ./qemu-img create -f raw test.raw 1g
    Formatting 'test.raw', fmt=raw size=1073741824

$ ls -lhs test.raw
    4.0K -rw-r--r--. 1 nsoffer nsoffer 1.0G Aug 16 23:48 test.raw

And converting the image requires additional cluster:

$ ./qemu-img measure -f raw -O qcow2 test.raw
    required size: 458752
    fully allocated size: 1074135040

When using format like vmdk with multiple files per image, we allocate
one block per file:

$ ./qemu-img create -f vmdk -o subformat=twoGbMaxExtentFlat test.vmdk 4g
    Formatting 'test.vmdk', fmt=vmdk size=4294967296 compat6=off hwversion=undefined subformat=twoGbMaxExtentFlat

$ ls -lhs test*.vmdk
    4.0K -rw-r--r--. 1 nsoffer nsoffer 2.0G Aug 27 03:23 test-f001.vmdk
    4.0K -rw-r--r--. 1 nsoffer nsoffer 2.0G Aug 27 03:23 test-f002.vmdk
    4.0K -rw-r--r--. 1 nsoffer nsoffer  353 Aug 27 03:23 test.vmdk

I did quick performance test for copying disks with qemu-img convert to
new raw target image to Gluster storage with sector size of 512 bytes:

for i in $(seq 10); do
        rm -f dst.raw
        sleep 10
        time ./qemu-img convert -f raw -O raw -t none -T none src.raw dst.raw
    done

Here is a table comparing the total time spent:

Type    Before(s)   After(s)    Diff(%)
---------------------------------------
real      530.028    469.123      -11.4
user       17.204     10.768      -37.4
sys        17.881      7.011      -60.7

We can see very clear improvement in CPU usage.

Signed-off-by: Nir Soffer <nsoffer@redhat.com>
Message-id: 20190827010528.8818-2-nsoffer@redhat.com
Reviewed-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 block/file-posix.c                            | 51 +++++++++++++++++++
 tests/qemu-iotests/059.out                    |  2 +-
 tests/qemu-iotests/{150.out => 150.out.qcow2} |  0
 tests/qemu-iotests/150.out.raw                | 12 +++++
 tests/qemu-iotests/175                        | 19 ++++---
 tests/qemu-iotests/175.out                    |  8 +--
 tests/qemu-iotests/178.out.qcow2              |  4 +-
 tests/qemu-iotests/221.out                    | 12 +++--
 tests/qemu-iotests/253.out                    | 12 +++--
 9 files changed, 99 insertions(+), 21 deletions(-)
 rename tests/qemu-iotests/{150.out => 150.out.qcow2} (100%)
 create mode 100644 tests/qemu-iotests/150.out.raw

diff --git a/block/file-posix.c b/block/file-posix.c
index XXXXXXX..XXXXXXX 100644
--- a/block/file-posix.c
+++ b/block/file-posix.c
@@ -XXX,XX +XXX,XX @@ static int handle_aiocb_discard(void *opaque)
     return ret;
 }
 
+/*
+ * Help alignment probing by allocating the first block.
+ *
+ * When reading with direct I/O from unallocated area on Gluster backed by XFS,
+ * reading succeeds regardless of request length. In this case we fallback to
+ * safe alignment which is not optimal. Allocating the first block avoids this
+ * fallback.
+ *
+ * fd may be opened with O_DIRECT, but we don't know the buffer alignment or
+ * request alignment, so we use safe values.
+ *
+ * Returns: 0 on success, -errno on failure. Since this is an optimization,
+ * caller may ignore failures.
+ */
+static int allocate_first_block(int fd, size_t max_size)
+{
+    size_t write_size = (max_size < MAX_BLOCKSIZE)
+        ? BDRV_SECTOR_SIZE
+        : MAX_BLOCKSIZE;
+    size_t max_align = MAX(MAX_BLOCKSIZE, getpagesize());
+    void *buf;
+    ssize_t n;
+    int ret;
+
+    buf = qemu_memalign(max_align, write_size);
+    memset(buf, 0, write_size);
+
+    do {
+        n = pwrite(fd, buf, write_size, 0);
+    } while (n == -1 && errno == EINTR);
+
+    ret = (n == -1) ? -errno : 0;
+
+    qemu_vfree(buf);
+    return ret;
+}
+
 static int handle_aiocb_truncate(void *opaque)
 {
     RawPosixAIOData *aiocb = opaque;
@@ -XXX,XX +XXX,XX @@ static int handle_aiocb_truncate(void *opaque)
                 /* posix_fallocate() doesn't set errno. */
                 error_setg_errno(errp, -result,
                                  "Could not preallocate new data");
+            } else if (current_length == 0) {
+                /*
+                 * posix_fallocate() uses fallocate() if the filesystem
+                 * supports it, or fallback to manually writing zeroes. If
+                 * fallocate() was used, unaligned reads from the fallocated
+                 * area in raw_probe_alignment() will succeed, hence we need to
+                 * allocate the first block.
+                 *
+                 * Optimize future alignment probing; ignore failures.
+                 */
+                allocate_first_block(fd, offset);
             }
         } else {
             result = 0;
@@ -XXX,XX +XXX,XX @@ static int handle_aiocb_truncate(void *opaque)
         if (ftruncate(fd, offset) != 0) {
             result = -errno;
             error_setg_errno(errp, -result, "Could not resize file");
+        } else if (current_length == 0 && offset > current_length) {
+            /* Optimize future alignment probing; ignore failures. */
+            allocate_first_block(fd, offset);
         }
         return result;
     default:
diff --git a/tests/qemu-iotests/059.out b/tests/qemu-iotests/059.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/059.out
+++ b/tests/qemu-iotests/059.out
@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824000 subformat=twoGbMax
 image: TEST_DIR/t.vmdk
 file format: vmdk
 virtual size: 0.977 TiB (1073741824000 bytes)
-disk size: 16 KiB
+disk size: 1.97 MiB
 Format specific information:
     cid: XXXXXXXX
     parent cid: XXXXXXXX
diff --git a/tests/qemu-iotests/150.out b/tests/qemu-iotests/150.out.qcow2
similarity index 100%
rename from tests/qemu-iotests/150.out
rename to tests/qemu-iotests/150.out.qcow2
diff --git a/tests/qemu-iotests/150.out.raw b/tests/qemu-iotests/150.out.raw
new file mode 100644
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/tests/qemu-iotests/150.out.raw
@@ -XXX,XX +XXX,XX @@
+QA output created by 150
+
+=== Mapping sparse conversion ===
+
+Offset          Length          File
+0               0x1000          TEST_DIR/t.IMGFMT
+
+=== Mapping non-sparse conversion ===
+
+Offset          Length          File
+0               0x100000        TEST_DIR/t.IMGFMT
+*** done
diff --git a/tests/qemu-iotests/175 b/tests/qemu-iotests/175
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/175
+++ b/tests/qemu-iotests/175
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # the file size.  This function hides the resulting difference in the
 # stat -c '%b' output.
 # Parameter 1: Number of blocks an empty file occupies
-# Parameter 2: Image size in bytes
+# Parameter 2: Minimal number of blocks in an image
+# Parameter 3: Image size in bytes
 _filter_blocks()
 {
     extra_blocks=$1
-    img_size=$2
+    min_blocks=$2
+    img_size=$3
 
-    sed -e "s/blocks=$extra_blocks\$\$\\|[^0-9]\$/nothing allocated/" \
-        -e "s/blocks=$((extra_blocks + img_size / 512))\$\$\\|[^0-9]\$/everything allocated/"
+    sed -e "s/blocks=$min_blocks\$\$\\|[^0-9]\$/min allocation/" \
+        -e "s/blocks=$((extra_blocks + img_size / 512))\$\$\\|[^0-9]\$/max allocation/"
 }
 
 # get standard environment, filters and checks
@@ -XXX,XX +XXX,XX @@ size=$((1 * 1024 * 1024))
 touch "$TEST_DIR/empty"
 extra_blocks=$(stat -c '%b' "$TEST_DIR/empty")
 
+# We always write the first byte; check how many blocks this filesystem
+# allocates to match empty image alloation.
+printf "\0" > "$TEST_DIR/empty"
+min_blocks=$(stat -c '%b' "$TEST_DIR/empty")
+
 echo
 echo "== creating image with default preallocation =="
 _make_test_img $size | _filter_imgfmt
-stat -c "size=%s, blocks=%b" $TEST_IMG | _filter_blocks $extra_blocks $size
+stat -c "size=%s, blocks=%b" $TEST_IMG | _filter_blocks $extra_blocks $min_blocks $size
 
 for mode in off full falloc; do
     echo
     echo "== creating image with preallocation $mode =="
     IMGOPTS=preallocation=$mode _make_test_img $size | _filter_imgfmt
-    stat -c "size=%s, blocks=%b" $TEST_IMG | _filter_blocks $extra_blocks $size
+    stat -c "size=%s, blocks=%b" $TEST_IMG | _filter_blocks $extra_blocks $min_blocks $size
 done
 
 # success, all done
diff --git a/tests/qemu-iotests/175.out b/tests/qemu-iotests/175.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/175.out
+++ b/tests/qemu-iotests/175.out
@@ -XXX,XX +XXX,XX @@ QA output created by 175
 
 == creating image with default preallocation ==
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576
-size=1048576, nothing allocated
+size=1048576, min allocation
 
 == creating image with preallocation off ==
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576 preallocation=off
-size=1048576, nothing allocated
+size=1048576, min allocation
 
 == creating image with preallocation full ==
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576 preallocation=full
-size=1048576, everything allocated
+size=1048576, max allocation
 
 == creating image with preallocation falloc ==
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576 preallocation=falloc
-size=1048576, everything allocated
+size=1048576, max allocation
  *** done
diff --git a/tests/qemu-iotests/178.out.qcow2 b/tests/qemu-iotests/178.out.qcow2
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/178.out.qcow2
+++ b/tests/qemu-iotests/178.out.qcow2
@@ -XXX,XX +XXX,XX @@ converted image file size in bytes: 196608
 == raw input image with data (human) ==
 
 Formatting 'TEST_DIR/t.qcow2', fmt=IMGFMT size=1073741824
-required size: 393216
+required size: 458752
 fully allocated size: 1074135040
 wrote 512/512 bytes at offset 512
 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
@@ -XXX,XX +XXX,XX @@ converted image file size in bytes: 196608
 
 Formatting 'TEST_DIR/t.qcow2', fmt=IMGFMT size=1073741824
 {
-    "required": 393216,
+    "required": 458752,
     "fully-allocated": 1074135040
 }
 wrote 512/512 bytes at offset 512
diff --git a/tests/qemu-iotests/221.out b/tests/qemu-iotests/221.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/221.out
+++ b/tests/qemu-iotests/221.out
@@ -XXX,XX +XXX,XX @@ QA output created by 221
 === Check mapping of unaligned raw image ===
 
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=65537
-[{ "start": 0, "length": 66048, "depth": 0, "zero": true, "data": false, "offset": OFFSET}]
-[{ "start": 0, "length": 66048, "depth": 0, "zero": true, "data": false, "offset": OFFSET}]
+[{ "start": 0, "length": 4096, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 4096, "length": 61952, "depth": 0, "zero": true, "data": false, "offset": OFFSET}]
+[{ "start": 0, "length": 4096, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 4096, "length": 61952, "depth": 0, "zero": true, "data": false, "offset": OFFSET}]
 wrote 1/1 bytes at offset 65536
 1 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-[{ "start": 0, "length": 65536, "depth": 0, "zero": true, "data": false, "offset": OFFSET},
+[{ "start": 0, "length": 4096, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 4096, "length": 61440, "depth": 0, "zero": true, "data": false, "offset": OFFSET},
 { "start": 65536, "length": 1, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 { "start": 65537, "length": 511, "depth": 0, "zero": true, "data": false, "offset": OFFSET}]
-[{ "start": 0, "length": 65536, "depth": 0, "zero": true, "data": false, "offset": OFFSET},
+[{ "start": 0, "length": 4096, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 4096, "length": 61440, "depth": 0, "zero": true, "data": false, "offset": OFFSET},
 { "start": 65536, "length": 1, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
 { "start": 65537, "length": 511, "depth": 0, "zero": true, "data": false, "offset": OFFSET}]
 *** done
diff --git a/tests/qemu-iotests/253.out b/tests/qemu-iotests/253.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/253.out
+++ b/tests/qemu-iotests/253.out
@@ -XXX,XX +XXX,XX @@ QA output created by 253
 === Check mapping of unaligned raw image ===
 
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048575
-[{ "start": 0, "length": 1048576, "depth": 0, "zero": true, "data": false, "offset": OFFSET}]
-[{ "start": 0, "length": 1048576, "depth": 0, "zero": true, "data": false, "offset": OFFSET}]
+[{ "start": 0, "length": 4096, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 4096, "length": 1044480, "depth": 0, "zero": true, "data": false, "offset": OFFSET}]
+[{ "start": 0, "length": 4096, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 4096, "length": 1044480, "depth": 0, "zero": true, "data": false, "offset": OFFSET}]
 wrote 65535/65535 bytes at offset 983040
 63.999 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-[{ "start": 0, "length": 983040, "depth": 0, "zero": true, "data": false, "offset": OFFSET},
+[{ "start": 0, "length": 4096, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 4096, "length": 978944, "depth": 0, "zero": true, "data": false, "offset": OFFSET},
 { "start": 983040, "length": 65536, "depth": 0, "zero": false, "data": true, "offset": OFFSET}]
-[{ "start": 0, "length": 983040, "depth": 0, "zero": true, "data": false, "offset": OFFSET},
+[{ "start": 0, "length": 4096, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
+{ "start": 4096, "length": 978944, "depth": 0, "zero": true, "data": false, "offset": OFFSET},
 { "start": 983040, "length": 65536, "depth": 0, "zero": false, "data": true, "offset": OFFSET}]
 *** done
-- 
2.21.0

From: Nir Soffer <nirsof@gmail.com>

Using block_resize we can test allocate_first_block() with file
descriptor opened with O_DIRECT, ensuring that it works for any size
larger than 4096 bytes.

Testing smaller sizes is tricky as the result depends on the filesystem
used for testing. For example on NFS any size will work since O_DIRECT
does not require any alignment.

Signed-off-by: Nir Soffer <nsoffer@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Message-id: 20190827010528.8818-3-nsoffer@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/175     | 28 ++++++++++++++++++++++++++++
 tests/qemu-iotests/175.out |  8 ++++++++
 2 files changed, 36 insertions(+)

diff --git a/tests/qemu-iotests/175 b/tests/qemu-iotests/175
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/175
+++ b/tests/qemu-iotests/175
@@ -XXX,XX +XXX,XX @@ _filter_blocks()
         -e "s/blocks=$((extra_blocks + img_size / 512))\$\$\\|[^0-9]\$/max allocation/"
 }
 
+# Resize image using block_resize.
+# Parameter 1: image path
+# Parameter 2: new size
+_block_resize()
+{
+    local path=$1
+    local size=$2
+
+    $QEMU -qmp stdio -nographic -nodefaults \
+        -blockdev file,node-name=file,filename=$path,cache.direct=on \
+        <<EOF
+{'execute': 'qmp_capabilities'}
+{'execute': 'block_resize', 'arguments': {'node-name': 'file', 'size': $size}}
+{'execute': 'quit'}
+EOF
+}
+
 # get standard environment, filters and checks
 . ./common.rc
 . ./common.filter
@@ -XXX,XX +XXX,XX @@ _supported_fmt raw
 _supported_proto file
 _supported_os Linux
 
+_default_cache_mode none
+_supported_cache_modes none directsync
+
 size=$((1 * 1024 * 1024))
 
 touch "$TEST_DIR/empty"
@@ -XXX,XX +XXX,XX @@ for mode in off full falloc; do
     stat -c "size=%s, blocks=%b" $TEST_IMG | _filter_blocks $extra_blocks $min_blocks $size
 done
 
+for new_size in 4096 1048576; do
+    echo
+    echo "== resize empty image with block_resize =="
+    _make_test_img 0 | _filter_imgfmt
+    _block_resize $TEST_IMG $new_size >/dev/null
+    stat -c "size=%s, blocks=%b" $TEST_IMG | _filter_blocks $extra_blocks $min_blocks $new_size
+done
+
 # success, all done
 echo "*** done"
 rm -f $seq.full
diff --git a/tests/qemu-iotests/175.out b/tests/qemu-iotests/175.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/175.out
+++ b/tests/qemu-iotests/175.out
@@ -XXX,XX +XXX,XX @@ size=1048576, max allocation
 == creating image with preallocation falloc ==
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576 preallocation=falloc
 size=1048576, max allocation
+
+== resize empty image with block_resize ==
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=0
+size=4096, min allocation
+
+== resize empty image with block_resize ==
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=0
+size=1048576, min allocation
  *** done
-- 
2.21.0

fe646693acc changed qemu-img create's output so that it no longer prints
single quotes around parameter values.  The subformat and adapter_type
filters in _filter_img_create() have never been adapted to that change.

Fixes: fe646693acc13ac48b98435d14149ab04dc597bc
Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Message-id: 20190815153638.4600-2-mreitz@redhat.com
Reviewed-by: John Snow <jsnow@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/059.out       | 16 ++++++++--------
 tests/qemu-iotests/common.filter |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/qemu-iotests/059.out b/tests/qemu-iotests/059.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/059.out
+++ b/tests/qemu-iotests/059.out
@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
 qemu-io: can't open device TEST_DIR/t.vmdk: L1 size too big
 
 === Testing monolithicFlat creation and opening ===
-Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=2147483648 subformat=monolithicFlat
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=2147483648
 image: TEST_DIR/t.IMGFMT
 file format: IMGFMT
 virtual size: 2 GiB (2147483648 bytes)
 
 === Testing monolithicFlat with zeroed_grain ===
 qemu-img: TEST_DIR/t.IMGFMT: Flat image can't enable zeroed grain
-Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=2147483648 subformat=monolithicFlat
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=2147483648
 
 === Testing big twoGbMaxExtentFlat ===
-Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824000 subformat=twoGbMaxExtentFlat
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824000
 image: TEST_DIR/t.vmdk
 file format: vmdk
 virtual size: 0.977 TiB (1073741824000 bytes)
@@ -XXX,XX +XXX,XX @@ Format specific information:
 qemu-img: Could not open 'TEST_DIR/t.IMGFMT': Invalid extent line: RW 12582912 VMFS "dummy.IMGFMT" 1
 
 === Testing truncated sparse ===
-Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=107374182400 subformat=monolithicSparse
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=107374182400
 qemu-img: Could not open 'TEST_DIR/t.IMGFMT': File truncated, expecting at least 13172736 bytes
 
 === Converting to streamOptimized from image with small cluster size===
@@ -XXX,XX +XXX,XX @@ wrote 512/512 bytes at offset 10240
 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 
 === Testing monolithicFlat with internally generated JSON file name ===
-Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 subformat=monolithicFlat
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
 qemu-io: can't open: Cannot use relative extent paths with VMDK descriptor file 'json:{"image": {"driver": "file", "filename": "TEST_DIR/t.IMGFMT"}, "driver": "blkdebug", "inject-error.0.event": "read_aio"}'
 
 === Testing version 3 ===
@@ -XXX,XX +XXX,XX @@ read 512/512 bytes at offset 64931328
 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 
 === Testing 4TB monolithicFlat creation and IO ===
-Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=4398046511104 subformat=monolithicFlat
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=4398046511104
 image: TEST_DIR/t.IMGFMT
 file format: IMGFMT
 virtual size: 4 TiB (4398046511104 bytes)
@@ -XXX,XX +XXX,XX @@ read 1024/1024 bytes at offset 966367641600
 1 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 
 === Testing qemu-img map on extents ===
-Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=33285996544 subformat=monolithicSparse
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=33285996544
 wrote 1024/1024 bytes at offset 65024
 1 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 wrote 1024/1024 bytes at offset 2147483136
@@ -XXX,XX +XXX,XX @@ Offset          Length          Mapped to       File
 0               0x20000         0x3f0000        TEST_DIR/t.vmdk
 0x7fff0000      0x20000         0x410000        TEST_DIR/t.vmdk
 0x140000000     0x10000         0x430000        TEST_DIR/t.vmdk
-Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=33285996544 subformat=twoGbMaxExtentSparse
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=33285996544
 wrote 1024/1024 bytes at offset 65024
 1 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 wrote 1024/1024 bytes at offset 2147483136
diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.filter
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/common.filter
+++ b/tests/qemu-iotests/common.filter
@@ -XXX,XX +XXX,XX @@ _filter_img_create()
         -e "s# compat6=\$on\\|off\$##g" \
         -e "s# static=\$on\\|off\$##g" \
         -e "s# zeroed_grain=\$on\\|off\$##g" \
-        -e "s# subformat='[^']*'##g" \
-        -e "s# adapter_type='[^']*'##g" \
+        -e "s# subformat=[^ ]*##g" \
+        -e "s# adapter_type=[^ ]*##g" \
         -e "s# hwversion=[^ ]*##g" \
         -e "s# lazy_refcounts=\$on\\|off\$##g" \
         -e "s# block_size=[0-9]\\+##g" \
-- 
2.21.0

This makes iotest 033 pass with e.g. subformat=monolithicFlat.  It also
turns a former error in 059 into success.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-id: 20190815153638.4600-3-mreitz@redhat.com
Reviewed-by: John Snow <jsnow@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 block/vmdk.c               | 54 ++++++++++++++++++++++++--------------
 tests/qemu-iotests/059     |  7 +++--
 tests/qemu-iotests/059.out |  4 ++-
 3 files changed, 42 insertions(+), 23 deletions(-)

diff --git a/block/vmdk.c b/block/vmdk.c
index XXXXXXX..XXXXXXX 100644
--- a/block/vmdk.c
+++ b/block/vmdk.c
@@ -XXX,XX +XXX,XX @@ static const char *next_line(const char *s)
 }
 
 static int vmdk_parse_extents(const char *desc, BlockDriverState *bs,
-                              const char *desc_file_path, QDict *options,
-                              Error **errp)
+                              QDict *options, Error **errp)
 {
     int ret;
     int matches;
@@ -XXX,XX +XXX,XX @@ static int vmdk_parse_extents(const char *desc, BlockDriverState *bs,
     const char *p, *np;
     int64_t sectors = 0;
     int64_t flat_offset;
+    char *desc_file_dir = NULL;
     char *extent_path;
     BdrvChild *extent_file;
     BDRVVmdkState *s = bs->opaque;
@@ -XXX,XX +XXX,XX @@ static int vmdk_parse_extents(const char *desc, BlockDriverState *bs,
             continue;
         }
 
-        if (!path_is_absolute(fname) && !path_has_protocol(fname) &&
-            !desc_file_path[0])
-        {
-            bdrv_refresh_filename(bs->file->bs);
-            error_setg(errp, "Cannot use relative extent paths with VMDK "
-                       "descriptor file '%s'", bs->file->bs->filename);
-            return -EINVAL;
-        }
+        if (path_is_absolute(fname)) {
+            extent_path = g_strdup(fname);
+        } else {
+            if (!desc_file_dir) {
+                desc_file_dir = bdrv_dirname(bs->file->bs, errp);
+                if (!desc_file_dir) {
+                    bdrv_refresh_filename(bs->file->bs);
+                    error_prepend(errp, "Cannot use relative paths with VMDK "
+                                  "descriptor file '%s': ",
+                                  bs->file->bs->filename);
+                    ret = -EINVAL;
+                    goto out;
+                }
+            }
 
-        extent_path = path_combine(desc_file_path, fname);
+            extent_path = g_strconcat(desc_file_dir, fname, NULL);
+        }
 
         ret = snprintf(extent_opt_prefix, 32, "extents.%d", s->num_extents);
         assert(ret < 32);
@@ -XXX,XX +XXX,XX @@ static int vmdk_parse_extents(const char *desc, BlockDriverState *bs,
         g_free(extent_path);
         if (local_err) {
             error_propagate(errp, local_err);
-            return -EINVAL;
+            ret = -EINVAL;
+            goto out;
         }
 
         /* save to extents array */
@@ -XXX,XX +XXX,XX @@ static int vmdk_parse_extents(const char *desc, BlockDriverState *bs,
                             0, 0, 0, 0, 0, &extent, errp);
             if (ret < 0) {
                 bdrv_unref_child(bs, extent_file);
-                return ret;
+                goto out;
             }
             extent->flat_start_offset = flat_offset << 9;
         } else if (!strcmp(type, "SPARSE") || !strcmp(type, "VMFSSPARSE")) {
@@ -XXX,XX +XXX,XX @@ static int vmdk_parse_extents(const char *desc, BlockDriverState *bs,
             g_free(buf);
             if (ret) {
                 bdrv_unref_child(bs, extent_file);
-                return ret;
+                goto out;
             }
             extent = &s->extents[s->num_extents - 1];
         } else if (!strcmp(type, "SESPARSE")) {
             ret = vmdk_open_se_sparse(bs, extent_file, bs->open_flags, errp);
             if (ret) {
                 bdrv_unref_child(bs, extent_file);
-                return ret;
+                goto out;
             }
             extent = &s->extents[s->num_extents - 1];
         } else {
             error_setg(errp, "Unsupported extent type '%s'", type);
             bdrv_unref_child(bs, extent_file);
-            return -ENOTSUP;
+            ret = -ENOTSUP;
+            goto out;
         }
         extent->type = g_strdup(type);
     }
-    return 0;
+
+    ret = 0;
+    goto out;
 
 invalid:
     np = next_line(p);
@@ -XXX,XX +XXX,XX @@ invalid:
         np--;
     }
     error_setg(errp, "Invalid extent line: %.*s", (int)(np - p), p);
-    return -EINVAL;
+    ret = -EINVAL;
+
+out:
+    g_free(desc_file_dir);
+    return ret;
 }
 
 static int vmdk_open_desc_file(BlockDriverState *bs, int flags, char *buf,
@@ -XXX,XX +XXX,XX @@ static int vmdk_open_desc_file(BlockDriverState *bs, int flags, char *buf,
     }
     s->create_type = g_strdup(ct);
     s->desc_offset = 0;
-    ret = vmdk_parse_extents(buf, bs, bs->file->bs->exact_filename, options,
-                             errp);
+    ret = vmdk_parse_extents(buf, bs, options, errp);
 exit:
     return ret;
 }
diff --git a/tests/qemu-iotests/059 b/tests/qemu-iotests/059
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/059
+++ b/tests/qemu-iotests/059
@@ -XXX,XX +XXX,XX @@ $QEMU_IMG convert -f qcow2 -O vmdk -o subformat=streamOptimized "$TEST_IMG.qcow2
 
 echo
 echo "=== Testing monolithicFlat with internally generated JSON file name ==="
+# Should work, because bdrv_dirname() works fine with blkdebug
 IMGOPTS="subformat=monolithicFlat" _make_test_img 64M
-$QEMU_IO -c "open -o driver=$IMGFMT,file.driver=blkdebug,file.image.filename=$TEST_IMG,file.inject-error.0.event=read_aio" 2>&1 \
-    | _filter_testdir | _filter_imgfmt
+$QEMU_IO -c "open -o driver=$IMGFMT,file.driver=blkdebug,file.image.filename=$TEST_IMG,file.inject-error.0.event=read_aio" \
+         -c info \
+    2>&1 \
+    | _filter_testdir | _filter_imgfmt | _filter_img_info
 _cleanup_test_img
 
 echo
diff --git a/tests/qemu-iotests/059.out b/tests/qemu-iotests/059.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/059.out
+++ b/tests/qemu-iotests/059.out
@@ -XXX,XX +XXX,XX @@ wrote 512/512 bytes at offset 10240
 
 === Testing monolithicFlat with internally generated JSON file name ===
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
-qemu-io: can't open: Cannot use relative extent paths with VMDK descriptor file 'json:{"image": {"driver": "file", "filename": "TEST_DIR/t.IMGFMT"}, "driver": "blkdebug", "inject-error.0.event": "read_aio"}'
+format name: IMGFMT
+cluster size: 0 bytes
+vm state offset: 0 bytes
 
 === Testing version 3 ===
 image: TEST_DIR/iotest-version3.IMGFMT
-- 
2.21.0

We had a test for a case where relative extent paths did not work, but
unfortunately we just fixed the underlying problem, so it works now.
This patch adds a new test case that still fails.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Message-id: 20190815153638.4600-4-mreitz@redhat.com
Reviewed-by: John Snow <jsnow@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/059     | 27 +++++++++++++++++++++++++++
 tests/qemu-iotests/059.out |  4 ++++
 2 files changed, 31 insertions(+)

diff --git a/tests/qemu-iotests/059 b/tests/qemu-iotests/059
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/059
+++ b/tests/qemu-iotests/059
@@ -XXX,XX +XXX,XX @@ $QEMU_IMG convert -f qcow2 -O vmdk -o subformat=streamOptimized "$TEST_IMG.qcow2
 
 echo
 echo "=== Testing monolithicFlat with internally generated JSON file name ==="
+
+echo '--- blkdebug ---'
 # Should work, because bdrv_dirname() works fine with blkdebug
 IMGOPTS="subformat=monolithicFlat" _make_test_img 64M
 $QEMU_IO -c "open -o driver=$IMGFMT,file.driver=blkdebug,file.image.filename=$TEST_IMG,file.inject-error.0.event=read_aio" \
@@ -XXX,XX +XXX,XX @@ $QEMU_IO -c "open -o driver=$IMGFMT,file.driver=blkdebug,file.image.filename=$TE
     | _filter_testdir | _filter_imgfmt | _filter_img_info
 _cleanup_test_img
 
+echo '--- quorum ---'
+# Should not work, because bdrv_dirname() does not work with quorum
+IMGOPTS="subformat=monolithicFlat" _make_test_img 64M
+cp "$TEST_IMG" "$TEST_IMG.orig"
+
+filename="json:{
+    \"driver\": \"$IMGFMT\",
+    \"file\": {
+        \"driver\": \"quorum\",
+        \"children\": [ {
+            \"driver\": \"file\",
+            \"filename\": \"$TEST_IMG\"
+        }, {
+            \"driver\": \"file\",
+            \"filename\": \"$TEST_IMG.orig\"
+        } ],
+        \"vote-threshold\": 1
+    } }"
+
+filename=$(echo "$filename" | tr '\n' ' ' | sed -e 's/\s\+/ /g')
+$QEMU_IMG info "$filename" 2>&1 \
+    | sed -e "s/'json:[^']*'/\$QUORUM_FILE/g" \
+    | _filter_testdir | _filter_imgfmt | _filter_img_info
+
+
 echo
 echo "=== Testing version 3 ==="
 _use_sample_img iotest-version3.vmdk.bz2
diff --git a/tests/qemu-iotests/059.out b/tests/qemu-iotests/059.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/059.out
+++ b/tests/qemu-iotests/059.out
@@ -XXX,XX +XXX,XX @@ wrote 512/512 bytes at offset 10240
 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 
 === Testing monolithicFlat with internally generated JSON file name ===
+--- blkdebug ---
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
 format name: IMGFMT
 cluster size: 0 bytes
 vm state offset: 0 bytes
+--- quorum ---
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
+qemu-img: Could not open $QUORUM_FILE: Cannot use relative paths with VMDK descriptor file $QUORUM_FILE: Cannot generate a base directory for quorum nodes
 
 === Testing version 3 ===
 image: TEST_DIR/iotest-version3.IMGFMT
-- 
2.21.0

Compressed writes generally have to write full clusters, not just in
theory but also in practice when it comes to vmdk's streamOptimized
subformat.  It currently is just silently broken for writes with
non-zero in-cluster offsets:

$ qemu-img create -f vmdk -o subformat=streamOptimized foo.vmdk 1M
$ qemu-io -c 'write 4k 4k' -c 'read 4k 4k' foo.vmdk
wrote 4096/4096 bytes at offset 4096
4 KiB, 1 ops; 00.01 sec (443.724 KiB/sec and 110.9309 ops/sec)
read failed: Invalid argument

(The technical reason is that vmdk_write_extent() just writes the
incomplete compressed data actually to offset 4k.  When reading the
data, vmdk_read_extent() looks at offset 0 and finds the compressed data
size to be 0, because that is what it reads from there.  This yields an
error.)

For incomplete writes with zero in-cluster offsets, the error path when
reading the rest of the cluster is a bit different, but the result is
the same:

$ qemu-img create -f vmdk -o subformat=streamOptimized foo.vmdk 1M
$ qemu-io -c 'write 0k 4k' -c 'read 4k 4k' foo.vmdk
wrote 4096/4096 bytes at offset 0
4 KiB, 1 ops; 00.01 sec (362.641 KiB/sec and 90.6603 ops/sec)
read failed: Invalid argument

(Here, vmdk_read_extent() finds the data and then sees that the
uncompressed data is short.)

It is better to reject invalid writes than to make the user believe they
might have succeeded and then fail when trying to read it back.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Message-id: 20190815153638.4600-5-mreitz@redhat.com
Reviewed-by: John Snow <jsnow@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 block/vmdk.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/block/vmdk.c b/block/vmdk.c
index XXXXXXX..XXXXXXX 100644
--- a/block/vmdk.c
+++ b/block/vmdk.c
@@ -XXX,XX +XXX,XX @@ static int vmdk_write_extent(VmdkExtent *extent, int64_t cluster_offset,
     if (extent->compressed) {
         void *compressed_data;
 
+        /* Only whole clusters */
+        if (offset_in_cluster ||
+            n_bytes > (extent->cluster_sectors * SECTOR_SIZE) ||
+            (n_bytes < (extent->cluster_sectors * SECTOR_SIZE) &&
+             offset + n_bytes != extent->end_sector * SECTOR_SIZE))
+        {
+            ret = -EINVAL;
+            goto out;
+        }
+
         if (!extent->has_marker) {
             ret = -EINVAL;
             goto out;
-- 
2.21.0

streamOptimized does not support writes that do not span exactly one
cluster.  Furthermore, it cannot rewrite already allocated clusters.
As such, many iotests do not work with it.  Disable them.

diff --git a/tests/qemu-iotests/002 b/tests/qemu-iotests/002
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/002
+++ b/tests/qemu-iotests/002
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt generic
 _supported_proto generic
+_unsupported_imgopts "subformat=streamOptimized"
 
 
 size=128M
diff --git a/tests/qemu-iotests/003 b/tests/qemu-iotests/003
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/003
+++ b/tests/qemu-iotests/003
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt generic
 _supported_proto generic
+_unsupported_imgopts "subformat=streamOptimized"
 
 size=128M
 offset=67M
diff --git a/tests/qemu-iotests/005 b/tests/qemu-iotests/005
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/005
+++ b/tests/qemu-iotests/005
@@ -XXX,XX +XXX,XX @@ _supported_fmt generic
 _supported_proto generic
 _supported_os Linux
 _unsupported_imgopts "subformat=twoGbMaxExtentFlat" \
-                     "subformat=twoGbMaxExtentSparse"
+                     "subformat=twoGbMaxExtentSparse" \
+                     "subformat=streamOptimized"
 
 # vpc is limited to 127GB, so we can't test it here
 if [ "$IMGFMT" = "vpc" ]; then
diff --git a/tests/qemu-iotests/009 b/tests/qemu-iotests/009
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/009
+++ b/tests/qemu-iotests/009
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt generic
 _supported_proto generic
+_unsupported_imgopts "subformat=streamOptimized"
 
 
 size=6G
diff --git a/tests/qemu-iotests/010 b/tests/qemu-iotests/010
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/010
+++ b/tests/qemu-iotests/010
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt generic
 _supported_proto generic
+_unsupported_imgopts "subformat=streamOptimized"
 
 
 size=6G
diff --git a/tests/qemu-iotests/011 b/tests/qemu-iotests/011
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/011
+++ b/tests/qemu-iotests/011
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt generic
 _supported_proto generic
+_unsupported_imgopts "subformat=streamOptimized"
 
 
 size=6G
diff --git a/tests/qemu-iotests/017 b/tests/qemu-iotests/017
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/017
+++ b/tests/qemu-iotests/017
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt qcow qcow2 vmdk qed
 _supported_proto generic
 _unsupported_proto vxhs
-_unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat"
+_unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat" \
+                     "subformat=streamOptimized"
 
 TEST_OFFSETS="0 4294967296"
 
diff --git a/tests/qemu-iotests/018 b/tests/qemu-iotests/018
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/018
+++ b/tests/qemu-iotests/018
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt qcow qcow2 vmdk qed
 _supported_proto file
 _supported_os Linux
-_unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat"
+_unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat" \
+                     "streamOptimized"
 
 TEST_OFFSETS="0 4294967296"
 
diff --git a/tests/qemu-iotests/019 b/tests/qemu-iotests/019
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/019
+++ b/tests/qemu-iotests/019
@@ -XXX,XX +XXX,XX @@ _supported_proto file
 _supported_os Linux
 _unsupported_imgopts "subformat=monolithicFlat" \
                      "subformat=twoGbMaxExtentFlat" \
-                     "subformat=twoGbMaxExtentSparse"
+                     "subformat=twoGbMaxExtentSparse" \
+                     "subformat=streamOptimized"
 
 TEST_OFFSETS="0 4294967296"
 CLUSTER_SIZE=65536
diff --git a/tests/qemu-iotests/020 b/tests/qemu-iotests/020
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/020
+++ b/tests/qemu-iotests/020
@@ -XXX,XX +XXX,XX @@ _supported_fmt qcow qcow2 vmdk qed
 _supported_proto file
 _unsupported_imgopts "subformat=monolithicFlat" \
                      "subformat=twoGbMaxExtentFlat" \
-                     "subformat=twoGbMaxExtentSparse"
+                     "subformat=twoGbMaxExtentSparse" \
+                     "subformat=streamOptimized"
 
 TEST_OFFSETS="0 4294967296"
 
diff --git a/tests/qemu-iotests/027 b/tests/qemu-iotests/027
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/027
+++ b/tests/qemu-iotests/027
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt vmdk qcow qcow2 qed
 _supported_proto generic
+_unsupported_imgopts "subformat=streamOptimized"
 
 
 size=128M
diff --git a/tests/qemu-iotests/032 b/tests/qemu-iotests/032
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/032
+++ b/tests/qemu-iotests/032
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # This works for any image format (though unlikely to segfault for raw)
 _supported_fmt generic
 _supported_proto generic
+_unsupported_imgopts "subformat=streamOptimized"
 
 echo
 echo === Prepare image ===
diff --git a/tests/qemu-iotests/033 b/tests/qemu-iotests/033
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/033
+++ b/tests/qemu-iotests/033
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt generic
 _supported_proto generic
+_unsupported_imgopts "subformat=streamOptimized"
 
 
 size=128M
diff --git a/tests/qemu-iotests/034 b/tests/qemu-iotests/034
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/034
+++ b/tests/qemu-iotests/034
@@ -XXX,XX +XXX,XX @@ _supported_proto file
 _supported_os Linux
 _unsupported_imgopts "subformat=monolithicFlat" \
                      "subformat=twoGbMaxExtentFlat" \
-                     "subformat=twoGbMaxExtentSparse"
+                     "subformat=twoGbMaxExtentSparse" \
+                     "subformat=streamOptimized"
 
 CLUSTER_SIZE=4k
 size=128M
diff --git a/tests/qemu-iotests/037 b/tests/qemu-iotests/037
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/037
+++ b/tests/qemu-iotests/037
@@ -XXX,XX +XXX,XX @@ _supported_fmt qcow qcow2 vmdk qed
 _supported_proto file
 _unsupported_imgopts "subformat=monolithicFlat" \
                      "subformat=twoGbMaxExtentFlat" \
-                     "subformat=twoGbMaxExtentSparse"
+                     "subformat=twoGbMaxExtentSparse" \
+                     "subformat=streamOptimized"
 
 CLUSTER_SIZE=4k
 size=128M
diff --git a/tests/qemu-iotests/063 b/tests/qemu-iotests/063
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/063
+++ b/tests/qemu-iotests/063
@@ -XXX,XX +XXX,XX @@ _supported_fmt qcow qcow2 vmdk qed raw
 _supported_proto file
 _unsupported_imgopts "subformat=monolithicFlat" \
                      "subformat=twoGbMaxExtentFlat" \
-                     "subformat=twoGbMaxExtentSparse"
+                     "subformat=twoGbMaxExtentSparse" \
+                     "subformat=streamOptimized"
 
 _make_test_img 4M
 
diff --git a/tests/qemu-iotests/072 b/tests/qemu-iotests/072
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/072
+++ b/tests/qemu-iotests/072
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt vpc vmdk vhdx vdi qed qcow2 qcow
 _supported_proto file
+_unsupported_imgopts "subformat=streamOptimized"
 
 IMG_SIZE=64M
 
diff --git a/tests/qemu-iotests/105 b/tests/qemu-iotests/105
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/105
+++ b/tests/qemu-iotests/105
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt qcow2 vmdk vhdx qed
 _supported_proto generic
 _unsupported_imgopts "subformat=twoGbMaxExtentFlat" \
-                     "subformat=twoGbMaxExtentSparse"
+                     "subformat=twoGbMaxExtentSparse" \
+                     "subformat=streamOptimized"
 
 echo
 echo "creating large image"
diff --git a/tests/qemu-iotests/197 b/tests/qemu-iotests/197
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/197
+++ b/tests/qemu-iotests/197
@@ -XXX,XX +XXX,XX @@ _supported_fmt generic
 _supported_proto generic
 # LUKS support may be possible, but it complicates things.
 _unsupported_fmt luks
+_unsupported_imgopts "subformat=streamOptimized"
 
 echo
 echo '=== Copy-on-read ==='
diff --git a/tests/qemu-iotests/215 b/tests/qemu-iotests/215
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/215
+++ b/tests/qemu-iotests/215
@@ -XXX,XX +XXX,XX @@ _supported_fmt generic
 _supported_proto generic
 # LUKS support may be possible, but it complicates things.
 _unsupported_fmt luks
+_unsupported_imgopts "subformat=streamOptimized"
 
 echo
 echo '=== Copy-on-read ==='
diff --git a/tests/qemu-iotests/251 b/tests/qemu-iotests/251
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/251
+++ b/tests/qemu-iotests/251
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt generic
 _supported_proto file
 _supported_os Linux
+_unsupported_imgopts "subformat=streamOptimized"
 
 if [ "$IMGOPTSSYNTAX" = "true" ]; then
     # We use json:{} filenames here, so we cannot work with additional options.
-- 
2.21.0

The error message for the test case where we have a quorum node for
which no directory name can be generated is different: For
twoGbMaxExtentSparse, it complains that it cannot open the extent file.
For other (sub)formats, it just notes that it cannot determine the
backing file path.  Both are fine, but just disable twoGbMaxExtentSparse
for simplicity's sake.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Message-id: 20190815153638.4600-7-mreitz@redhat.com
Reviewed-by: John Snow <jsnow@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/110 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/qemu-iotests/110 b/tests/qemu-iotests/110
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/110
+++ b/tests/qemu-iotests/110
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # Any format supporting backing files
 _supported_fmt qed qcow qcow2 vmdk
 _supported_proto file
-_unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat"
+_unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat" \
+                     "subformat=twoGbMaxExtentSparse"
 
 TEST_IMG_REL=$(basename "$TEST_IMG")
 
-- 
2.21.0

From: Stefan Hajnoczi <stefanha@redhat.com>

Fixes: a6b257a08e3d72219f03e461a52152672fec0612
       ("file-posix: Handle undetectable alignment")
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: 20190827101328.4062-1-stefanha@redhat.com
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 block/file-posix.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/block/file-posix.c b/block/file-posix.c
index XXXXXXX..XXXXXXX 100644
--- a/block/file-posix.c
+++ b/block/file-posix.c
@@ -XXX,XX +XXX,XX @@ static void raw_probe_alignment(BlockDriverState *bs, int fd, Error **errp)
         for (i = 0; i < ARRAY_SIZE(alignments); i++) {
             align = alignments[i];
             if (raw_is_io_aligned(fd, buf + align, max_align)) {
-                /* Fallback to request_aligment. */
+                /* Fallback to request_alignment. */
                 s->buf_align = (align != 1) ? align : bs->bl.request_alignment;
                 break;
             }
-- 
2.21.0

From: Thomas Huth <thuth@redhat.com>

It is possible to enable only a subset of the block drivers with the
"--block-drv-rw-whitelist" option of the "configure" script. All other
drivers are marked as unusable (or only included as read-only with the
"--block-drv-ro-whitelist" option). If an iotest is now using such a
disabled block driver, it is failing - which is bad, since at least the
tests in the "auto" group should be able to deal with this situation.
Thus let's introduce a "_require_drivers" function that can be used by
the shell tests to check for the availability of certain drivers first,
and marks the test as "not run" if one of the drivers is missing.

This patch mainly targets the test in the "auto" group which should
never fail in such a case, but also improves some of the other tests
along the way. Note that we also assume that the "qcow2" and "file"
drivers are always available - otherwise it does not make sense to
run "make check-block" at all (which only tests with qcow2 by default).

Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-id: 20190823133552.11680-1-thuth@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/071       |  1 +
 tests/qemu-iotests/081       |  4 +---
 tests/qemu-iotests/099       |  1 +
 tests/qemu-iotests/120       |  1 +
 tests/qemu-iotests/162       |  4 +---
 tests/qemu-iotests/184       |  1 +
 tests/qemu-iotests/186       |  1 +
 tests/qemu-iotests/common.rc | 14 ++++++++++++++
 8 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/tests/qemu-iotests/071 b/tests/qemu-iotests/071
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/071
+++ b/tests/qemu-iotests/071
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto file
+_require_drivers blkdebug blkverify
 
 do_run_qemu()
 {
diff --git a/tests/qemu-iotests/081 b/tests/qemu-iotests/081
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/081
+++ b/tests/qemu-iotests/081
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt raw
 _supported_proto file
 _supported_os Linux
+_require_drivers quorum
 
 do_run_qemu()
 {
@@ -XXX,XX +XXX,XX @@ run_qemu()
                           | _filter_qemu_io | _filter_generated_node_ids
 }
 
-test_quorum=$($QEMU_IMG --help|grep quorum)
-[ "$test_quorum" = "" ] && _supported_fmt quorum
-
 quorum="driver=raw,file.driver=quorum,file.vote-threshold=2"
 quorum="$quorum,file.children.0.file.filename=$TEST_DIR/1.raw"
 quorum="$quorum,file.children.1.file.filename=$TEST_DIR/2.raw"
diff --git a/tests/qemu-iotests/099 b/tests/qemu-iotests/099
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/099
+++ b/tests/qemu-iotests/099
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt qcow qcow2 qed vdi vhdx vmdk vpc
 _supported_proto file
 _supported_os Linux
+_require_drivers blkdebug blkverify
 _unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat" \
     "subformat=twoGbMaxExtentSparse"
 
diff --git a/tests/qemu-iotests/120 b/tests/qemu-iotests/120
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/120
+++ b/tests/qemu-iotests/120
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt generic
 _supported_proto file
 _unsupported_fmt luks
+_require_drivers raw
 
 _make_test_img 64M
 
diff --git a/tests/qemu-iotests/162 b/tests/qemu-iotests/162
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/162
+++ b/tests/qemu-iotests/162
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.filter
 
 _supported_fmt generic
-
-test_ssh=$($QEMU_IMG --help | grep '^Supported formats:.* ssh$ \|$$')
-[ "$test_ssh" = "" ] && _notrun "ssh support required"
+_require_drivers ssh
 
 echo
 echo '=== NBD ==='
diff --git a/tests/qemu-iotests/184 b/tests/qemu-iotests/184
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/184
+++ b/tests/qemu-iotests/184
@@ -XXX,XX +XXX,XX @@ trap "exit \$status" 0 1 2 3 15
 . ./common.filter
 
 _supported_os Linux
+_require_drivers throttle
 
 do_run_qemu()
 {
diff --git a/tests/qemu-iotests/186 b/tests/qemu-iotests/186
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/186
+++ b/tests/qemu-iotests/186
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto file
+_require_drivers null-co
 
 if [ "$QEMU_DEFAULT_MACHINE" != "pc" ]; then
     _notrun "Requires a PC machine"
diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/common.rc
+++ b/tests/qemu-iotests/common.rc
@@ -XXX,XX +XXX,XX @@ _require_command()
     [ -x "$c" ] || _notrun "$1 utility required, skipped this test"
 }
 
+# Check that a set of drivers has been whitelisted in the QEMU binary
+#
+_require_drivers()
+{
+    available=$($QEMU -drive format=help | \
+                sed -e '/Supported formats:/!d' -e 's/Supported formats://')
+    for driver
+    do
+        if ! echo "$available" | grep -q " $driver$ \|$$"; then
+            _notrun "$driver not available"
+        fi
+    done
+}
+
 # make sure this script returns success
 true
-- 
2.21.0

From: Thomas Huth <thuth@redhat.com>

The sanitizers (especially the address sanitizer from Clang) are
sometimes printing out warnings or false positives - this spoils
the output of the iotests, causing some of the tests to fail.
Thus let's skip the automatic iotests during "make check" when the
user configured QEMU with --enable-sanitizers.

Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-id: 20190823084203.29734-1-thuth@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/check-block.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tests/check-block.sh b/tests/check-block.sh
index XXXXXXX..XXXXXXX 100755
--- a/tests/check-block.sh
+++ b/tests/check-block.sh
@@ -XXX,XX +XXX,XX @@ if grep -q "TARGET_GPROF=y" *-softmmu/config-target.mak 2>/dev/null ; then
     exit 0
 fi
 
+if grep -q "CFLAGS.*-fsanitize" config-host.mak 2>/dev/null ; then
+    echo "Sanitizers are enabled ==> Not running the qemu-iotests."
+    exit 0
+fi
+
 if [ -z "$(find . -name 'qemu-system-*' -print)" ]; then
     echo "No qemu-system binary available ==> Not running the qemu-iotests."
     exit 0
-- 
2.21.0

From: Nir Soffer <nirsof@gmail.com>

Quoting cache mode is not needed, and most tests use unquoted values.
Unify all test to use the same style.

Message-id: 20190827173432.7656-1-nsoffer@redhat.com
Signed-off-by: Nir Soffer <nsoffer@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/026 | 4 ++--
 tests/qemu-iotests/039 | 4 ++--
 tests/qemu-iotests/052 | 2 +-
 tests/qemu-iotests/091 | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/tests/qemu-iotests/026 b/tests/qemu-iotests/026
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/026
+++ b/tests/qemu-iotests/026
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # Currently only qcow2 supports rebasing
 _supported_fmt qcow2
 _supported_proto file
-_default_cache_mode "writethrough"
-_supported_cache_modes "writethrough" "none"
+_default_cache_mode writethrough
+_supported_cache_modes writethrough none
 # The refcount table tests expect a certain minimum width for refcount entries
 # (so that the refcount table actually needs to grow); that minimum is 16 bits,
 # being the default refcount entry width.
diff --git a/tests/qemu-iotests/039 b/tests/qemu-iotests/039
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/039
+++ b/tests/qemu-iotests/039
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt qcow2
 _supported_proto file
 _supported_os Linux
-_default_cache_mode "writethrough"
-_supported_cache_modes "writethrough"
+_default_cache_mode writethrough
+_supported_cache_modes writethrough
 
 size=128M
 
diff --git a/tests/qemu-iotests/052 b/tests/qemu-iotests/052
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/052
+++ b/tests/qemu-iotests/052
@@ -XXX,XX +XXX,XX @@ _supported_fmt generic
 _supported_proto file
 
 # Don't do O_DIRECT on tmpfs
-_supported_cache_modes "writeback" "writethrough" "unsafe"
+_supported_cache_modes writeback writethrough unsafe
 
 size=128M
 _make_test_img $size
diff --git a/tests/qemu-iotests/091 b/tests/qemu-iotests/091
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/091
+++ b/tests/qemu-iotests/091
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt qcow2
 _supported_proto file
 _supported_os Linux
-_default_cache_mode "none"
-_supported_cache_modes "writethrough" "none" "writeback"
+_default_cache_mode none
+_supported_cache_modes writethrough none writeback
 
 size=1G
 
-- 
2.21.0

The following changes since commit 813bac3d8d70d85cb7835f7945eb9eed84c2d8d0:

Merge tag '2023q3-bsd-user-pull-request' of https://gitlab.com/bsdimp/qemu into staging (2023-08-29 08:58:00 -0400)

are available in the Git repository at:

https://gitlab.com/stefanha/qemu.git tags/block-pull-request

for you to fetch changes up to 3f5f2285bfcdd855508a55da7875fb92de1a6ed0:

tests/qemu-iotests/197: add testcase for CoR with subclusters (2023-08-29 13:19:56 -0400)

----------------------------------------------------------------
Pull request

v2:
- Fix authorship information lost by the mailing list for Andrey Drobyshev

----------------------------------------------------------------

Andrey Drobyshev (3):
  block: add subcluster_size field to BlockDriverInfo
  block/io: align requests to subcluster_size
  tests/qemu-iotests/197: add testcase for CoR with subclusters

Fabiano Rosas (1):
  block-migration: Ensure we don't crash during migration cleanup

Jeuk Kim (4):
  hw/ufs: Initial commit for emulated Universal-Flash-Storage
  hw/ufs: Support for Query Transfer Requests
  hw/ufs: Support for UFS logical unit
  tests/qtest: Introduce tests for UFS

-- 
2.41.0

From: Jeuk Kim <jeuk20.kim@gmail.com>

Universal Flash Storage (UFS) is a high-performance mass storage device
with a serial interface. It is primarily used as a high-performance
data storage device for embedded applications.

This commit contains code for UFS device to be recognized
as a UFS PCI device.
Patches to handle UFS logical unit and Transfer Request will follow.

Signed-off-by: Jeuk Kim <jeuk20.kim@samsung.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: 9f3db32fe1c708090a6bb764d456973b5abef55f.1691062912.git.jeuk20.kim@samsung.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 MAINTAINERS              |    6 +
 docs/specs/pci-ids.rst   |    2 +
 meson.build              |    1 +
 hw/ufs/trace.h           |    1 +
 hw/ufs/ufs.h             |   42 ++
 include/block/ufs.h      | 1090 ++++++++++++++++++++++++++++++++++++++
 include/hw/pci/pci.h     |    1 +
 include/hw/pci/pci_ids.h |    1 +
 hw/ufs/ufs.c             |  278 ++++++++++
 hw/Kconfig               |    1 +
 hw/meson.build           |    1 +
 hw/ufs/Kconfig           |    4 +
 hw/ufs/meson.build       |    1 +
 hw/ufs/trace-events      |   32 ++
 14 files changed, 1461 insertions(+)
 create mode 100644 hw/ufs/trace.h
 create mode 100644 hw/ufs/ufs.h
 create mode 100644 include/block/ufs.h
 create mode 100644 hw/ufs/ufs.c
 create mode 100644 hw/ufs/Kconfig
 create mode 100644 hw/ufs/meson.build
 create mode 100644 hw/ufs/trace-events

diff --git a/MAINTAINERS b/MAINTAINERS
index XXXXXXX..XXXXXXX 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -XXX,XX +XXX,XX @@ F: tests/qtest/nvme-test.c
 F: docs/system/devices/nvme.rst
 T: git git://git.infradead.org/qemu-nvme.git nvme-next
 
+ufs
+M: Jeuk Kim <jeuk20.kim@samsung.com>
+S: Supported
+F: hw/ufs/*
+F: include/block/ufs.h
+
 megasas
 M: Hannes Reinecke <hare@suse.com>
 L: qemu-block@nongnu.org
diff --git a/docs/specs/pci-ids.rst b/docs/specs/pci-ids.rst
index XXXXXXX..XXXXXXX 100644
--- a/docs/specs/pci-ids.rst
+++ b/docs/specs/pci-ids.rst
@@ -XXX,XX +XXX,XX @@ PCI devices (other than virtio):
   PCI PVPanic device (``-device pvpanic-pci``)
 1b36:0012
   PCI ACPI ERST device (``-device acpi-erst``)
+1b36:0013
+  PCI UFS device (``-device ufs``)
 
 All these devices are documented in :doc:`index`.
 
diff --git a/meson.build b/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/meson.build
+++ b/meson.build
@@ -XXX,XX +XXX,XX @@ if have_system
     'hw/ssi',
     'hw/timer',
     'hw/tpm',
+    'hw/ufs',
     'hw/usb',
     'hw/vfio',
     'hw/virtio',
diff --git a/hw/ufs/trace.h b/hw/ufs/trace.h
new file mode 100644
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/hw/ufs/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_ufs.h"
diff --git a/hw/ufs/ufs.h b/hw/ufs/ufs.h
new file mode 100644
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/hw/ufs/ufs.h
@@ -XXX,XX +XXX,XX @@
+/*
+ * QEMU UFS
+ *
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd. All rights reserved.
+ *
+ * Written by Jeuk Kim <jeuk20.kim@samsung.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+#ifndef HW_UFS_UFS_H
+#define HW_UFS_UFS_H
+
+#include "hw/pci/pci_device.h"
+#include "hw/scsi/scsi.h"
+#include "block/ufs.h"
+
+#define UFS_MAX_LUS 32
+#define UFS_BLOCK_SIZE 4096
+
+typedef struct UfsParams {
+    char *serial;
+    uint8_t nutrs; /* Number of UTP Transfer Request Slots */
+    uint8_t nutmrs; /* Number of UTP Task Management Request Slots */
+} UfsParams;
+
+typedef struct UfsHc {
+    PCIDevice parent_obj;
+    MemoryRegion iomem;
+    UfsReg reg;
+    UfsParams params;
+    uint32_t reg_size;
+
+    qemu_irq irq;
+    QEMUBH *doorbell_bh;
+    QEMUBH *complete_bh;
+} UfsHc;
+
+#define TYPE_UFS "ufs"
+#define UFS(obj) OBJECT_CHECK(UfsHc, (obj), TYPE_UFS)
+
+#endif /* HW_UFS_UFS_H */
diff --git a/include/block/ufs.h b/include/block/ufs.h
new file mode 100644
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/include/block/ufs.h
@@ -XXX,XX +XXX,XX @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#ifndef BLOCK_UFS_H
+#define BLOCK_UFS_H
+
+#include "hw/registerfields.h"
+
+typedef struct QEMU_PACKED UfsReg {
+    uint32_t cap;
+    uint32_t rsvd0;
+    uint32_t ver;
+    uint32_t rsvd1;
+    uint32_t hcpid;
+    uint32_t hcmid;
+    uint32_t ahit;
+    uint32_t rsvd2;
+    uint32_t is;
+    uint32_t ie;
+    uint32_t rsvd3[2];
+    uint32_t hcs;
+    uint32_t hce;
+    uint32_t uecpa;
+    uint32_t uecdl;
+    uint32_t uecn;
+    uint32_t uect;
+    uint32_t uecdme;
+    uint32_t utriacr;
+    uint32_t utrlba;
+    uint32_t utrlbau;
+    uint32_t utrldbr;
+    uint32_t utrlclr;
+    uint32_t utrlrsr;
+    uint32_t utrlcnr;
+    uint32_t rsvd4[2];
+    uint32_t utmrlba;
+    uint32_t utmrlbau;
+    uint32_t utmrldbr;
+    uint32_t utmrlclr;
+    uint32_t utmrlrsr;
+    uint32_t rsvd5[3];
+    uint32_t uiccmd;
+    uint32_t ucmdarg1;
+    uint32_t ucmdarg2;
+    uint32_t ucmdarg3;
+    uint32_t rsvd6[4];
+    uint32_t rsvd7[4];
+    uint32_t rsvd8[16];
+    uint32_t ccap;
+} UfsReg;
+
+REG32(CAP, offsetof(UfsReg, cap))
+    FIELD(CAP, NUTRS, 0, 5)
+    FIELD(CAP, RTT, 8, 8)
+    FIELD(CAP, NUTMRS, 16, 3)
+    FIELD(CAP, AUTOH8, 23, 1)
+    FIELD(CAP, 64AS, 24, 1)
+    FIELD(CAP, OODDS, 25, 1)
+    FIELD(CAP, UICDMETMS, 26, 1)
+    FIELD(CAP, CS, 28, 1)
+REG32(VER, offsetof(UfsReg, ver))
+REG32(HCPID, offsetof(UfsReg, hcpid))
+REG32(HCMID, offsetof(UfsReg, hcmid))
+REG32(AHIT, offsetof(UfsReg, ahit))
+REG32(IS, offsetof(UfsReg, is))
+    FIELD(IS, UTRCS, 0, 1)
+    FIELD(IS, UDEPRI, 1, 1)
+    FIELD(IS, UE, 2, 1)
+    FIELD(IS, UTMS, 3, 1)
+    FIELD(IS, UPMS, 4, 1)
+    FIELD(IS, UHXS, 5, 1)
+    FIELD(IS, UHES, 6, 1)
+    FIELD(IS, ULLS, 7, 1)
+    FIELD(IS, ULSS, 8, 1)
+    FIELD(IS, UTMRCS, 9, 1)
+    FIELD(IS, UCCS, 10, 1)
+    FIELD(IS, DFES, 11, 1)
+    FIELD(IS, UTPES, 12, 1)
+    FIELD(IS, HCFES, 16, 1)
+    FIELD(IS, SBFES, 17, 1)
+    FIELD(IS, CEFES, 18, 1)
+REG32(IE, offsetof(UfsReg, ie))
+    FIELD(IE, UTRCE, 0, 1)
+    FIELD(IE, UDEPRIE, 1, 1)
+    FIELD(IE, UEE, 2, 1)
+    FIELD(IE, UTMSE, 3, 1)
+    FIELD(IE, UPMSE, 4, 1)
+    FIELD(IE, UHXSE, 5, 1)
+    FIELD(IE, UHESE, 6, 1)
+    FIELD(IE, ULLSE, 7, 1)
+    FIELD(IE, ULSSE, 8, 1)
+    FIELD(IE, UTMRCE, 9, 1)
+    FIELD(IE, UCCE, 10, 1)
+    FIELD(IE, DFEE, 11, 1)
+    FIELD(IE, UTPEE, 12, 1)
+    FIELD(IE, HCFEE, 16, 1)
+    FIELD(IE, SBFEE, 17, 1)
+    FIELD(IE, CEFEE, 18, 1)
+REG32(HCS, offsetof(UfsReg, hcs))
+    FIELD(HCS, DP, 0, 1)
+    FIELD(HCS, UTRLRDY, 1, 1)
+    FIELD(HCS, UTMRLRDY, 2, 1)
+    FIELD(HCS, UCRDY, 3, 1)
+    FIELD(HCS, UPMCRS, 8, 3)
+REG32(HCE, offsetof(UfsReg, hce))
+    FIELD(HCE, HCE, 0, 1)
+    FIELD(HCE, CGE, 1, 1)
+REG32(UECPA, offsetof(UfsReg, uecpa))
+REG32(UECDL, offsetof(UfsReg, uecdl))
+REG32(UECN, offsetof(UfsReg, uecn))
+REG32(UECT, offsetof(UfsReg, uect))
+REG32(UECDME, offsetof(UfsReg, uecdme))
+REG32(UTRIACR, offsetof(UfsReg, utriacr))
+REG32(UTRLBA, offsetof(UfsReg, utrlba))
+    FIELD(UTRLBA, UTRLBA, 9, 22)
+REG32(UTRLBAU, offsetof(UfsReg, utrlbau))
+REG32(UTRLDBR, offsetof(UfsReg, utrldbr))
+REG32(UTRLCLR, offsetof(UfsReg, utrlclr))
+REG32(UTRLRSR, offsetof(UfsReg, utrlrsr))
+REG32(UTRLCNR, offsetof(UfsReg, utrlcnr))
+REG32(UTMRLBA, offsetof(UfsReg, utmrlba))
+    FIELD(UTMRLBA, UTMRLBA, 9, 22)
+REG32(UTMRLBAU, offsetof(UfsReg, utmrlbau))
+REG32(UTMRLDBR, offsetof(UfsReg, utmrldbr))
+REG32(UTMRLCLR, offsetof(UfsReg, utmrlclr))
+REG32(UTMRLRSR, offsetof(UfsReg, utmrlrsr))
+REG32(UICCMD, offsetof(UfsReg, uiccmd))
+REG32(UCMDARG1, offsetof(UfsReg, ucmdarg1))
+REG32(UCMDARG2, offsetof(UfsReg, ucmdarg2))
+REG32(UCMDARG3, offsetof(UfsReg, ucmdarg3))
+REG32(CCAP, offsetof(UfsReg, ccap))
+
+#define UFS_INTR_MASK                                    \
+    ((1 << R_IS_CEFES_SHIFT) | (1 << R_IS_SBFES_SHIFT) | \
+     (1 << R_IS_HCFES_SHIFT) | (1 << R_IS_UTPES_SHIFT) | \
+     (1 << R_IS_DFES_SHIFT) | (1 << R_IS_UCCS_SHIFT) |   \
+     (1 << R_IS_UTMRCS_SHIFT) | (1 << R_IS_ULSS_SHIFT) | \
+     (1 << R_IS_ULLS_SHIFT) | (1 << R_IS_UHES_SHIFT) |   \
+     (1 << R_IS_UHXS_SHIFT) | (1 << R_IS_UPMS_SHIFT) |   \
+     (1 << R_IS_UTMS_SHIFT) | (1 << R_IS_UE_SHIFT) |     \
+     (1 << R_IS_UDEPRI_SHIFT) | (1 << R_IS_UTRCS_SHIFT))
+
+#define UFS_UPIU_HEADER_TRANSACTION_TYPE_SHIFT 24
+#define UFS_UPIU_HEADER_TRANSACTION_TYPE_MASK 0xff
+#define UFS_UPIU_HEADER_TRANSACTION_TYPE(dword0)                       \
+    ((be32_to_cpu(dword0) >> UFS_UPIU_HEADER_TRANSACTION_TYPE_SHIFT) & \
+     UFS_UPIU_HEADER_TRANSACTION_TYPE_MASK)
+
+#define UFS_UPIU_HEADER_QUERY_FUNC_SHIFT 16
+#define UFS_UPIU_HEADER_QUERY_FUNC_MASK 0xff
+#define UFS_UPIU_HEADER_QUERY_FUNC(dword1)                       \
+    ((be32_to_cpu(dword1) >> UFS_UPIU_HEADER_QUERY_FUNC_SHIFT) & \
+     UFS_UPIU_HEADER_QUERY_FUNC_MASK)
+
+#define UFS_UPIU_HEADER_DATA_SEGMENT_LENGTH_SHIFT 0
+#define UFS_UPIU_HEADER_DATA_SEGMENT_LENGTH_MASK 0xffff
+#define UFS_UPIU_HEADER_DATA_SEGMENT_LENGTH(dword2)                       \
+    ((be32_to_cpu(dword2) >> UFS_UPIU_HEADER_DATA_SEGMENT_LENGTH_SHIFT) & \
+     UFS_UPIU_HEADER_DATA_SEGMENT_LENGTH_MASK)
+
+typedef struct QEMU_PACKED DeviceDescriptor {
+    uint8_t length;
+    uint8_t descriptor_idn;
+    uint8_t device;
+    uint8_t device_class;
+    uint8_t device_sub_class;
+    uint8_t protocol;
+    uint8_t number_lu;
+    uint8_t number_wlu;
+    uint8_t boot_enable;
+    uint8_t descr_access_en;
+    uint8_t init_power_mode;
+    uint8_t high_priority_lun;
+    uint8_t secure_removal_type;
+    uint8_t security_lu;
+    uint8_t background_ops_term_lat;
+    uint8_t init_active_icc_level;
+    uint16_t spec_version;
+    uint16_t manufacture_date;
+    uint8_t manufacturer_name;
+    uint8_t product_name;
+    uint8_t serial_number;
+    uint8_t oem_id;
+    uint16_t manufacturer_id;
+    uint8_t ud_0_base_offset;
+    uint8_t ud_config_p_length;
+    uint8_t device_rtt_cap;
+    uint16_t periodic_rtc_update;
+    uint8_t ufs_features_support;
+    uint8_t ffu_timeout;
+    uint8_t queue_depth;
+    uint16_t device_version;
+    uint8_t num_secure_wp_area;
+    uint32_t psa_max_data_size;
+    uint8_t psa_state_timeout;
+    uint8_t product_revision_level;
+    uint8_t reserved[36];
+    uint32_t extended_ufs_features_support;
+    uint8_t write_booster_buffer_preserve_user_space_en;
+    uint8_t write_booster_buffer_type;
+    uint32_t num_shared_write_booster_buffer_alloc_units;
+} DeviceDescriptor;
+
+typedef struct QEMU_PACKED GeometryDescriptor {
+    uint8_t length;
+    uint8_t descriptor_idn;
+    uint8_t media_technology;
+    uint8_t reserved;
+    uint64_t total_raw_device_capacity;
+    uint8_t max_number_lu;
+    uint32_t segment_size;
+    uint8_t allocation_unit_size;
+    uint8_t min_addr_block_size;
+    uint8_t optimal_read_block_size;
+    uint8_t optimal_write_block_size;
+    uint8_t max_in_buffer_size;
+    uint8_t max_out_buffer_size;
+    uint8_t rpmb_read_write_size;
+    uint8_t dynamic_capacity_resource_policy;
+    uint8_t data_ordering;
+    uint8_t max_context_id_number;
+    uint8_t sys_data_tag_unit_size;
+    uint8_t sys_data_tag_res_size;
+    uint8_t supported_sec_r_types;
+    uint16_t supported_memory_types;
+    uint32_t system_code_max_n_alloc_u;
+    uint16_t system_code_cap_adj_fac;
+    uint32_t non_persist_max_n_alloc_u;
+    uint16_t non_persist_cap_adj_fac;
+    uint32_t enhanced_1_max_n_alloc_u;
+    uint16_t enhanced_1_cap_adj_fac;
+    uint32_t enhanced_2_max_n_alloc_u;
+    uint16_t enhanced_2_cap_adj_fac;
+    uint32_t enhanced_3_max_n_alloc_u;
+    uint16_t enhanced_3_cap_adj_fac;
+    uint32_t enhanced_4_max_n_alloc_u;
+    uint16_t enhanced_4_cap_adj_fac;
+    uint32_t optimal_logical_block_size;
+    uint8_t reserved2[7];
+    uint32_t write_booster_buffer_max_n_alloc_units;
+    uint8_t device_max_write_booster_l_us;
+    uint8_t write_booster_buffer_cap_adj_fac;
+    uint8_t supported_write_booster_buffer_user_space_reduction_types;
+    uint8_t supported_write_booster_buffer_types;
+} GeometryDescriptor;
+
+#define UFS_GEOMETRY_CAPACITY_SHIFT 9
+
+typedef struct QEMU_PACKED UnitDescriptor {
+    uint8_t length;
+    uint8_t descriptor_idn;
+    uint8_t unit_index;
+    uint8_t lu_enable;
+    uint8_t boot_lun_id;
+    uint8_t lu_write_protect;
+    uint8_t lu_queue_depth;
+    uint8_t psa_sensitive;
+    uint8_t memory_type;
+    uint8_t data_reliability;
+    uint8_t logical_block_size;
+    uint64_t logical_block_count;
+    uint32_t erase_block_size;
+    uint8_t provisioning_type;
+    uint64_t phy_mem_resource_count;
+    uint16_t context_capabilities;
+    uint8_t large_unit_granularity_m1;
+    uint8_t reserved[6];
+    uint32_t lu_num_write_booster_buffer_alloc_units;
+} UnitDescriptor;
+
+typedef struct QEMU_PACKED RpmbUnitDescriptor {
+    uint8_t length;
+    uint8_t descriptor_idn;
+    uint8_t unit_index;
+    uint8_t lu_enable;
+    uint8_t boot_lun_id;
+    uint8_t lu_write_protect;
+    uint8_t lu_queue_depth;
+    uint8_t psa_sensitive;
+    uint8_t memory_type;
+    uint8_t reserved;
+    uint8_t logical_block_size;
+    uint64_t logical_block_count;
+    uint32_t erase_block_size;
+    uint8_t provisioning_type;
+    uint64_t phy_mem_resource_count;
+    uint8_t reserved2[3];
+} RpmbUnitDescriptor;
+
+typedef struct QEMU_PACKED PowerParametersDescriptor {
+    uint8_t length;
+    uint8_t descriptor_idn;
+    uint16_t active_icc_levels_vcc[16];
+    uint16_t active_icc_levels_vccq[16];
+    uint16_t active_icc_levels_vccq_2[16];
+} PowerParametersDescriptor;
+
+typedef struct QEMU_PACKED InterconnectDescriptor {
+    uint8_t length;
+    uint8_t descriptor_idn;
+    uint16_t bcd_unipro_version;
+    uint16_t bcd_mphy_version;
+} InterconnectDescriptor;
+
+typedef struct QEMU_PACKED StringDescriptor {
+    uint8_t length;
+    uint8_t descriptor_idn;
+    uint16_t UC[126];
+} StringDescriptor;
+
+typedef struct QEMU_PACKED DeviceHealthDescriptor {
+    uint8_t length;
+    uint8_t descriptor_idn;
+    uint8_t pre_eol_info;
+    uint8_t device_life_time_est_a;
+    uint8_t device_life_time_est_b;
+    uint8_t vendor_prop_info[32];
+    uint32_t refresh_total_count;
+    uint32_t refresh_progress;
+} DeviceHealthDescriptor;
+
+typedef struct QEMU_PACKED Flags {
+    uint8_t reserved;
+    uint8_t device_init;
+    uint8_t permanent_wp_en;
+    uint8_t power_on_wp_en;
+    uint8_t background_ops_en;
+    uint8_t device_life_span_mode_en;
+    uint8_t purge_enable;
+    uint8_t refresh_enable;
+    uint8_t phy_resource_removal;
+    uint8_t busy_rtc;
+    uint8_t reserved2;
+    uint8_t permanently_disable_fw_update;
+    uint8_t reserved3[2];
+    uint8_t wb_en;
+    uint8_t wb_buffer_flush_en;
+    uint8_t wb_buffer_flush_during_hibernate;
+    uint8_t reserved4[2];
+} Flags;
+
+typedef struct Attributes {
+    uint8_t boot_lun_en;
+    uint8_t reserved;
+    uint8_t current_power_mode;
+    uint8_t active_icc_level;
+    uint8_t out_of_order_data_en;
+    uint8_t background_op_status;
+    uint8_t purge_status;
+    uint8_t max_data_in_size;
+    uint8_t max_data_out_size;
+    uint32_t dyn_cap_needed;
+    uint8_t ref_clk_freq;
+    uint8_t config_descr_lock;
+    uint8_t max_num_of_rtt;
+    uint16_t exception_event_control;
+    uint16_t exception_event_status;
+    uint32_t seconds_passed;
+    uint16_t context_conf;
+    uint8_t device_ffu_status;
+    uint8_t psa_state;
+    uint32_t psa_data_size;
+    uint8_t ref_clk_gating_wait_time;
+    uint8_t device_case_rough_temperaure;
+    uint8_t device_too_high_temp_boundary;
+    uint8_t device_too_low_temp_boundary;
+    uint8_t throttling_status;
+    uint8_t wb_buffer_flush_status;
+    uint8_t available_wb_buffer_size;
+    uint8_t wb_buffer_life_time_est;
+    uint32_t current_wb_buffer_size;
+    uint8_t refresh_status;
+    uint8_t refresh_freq;
+    uint8_t refresh_unit;
+    uint8_t refresh_method;
+} Attributes;
+
+#define UFS_TRANSACTION_SPECIFIC_FIELD_SIZE 20
+#define UFS_MAX_QUERY_DATA_SIZE 256
+
+/* Command response result code */
+typedef enum CommandRespCode {
+    COMMAND_RESULT_SUCESS = 0x00,
+    COMMAND_RESULT_FAIL = 0x01,
+} CommandRespCode;
+
+enum {
+    UFS_UPIU_FLAG_UNDERFLOW = 0x20,
+    UFS_UPIU_FLAG_OVERFLOW = 0x40,
+};
+
+typedef struct QEMU_PACKED UtpUpiuHeader {
+    uint8_t trans_type;
+    uint8_t flags;
+    uint8_t lun;
+    uint8_t task_tag;
+    uint8_t iid_cmd_set_type;
+    uint8_t query_func;
+    uint8_t response;
+    uint8_t scsi_status;
+    uint8_t ehs_len;
+    uint8_t device_inf;
+    uint16_t data_segment_length;
+} UtpUpiuHeader;
+
+/*
+ * The code below is copied from the linux kernel
+ * ("include/uapi/scsi/scsi_bsg_ufs.h") and modified to fit the qemu style.
+ */
+
+typedef struct QEMU_PACKED UtpUpiuQuery {
+    uint8_t opcode;
+    uint8_t idn;
+    uint8_t index;
+    uint8_t selector;
+    uint16_t reserved_osf;
+    uint16_t length;
+    uint32_t value;
+    uint32_t reserved[2];
+    /* EHS length should be 0. We don't have to worry about EHS area. */
+    uint8_t data[UFS_MAX_QUERY_DATA_SIZE];
+} UtpUpiuQuery;
+
+#define UFS_CDB_SIZE 16
+
+/*
+ * struct UtpUpiuCmd - Command UPIU structure
+ * @data_transfer_len: Data Transfer Length DW-3
+ * @cdb: Command Descriptor Block CDB DW-4 to DW-7
+ */
+typedef struct QEMU_PACKED UtpUpiuCmd {
+    uint32_t exp_data_transfer_len;
+    uint8_t cdb[UFS_CDB_SIZE];
+} UtpUpiuCmd;
+
+/*
+ * struct UtpUpiuReq - general upiu request structure
+ * @header:UPIU header structure DW-0 to DW-2
+ * @sc: fields structure for scsi command DW-3 to DW-7
+ * @qr: fields structure for query request DW-3 to DW-7
+ * @uc: use utp_upiu_query to host the 4 dwords of uic command
+ */
+typedef struct QEMU_PACKED UtpUpiuReq {
+    UtpUpiuHeader header;
+    union {
+        UtpUpiuCmd sc;
+        UtpUpiuQuery qr;
+    };
+} UtpUpiuReq;
+
+/*
+ * The code below is copied from the linux kernel ("include/ufs/ufshci.h") and
+ * modified to fit the qemu style.
+ */
+
+enum {
+    PWR_OK = 0x0,
+    PWR_LOCAL = 0x01,
+    PWR_REMOTE = 0x02,
+    PWR_BUSY = 0x03,
+    PWR_ERROR_CAP = 0x04,
+    PWR_FATAL_ERROR = 0x05,
+};
+
+/* UIC Commands */
+enum uic_cmd_dme {
+    UIC_CMD_DME_GET = 0x01,
+    UIC_CMD_DME_SET = 0x02,
+    UIC_CMD_DME_PEER_GET = 0x03,
+    UIC_CMD_DME_PEER_SET = 0x04,
+    UIC_CMD_DME_POWERON = 0x10,
+    UIC_CMD_DME_POWEROFF = 0x11,
+    UIC_CMD_DME_ENABLE = 0x12,
+    UIC_CMD_DME_RESET = 0x14,
+    UIC_CMD_DME_END_PT_RST = 0x15,
+    UIC_CMD_DME_LINK_STARTUP = 0x16,
+    UIC_CMD_DME_HIBER_ENTER = 0x17,
+    UIC_CMD_DME_HIBER_EXIT = 0x18,
+    UIC_CMD_DME_TEST_MODE = 0x1A,
+};
+
+/* UIC Config result code / Generic error code */
+enum {
+    UIC_CMD_RESULT_SUCCESS = 0x00,
+    UIC_CMD_RESULT_INVALID_ATTR = 0x01,
+    UIC_CMD_RESULT_FAILURE = 0x01,
+    UIC_CMD_RESULT_INVALID_ATTR_VALUE = 0x02,
+    UIC_CMD_RESULT_READ_ONLY_ATTR = 0x03,
+    UIC_CMD_RESULT_WRITE_ONLY_ATTR = 0x04,
+    UIC_CMD_RESULT_BAD_INDEX = 0x05,
+    UIC_CMD_RESULT_LOCKED_ATTR = 0x06,
+    UIC_CMD_RESULT_BAD_TEST_FEATURE_INDEX = 0x07,
+    UIC_CMD_RESULT_PEER_COMM_FAILURE = 0x08,
+    UIC_CMD_RESULT_BUSY = 0x09,
+    UIC_CMD_RESULT_DME_FAILURE = 0x0A,
+};
+
+#define MASK_UIC_COMMAND_RESULT 0xFF
+
+/*
+ * Request Descriptor Definitions
+ */
+
+/* Transfer request command type */
+enum {
+    UTP_CMD_TYPE_SCSI = 0x0,
+    UTP_CMD_TYPE_UFS = 0x1,
+    UTP_CMD_TYPE_DEV_MANAGE = 0x2,
+};
+
+/* To accommodate UFS2.0 required Command type */
+enum {
+    UTP_CMD_TYPE_UFS_STORAGE = 0x1,
+};
+
+enum {
+    UTP_SCSI_COMMAND = 0x00000000,
+    UTP_NATIVE_UFS_COMMAND = 0x10000000,
+    UTP_DEVICE_MANAGEMENT_FUNCTION = 0x20000000,
+    UTP_REQ_DESC_INT_CMD = 0x01000000,
+    UTP_REQ_DESC_CRYPTO_ENABLE_CMD = 0x00800000,
+};
+
+/* UTP Transfer Request Data Direction (DD) */
+enum {
+    UTP_NO_DATA_TRANSFER = 0x00000000,
+    UTP_HOST_TO_DEVICE = 0x02000000,
+    UTP_DEVICE_TO_HOST = 0x04000000,
+};
+
+/* Overall command status values */
+enum UtpOcsCodes {
+    OCS_SUCCESS = 0x0,
+    OCS_INVALID_CMD_TABLE_ATTR = 0x1,
+    OCS_INVALID_PRDT_ATTR = 0x2,
+    OCS_MISMATCH_DATA_BUF_SIZE = 0x3,
+    OCS_MISMATCH_RESP_UPIU_SIZE = 0x4,
+    OCS_PEER_COMM_FAILURE = 0x5,
+    OCS_ABORTED = 0x6,
+    OCS_FATAL_ERROR = 0x7,
+    OCS_DEVICE_FATAL_ERROR = 0x8,
+    OCS_INVALID_CRYPTO_CONFIG = 0x9,
+    OCS_GENERAL_CRYPTO_ERROR = 0xa,
+    OCS_INVALID_COMMAND_STATUS = 0xf,
+};
+
+enum {
+    MASK_OCS = 0x0F,
+};
+
+/*
+ * struct UfshcdSgEntry - UFSHCI PRD Entry
+ * @addr: Physical address; DW-0 and DW-1.
+ * @reserved: Reserved for future use DW-2
+ * @size: size of physical segment DW-3
+ */
+typedef struct QEMU_PACKED UfshcdSgEntry {
+    uint64_t addr;
+    uint32_t reserved;
+    uint32_t size;
+    /*
+     * followed by variant-specific fields if
+     * CONFIG_SCSI_UFS_VARIABLE_SG_ENTRY_SIZE has been defined.
+     */
+} UfshcdSgEntry;
+
+/*
+ * struct RequestDescHeader - Descriptor Header common to both UTRD and UTMRD
+ * @dword0: Descriptor Header DW0
+ * @dword1: Descriptor Header DW1
+ * @dword2: Descriptor Header DW2
+ * @dword3: Descriptor Header DW3
+ */
+typedef struct QEMU_PACKED RequestDescHeader {
+    uint32_t dword_0;
+    uint32_t dword_1;
+    uint32_t dword_2;
+    uint32_t dword_3;
+} RequestDescHeader;
+
+/*
+ * struct UtpTransferReqDesc - UTP Transfer Request Descriptor (UTRD)
+ * @header: UTRD header DW-0 to DW-3
+ * @command_desc_base_addr_lo: UCD base address low DW-4
+ * @command_desc_base_addr_hi: UCD base address high DW-5
+ * @response_upiu_length: response UPIU length DW-6
+ * @response_upiu_offset: response UPIU offset DW-6
+ * @prd_table_length: Physical region descriptor length DW-7
+ * @prd_table_offset: Physical region descriptor offset DW-7
+ */
+typedef struct QEMU_PACKED UtpTransferReqDesc {
+    /* DW 0-3 */
+    RequestDescHeader header;
+
+    /* DW 4-5*/
+    uint32_t command_desc_base_addr_lo;
+    uint32_t command_desc_base_addr_hi;
+
+    /* DW 6 */
+    uint16_t response_upiu_length;
+    uint16_t response_upiu_offset;
+
+    /* DW 7 */
+    uint16_t prd_table_length;
+    uint16_t prd_table_offset;
+} UtpTransferReqDesc;
+
+/*
+ * UTMRD structure.
+ */
+typedef struct QEMU_PACKED UtpTaskReqDesc {
+    /* DW 0-3 */
+    RequestDescHeader header;
+
+    /* DW 4-11 - Task request UPIU structure */
+    struct {
+        UtpUpiuHeader req_header;
+        uint32_t input_param1;
+        uint32_t input_param2;
+        uint32_t input_param3;
+        uint32_t reserved1[2];
+    } upiu_req;
+
+    /* DW 12-19 - Task Management Response UPIU structure */
+    struct {
+        UtpUpiuHeader rsp_header;
+        uint32_t output_param1;
+        uint32_t output_param2;
+        uint32_t reserved2[3];
+    } upiu_rsp;
+} UtpTaskReqDesc;
+
+/*
+ * The code below is copied from the linux kernel ("include/ufs/ufs.h") and
+ * modified to fit the qemu style.
+ */
+
+#define GENERAL_UPIU_REQUEST_SIZE (sizeof(UtpUpiuReq))
+#define QUERY_DESC_MAX_SIZE 255
+#define QUERY_DESC_MIN_SIZE 2
+#define QUERY_DESC_HDR_SIZE 2
+#define QUERY_OSF_SIZE (GENERAL_UPIU_REQUEST_SIZE - (sizeof(UtpUpiuHeader)))
+#define UFS_SENSE_SIZE 18
+
+/*
+ * UFS device may have standard LUs and LUN id could be from 0x00 to
+ * 0x7F. Standard LUs use "Peripheral Device Addressing Format".
+ * UFS device may also have the Well Known LUs (also referred as W-LU)
+ * which again could be from 0x00 to 0x7F. For W-LUs, device only use
+ * the "Extended Addressing Format" which means the W-LUNs would be
+ * from 0xc100 (SCSI_W_LUN_BASE) onwards.
+ * This means max. LUN number reported from UFS device could be 0xC17F.
+ */
+#define UFS_UPIU_MAX_UNIT_NUM_ID 0x7F
+#define UFS_UPIU_WLUN_ID (1 << 7)
+
+/* WriteBooster buffer is available only for the logical unit from 0 to 7 */
+#define UFS_UPIU_MAX_WB_LUN_ID 8
+
+/*
+ * WriteBooster buffer lifetime has a limit setted by vendor.
+ * If it is over the limit, WriteBooster feature will be disabled.
+ */
+#define UFS_WB_EXCEED_LIFETIME 0x0B
+
+/*
+ * In UFS Spec, the Extra Header Segment (EHS) starts from byte 32 in UPIU
+ * request/response packet
+ */
+#define EHS_OFFSET_IN_RESPONSE 32
+
+/* Well known logical unit id in LUN field of UPIU */
+enum {
+    UFS_UPIU_REPORT_LUNS_WLUN = 0x81,
+    UFS_UPIU_UFS_DEVICE_WLUN = 0xD0,
+    UFS_UPIU_BOOT_WLUN = 0xB0,
+    UFS_UPIU_RPMB_WLUN = 0xC4,
+};
+
+/*
+ * UFS Protocol Information Unit related definitions
+ */
+
+/* Task management functions */
+enum {
+    UFS_ABORT_TASK = 0x01,
+    UFS_ABORT_TASK_SET = 0x02,
+    UFS_CLEAR_TASK_SET = 0x04,
+    UFS_LOGICAL_RESET = 0x08,
+    UFS_QUERY_TASK = 0x80,
+    UFS_QUERY_TASK_SET = 0x81,
+};
+
+/* UTP UPIU Transaction Codes Initiator to Target */
+enum {
+    UPIU_TRANSACTION_NOP_OUT = 0x00,
+    UPIU_TRANSACTION_COMMAND = 0x01,
+    UPIU_TRANSACTION_DATA_OUT = 0x02,
+    UPIU_TRANSACTION_TASK_REQ = 0x04,
+    UPIU_TRANSACTION_QUERY_REQ = 0x16,
+};
+
+/* UTP UPIU Transaction Codes Target to Initiator */
+enum {
+    UPIU_TRANSACTION_NOP_IN = 0x20,
+    UPIU_TRANSACTION_RESPONSE = 0x21,
+    UPIU_TRANSACTION_DATA_IN = 0x22,
+    UPIU_TRANSACTION_TASK_RSP = 0x24,
+    UPIU_TRANSACTION_READY_XFER = 0x31,
+    UPIU_TRANSACTION_QUERY_RSP = 0x36,
+    UPIU_TRANSACTION_REJECT_UPIU = 0x3F,
+};
+
+/* UPIU Read/Write flags */
+enum {
+    UPIU_CMD_FLAGS_NONE = 0x00,
+    UPIU_CMD_FLAGS_WRITE = 0x20,
+    UPIU_CMD_FLAGS_READ = 0x40,
+};
+
+/* UPIU Task Attributes */
+enum {
+    UPIU_TASK_ATTR_SIMPLE = 0x00,
+    UPIU_TASK_ATTR_ORDERED = 0x01,
+    UPIU_TASK_ATTR_HEADQ = 0x02,
+    UPIU_TASK_ATTR_ACA = 0x03,
+};
+
+/* UPIU Query request function */
+enum {
+    UPIU_QUERY_FUNC_STANDARD_READ_REQUEST = 0x01,
+    UPIU_QUERY_FUNC_STANDARD_WRITE_REQUEST = 0x81,
+};
+
+/* Flag idn for Query Requests*/
+enum flag_idn {
+    QUERY_FLAG_IDN_FDEVICEINIT = 0x01,
+    QUERY_FLAG_IDN_PERMANENT_WPE = 0x02,
+    QUERY_FLAG_IDN_PWR_ON_WPE = 0x03,
+    QUERY_FLAG_IDN_BKOPS_EN = 0x04,
+    QUERY_FLAG_IDN_LIFE_SPAN_MODE_ENABLE = 0x05,
+    QUERY_FLAG_IDN_PURGE_ENABLE = 0x06,
+    QUERY_FLAG_IDN_REFRESH_ENABLE = 0x07,
+    QUERY_FLAG_IDN_FPHYRESOURCEREMOVAL = 0x08,
+    QUERY_FLAG_IDN_BUSY_RTC = 0x09,
+    QUERY_FLAG_IDN_RESERVED3 = 0x0A,
+    QUERY_FLAG_IDN_PERMANENTLY_DISABLE_FW_UPDATE = 0x0B,
+    QUERY_FLAG_IDN_WB_EN = 0x0E,
+    QUERY_FLAG_IDN_WB_BUFF_FLUSH_EN = 0x0F,
+    QUERY_FLAG_IDN_WB_BUFF_FLUSH_DURING_HIBERN8 = 0x10,
+    QUERY_FLAG_IDN_HPB_RESET = 0x11,
+    QUERY_FLAG_IDN_HPB_EN = 0x12,
+    QUERY_FLAG_IDN_COUNT,
+};
+
+/* Attribute idn for Query requests */
+enum attr_idn {
+    QUERY_ATTR_IDN_BOOT_LU_EN = 0x00,
+    QUERY_ATTR_IDN_MAX_HPB_SINGLE_CMD = 0x01,
+    QUERY_ATTR_IDN_POWER_MODE = 0x02,
+    QUERY_ATTR_IDN_ACTIVE_ICC_LVL = 0x03,
+    QUERY_ATTR_IDN_OOO_DATA_EN = 0x04,
+    QUERY_ATTR_IDN_BKOPS_STATUS = 0x05,
+    QUERY_ATTR_IDN_PURGE_STATUS = 0x06,
+    QUERY_ATTR_IDN_MAX_DATA_IN = 0x07,
+    QUERY_ATTR_IDN_MAX_DATA_OUT = 0x08,
+    QUERY_ATTR_IDN_DYN_CAP_NEEDED = 0x09,
+    QUERY_ATTR_IDN_REF_CLK_FREQ = 0x0A,
+    QUERY_ATTR_IDN_CONF_DESC_LOCK = 0x0B,
+    QUERY_ATTR_IDN_MAX_NUM_OF_RTT = 0x0C,
+    QUERY_ATTR_IDN_EE_CONTROL = 0x0D,
+    QUERY_ATTR_IDN_EE_STATUS = 0x0E,
+    QUERY_ATTR_IDN_SECONDS_PASSED = 0x0F,
+    QUERY_ATTR_IDN_CNTX_CONF = 0x10,
+    QUERY_ATTR_IDN_CORR_PRG_BLK_NUM = 0x11,
+    QUERY_ATTR_IDN_RESERVED2 = 0x12,
+    QUERY_ATTR_IDN_RESERVED3 = 0x13,
+    QUERY_ATTR_IDN_FFU_STATUS = 0x14,
+    QUERY_ATTR_IDN_PSA_STATE = 0x15,
+    QUERY_ATTR_IDN_PSA_DATA_SIZE = 0x16,
+    QUERY_ATTR_IDN_REF_CLK_GATING_WAIT_TIME = 0x17,
+    QUERY_ATTR_IDN_CASE_ROUGH_TEMP = 0x18,
+    QUERY_ATTR_IDN_HIGH_TEMP_BOUND = 0x19,
+    QUERY_ATTR_IDN_LOW_TEMP_BOUND = 0x1A,
+    QUERY_ATTR_IDN_THROTTLING_STATUS = 0x1B,
+    QUERY_ATTR_IDN_WB_FLUSH_STATUS = 0x1C,
+    QUERY_ATTR_IDN_AVAIL_WB_BUFF_SIZE = 0x1D,
+    QUERY_ATTR_IDN_WB_BUFF_LIFE_TIME_EST = 0x1E,
+    QUERY_ATTR_IDN_CURR_WB_BUFF_SIZE = 0x1F,
+    QUERY_ATTR_IDN_REFRESH_STATUS = 0x2C,
+    QUERY_ATTR_IDN_REFRESH_FREQ = 0x2D,
+    QUERY_ATTR_IDN_REFRESH_UNIT = 0x2E,
+    QUERY_ATTR_IDN_COUNT,
+};
+
+/* Descriptor idn for Query requests */
+enum desc_idn {
+    QUERY_DESC_IDN_DEVICE = 0x0,
+    QUERY_DESC_IDN_CONFIGURATION = 0x1,
+    QUERY_DESC_IDN_UNIT = 0x2,
+    QUERY_DESC_IDN_RFU_0 = 0x3,
+    QUERY_DESC_IDN_INTERCONNECT = 0x4,
+    QUERY_DESC_IDN_STRING = 0x5,
+    QUERY_DESC_IDN_RFU_1 = 0x6,
+    QUERY_DESC_IDN_GEOMETRY = 0x7,
+    QUERY_DESC_IDN_POWER = 0x8,
+    QUERY_DESC_IDN_HEALTH = 0x9,
+    QUERY_DESC_IDN_MAX,
+};
+
+enum desc_header_offset {
+    QUERY_DESC_LENGTH_OFFSET = 0x00,
+    QUERY_DESC_DESC_TYPE_OFFSET = 0x01,
+};
+
+/* Unit descriptor parameters offsets in bytes*/
+enum unit_desc_param {
+    UNIT_DESC_PARAM_LEN = 0x0,
+    UNIT_DESC_PARAM_TYPE = 0x1,
+    UNIT_DESC_PARAM_UNIT_INDEX = 0x2,
+    UNIT_DESC_PARAM_LU_ENABLE = 0x3,
+    UNIT_DESC_PARAM_BOOT_LUN_ID = 0x4,
+    UNIT_DESC_PARAM_LU_WR_PROTECT = 0x5,
+    UNIT_DESC_PARAM_LU_Q_DEPTH = 0x6,
+    UNIT_DESC_PARAM_PSA_SENSITIVE = 0x7,
+    UNIT_DESC_PARAM_MEM_TYPE = 0x8,
+    UNIT_DESC_PARAM_DATA_RELIABILITY = 0x9,
+    UNIT_DESC_PARAM_LOGICAL_BLK_SIZE = 0xA,
+    UNIT_DESC_PARAM_LOGICAL_BLK_COUNT = 0xB,
+    UNIT_DESC_PARAM_ERASE_BLK_SIZE = 0x13,
+    UNIT_DESC_PARAM_PROVISIONING_TYPE = 0x17,
+    UNIT_DESC_PARAM_PHY_MEM_RSRC_CNT = 0x18,
+    UNIT_DESC_PARAM_CTX_CAPABILITIES = 0x20,
+    UNIT_DESC_PARAM_LARGE_UNIT_SIZE_M1 = 0x22,
+    UNIT_DESC_PARAM_HPB_LU_MAX_ACTIVE_RGNS = 0x23,
+    UNIT_DESC_PARAM_HPB_PIN_RGN_START_OFF = 0x25,
+    UNIT_DESC_PARAM_HPB_NUM_PIN_RGNS = 0x27,
+    UNIT_DESC_PARAM_WB_BUF_ALLOC_UNITS = 0x29,
+};
+
+/* RPMB Unit descriptor parameters offsets in bytes*/
+enum rpmb_unit_desc_param {
+    RPMB_UNIT_DESC_PARAM_LEN = 0x0,
+    RPMB_UNIT_DESC_PARAM_TYPE = 0x1,
+    RPMB_UNIT_DESC_PARAM_UNIT_INDEX = 0x2,
+    RPMB_UNIT_DESC_PARAM_LU_ENABLE = 0x3,
+    RPMB_UNIT_DESC_PARAM_BOOT_LUN_ID = 0x4,
+    RPMB_UNIT_DESC_PARAM_LU_WR_PROTECT = 0x5,
+    RPMB_UNIT_DESC_PARAM_LU_Q_DEPTH = 0x6,
+    RPMB_UNIT_DESC_PARAM_PSA_SENSITIVE = 0x7,
+    RPMB_UNIT_DESC_PARAM_MEM_TYPE = 0x8,
+    RPMB_UNIT_DESC_PARAM_REGION_EN = 0x9,
+    RPMB_UNIT_DESC_PARAM_LOGICAL_BLK_SIZE = 0xA,
+    RPMB_UNIT_DESC_PARAM_LOGICAL_BLK_COUNT = 0xB,
+    RPMB_UNIT_DESC_PARAM_REGION0_SIZE = 0x13,
+    RPMB_UNIT_DESC_PARAM_REGION1_SIZE = 0x14,
+    RPMB_UNIT_DESC_PARAM_REGION2_SIZE = 0x15,
+    RPMB_UNIT_DESC_PARAM_REGION3_SIZE = 0x16,
+    RPMB_UNIT_DESC_PARAM_PROVISIONING_TYPE = 0x17,
+    RPMB_UNIT_DESC_PARAM_PHY_MEM_RSRC_CNT = 0x18,
+};
+
+/* Device descriptor parameters offsets in bytes*/
+enum device_desc_param {
+    DEVICE_DESC_PARAM_LEN = 0x0,
+    DEVICE_DESC_PARAM_TYPE = 0x1,
+    DEVICE_DESC_PARAM_DEVICE_TYPE = 0x2,
+    DEVICE_DESC_PARAM_DEVICE_CLASS = 0x3,
+    DEVICE_DESC_PARAM_DEVICE_SUB_CLASS = 0x4,
+    DEVICE_DESC_PARAM_PRTCL = 0x5,
+    DEVICE_DESC_PARAM_NUM_LU = 0x6,
+    DEVICE_DESC_PARAM_NUM_WLU = 0x7,
+    DEVICE_DESC_PARAM_BOOT_ENBL = 0x8,
+    DEVICE_DESC_PARAM_DESC_ACCSS_ENBL = 0x9,
+    DEVICE_DESC_PARAM_INIT_PWR_MODE = 0xA,
+    DEVICE_DESC_PARAM_HIGH_PR_LUN = 0xB,
+    DEVICE_DESC_PARAM_SEC_RMV_TYPE = 0xC,
+    DEVICE_DESC_PARAM_SEC_LU = 0xD,
+    DEVICE_DESC_PARAM_BKOP_TERM_LT = 0xE,
+    DEVICE_DESC_PARAM_ACTVE_ICC_LVL = 0xF,
+    DEVICE_DESC_PARAM_SPEC_VER = 0x10,
+    DEVICE_DESC_PARAM_MANF_DATE = 0x12,
+    DEVICE_DESC_PARAM_MANF_NAME = 0x14,
+    DEVICE_DESC_PARAM_PRDCT_NAME = 0x15,
+    DEVICE_DESC_PARAM_SN = 0x16,
+    DEVICE_DESC_PARAM_OEM_ID = 0x17,
+    DEVICE_DESC_PARAM_MANF_ID = 0x18,
+    DEVICE_DESC_PARAM_UD_OFFSET = 0x1A,
+    DEVICE_DESC_PARAM_UD_LEN = 0x1B,
+    DEVICE_DESC_PARAM_RTT_CAP = 0x1C,
+    DEVICE_DESC_PARAM_FRQ_RTC = 0x1D,
+    DEVICE_DESC_PARAM_UFS_FEAT = 0x1F,
+    DEVICE_DESC_PARAM_FFU_TMT = 0x20,
+    DEVICE_DESC_PARAM_Q_DPTH = 0x21,
+    DEVICE_DESC_PARAM_DEV_VER = 0x22,
+    DEVICE_DESC_PARAM_NUM_SEC_WPA = 0x24,
+    DEVICE_DESC_PARAM_PSA_MAX_DATA = 0x25,
+    DEVICE_DESC_PARAM_PSA_TMT = 0x29,
+    DEVICE_DESC_PARAM_PRDCT_REV = 0x2A,
+    DEVICE_DESC_PARAM_HPB_VER = 0x40,
+    DEVICE_DESC_PARAM_HPB_CONTROL = 0x42,
+    DEVICE_DESC_PARAM_EXT_UFS_FEATURE_SUP = 0x4F,
+    DEVICE_DESC_PARAM_WB_PRESRV_USRSPC_EN = 0x53,
+    DEVICE_DESC_PARAM_WB_TYPE = 0x54,
+    DEVICE_DESC_PARAM_WB_SHARED_ALLOC_UNITS = 0x55,
+};
+
+/* Interconnect descriptor parameters offsets in bytes*/
+enum interconnect_desc_param {
+    INTERCONNECT_DESC_PARAM_LEN = 0x0,
+    INTERCONNECT_DESC_PARAM_TYPE = 0x1,
+    INTERCONNECT_DESC_PARAM_UNIPRO_VER = 0x2,
+    INTERCONNECT_DESC_PARAM_MPHY_VER = 0x4,
+};
+
+/* Geometry descriptor parameters offsets in bytes*/
+enum geometry_desc_param {
+    GEOMETRY_DESC_PARAM_LEN = 0x0,
+    GEOMETRY_DESC_PARAM_TYPE = 0x1,
+    GEOMETRY_DESC_PARAM_DEV_CAP = 0x4,
+    GEOMETRY_DESC_PARAM_MAX_NUM_LUN = 0xC,
+    GEOMETRY_DESC_PARAM_SEG_SIZE = 0xD,
+    GEOMETRY_DESC_PARAM_ALLOC_UNIT_SIZE = 0x11,
+    GEOMETRY_DESC_PARAM_MIN_BLK_SIZE = 0x12,
+    GEOMETRY_DESC_PARAM_OPT_RD_BLK_SIZE = 0x13,
+    GEOMETRY_DESC_PARAM_OPT_WR_BLK_SIZE = 0x14,
+    GEOMETRY_DESC_PARAM_MAX_IN_BUF_SIZE = 0x15,
+    GEOMETRY_DESC_PARAM_MAX_OUT_BUF_SIZE = 0x16,
+    GEOMETRY_DESC_PARAM_RPMB_RW_SIZE = 0x17,
+    GEOMETRY_DESC_PARAM_DYN_CAP_RSRC_PLC = 0x18,
+    GEOMETRY_DESC_PARAM_DATA_ORDER = 0x19,
+    GEOMETRY_DESC_PARAM_MAX_NUM_CTX = 0x1A,
+    GEOMETRY_DESC_PARAM_TAG_UNIT_SIZE = 0x1B,
+    GEOMETRY_DESC_PARAM_TAG_RSRC_SIZE = 0x1C,
+    GEOMETRY_DESC_PARAM_SEC_RM_TYPES = 0x1D,
+    GEOMETRY_DESC_PARAM_MEM_TYPES = 0x1E,
+    GEOMETRY_DESC_PARAM_SCM_MAX_NUM_UNITS = 0x20,
+    GEOMETRY_DESC_PARAM_SCM_CAP_ADJ_FCTR = 0x24,
+    GEOMETRY_DESC_PARAM_NPM_MAX_NUM_UNITS = 0x26,
+    GEOMETRY_DESC_PARAM_NPM_CAP_ADJ_FCTR = 0x2A,
+    GEOMETRY_DESC_PARAM_ENM1_MAX_NUM_UNITS = 0x2C,
+    GEOMETRY_DESC_PARAM_ENM1_CAP_ADJ_FCTR = 0x30,
+    GEOMETRY_DESC_PARAM_ENM2_MAX_NUM_UNITS = 0x32,
+    GEOMETRY_DESC_PARAM_ENM2_CAP_ADJ_FCTR = 0x36,
+    GEOMETRY_DESC_PARAM_ENM3_MAX_NUM_UNITS = 0x38,
+    GEOMETRY_DESC_PARAM_ENM3_CAP_ADJ_FCTR = 0x3C,
+    GEOMETRY_DESC_PARAM_ENM4_MAX_NUM_UNITS = 0x3E,
+    GEOMETRY_DESC_PARAM_ENM4_CAP_ADJ_FCTR = 0x42,
+    GEOMETRY_DESC_PARAM_OPT_LOG_BLK_SIZE = 0x44,
+    GEOMETRY_DESC_PARAM_HPB_REGION_SIZE = 0x48,
+    GEOMETRY_DESC_PARAM_HPB_NUMBER_LU = 0x49,
+    GEOMETRY_DESC_PARAM_HPB_SUBREGION_SIZE = 0x4A,
+    GEOMETRY_DESC_PARAM_HPB_MAX_ACTIVE_REGS = 0x4B,
+    GEOMETRY_DESC_PARAM_WB_MAX_ALLOC_UNITS = 0x4F,
+    GEOMETRY_DESC_PARAM_WB_MAX_WB_LUNS = 0x53,
+    GEOMETRY_DESC_PARAM_WB_BUFF_CAP_ADJ = 0x54,
+    GEOMETRY_DESC_PARAM_WB_SUP_RED_TYPE = 0x55,
+    GEOMETRY_DESC_PARAM_WB_SUP_WB_TYPE = 0x56,
+};
+
+/* Health descriptor parameters offsets in bytes*/
+enum health_desc_param {
+    HEALTH_DESC_PARAM_LEN = 0x0,
+    HEALTH_DESC_PARAM_TYPE = 0x1,
+    HEALTH_DESC_PARAM_EOL_INFO = 0x2,
+    HEALTH_DESC_PARAM_LIFE_TIME_EST_A = 0x3,
+    HEALTH_DESC_PARAM_LIFE_TIME_EST_B = 0x4,
+};
+
+/* WriteBooster buffer mode */
+enum {
+    WB_BUF_MODE_LU_DEDICATED = 0x0,
+    WB_BUF_MODE_SHARED = 0x1,
+};
+
+/*
+ * Logical Unit Write Protect
+ * 00h: LU not write protected
+ * 01h: LU write protected when fPowerOnWPEn =1
+ * 02h: LU permanently write protected when fPermanentWPEn =1
+ */
+enum ufs_lu_wp_type {
+    UFS_LU_NO_WP = 0x00,
+    UFS_LU_POWER_ON_WP = 0x01,
+    UFS_LU_PERM_WP = 0x02,
+};
+
+/* UTP QUERY Transaction Specific Fields OpCode */
+enum query_opcode {
+    UPIU_QUERY_OPCODE_NOP = 0x0,
+    UPIU_QUERY_OPCODE_READ_DESC = 0x1,
+    UPIU_QUERY_OPCODE_WRITE_DESC = 0x2,
+    UPIU_QUERY_OPCODE_READ_ATTR = 0x3,
+    UPIU_QUERY_OPCODE_WRITE_ATTR = 0x4,
+    UPIU_QUERY_OPCODE_READ_FLAG = 0x5,
+    UPIU_QUERY_OPCODE_SET_FLAG = 0x6,
+    UPIU_QUERY_OPCODE_CLEAR_FLAG = 0x7,
+    UPIU_QUERY_OPCODE_TOGGLE_FLAG = 0x8,
+};
+
+/* Query response result code */
+typedef enum QueryRespCode {
+    QUERY_RESULT_SUCCESS = 0x00,
+    QUERY_RESULT_NOT_READABLE = 0xF6,
+    QUERY_RESULT_NOT_WRITEABLE = 0xF7,
+    QUERY_RESULT_ALREADY_WRITTEN = 0xF8,
+    QUERY_RESULT_INVALID_LENGTH = 0xF9,
+    QUERY_RESULT_INVALID_VALUE = 0xFA,
+    QUERY_RESULT_INVALID_SELECTOR = 0xFB,
+    QUERY_RESULT_INVALID_INDEX = 0xFC,
+    QUERY_RESULT_INVALID_IDN = 0xFD,
+    QUERY_RESULT_INVALID_OPCODE = 0xFE,
+    QUERY_RESULT_GENERAL_FAILURE = 0xFF,
+} QueryRespCode;
+
+/* UTP Transfer Request Command Type (CT) */
+enum {
+    UPIU_COMMAND_SET_TYPE_SCSI = 0x0,
+    UPIU_COMMAND_SET_TYPE_UFS = 0x1,
+    UPIU_COMMAND_SET_TYPE_QUERY = 0x2,
+};
+
+/* Task management service response */
+enum {
+    UPIU_TASK_MANAGEMENT_FUNC_COMPL = 0x00,
+    UPIU_TASK_MANAGEMENT_FUNC_NOT_SUPPORTED = 0x04,
+    UPIU_TASK_MANAGEMENT_FUNC_SUCCEEDED = 0x08,
+    UPIU_TASK_MANAGEMENT_FUNC_FAILED = 0x05,
+    UPIU_INCORRECT_LOGICAL_UNIT_NO = 0x09,
+};
+
+/* UFS device power modes */
+enum ufs_dev_pwr_mode {
+    UFS_ACTIVE_PWR_MODE = 1,
+    UFS_SLEEP_PWR_MODE = 2,
+    UFS_POWERDOWN_PWR_MODE = 3,
+    UFS_DEEPSLEEP_PWR_MODE = 4,
+};
+
+/*
+ * struct UtpCmdRsp - Response UPIU structure
+ * @residual_transfer_count: Residual transfer count DW-3
+ * @reserved: Reserved double words DW-4 to DW-7
+ * @sense_data_len: Sense data length DW-8 U16
+ * @sense_data: Sense data field DW-8 to DW-12
+ */
+typedef struct QEMU_PACKED UtpCmdRsp {
+    uint32_t residual_transfer_count;
+    uint32_t reserved[4];
+    uint16_t sense_data_len;
+    uint8_t sense_data[UFS_SENSE_SIZE];
+} UtpCmdRsp;
+
+/*
+ * struct UtpUpiuRsp - general upiu response structure
+ * @header: UPIU header structure DW-0 to DW-2
+ * @sr: fields structure for scsi command DW-3 to DW-12
+ * @qr: fields structure for query request DW-3 to DW-7
+ */
+typedef struct QEMU_PACKED UtpUpiuRsp {
+    UtpUpiuHeader header;
+    union {
+        UtpCmdRsp sr;
+        UtpUpiuQuery qr;
+    };
+} UtpUpiuRsp;
+
+static inline void _ufs_check_size(void)
+{
+    QEMU_BUILD_BUG_ON(sizeof(UfsReg) != 0x104);
+    QEMU_BUILD_BUG_ON(sizeof(DeviceDescriptor) != 89);
+    QEMU_BUILD_BUG_ON(sizeof(GeometryDescriptor) != 87);
+    QEMU_BUILD_BUG_ON(sizeof(UnitDescriptor) != 45);
+    QEMU_BUILD_BUG_ON(sizeof(RpmbUnitDescriptor) != 35);
+    QEMU_BUILD_BUG_ON(sizeof(PowerParametersDescriptor) != 98);
+    QEMU_BUILD_BUG_ON(sizeof(InterconnectDescriptor) != 6);
+    QEMU_BUILD_BUG_ON(sizeof(StringDescriptor) != 254);
+    QEMU_BUILD_BUG_ON(sizeof(DeviceHealthDescriptor) != 45);
+    QEMU_BUILD_BUG_ON(sizeof(Flags) != 0x13);
+    QEMU_BUILD_BUG_ON(sizeof(UtpUpiuHeader) != 12);
+    QEMU_BUILD_BUG_ON(sizeof(UtpUpiuQuery) != 276);
+    QEMU_BUILD_BUG_ON(sizeof(UtpUpiuCmd) != 20);
+    QEMU_BUILD_BUG_ON(sizeof(UtpUpiuReq) != 288);
+    QEMU_BUILD_BUG_ON(sizeof(UfshcdSgEntry) != 16);
+    QEMU_BUILD_BUG_ON(sizeof(RequestDescHeader) != 16);
+    QEMU_BUILD_BUG_ON(sizeof(UtpTransferReqDesc) != 32);
+    QEMU_BUILD_BUG_ON(sizeof(UtpTaskReqDesc) != 80);
+    QEMU_BUILD_BUG_ON(sizeof(UtpCmdRsp) != 40);
+    QEMU_BUILD_BUG_ON(sizeof(UtpUpiuRsp) != 288);
+}
+#endif
diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h
index XXXXXXX..XXXXXXX 100644
--- a/include/hw/pci/pci.h
+++ b/include/hw/pci/pci.h
@@ -XXX,XX +XXX,XX @@ extern bool pci_available;
 #define PCI_DEVICE_ID_REDHAT_NVME        0x0010
 #define PCI_DEVICE_ID_REDHAT_PVPANIC     0x0011
 #define PCI_DEVICE_ID_REDHAT_ACPI_ERST   0x0012
+#define PCI_DEVICE_ID_REDHAT_UFS         0x0013
 #define PCI_DEVICE_ID_REDHAT_QXL         0x0100
 
 #define FMT_PCIBUS                      PRIx64
diff --git a/include/hw/pci/pci_ids.h b/include/hw/pci/pci_ids.h
index XXXXXXX..XXXXXXX 100644
--- a/include/hw/pci/pci_ids.h
+++ b/include/hw/pci/pci_ids.h
@@ -XXX,XX +XXX,XX @@
 #define PCI_CLASS_STORAGE_SATA           0x0106
 #define PCI_CLASS_STORAGE_SAS            0x0107
 #define PCI_CLASS_STORAGE_EXPRESS        0x0108
+#define PCI_CLASS_STORAGE_UFS            0x0109
 #define PCI_CLASS_STORAGE_OTHER          0x0180
 
 #define PCI_BASE_CLASS_NETWORK           0x02
diff --git a/hw/ufs/ufs.c b/hw/ufs/ufs.c
new file mode 100644
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/hw/ufs/ufs.c
@@ -XXX,XX +XXX,XX @@
+/*
+ * QEMU Universal Flash Storage (UFS) Controller
+ *
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd. All rights reserved.
+ *
+ * Written by Jeuk Kim <jeuk20.kim@samsung.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+#include "qemu/osdep.h"
+#include "qapi/error.h"
+#include "migration/vmstate.h"
+#include "trace.h"
+#include "ufs.h"
+
+/* The QEMU-UFS device follows spec version 3.1 */
+#define UFS_SPEC_VER 0x00000310
+#define UFS_MAX_NUTRS 32
+#define UFS_MAX_NUTMRS 8
+
+static void ufs_irq_check(UfsHc *u)
+{
+    PCIDevice *pci = PCI_DEVICE(u);
+
+    if ((u->reg.is & UFS_INTR_MASK) & u->reg.ie) {
+        trace_ufs_irq_raise();
+        pci_irq_assert(pci);
+    } else {
+        trace_ufs_irq_lower();
+        pci_irq_deassert(pci);
+    }
+}
+
+static void ufs_process_uiccmd(UfsHc *u, uint32_t val)
+{
+    trace_ufs_process_uiccmd(val, u->reg.ucmdarg1, u->reg.ucmdarg2,
+                             u->reg.ucmdarg3);
+    /*
+     * Only the essential uic commands for running drivers on Linux and Windows
+     * are implemented.
+     */
+    switch (val) {
+    case UIC_CMD_DME_LINK_STARTUP:
+        u->reg.hcs = FIELD_DP32(u->reg.hcs, HCS, DP, 1);
+        u->reg.hcs = FIELD_DP32(u->reg.hcs, HCS, UTRLRDY, 1);
+        u->reg.hcs = FIELD_DP32(u->reg.hcs, HCS, UTMRLRDY, 1);
+        u->reg.ucmdarg2 = UIC_CMD_RESULT_SUCCESS;
+        break;
+    /* TODO: Revisit it when Power Management is implemented */
+    case UIC_CMD_DME_HIBER_ENTER:
+        u->reg.is = FIELD_DP32(u->reg.is, IS, UHES, 1);
+        u->reg.hcs = FIELD_DP32(u->reg.hcs, HCS, UPMCRS, PWR_LOCAL);
+        u->reg.ucmdarg2 = UIC_CMD_RESULT_SUCCESS;
+        break;
+    case UIC_CMD_DME_HIBER_EXIT:
+        u->reg.is = FIELD_DP32(u->reg.is, IS, UHXS, 1);
+        u->reg.hcs = FIELD_DP32(u->reg.hcs, HCS, UPMCRS, PWR_LOCAL);
+        u->reg.ucmdarg2 = UIC_CMD_RESULT_SUCCESS;
+        break;
+    default:
+        u->reg.ucmdarg2 = UIC_CMD_RESULT_FAILURE;
+    }
+
+    u->reg.is = FIELD_DP32(u->reg.is, IS, UCCS, 1);
+
+    ufs_irq_check(u);
+}
+
+static void ufs_write_reg(UfsHc *u, hwaddr offset, uint32_t data, unsigned size)
+{
+    switch (offset) {
+    case A_IS:
+        u->reg.is &= ~data;
+        ufs_irq_check(u);
+        break;
+    case A_IE:
+        u->reg.ie = data;
+        ufs_irq_check(u);
+        break;
+    case A_HCE:
+        if (!FIELD_EX32(u->reg.hce, HCE, HCE) && FIELD_EX32(data, HCE, HCE)) {
+            u->reg.hcs = FIELD_DP32(u->reg.hcs, HCS, UCRDY, 1);
+            u->reg.hce = FIELD_DP32(u->reg.hce, HCE, HCE, 1);
+        } else if (FIELD_EX32(u->reg.hce, HCE, HCE) &&
+                   !FIELD_EX32(data, HCE, HCE)) {
+            u->reg.hcs = 0;
+            u->reg.hce = FIELD_DP32(u->reg.hce, HCE, HCE, 0);
+        }
+        break;
+    case A_UTRLBA:
+        u->reg.utrlba = data & R_UTRLBA_UTRLBA_MASK;
+        break;
+    case A_UTRLBAU:
+        u->reg.utrlbau = data;
+        break;
+    case A_UTRLDBR:
+        /* Not yet supported */
+        break;
+    case A_UTRLRSR:
+        u->reg.utrlrsr = data;
+        break;
+    case A_UTRLCNR:
+        u->reg.utrlcnr &= ~data;
+        break;
+    case A_UTMRLBA:
+        u->reg.utmrlba = data & R_UTMRLBA_UTMRLBA_MASK;
+        break;
+    case A_UTMRLBAU:
+        u->reg.utmrlbau = data;
+        break;
+    case A_UICCMD:
+        ufs_process_uiccmd(u, data);
+        break;
+    case A_UCMDARG1:
+        u->reg.ucmdarg1 = data;
+        break;
+    case A_UCMDARG2:
+        u->reg.ucmdarg2 = data;
+        break;
+    case A_UCMDARG3:
+        u->reg.ucmdarg3 = data;
+        break;
+    case A_UTRLCLR:
+    case A_UTMRLDBR:
+    case A_UTMRLCLR:
+    case A_UTMRLRSR:
+        trace_ufs_err_unsupport_register_offset(offset);
+        break;
+    default:
+        trace_ufs_err_invalid_register_offset(offset);
+        break;
+    }
+}
+
+static uint64_t ufs_mmio_read(void *opaque, hwaddr addr, unsigned size)
+{
+    UfsHc *u = (UfsHc *)opaque;
+    uint8_t *ptr = (uint8_t *)&u->reg;
+    uint64_t value;
+
+    if (addr > sizeof(u->reg) - size) {
+        trace_ufs_err_invalid_register_offset(addr);
+        return 0;
+    }
+
+    value = *(uint32_t *)(ptr + addr);
+    trace_ufs_mmio_read(addr, value, size);
+    return value;
+}
+
+static void ufs_mmio_write(void *opaque, hwaddr addr, uint64_t data,
+                           unsigned size)
+{
+    UfsHc *u = (UfsHc *)opaque;
+
+    if (addr > sizeof(u->reg) - size) {
+        trace_ufs_err_invalid_register_offset(addr);
+        return;
+    }
+
+    trace_ufs_mmio_write(addr, data, size);
+    ufs_write_reg(u, addr, data, size);
+}
+
+static const MemoryRegionOps ufs_mmio_ops = {
+    .read = ufs_mmio_read,
+    .write = ufs_mmio_write,
+    .endianness = DEVICE_LITTLE_ENDIAN,
+    .impl = {
+        .min_access_size = 4,
+        .max_access_size = 4,
+    },
+};
+
+static bool ufs_check_constraints(UfsHc *u, Error **errp)
+{
+    if (u->params.nutrs > UFS_MAX_NUTRS) {
+        error_setg(errp, "nutrs must be less than or equal to %d",
+                   UFS_MAX_NUTRS);
+        return false;
+    }
+
+    if (u->params.nutmrs > UFS_MAX_NUTMRS) {
+        error_setg(errp, "nutmrs must be less than or equal to %d",
+                   UFS_MAX_NUTMRS);
+        return false;
+    }
+
+    return true;
+}
+
+static void ufs_init_pci(UfsHc *u, PCIDevice *pci_dev)
+{
+    uint8_t *pci_conf = pci_dev->config;
+
+    pci_conf[PCI_INTERRUPT_PIN] = 1;
+    pci_config_set_prog_interface(pci_conf, 0x1);
+
+    memory_region_init_io(&u->iomem, OBJECT(u), &ufs_mmio_ops, u, "ufs",
+                          u->reg_size);
+    pci_register_bar(pci_dev, 0, PCI_BASE_ADDRESS_SPACE_MEMORY, &u->iomem);
+    u->irq = pci_allocate_irq(pci_dev);
+}
+
+static void ufs_init_hc(UfsHc *u)
+{
+    uint32_t cap = 0;
+
+    u->reg_size = pow2ceil(sizeof(UfsReg));
+
+    memset(&u->reg, 0, sizeof(u->reg));
+    cap = FIELD_DP32(cap, CAP, NUTRS, (u->params.nutrs - 1));
+    cap = FIELD_DP32(cap, CAP, RTT, 2);
+    cap = FIELD_DP32(cap, CAP, NUTMRS, (u->params.nutmrs - 1));
+    cap = FIELD_DP32(cap, CAP, AUTOH8, 0);
+    cap = FIELD_DP32(cap, CAP, 64AS, 1);
+    cap = FIELD_DP32(cap, CAP, OODDS, 0);
+    cap = FIELD_DP32(cap, CAP, UICDMETMS, 0);
+    cap = FIELD_DP32(cap, CAP, CS, 0);
+    u->reg.cap = cap;
+    u->reg.ver = UFS_SPEC_VER;
+}
+
+static void ufs_realize(PCIDevice *pci_dev, Error **errp)
+{
+    UfsHc *u = UFS(pci_dev);
+
+    if (!ufs_check_constraints(u, errp)) {
+        return;
+    }
+
+    ufs_init_hc(u);
+    ufs_init_pci(u, pci_dev);
+}
+
+static Property ufs_props[] = {
+    DEFINE_PROP_STRING("serial", UfsHc, params.serial),
+    DEFINE_PROP_UINT8("nutrs", UfsHc, params.nutrs, 32),
+    DEFINE_PROP_UINT8("nutmrs", UfsHc, params.nutmrs, 8),
+    DEFINE_PROP_END_OF_LIST(),
+};
+
+static const VMStateDescription ufs_vmstate = {
+    .name = "ufs",
+    .unmigratable = 1,
+};
+
+static void ufs_class_init(ObjectClass *oc, void *data)
+{
+    DeviceClass *dc = DEVICE_CLASS(oc);
+    PCIDeviceClass *pc = PCI_DEVICE_CLASS(oc);
+
+    pc->realize = ufs_realize;
+    pc->vendor_id = PCI_VENDOR_ID_REDHAT;
+    pc->device_id = PCI_DEVICE_ID_REDHAT_UFS;
+    pc->class_id = PCI_CLASS_STORAGE_UFS;
+
+    set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
+    dc->desc = "Universal Flash Storage";
+    device_class_set_props(dc, ufs_props);
+    dc->vmsd = &ufs_vmstate;
+}
+
+static const TypeInfo ufs_info = {
+    .name = TYPE_UFS,
+    .parent = TYPE_PCI_DEVICE,
+    .class_init = ufs_class_init,
+    .instance_size = sizeof(UfsHc),
+    .interfaces = (InterfaceInfo[]){ { INTERFACE_PCIE_DEVICE }, {} },
+};
+
+static void ufs_register_types(void)
+{
+    type_register_static(&ufs_info);
+}
+
+type_init(ufs_register_types)
diff --git a/hw/Kconfig b/hw/Kconfig
index XXXXXXX..XXXXXXX 100644
--- a/hw/Kconfig
+++ b/hw/Kconfig
@@ -XXX,XX +XXX,XX @@ source smbios/Kconfig
 source ssi/Kconfig
 source timer/Kconfig
 source tpm/Kconfig
+source ufs/Kconfig
 source usb/Kconfig
 source virtio/Kconfig
 source vfio/Kconfig
diff --git a/hw/meson.build b/hw/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/hw/meson.build
+++ b/hw/meson.build
@@ -XXX,XX +XXX,XX @@ subdir('smbios')
 subdir('ssi')
 subdir('timer')
 subdir('tpm')
+subdir('ufs')
 subdir('usb')
 subdir('vfio')
 subdir('virtio')
diff --git a/hw/ufs/Kconfig b/hw/ufs/Kconfig
new file mode 100644
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/hw/ufs/Kconfig
@@ -XXX,XX +XXX,XX @@
+config UFS_PCI
+    bool
+    default y if PCI_DEVICES
+    depends on PCI
diff --git a/hw/ufs/meson.build b/hw/ufs/meson.build
new file mode 100644
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/hw/ufs/meson.build
@@ -0,0 +1 @@
+system_ss.add(when: 'CONFIG_UFS_PCI', if_true: files('ufs.c'))
diff --git a/hw/ufs/trace-events b/hw/ufs/trace-events
new file mode 100644
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/hw/ufs/trace-events
@@ -XXX,XX +XXX,XX @@
+# ufs.c
+ufs_irq_raise(void) "INTx"
+ufs_irq_lower(void) "INTx"
+ufs_mmio_read(uint64_t addr, uint64_t data, unsigned size) "addr 0x%"PRIx64" data 0x%"PRIx64" size %d"
+ufs_mmio_write(uint64_t addr, uint64_t data, unsigned size) "addr 0x%"PRIx64" data 0x%"PRIx64" size %d"
+ufs_process_db(uint32_t slot) "UTRLDBR slot %"PRIu32""
+ufs_process_req(uint32_t slot) "UTRLDBR slot %"PRIu32""
+ufs_complete_req(uint32_t slot) "UTRLDBR slot %"PRIu32""
+ufs_sendback_req(uint32_t slot) "UTRLDBR slot %"PRIu32""
+ufs_exec_nop_cmd(uint32_t slot) "UTRLDBR slot %"PRIu32""
+ufs_exec_scsi_cmd(uint32_t slot, uint8_t lun, uint8_t opcode) "slot %"PRIu32", lun 0x%"PRIx8", opcode 0x%"PRIx8""
+ufs_exec_query_cmd(uint32_t slot, uint8_t opcode) "slot %"PRIu32", opcode 0x%"PRIx8""
+ufs_process_uiccmd(uint32_t uiccmd, uint32_t ucmdarg1, uint32_t ucmdarg2, uint32_t ucmdarg3) "uiccmd 0x%"PRIx32", ucmdarg1 0x%"PRIx32", ucmdarg2 0x%"PRIx32", ucmdarg3 0x%"PRIx32""
+
+# error condition
+ufs_err_dma_read_utrd(uint32_t slot, uint64_t addr) "failed to read utrd. UTRLDBR slot %"PRIu32", UTRD dma addr %"PRIu64""
+ufs_err_dma_read_req_upiu(uint32_t slot, uint64_t addr) "failed to read req upiu. UTRLDBR slot %"PRIu32", request upiu addr %"PRIu64""
+ufs_err_dma_read_prdt(uint32_t slot, uint64_t addr) "failed to read prdt. UTRLDBR slot %"PRIu32", prdt addr %"PRIu64""
+ufs_err_dma_write_utrd(uint32_t slot, uint64_t addr) "failed to write utrd. UTRLDBR slot %"PRIu32", UTRD dma addr %"PRIu64""
+ufs_err_dma_write_rsp_upiu(uint32_t slot, uint64_t addr) "failed to write rsp upiu. UTRLDBR slot %"PRIu32", response upiu addr %"PRIu64""
+ufs_err_utrl_slot_busy(uint32_t slot) "UTRLDBR slot %"PRIu32" is busy"
+ufs_err_unsupport_register_offset(uint32_t offset) "Register offset 0x%"PRIx32" is not yet supported"
+ufs_err_invalid_register_offset(uint32_t offset) "Register offset 0x%"PRIx32" is invalid"
+ufs_err_scsi_cmd_invalid_lun(uint8_t lun) "scsi command has invalid lun: 0x%"PRIx8""
+ufs_err_query_flag_not_readable(uint8_t idn) "query flag idn 0x%"PRIx8" is denied to read"
+ufs_err_query_flag_not_writable(uint8_t idn) "query flag idn 0x%"PRIx8" is denied to write"
+ufs_err_query_attr_not_readable(uint8_t idn) "query attribute idn 0x%"PRIx8" is denied to read"
+ufs_err_query_attr_not_writable(uint8_t idn) "query attribute idn 0x%"PRIx8" is denied to write"
+ufs_err_query_invalid_opcode(uint8_t opcode) "query request has invalid opcode. opcode: 0x%"PRIx8""
+ufs_err_query_invalid_idn(uint8_t opcode, uint8_t idn) "query request has invalid idn. opcode: 0x%"PRIx8", idn 0x%"PRIx8""
+ufs_err_query_invalid_index(uint8_t opcode, uint8_t index) "query request has invalid index. opcode: 0x%"PRIx8", index 0x%"PRIx8""
+ufs_err_invalid_trans_code(uint32_t slot, uint8_t trans_code) "request upiu has invalid transaction code. slot: %"PRIu32", trans_code: 0x%"PRIx8""
-- 
2.41.0

From: Jeuk Kim <jeuk20.kim@gmail.com>

This commit makes the UFS device support query
and nop out transfer requests.

The next patch would be support for UFS logical
unit and scsi command transfer request.

Signed-off-by: Jeuk Kim <jeuk20.kim@samsung.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: d06b440d660872092f70af1b8167bd5f4704c957.1691062912.git.jeuk20.kim@samsung.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 hw/ufs/ufs.h        |  46 +++
 hw/ufs/ufs.c        | 980 +++++++++++++++++++++++++++++++++++++++++++-
 hw/ufs/trace-events |   1 +
 3 files changed, 1025 insertions(+), 2 deletions(-)

diff --git a/hw/ufs/ufs.h b/hw/ufs/ufs.h
index XXXXXXX..XXXXXXX 100644
--- a/hw/ufs/ufs.h
+++ b/hw/ufs/ufs.h
@@ -XXX,XX +XXX,XX @@
 #define UFS_MAX_LUS 32
 #define UFS_BLOCK_SIZE 4096
 
+typedef enum UfsRequestState {
+    UFS_REQUEST_IDLE = 0,
+    UFS_REQUEST_READY = 1,
+    UFS_REQUEST_RUNNING = 2,
+    UFS_REQUEST_COMPLETE = 3,
+    UFS_REQUEST_ERROR = 4,
+} UfsRequestState;
+
+typedef enum UfsReqResult {
+    UFS_REQUEST_SUCCESS = 0,
+    UFS_REQUEST_FAIL = 1,
+} UfsReqResult;
+
+typedef struct UfsRequest {
+    struct UfsHc *hc;
+    UfsRequestState state;
+    int slot;
+
+    UtpTransferReqDesc utrd;
+    UtpUpiuReq req_upiu;
+    UtpUpiuRsp rsp_upiu;
+
+    /* for scsi command */
+    QEMUSGList *sg;
+} UfsRequest;
+
 typedef struct UfsParams {
     char *serial;
     uint8_t nutrs; /* Number of UTP Transfer Request Slots */
@@ -XXX,XX +XXX,XX @@ typedef struct UfsHc {
     UfsReg reg;
     UfsParams params;
     uint32_t reg_size;
+    UfsRequest *req_list;
+
+    DeviceDescriptor device_desc;
+    GeometryDescriptor geometry_desc;
+    Attributes attributes;
+    Flags flags;
 
     qemu_irq irq;
     QEMUBH *doorbell_bh;
@@ -XXX,XX +XXX,XX @@ typedef struct UfsHc {
 #define TYPE_UFS "ufs"
 #define UFS(obj) OBJECT_CHECK(UfsHc, (obj), TYPE_UFS)
 
+typedef enum UfsQueryFlagPerm {
+    UFS_QUERY_FLAG_NONE = 0x0,
+    UFS_QUERY_FLAG_READ = 0x1,
+    UFS_QUERY_FLAG_SET = 0x2,
+    UFS_QUERY_FLAG_CLEAR = 0x4,
+    UFS_QUERY_FLAG_TOGGLE = 0x8,
+} UfsQueryFlagPerm;
+
+typedef enum UfsQueryAttrPerm {
+    UFS_QUERY_ATTR_NONE = 0x0,
+    UFS_QUERY_ATTR_READ = 0x1,
+    UFS_QUERY_ATTR_WRITE = 0x2,
+} UfsQueryAttrPerm;
+
 #endif /* HW_UFS_UFS_H */
diff --git a/hw/ufs/ufs.c b/hw/ufs/ufs.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/ufs/ufs.c
+++ b/hw/ufs/ufs.c
@@ -XXX,XX +XXX,XX @@
 #include "ufs.h"
 
 /* The QEMU-UFS device follows spec version 3.1 */
-#define UFS_SPEC_VER 0x00000310
+#define UFS_SPEC_VER 0x0310
 #define UFS_MAX_NUTRS 32
 #define UFS_MAX_NUTMRS 8
 
+static MemTxResult ufs_addr_read(UfsHc *u, hwaddr addr, void *buf, int size)
+{
+    hwaddr hi = addr + size - 1;
+
+    if (hi < addr) {
+        return MEMTX_DECODE_ERROR;
+    }
+
+    if (!FIELD_EX32(u->reg.cap, CAP, 64AS) && (hi >> 32)) {
+        return MEMTX_DECODE_ERROR;
+    }
+
+    return pci_dma_read(PCI_DEVICE(u), addr, buf, size);
+}
+
+static MemTxResult ufs_addr_write(UfsHc *u, hwaddr addr, const void *buf,
+                                  int size)
+{
+    hwaddr hi = addr + size - 1;
+    if (hi < addr) {
+        return MEMTX_DECODE_ERROR;
+    }
+
+    if (!FIELD_EX32(u->reg.cap, CAP, 64AS) && (hi >> 32)) {
+        return MEMTX_DECODE_ERROR;
+    }
+
+    return pci_dma_write(PCI_DEVICE(u), addr, buf, size);
+}
+
+static void ufs_complete_req(UfsRequest *req, UfsReqResult req_result);
+
+static inline hwaddr ufs_get_utrd_addr(UfsHc *u, uint32_t slot)
+{
+    hwaddr utrl_base_addr = (((hwaddr)u->reg.utrlbau) << 32) + u->reg.utrlba;
+    hwaddr utrd_addr = utrl_base_addr + slot * sizeof(UtpTransferReqDesc);
+
+    return utrd_addr;
+}
+
+static inline hwaddr ufs_get_req_upiu_base_addr(const UtpTransferReqDesc *utrd)
+{
+    uint32_t cmd_desc_base_addr_lo =
+        le32_to_cpu(utrd->command_desc_base_addr_lo);
+    uint32_t cmd_desc_base_addr_hi =
+        le32_to_cpu(utrd->command_desc_base_addr_hi);
+
+    return (((hwaddr)cmd_desc_base_addr_hi) << 32) + cmd_desc_base_addr_lo;
+}
+
+static inline hwaddr ufs_get_rsp_upiu_base_addr(const UtpTransferReqDesc *utrd)
+{
+    hwaddr req_upiu_base_addr = ufs_get_req_upiu_base_addr(utrd);
+    uint32_t rsp_upiu_byte_off =
+        le16_to_cpu(utrd->response_upiu_offset) * sizeof(uint32_t);
+    return req_upiu_base_addr + rsp_upiu_byte_off;
+}
+
+static MemTxResult ufs_dma_read_utrd(UfsRequest *req)
+{
+    UfsHc *u = req->hc;
+    hwaddr utrd_addr = ufs_get_utrd_addr(u, req->slot);
+    MemTxResult ret;
+
+    ret = ufs_addr_read(u, utrd_addr, &req->utrd, sizeof(req->utrd));
+    if (ret) {
+        trace_ufs_err_dma_read_utrd(req->slot, utrd_addr);
+    }
+    return ret;
+}
+
+static MemTxResult ufs_dma_read_req_upiu(UfsRequest *req)
+{
+    UfsHc *u = req->hc;
+    hwaddr req_upiu_base_addr = ufs_get_req_upiu_base_addr(&req->utrd);
+    UtpUpiuReq *req_upiu = &req->req_upiu;
+    uint32_t copy_size;
+    uint16_t data_segment_length;
+    MemTxResult ret;
+
+    /*
+     * To know the size of the req_upiu, we need to read the
+     * data_segment_length in the header first.
+     */
+    ret = ufs_addr_read(u, req_upiu_base_addr, &req_upiu->header,
+                        sizeof(UtpUpiuHeader));
+    if (ret) {
+        trace_ufs_err_dma_read_req_upiu(req->slot, req_upiu_base_addr);
+        return ret;
+    }
+    data_segment_length = be16_to_cpu(req_upiu->header.data_segment_length);
+
+    copy_size = sizeof(UtpUpiuHeader) + UFS_TRANSACTION_SPECIFIC_FIELD_SIZE +
+                data_segment_length;
+
+    ret = ufs_addr_read(u, req_upiu_base_addr, &req->req_upiu, copy_size);
+    if (ret) {
+        trace_ufs_err_dma_read_req_upiu(req->slot, req_upiu_base_addr);
+    }
+    return ret;
+}
+
+static MemTxResult ufs_dma_read_prdt(UfsRequest *req)
+{
+    UfsHc *u = req->hc;
+    uint16_t prdt_len = le16_to_cpu(req->utrd.prd_table_length);
+    uint16_t prdt_byte_off =
+        le16_to_cpu(req->utrd.prd_table_offset) * sizeof(uint32_t);
+    uint32_t prdt_size = prdt_len * sizeof(UfshcdSgEntry);
+    g_autofree UfshcdSgEntry *prd_entries = NULL;
+    hwaddr req_upiu_base_addr, prdt_base_addr;
+    int err;
+
+    assert(!req->sg);
+
+    if (prdt_size == 0) {
+        return MEMTX_OK;
+    }
+    prd_entries = g_new(UfshcdSgEntry, prdt_size);
+
+    req_upiu_base_addr = ufs_get_req_upiu_base_addr(&req->utrd);
+    prdt_base_addr = req_upiu_base_addr + prdt_byte_off;
+
+    err = ufs_addr_read(u, prdt_base_addr, prd_entries, prdt_size);
+    if (err) {
+        trace_ufs_err_dma_read_prdt(req->slot, prdt_base_addr);
+        return err;
+    }
+
+    req->sg = g_malloc0(sizeof(QEMUSGList));
+    pci_dma_sglist_init(req->sg, PCI_DEVICE(u), prdt_len);
+
+    for (uint16_t i = 0; i < prdt_len; ++i) {
+        hwaddr data_dma_addr = le64_to_cpu(prd_entries[i].addr);
+        uint32_t data_byte_count = le32_to_cpu(prd_entries[i].size) + 1;
+        qemu_sglist_add(req->sg, data_dma_addr, data_byte_count);
+    }
+    return MEMTX_OK;
+}
+
+static MemTxResult ufs_dma_read_upiu(UfsRequest *req)
+{
+    MemTxResult ret;
+
+    ret = ufs_dma_read_utrd(req);
+    if (ret) {
+        return ret;
+    }
+
+    ret = ufs_dma_read_req_upiu(req);
+    if (ret) {
+        return ret;
+    }
+
+    ret = ufs_dma_read_prdt(req);
+    if (ret) {
+        return ret;
+    }
+
+    return 0;
+}
+
+static MemTxResult ufs_dma_write_utrd(UfsRequest *req)
+{
+    UfsHc *u = req->hc;
+    hwaddr utrd_addr = ufs_get_utrd_addr(u, req->slot);
+    MemTxResult ret;
+
+    ret = ufs_addr_write(u, utrd_addr, &req->utrd, sizeof(req->utrd));
+    if (ret) {
+        trace_ufs_err_dma_write_utrd(req->slot, utrd_addr);
+    }
+    return ret;
+}
+
+static MemTxResult ufs_dma_write_rsp_upiu(UfsRequest *req)
+{
+    UfsHc *u = req->hc;
+    hwaddr rsp_upiu_base_addr = ufs_get_rsp_upiu_base_addr(&req->utrd);
+    uint32_t rsp_upiu_byte_len =
+        le16_to_cpu(req->utrd.response_upiu_length) * sizeof(uint32_t);
+    uint16_t data_segment_length =
+        be16_to_cpu(req->rsp_upiu.header.data_segment_length);
+    uint32_t copy_size = sizeof(UtpUpiuHeader) +
+                         UFS_TRANSACTION_SPECIFIC_FIELD_SIZE +
+                         data_segment_length;
+    MemTxResult ret;
+
+    if (copy_size > rsp_upiu_byte_len) {
+        copy_size = rsp_upiu_byte_len;
+    }
+
+    ret = ufs_addr_write(u, rsp_upiu_base_addr, &req->rsp_upiu, copy_size);
+    if (ret) {
+        trace_ufs_err_dma_write_rsp_upiu(req->slot, rsp_upiu_base_addr);
+    }
+    return ret;
+}
+
+static MemTxResult ufs_dma_write_upiu(UfsRequest *req)
+{
+    MemTxResult ret;
+
+    ret = ufs_dma_write_rsp_upiu(req);
+    if (ret) {
+        return ret;
+    }
+
+    return ufs_dma_write_utrd(req);
+}
+
 static void ufs_irq_check(UfsHc *u)
 {
     PCIDevice *pci = PCI_DEVICE(u);
@@ -XXX,XX +XXX,XX @@ static void ufs_irq_check(UfsHc *u)
     }
 }
 
+static void ufs_process_db(UfsHc *u, uint32_t val)
+{
+    uint32_t slot;
+    uint32_t nutrs = u->params.nutrs;
+    UfsRequest *req;
+
+    val &= ~u->reg.utrldbr;
+    if (!val) {
+        return;
+    }
+
+    slot = find_first_bit((unsigned long *)&val, nutrs);
+
+    while (slot < nutrs) {
+        req = &u->req_list[slot];
+        if (req->state == UFS_REQUEST_ERROR) {
+            trace_ufs_err_utrl_slot_error(req->slot);
+            return;
+        }
+
+        if (req->state != UFS_REQUEST_IDLE) {
+            trace_ufs_err_utrl_slot_busy(req->slot);
+            return;
+        }
+
+        trace_ufs_process_db(slot);
+        req->state = UFS_REQUEST_READY;
+        slot = find_next_bit((unsigned long *)&val, nutrs, slot + 1);
+    }
+
+    qemu_bh_schedule(u->doorbell_bh);
+}
+
 static void ufs_process_uiccmd(UfsHc *u, uint32_t val)
 {
     trace_ufs_process_uiccmd(val, u->reg.ucmdarg1, u->reg.ucmdarg2,
@@ -XXX,XX +XXX,XX @@ static void ufs_write_reg(UfsHc *u, hwaddr offset, uint32_t data, unsigned size)
         u->reg.utrlbau = data;
         break;
     case A_UTRLDBR:
-        /* Not yet supported */
+        ufs_process_db(u, data);
+        u->reg.utrldbr |= data;
         break;
     case A_UTRLRSR:
         u->reg.utrlrsr = data;
@@ -XXX,XX +XXX,XX @@ static const MemoryRegionOps ufs_mmio_ops = {
     },
 };
 
+static void ufs_build_upiu_header(UfsRequest *req, uint8_t trans_type,
+                                  uint8_t flags, uint8_t response,
+                                  uint8_t scsi_status,
+                                  uint16_t data_segment_length)
+{
+    memcpy(&req->rsp_upiu.header, &req->req_upiu.header, sizeof(UtpUpiuHeader));
+    req->rsp_upiu.header.trans_type = trans_type;
+    req->rsp_upiu.header.flags = flags;
+    req->rsp_upiu.header.response = response;
+    req->rsp_upiu.header.scsi_status = scsi_status;
+    req->rsp_upiu.header.data_segment_length = cpu_to_be16(data_segment_length);
+}
+
+static UfsReqResult ufs_exec_nop_cmd(UfsRequest *req)
+{
+    trace_ufs_exec_nop_cmd(req->slot);
+    ufs_build_upiu_header(req, UPIU_TRANSACTION_NOP_IN, 0, 0, 0, 0);
+    return UFS_REQUEST_SUCCESS;
+}
+
+/*
+ * This defines the permission of flags based on their IDN. There are some
+ * things that are declared read-only, which is inconsistent with the ufs spec,
+ * because we want to return an error for features that are not yet supported.
+ */
+static const int flag_permission[QUERY_FLAG_IDN_COUNT] = {
+    [QUERY_FLAG_IDN_FDEVICEINIT] = UFS_QUERY_FLAG_READ | UFS_QUERY_FLAG_SET,
+    /* Write protection is not supported */
+    [QUERY_FLAG_IDN_PERMANENT_WPE] = UFS_QUERY_FLAG_READ,
+    [QUERY_FLAG_IDN_PWR_ON_WPE] = UFS_QUERY_FLAG_READ,
+    [QUERY_FLAG_IDN_BKOPS_EN] = UFS_QUERY_FLAG_READ | UFS_QUERY_FLAG_SET |
+                                UFS_QUERY_FLAG_CLEAR | UFS_QUERY_FLAG_TOGGLE,
+    [QUERY_FLAG_IDN_LIFE_SPAN_MODE_ENABLE] =
+        UFS_QUERY_FLAG_READ | UFS_QUERY_FLAG_SET | UFS_QUERY_FLAG_CLEAR |
+        UFS_QUERY_FLAG_TOGGLE,
+    /* Purge Operation is not supported */
+    [QUERY_FLAG_IDN_PURGE_ENABLE] = UFS_QUERY_FLAG_NONE,
+    /* Refresh Operation is not supported */
+    [QUERY_FLAG_IDN_REFRESH_ENABLE] = UFS_QUERY_FLAG_NONE,
+    /* Physical Resource Removal is not supported */
+    [QUERY_FLAG_IDN_FPHYRESOURCEREMOVAL] = UFS_QUERY_FLAG_READ,
+    [QUERY_FLAG_IDN_BUSY_RTC] = UFS_QUERY_FLAG_READ,
+    [QUERY_FLAG_IDN_PERMANENTLY_DISABLE_FW_UPDATE] = UFS_QUERY_FLAG_READ,
+    /* Write Booster is not supported */
+    [QUERY_FLAG_IDN_WB_EN] = UFS_QUERY_FLAG_READ,
+    [QUERY_FLAG_IDN_WB_BUFF_FLUSH_EN] = UFS_QUERY_FLAG_READ,
+    [QUERY_FLAG_IDN_WB_BUFF_FLUSH_DURING_HIBERN8] = UFS_QUERY_FLAG_READ,
+};
+
+static inline QueryRespCode ufs_flag_check_idn_valid(uint8_t idn, int op)
+{
+    if (idn >= QUERY_FLAG_IDN_COUNT) {
+        return QUERY_RESULT_INVALID_IDN;
+    }
+
+    if (!(flag_permission[idn] & op)) {
+        if (op == UFS_QUERY_FLAG_READ) {
+            trace_ufs_err_query_flag_not_readable(idn);
+            return QUERY_RESULT_NOT_READABLE;
+        }
+        trace_ufs_err_query_flag_not_writable(idn);
+        return QUERY_RESULT_NOT_WRITEABLE;
+    }
+
+    return QUERY_RESULT_SUCCESS;
+}
+
+static const int attr_permission[QUERY_ATTR_IDN_COUNT] = {
+    /* booting is not supported */
+    [QUERY_ATTR_IDN_BOOT_LU_EN] = UFS_QUERY_ATTR_READ,
+    [QUERY_ATTR_IDN_POWER_MODE] = UFS_QUERY_ATTR_READ,
+    [QUERY_ATTR_IDN_ACTIVE_ICC_LVL] =
+        UFS_QUERY_ATTR_READ | UFS_QUERY_ATTR_WRITE,
+    [QUERY_ATTR_IDN_OOO_DATA_EN] = UFS_QUERY_ATTR_READ,
+    [QUERY_ATTR_IDN_BKOPS_STATUS] = UFS_QUERY_ATTR_READ,
+    [QUERY_ATTR_IDN_PURGE_STATUS] = UFS_QUERY_ATTR_READ,
+    [QUERY_ATTR_IDN_MAX_DATA_IN] = UFS_QUERY_ATTR_READ | UFS_QUERY_ATTR_WRITE,
+    [QUERY_ATTR_IDN_MAX_DATA_OUT] = UFS_QUERY_ATTR_READ | UFS_QUERY_ATTR_WRITE,
+    [QUERY_ATTR_IDN_DYN_CAP_NEEDED] = UFS_QUERY_ATTR_READ,
+    [QUERY_ATTR_IDN_REF_CLK_FREQ] = UFS_QUERY_ATTR_READ | UFS_QUERY_ATTR_WRITE,
+    [QUERY_ATTR_IDN_CONF_DESC_LOCK] = UFS_QUERY_ATTR_READ,
+    [QUERY_ATTR_IDN_MAX_NUM_OF_RTT] =
+        UFS_QUERY_ATTR_READ | UFS_QUERY_ATTR_WRITE,
+    [QUERY_ATTR_IDN_EE_CONTROL] = UFS_QUERY_ATTR_READ | UFS_QUERY_ATTR_WRITE,
+    [QUERY_ATTR_IDN_EE_STATUS] = UFS_QUERY_ATTR_READ,
+    [QUERY_ATTR_IDN_SECONDS_PASSED] = UFS_QUERY_ATTR_WRITE,
+    [QUERY_ATTR_IDN_CNTX_CONF] = UFS_QUERY_ATTR_READ,
+    [QUERY_ATTR_IDN_FFU_STATUS] = UFS_QUERY_ATTR_READ,
+    [QUERY_ATTR_IDN_PSA_STATE] = UFS_QUERY_ATTR_READ | UFS_QUERY_ATTR_WRITE,
+    [QUERY_ATTR_IDN_PSA_DATA_SIZE] = UFS_QUERY_ATTR_READ | UFS_QUERY_ATTR_WRITE,
+    [QUERY_ATTR_IDN_REF_CLK_GATING_WAIT_TIME] = UFS_QUERY_ATTR_READ,
+    [QUERY_ATTR_IDN_CASE_ROUGH_TEMP] = UFS_QUERY_ATTR_READ,
+    [QUERY_ATTR_IDN_HIGH_TEMP_BOUND] = UFS_QUERY_ATTR_READ,
+    [QUERY_ATTR_IDN_LOW_TEMP_BOUND] = UFS_QUERY_ATTR_READ,
+    [QUERY_ATTR_IDN_THROTTLING_STATUS] = UFS_QUERY_ATTR_READ,
+    [QUERY_ATTR_IDN_WB_FLUSH_STATUS] = UFS_QUERY_ATTR_READ,
+    [QUERY_ATTR_IDN_AVAIL_WB_BUFF_SIZE] = UFS_QUERY_ATTR_READ,
+    [QUERY_ATTR_IDN_WB_BUFF_LIFE_TIME_EST] = UFS_QUERY_ATTR_READ,
+    [QUERY_ATTR_IDN_CURR_WB_BUFF_SIZE] = UFS_QUERY_ATTR_READ,
+    /* refresh operation is not supported */
+    [QUERY_ATTR_IDN_REFRESH_STATUS] = UFS_QUERY_ATTR_READ,
+    [QUERY_ATTR_IDN_REFRESH_FREQ] = UFS_QUERY_ATTR_READ,
+    [QUERY_ATTR_IDN_REFRESH_UNIT] = UFS_QUERY_ATTR_READ,
+};
+
+static inline QueryRespCode ufs_attr_check_idn_valid(uint8_t idn, int op)
+{
+    if (idn >= QUERY_ATTR_IDN_COUNT) {
+        return QUERY_RESULT_INVALID_IDN;
+    }
+
+    if (!(attr_permission[idn] & op)) {
+        if (op == UFS_QUERY_ATTR_READ) {
+            trace_ufs_err_query_attr_not_readable(idn);
+            return QUERY_RESULT_NOT_READABLE;
+        }
+        trace_ufs_err_query_attr_not_writable(idn);
+        return QUERY_RESULT_NOT_WRITEABLE;
+    }
+
+    return QUERY_RESULT_SUCCESS;
+}
+
+static QueryRespCode ufs_exec_query_flag(UfsRequest *req, int op)
+{
+    UfsHc *u = req->hc;
+    uint8_t idn = req->req_upiu.qr.idn;
+    uint32_t value;
+    QueryRespCode ret;
+
+    ret = ufs_flag_check_idn_valid(idn, op);
+    if (ret) {
+        return ret;
+    }
+
+    if (idn == QUERY_FLAG_IDN_FDEVICEINIT) {
+        value = 0;
+    } else if (op == UFS_QUERY_FLAG_READ) {
+        value = *(((uint8_t *)&u->flags) + idn);
+    } else if (op == UFS_QUERY_FLAG_SET) {
+        value = 1;
+    } else if (op == UFS_QUERY_FLAG_CLEAR) {
+        value = 0;
+    } else if (op == UFS_QUERY_FLAG_TOGGLE) {
+        value = *(((uint8_t *)&u->flags) + idn);
+        value = !value;
+    } else {
+        trace_ufs_err_query_invalid_opcode(op);
+        return QUERY_RESULT_INVALID_OPCODE;
+    }
+
+    *(((uint8_t *)&u->flags) + idn) = value;
+    req->rsp_upiu.qr.value = cpu_to_be32(value);
+    return QUERY_RESULT_SUCCESS;
+}
+
+static uint32_t ufs_read_attr_value(UfsHc *u, uint8_t idn)
+{
+    switch (idn) {
+    case QUERY_ATTR_IDN_BOOT_LU_EN:
+        return u->attributes.boot_lun_en;
+    case QUERY_ATTR_IDN_POWER_MODE:
+        return u->attributes.current_power_mode;
+    case QUERY_ATTR_IDN_ACTIVE_ICC_LVL:
+        return u->attributes.active_icc_level;
+    case QUERY_ATTR_IDN_OOO_DATA_EN:
+        return u->attributes.out_of_order_data_en;
+    case QUERY_ATTR_IDN_BKOPS_STATUS:
+        return u->attributes.background_op_status;
+    case QUERY_ATTR_IDN_PURGE_STATUS:
+        return u->attributes.purge_status;
+    case QUERY_ATTR_IDN_MAX_DATA_IN:
+        return u->attributes.max_data_in_size;
+    case QUERY_ATTR_IDN_MAX_DATA_OUT:
+        return u->attributes.max_data_out_size;
+    case QUERY_ATTR_IDN_DYN_CAP_NEEDED:
+        return be32_to_cpu(u->attributes.dyn_cap_needed);
+    case QUERY_ATTR_IDN_REF_CLK_FREQ:
+        return u->attributes.ref_clk_freq;
+    case QUERY_ATTR_IDN_CONF_DESC_LOCK:
+        return u->attributes.config_descr_lock;
+    case QUERY_ATTR_IDN_MAX_NUM_OF_RTT:
+        return u->attributes.max_num_of_rtt;
+    case QUERY_ATTR_IDN_EE_CONTROL:
+        return be16_to_cpu(u->attributes.exception_event_control);
+    case QUERY_ATTR_IDN_EE_STATUS:
+        return be16_to_cpu(u->attributes.exception_event_status);
+    case QUERY_ATTR_IDN_SECONDS_PASSED:
+        return be32_to_cpu(u->attributes.seconds_passed);
+    case QUERY_ATTR_IDN_CNTX_CONF:
+        return be16_to_cpu(u->attributes.context_conf);
+    case QUERY_ATTR_IDN_FFU_STATUS:
+        return u->attributes.device_ffu_status;
+    case QUERY_ATTR_IDN_PSA_STATE:
+        return be32_to_cpu(u->attributes.psa_state);
+    case QUERY_ATTR_IDN_PSA_DATA_SIZE:
+        return be32_to_cpu(u->attributes.psa_data_size);
+    case QUERY_ATTR_IDN_REF_CLK_GATING_WAIT_TIME:
+        return u->attributes.ref_clk_gating_wait_time;
+    case QUERY_ATTR_IDN_CASE_ROUGH_TEMP:
+        return u->attributes.device_case_rough_temperaure;
+    case QUERY_ATTR_IDN_HIGH_TEMP_BOUND:
+        return u->attributes.device_too_high_temp_boundary;
+    case QUERY_ATTR_IDN_LOW_TEMP_BOUND:
+        return u->attributes.device_too_low_temp_boundary;
+    case QUERY_ATTR_IDN_THROTTLING_STATUS:
+        return u->attributes.throttling_status;
+    case QUERY_ATTR_IDN_WB_FLUSH_STATUS:
+        return u->attributes.wb_buffer_flush_status;
+    case QUERY_ATTR_IDN_AVAIL_WB_BUFF_SIZE:
+        return u->attributes.available_wb_buffer_size;
+    case QUERY_ATTR_IDN_WB_BUFF_LIFE_TIME_EST:
+        return u->attributes.wb_buffer_life_time_est;
+    case QUERY_ATTR_IDN_CURR_WB_BUFF_SIZE:
+        return be32_to_cpu(u->attributes.current_wb_buffer_size);
+    case QUERY_ATTR_IDN_REFRESH_STATUS:
+        return u->attributes.refresh_status;
+    case QUERY_ATTR_IDN_REFRESH_FREQ:
+        return u->attributes.refresh_freq;
+    case QUERY_ATTR_IDN_REFRESH_UNIT:
+        return u->attributes.refresh_unit;
+    }
+    return 0;
+}
+
+static void ufs_write_attr_value(UfsHc *u, uint8_t idn, uint32_t value)
+{
+    switch (idn) {
+    case QUERY_ATTR_IDN_ACTIVE_ICC_LVL:
+        u->attributes.active_icc_level = value;
+        break;
+    case QUERY_ATTR_IDN_MAX_DATA_IN:
+        u->attributes.max_data_in_size = value;
+        break;
+    case QUERY_ATTR_IDN_MAX_DATA_OUT:
+        u->attributes.max_data_out_size = value;
+        break;
+    case QUERY_ATTR_IDN_REF_CLK_FREQ:
+        u->attributes.ref_clk_freq = value;
+        break;
+    case QUERY_ATTR_IDN_MAX_NUM_OF_RTT:
+        u->attributes.max_num_of_rtt = value;
+        break;
+    case QUERY_ATTR_IDN_EE_CONTROL:
+        u->attributes.exception_event_control = cpu_to_be16(value);
+        break;
+    case QUERY_ATTR_IDN_SECONDS_PASSED:
+        u->attributes.seconds_passed = cpu_to_be32(value);
+        break;
+    case QUERY_ATTR_IDN_PSA_STATE:
+        u->attributes.psa_state = value;
+        break;
+    case QUERY_ATTR_IDN_PSA_DATA_SIZE:
+        u->attributes.psa_data_size = cpu_to_be32(value);
+        break;
+    }
+}
+
+static QueryRespCode ufs_exec_query_attr(UfsRequest *req, int op)
+{
+    UfsHc *u = req->hc;
+    uint8_t idn = req->req_upiu.qr.idn;
+    uint32_t value;
+    QueryRespCode ret;
+
+    ret = ufs_attr_check_idn_valid(idn, op);
+    if (ret) {
+        return ret;
+    }
+
+    if (op == UFS_QUERY_ATTR_READ) {
+        value = ufs_read_attr_value(u, idn);
+    } else {
+        value = be32_to_cpu(req->req_upiu.qr.value);
+        ufs_write_attr_value(u, idn, value);
+    }
+
+    req->rsp_upiu.qr.value = cpu_to_be32(value);
+    return QUERY_RESULT_SUCCESS;
+}
+
+static const RpmbUnitDescriptor rpmb_unit_desc = {
+    .length = sizeof(RpmbUnitDescriptor),
+    .descriptor_idn = 2,
+    .unit_index = UFS_UPIU_RPMB_WLUN,
+    .lu_enable = 0,
+};
+
+static QueryRespCode ufs_read_unit_desc(UfsRequest *req)
+{
+    uint8_t lun = req->req_upiu.qr.index;
+
+    if (lun != UFS_UPIU_RPMB_WLUN && lun > UFS_MAX_LUS) {
+        trace_ufs_err_query_invalid_index(req->req_upiu.qr.opcode, lun);
+        return QUERY_RESULT_INVALID_INDEX;
+    }
+
+    if (lun == UFS_UPIU_RPMB_WLUN) {
+        memcpy(&req->rsp_upiu.qr.data, &rpmb_unit_desc, rpmb_unit_desc.length);
+    } else {
+        /* unit descriptor is not yet supported */
+        return QUERY_RESULT_INVALID_INDEX;
+    }
+
+    return QUERY_RESULT_SUCCESS;
+}
+
+static inline StringDescriptor manufacturer_str_desc(void)
+{
+    StringDescriptor desc = {
+        .length = 0x12,
+        .descriptor_idn = QUERY_DESC_IDN_STRING,
+    };
+    desc.UC[0] = cpu_to_be16('R');
+    desc.UC[1] = cpu_to_be16('E');
+    desc.UC[2] = cpu_to_be16('D');
+    desc.UC[3] = cpu_to_be16('H');
+    desc.UC[4] = cpu_to_be16('A');
+    desc.UC[5] = cpu_to_be16('T');
+    return desc;
+}
+
+static inline StringDescriptor product_name_str_desc(void)
+{
+    StringDescriptor desc = {
+        .length = 0x22,
+        .descriptor_idn = QUERY_DESC_IDN_STRING,
+    };
+    desc.UC[0] = cpu_to_be16('Q');
+    desc.UC[1] = cpu_to_be16('E');
+    desc.UC[2] = cpu_to_be16('M');
+    desc.UC[3] = cpu_to_be16('U');
+    desc.UC[4] = cpu_to_be16(' ');
+    desc.UC[5] = cpu_to_be16('U');
+    desc.UC[6] = cpu_to_be16('F');
+    desc.UC[7] = cpu_to_be16('S');
+    return desc;
+}
+
+static inline StringDescriptor product_rev_level_str_desc(void)
+{
+    StringDescriptor desc = {
+        .length = 0x0a,
+        .descriptor_idn = QUERY_DESC_IDN_STRING,
+    };
+    desc.UC[0] = cpu_to_be16('0');
+    desc.UC[1] = cpu_to_be16('0');
+    desc.UC[2] = cpu_to_be16('0');
+    desc.UC[3] = cpu_to_be16('1');
+    return desc;
+}
+
+static const StringDescriptor null_str_desc = {
+    .length = 0x02,
+    .descriptor_idn = QUERY_DESC_IDN_STRING,
+};
+
+static QueryRespCode ufs_read_string_desc(UfsRequest *req)
+{
+    UfsHc *u = req->hc;
+    uint8_t index = req->req_upiu.qr.index;
+    StringDescriptor desc;
+
+    if (index == u->device_desc.manufacturer_name) {
+        desc = manufacturer_str_desc();
+        memcpy(&req->rsp_upiu.qr.data, &desc, desc.length);
+    } else if (index == u->device_desc.product_name) {
+        desc = product_name_str_desc();
+        memcpy(&req->rsp_upiu.qr.data, &desc, desc.length);
+    } else if (index == u->device_desc.serial_number) {
+        memcpy(&req->rsp_upiu.qr.data, &null_str_desc, null_str_desc.length);
+    } else if (index == u->device_desc.oem_id) {
+        memcpy(&req->rsp_upiu.qr.data, &null_str_desc, null_str_desc.length);
+    } else if (index == u->device_desc.product_revision_level) {
+        desc = product_rev_level_str_desc();
+        memcpy(&req->rsp_upiu.qr.data, &desc, desc.length);
+    } else {
+        trace_ufs_err_query_invalid_index(req->req_upiu.qr.opcode, index);
+        return QUERY_RESULT_INVALID_INDEX;
+    }
+    return QUERY_RESULT_SUCCESS;
+}
+
+static inline InterconnectDescriptor interconnect_desc(void)
+{
+    InterconnectDescriptor desc = {
+        .length = sizeof(InterconnectDescriptor),
+        .descriptor_idn = QUERY_DESC_IDN_INTERCONNECT,
+    };
+    desc.bcd_unipro_version = cpu_to_be16(0x180);
+    desc.bcd_mphy_version = cpu_to_be16(0x410);
+    return desc;
+}
+
+static QueryRespCode ufs_read_desc(UfsRequest *req)
+{
+    UfsHc *u = req->hc;
+    QueryRespCode status;
+    uint8_t idn = req->req_upiu.qr.idn;
+    uint16_t length = be16_to_cpu(req->req_upiu.qr.length);
+    InterconnectDescriptor desc;
+
+    switch (idn) {
+    case QUERY_DESC_IDN_DEVICE:
+        memcpy(&req->rsp_upiu.qr.data, &u->device_desc, sizeof(u->device_desc));
+        status = QUERY_RESULT_SUCCESS;
+        break;
+    case QUERY_DESC_IDN_UNIT:
+        status = ufs_read_unit_desc(req);
+        break;
+    case QUERY_DESC_IDN_GEOMETRY:
+        memcpy(&req->rsp_upiu.qr.data, &u->geometry_desc,
+               sizeof(u->geometry_desc));
+        status = QUERY_RESULT_SUCCESS;
+        break;
+    case QUERY_DESC_IDN_INTERCONNECT: {
+        desc = interconnect_desc();
+        memcpy(&req->rsp_upiu.qr.data, &desc, sizeof(InterconnectDescriptor));
+        status = QUERY_RESULT_SUCCESS;
+        break;
+    }
+    case QUERY_DESC_IDN_STRING:
+        status = ufs_read_string_desc(req);
+        break;
+    case QUERY_DESC_IDN_POWER:
+        /* mocking of power descriptor is not supported */
+        memset(&req->rsp_upiu.qr.data, 0, sizeof(PowerParametersDescriptor));
+        req->rsp_upiu.qr.data[0] = sizeof(PowerParametersDescriptor);
+        req->rsp_upiu.qr.data[1] = QUERY_DESC_IDN_POWER;
+        status = QUERY_RESULT_SUCCESS;
+        break;
+    case QUERY_DESC_IDN_HEALTH:
+        /* mocking of health descriptor is not supported */
+        memset(&req->rsp_upiu.qr.data, 0, sizeof(DeviceHealthDescriptor));
+        req->rsp_upiu.qr.data[0] = sizeof(DeviceHealthDescriptor);
+        req->rsp_upiu.qr.data[1] = QUERY_DESC_IDN_HEALTH;
+        status = QUERY_RESULT_SUCCESS;
+        break;
+    default:
+        length = 0;
+        trace_ufs_err_query_invalid_idn(req->req_upiu.qr.opcode, idn);
+        status = QUERY_RESULT_INVALID_IDN;
+    }
+
+    if (length > req->rsp_upiu.qr.data[0]) {
+        length = req->rsp_upiu.qr.data[0];
+    }
+    req->rsp_upiu.qr.opcode = req->req_upiu.qr.opcode;
+    req->rsp_upiu.qr.idn = req->req_upiu.qr.idn;
+    req->rsp_upiu.qr.index = req->req_upiu.qr.index;
+    req->rsp_upiu.qr.selector = req->req_upiu.qr.selector;
+    req->rsp_upiu.qr.length = cpu_to_be16(length);
+
+    return status;
+}
+
+static QueryRespCode ufs_exec_query_read(UfsRequest *req)
+{
+    QueryRespCode status;
+    switch (req->req_upiu.qr.opcode) {
+    case UPIU_QUERY_OPCODE_NOP:
+        status = QUERY_RESULT_SUCCESS;
+        break;
+    case UPIU_QUERY_OPCODE_READ_DESC:
+        status = ufs_read_desc(req);
+        break;
+    case UPIU_QUERY_OPCODE_READ_ATTR:
+        status = ufs_exec_query_attr(req, UFS_QUERY_ATTR_READ);
+        break;
+    case UPIU_QUERY_OPCODE_READ_FLAG:
+        status = ufs_exec_query_flag(req, UFS_QUERY_FLAG_READ);
+        break;
+    default:
+        trace_ufs_err_query_invalid_opcode(req->req_upiu.qr.opcode);
+        status = QUERY_RESULT_INVALID_OPCODE;
+        break;
+    }
+
+    return status;
+}
+
+static QueryRespCode ufs_exec_query_write(UfsRequest *req)
+{
+    QueryRespCode status;
+    switch (req->req_upiu.qr.opcode) {
+    case UPIU_QUERY_OPCODE_NOP:
+        status = QUERY_RESULT_SUCCESS;
+        break;
+    case UPIU_QUERY_OPCODE_WRITE_DESC:
+        /* write descriptor is not supported */
+        status = QUERY_RESULT_NOT_WRITEABLE;
+        break;
+    case UPIU_QUERY_OPCODE_WRITE_ATTR:
+        status = ufs_exec_query_attr(req, UFS_QUERY_ATTR_WRITE);
+        break;
+    case UPIU_QUERY_OPCODE_SET_FLAG:
+        status = ufs_exec_query_flag(req, UFS_QUERY_FLAG_SET);
+        break;
+    case UPIU_QUERY_OPCODE_CLEAR_FLAG:
+        status = ufs_exec_query_flag(req, UFS_QUERY_FLAG_CLEAR);
+        break;
+    case UPIU_QUERY_OPCODE_TOGGLE_FLAG:
+        status = ufs_exec_query_flag(req, UFS_QUERY_FLAG_TOGGLE);
+        break;
+    default:
+        trace_ufs_err_query_invalid_opcode(req->req_upiu.qr.opcode);
+        status = QUERY_RESULT_INVALID_OPCODE;
+        break;
+    }
+
+    return status;
+}
+
+static UfsReqResult ufs_exec_query_cmd(UfsRequest *req)
+{
+    uint8_t query_func = req->req_upiu.header.query_func;
+    uint16_t data_segment_length;
+    QueryRespCode status;
+
+    trace_ufs_exec_query_cmd(req->slot, req->req_upiu.qr.opcode);
+    if (query_func == UPIU_QUERY_FUNC_STANDARD_READ_REQUEST) {
+        status = ufs_exec_query_read(req);
+    } else if (query_func == UPIU_QUERY_FUNC_STANDARD_WRITE_REQUEST) {
+        status = ufs_exec_query_write(req);
+    } else {
+        status = QUERY_RESULT_GENERAL_FAILURE;
+    }
+
+    data_segment_length = be16_to_cpu(req->rsp_upiu.qr.length);
+    ufs_build_upiu_header(req, UPIU_TRANSACTION_QUERY_RSP, 0, status, 0,
+                          data_segment_length);
+
+    if (status != QUERY_RESULT_SUCCESS) {
+        return UFS_REQUEST_FAIL;
+    }
+    return UFS_REQUEST_SUCCESS;
+}
+
+static void ufs_exec_req(UfsRequest *req)
+{
+    UfsReqResult req_result;
+
+    if (ufs_dma_read_upiu(req)) {
+        return;
+    }
+
+    switch (req->req_upiu.header.trans_type) {
+    case UPIU_TRANSACTION_NOP_OUT:
+        req_result = ufs_exec_nop_cmd(req);
+        break;
+    case UPIU_TRANSACTION_COMMAND:
+        /* Not yet implemented */
+        req_result = UFS_REQUEST_FAIL;
+        break;
+    case UPIU_TRANSACTION_QUERY_REQ:
+        req_result = ufs_exec_query_cmd(req);
+        break;
+    default:
+        trace_ufs_err_invalid_trans_code(req->slot,
+                                         req->req_upiu.header.trans_type);
+        req_result = UFS_REQUEST_FAIL;
+    }
+
+    ufs_complete_req(req, req_result);
+}
+
+static void ufs_process_req(void *opaque)
+{
+    UfsHc *u = opaque;
+    UfsRequest *req;
+    int slot;
+
+    for (slot = 0; slot < u->params.nutrs; slot++) {
+        req = &u->req_list[slot];
+
+        if (req->state != UFS_REQUEST_READY) {
+            continue;
+        }
+        trace_ufs_process_req(slot);
+        req->state = UFS_REQUEST_RUNNING;
+
+        ufs_exec_req(req);
+    }
+}
+
+static void ufs_complete_req(UfsRequest *req, UfsReqResult req_result)
+{
+    UfsHc *u = req->hc;
+    assert(req->state == UFS_REQUEST_RUNNING);
+
+    if (req_result == UFS_REQUEST_SUCCESS) {
+        req->utrd.header.dword_2 = cpu_to_le32(OCS_SUCCESS);
+    } else {
+        req->utrd.header.dword_2 = cpu_to_le32(OCS_INVALID_CMD_TABLE_ATTR);
+    }
+
+    trace_ufs_complete_req(req->slot);
+    req->state = UFS_REQUEST_COMPLETE;
+    qemu_bh_schedule(u->complete_bh);
+}
+
+static void ufs_clear_req(UfsRequest *req)
+{
+    if (req->sg != NULL) {
+        qemu_sglist_destroy(req->sg);
+        g_free(req->sg);
+        req->sg = NULL;
+    }
+
+    memset(&req->utrd, 0, sizeof(req->utrd));
+    memset(&req->req_upiu, 0, sizeof(req->req_upiu));
+    memset(&req->rsp_upiu, 0, sizeof(req->rsp_upiu));
+}
+
+static void ufs_sendback_req(void *opaque)
+{
+    UfsHc *u = opaque;
+    UfsRequest *req;
+    int slot;
+
+    for (slot = 0; slot < u->params.nutrs; slot++) {
+        req = &u->req_list[slot];
+
+        if (req->state != UFS_REQUEST_COMPLETE) {
+            continue;
+        }
+
+        if (ufs_dma_write_upiu(req)) {
+            req->state = UFS_REQUEST_ERROR;
+            continue;
+        }
+
+        /*
+         * TODO: UTP Transfer Request Interrupt Aggregation Control is not yet
+         * supported
+         */
+        if (le32_to_cpu(req->utrd.header.dword_2) != OCS_SUCCESS ||
+            le32_to_cpu(req->utrd.header.dword_0) & UTP_REQ_DESC_INT_CMD) {
+            u->reg.is = FIELD_DP32(u->reg.is, IS, UTRCS, 1);
+        }
+
+        u->reg.utrldbr &= ~(1 << slot);
+        u->reg.utrlcnr |= (1 << slot);
+
+        trace_ufs_sendback_req(req->slot);
+
+        ufs_clear_req(req);
+        req->state = UFS_REQUEST_IDLE;
+    }
+
+    ufs_irq_check(u);
+}
+
 static bool ufs_check_constraints(UfsHc *u, Error **errp)
 {
     if (u->params.nutrs > UFS_MAX_NUTRS) {
@@ -XXX,XX +XXX,XX @@ static void ufs_init_pci(UfsHc *u, PCIDevice *pci_dev)
     u->irq = pci_allocate_irq(pci_dev);
 }
 
+static void ufs_init_state(UfsHc *u)
+{
+    u->req_list = g_new0(UfsRequest, u->params.nutrs);
+
+    for (int i = 0; i < u->params.nutrs; i++) {
+        u->req_list[i].hc = u;
+        u->req_list[i].slot = i;
+        u->req_list[i].sg = NULL;
+        u->req_list[i].state = UFS_REQUEST_IDLE;
+    }
+
+    u->doorbell_bh = qemu_bh_new_guarded(ufs_process_req, u,
+                                         &DEVICE(u)->mem_reentrancy_guard);
+    u->complete_bh = qemu_bh_new_guarded(ufs_sendback_req, u,
+                                         &DEVICE(u)->mem_reentrancy_guard);
+}
+
 static void ufs_init_hc(UfsHc *u)
 {
     uint32_t cap = 0;
@@ -XXX,XX +XXX,XX @@ static void ufs_init_hc(UfsHc *u)
     cap = FIELD_DP32(cap, CAP, CS, 0);
     u->reg.cap = cap;
     u->reg.ver = UFS_SPEC_VER;
+
+    memset(&u->device_desc, 0, sizeof(DeviceDescriptor));
+    u->device_desc.length = sizeof(DeviceDescriptor);
+    u->device_desc.descriptor_idn = QUERY_DESC_IDN_DEVICE;
+    u->device_desc.device_sub_class = 0x01;
+    u->device_desc.number_lu = 0x00;
+    u->device_desc.number_wlu = 0x04;
+    /* TODO: Revisit it when Power Management is implemented */
+    u->device_desc.init_power_mode = 0x01; /* Active Mode */
+    u->device_desc.high_priority_lun = 0x7F; /* Same Priority */
+    u->device_desc.spec_version = cpu_to_be16(UFS_SPEC_VER);
+    u->device_desc.manufacturer_name = 0x00;
+    u->device_desc.product_name = 0x01;
+    u->device_desc.serial_number = 0x02;
+    u->device_desc.oem_id = 0x03;
+    u->device_desc.ud_0_base_offset = 0x16;
+    u->device_desc.ud_config_p_length = 0x1A;
+    u->device_desc.device_rtt_cap = 0x02;
+    u->device_desc.queue_depth = u->params.nutrs;
+    u->device_desc.product_revision_level = 0x04;
+
+    memset(&u->geometry_desc, 0, sizeof(GeometryDescriptor));
+    u->geometry_desc.length = sizeof(GeometryDescriptor);
+    u->geometry_desc.descriptor_idn = QUERY_DESC_IDN_GEOMETRY;
+    u->geometry_desc.max_number_lu = (UFS_MAX_LUS == 32) ? 0x1 : 0x0;
+    u->geometry_desc.segment_size = cpu_to_be32(0x2000); /* 4KB */
+    u->geometry_desc.allocation_unit_size = 0x1; /* 4KB */
+    u->geometry_desc.min_addr_block_size = 0x8; /* 4KB */
+    u->geometry_desc.max_in_buffer_size = 0x8;
+    u->geometry_desc.max_out_buffer_size = 0x8;
+    u->geometry_desc.rpmb_read_write_size = 0x40;
+    u->geometry_desc.data_ordering =
+        0x0; /* out-of-order data transfer is not supported */
+    u->geometry_desc.max_context_id_number = 0x5;
+    u->geometry_desc.supported_memory_types = cpu_to_be16(0x8001);
+
+    memset(&u->attributes, 0, sizeof(u->attributes));
+    u->attributes.max_data_in_size = 0x08;
+    u->attributes.max_data_out_size = 0x08;
+    u->attributes.ref_clk_freq = 0x01; /* 26 MHz */
+    /* configure descriptor is not supported */
+    u->attributes.config_descr_lock = 0x01;
+    u->attributes.max_num_of_rtt = 0x02;
+
+    memset(&u->flags, 0, sizeof(u->flags));
+    u->flags.permanently_disable_fw_update = 1;
 }
 
 static void ufs_realize(PCIDevice *pci_dev, Error **errp)
@@ -XXX,XX +XXX,XX @@ static void ufs_realize(PCIDevice *pci_dev, Error **errp)
         return;
     }
 
+    ufs_init_state(u);
     ufs_init_hc(u);
     ufs_init_pci(u, pci_dev);
 }
 
+static void ufs_exit(PCIDevice *pci_dev)
+{
+    UfsHc *u = UFS(pci_dev);
+
+    qemu_bh_delete(u->doorbell_bh);
+    qemu_bh_delete(u->complete_bh);
+
+    for (int i = 0; i < u->params.nutrs; i++) {
+        ufs_clear_req(&u->req_list[i]);
+    }
+    g_free(u->req_list);
+}
+
 static Property ufs_props[] = {
     DEFINE_PROP_STRING("serial", UfsHc, params.serial),
     DEFINE_PROP_UINT8("nutrs", UfsHc, params.nutrs, 32),
@@ -XXX,XX +XXX,XX @@ static void ufs_class_init(ObjectClass *oc, void *data)
     PCIDeviceClass *pc = PCI_DEVICE_CLASS(oc);
 
     pc->realize = ufs_realize;
+    pc->exit = ufs_exit;
     pc->vendor_id = PCI_VENDOR_ID_REDHAT;
     pc->device_id = PCI_DEVICE_ID_REDHAT_UFS;
     pc->class_id = PCI_CLASS_STORAGE_UFS;
diff --git a/hw/ufs/trace-events b/hw/ufs/trace-events
index XXXXXXX..XXXXXXX 100644
--- a/hw/ufs/trace-events
+++ b/hw/ufs/trace-events
@@ -XXX,XX +XXX,XX @@ ufs_err_dma_read_req_upiu(uint32_t slot, uint64_t addr) "failed to read req upiu
 ufs_err_dma_read_prdt(uint32_t slot, uint64_t addr) "failed to read prdt. UTRLDBR slot %"PRIu32", prdt addr %"PRIu64""
 ufs_err_dma_write_utrd(uint32_t slot, uint64_t addr) "failed to write utrd. UTRLDBR slot %"PRIu32", UTRD dma addr %"PRIu64""
 ufs_err_dma_write_rsp_upiu(uint32_t slot, uint64_t addr) "failed to write rsp upiu. UTRLDBR slot %"PRIu32", response upiu addr %"PRIu64""
+ufs_err_utrl_slot_error(uint32_t slot) "UTRLDBR slot %"PRIu32" is in error"
 ufs_err_utrl_slot_busy(uint32_t slot) "UTRLDBR slot %"PRIu32" is busy"
 ufs_err_unsupport_register_offset(uint32_t offset) "Register offset 0x%"PRIx32" is not yet supported"
 ufs_err_invalid_register_offset(uint32_t offset) "Register offset 0x%"PRIx32" is invalid"
-- 
2.41.0

From: Jeuk Kim <jeuk20.kim@gmail.com>

This commit adds support for ufs logical unit.
The LU handles processing for the SCSI command,
unit descriptor query request.

This commit enables the UFS device to process
IO requests.

Signed-off-by: Jeuk Kim <jeuk20.kim@samsung.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: 898cea923e819dc21a99597bf045a12d7983be28.1691062912.git.jeuk20.kim@samsung.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 hw/ufs/ufs.h             |   43 ++
 include/scsi/constants.h |    1 +
 hw/ufs/lu.c              | 1445 ++++++++++++++++++++++++++++++++++++++
 hw/ufs/ufs.c             |  252 ++++++-
 hw/ufs/meson.build       |    2 +-
 hw/ufs/trace-events      |   25 +
 6 files changed, 1761 insertions(+), 7 deletions(-)
 create mode 100644 hw/ufs/lu.c

diff --git a/hw/ufs/ufs.h b/hw/ufs/ufs.h
index XXXXXXX..XXXXXXX 100644
--- a/hw/ufs/ufs.h
+++ b/hw/ufs/ufs.h
@@ -XXX,XX +XXX,XX @@
 #define UFS_MAX_LUS 32
 #define UFS_BLOCK_SIZE 4096
 
+typedef struct UfsBusClass {
+    BusClass parent_class;
+    bool (*parent_check_address)(BusState *bus, DeviceState *dev, Error **errp);
+} UfsBusClass;
+
+typedef struct UfsBus {
+    SCSIBus parent_bus;
+} UfsBus;
+
+#define TYPE_UFS_BUS "ufs-bus"
+DECLARE_OBJ_CHECKERS(UfsBus, UfsBusClass, UFS_BUS, TYPE_UFS_BUS)
+
 typedef enum UfsRequestState {
     UFS_REQUEST_IDLE = 0,
     UFS_REQUEST_READY = 1,
@@ -XXX,XX +XXX,XX @@ typedef enum UfsRequestState {
 typedef enum UfsReqResult {
     UFS_REQUEST_SUCCESS = 0,
     UFS_REQUEST_FAIL = 1,
+    UFS_REQUEST_NO_COMPLETE = 2,
 } UfsReqResult;
 
 typedef struct UfsRequest {
@@ -XXX,XX +XXX,XX @@ typedef struct UfsRequest {
     QEMUSGList *sg;
 } UfsRequest;
 
+typedef struct UfsLu {
+    SCSIDevice qdev;
+    uint8_t lun;
+    UnitDescriptor unit_desc;
+} UfsLu;
+
+typedef struct UfsWLu {
+    SCSIDevice qdev;
+    uint8_t lun;
+} UfsWLu;
+
 typedef struct UfsParams {
     char *serial;
     uint8_t nutrs; /* Number of UTP Transfer Request Slots */
@@ -XXX,XX +XXX,XX @@ typedef struct UfsParams {
 
 typedef struct UfsHc {
     PCIDevice parent_obj;
+    UfsBus bus;
     MemoryRegion iomem;
     UfsReg reg;
     UfsParams params;
     uint32_t reg_size;
     UfsRequest *req_list;
 
+    UfsLu *lus[UFS_MAX_LUS];
+    UfsWLu *report_wlu;
+    UfsWLu *dev_wlu;
+    UfsWLu *boot_wlu;
+    UfsWLu *rpmb_wlu;
     DeviceDescriptor device_desc;
     GeometryDescriptor geometry_desc;
     Attributes attributes;
@@ -XXX,XX +XXX,XX @@ typedef struct UfsHc {
 #define TYPE_UFS "ufs"
 #define UFS(obj) OBJECT_CHECK(UfsHc, (obj), TYPE_UFS)
 
+#define TYPE_UFS_LU "ufs-lu"
+#define UFSLU(obj) OBJECT_CHECK(UfsLu, (obj), TYPE_UFS_LU)
+
+#define TYPE_UFS_WLU "ufs-wlu"
+#define UFSWLU(obj) OBJECT_CHECK(UfsWLu, (obj), TYPE_UFS_WLU)
+
 typedef enum UfsQueryFlagPerm {
     UFS_QUERY_FLAG_NONE = 0x0,
     UFS_QUERY_FLAG_READ = 0x1,
@@ -XXX,XX +XXX,XX @@ typedef enum UfsQueryAttrPerm {
     UFS_QUERY_ATTR_WRITE = 0x2,
 } UfsQueryAttrPerm;
 
+static inline bool is_wlun(uint8_t lun)
+{
+    return (lun == UFS_UPIU_REPORT_LUNS_WLUN ||
+            lun == UFS_UPIU_UFS_DEVICE_WLUN || lun == UFS_UPIU_BOOT_WLUN ||
+            lun == UFS_UPIU_RPMB_WLUN);
+}
+
 #endif /* HW_UFS_UFS_H */
diff --git a/include/scsi/constants.h b/include/scsi/constants.h
index XXXXXXX..XXXXXXX 100644
--- a/include/scsi/constants.h
+++ b/include/scsi/constants.h
@@ -XXX,XX +XXX,XX @@
 #define MODE_PAGE_FLEXIBLE_DISK_GEOMETRY      0x05
 #define MODE_PAGE_CACHING                     0x08
 #define MODE_PAGE_AUDIO_CTL                   0x0e
+#define MODE_PAGE_CONTROL                     0x0a
 #define MODE_PAGE_POWER                       0x1a
 #define MODE_PAGE_FAULT_FAIL                  0x1c
 #define MODE_PAGE_TO_PROTECT                  0x1d
diff --git a/hw/ufs/lu.c b/hw/ufs/lu.c
new file mode 100644
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/hw/ufs/lu.c
@@ -XXX,XX +XXX,XX @@
+/*
+ * QEMU UFS Logical Unit
+ *
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd. All rights reserved.
+ *
+ * Written by Jeuk Kim <jeuk20.kim@samsung.com>
+ *
+ * This code is licensed under the GNU GPL v2 or later.
+ */
+
+#include "qemu/osdep.h"
+#include "qemu/units.h"
+#include "qapi/error.h"
+#include "qemu/memalign.h"
+#include "hw/scsi/scsi.h"
+#include "scsi/constants.h"
+#include "sysemu/block-backend.h"
+#include "qemu/cutils.h"
+#include "trace.h"
+#include "ufs.h"
+
+/*
+ * The code below handling SCSI commands is copied from hw/scsi/scsi-disk.c,
+ * with minor adjustments to make it work for UFS.
+ */
+
+#define SCSI_DMA_BUF_SIZE (128 * KiB)
+#define SCSI_MAX_INQUIRY_LEN 256
+#define SCSI_INQUIRY_DATA_SIZE 36
+#define SCSI_MAX_MODE_LEN 256
+
+typedef struct UfsSCSIReq {
+    SCSIRequest req;
+    /* Both sector and sector_count are in terms of BDRV_SECTOR_SIZE bytes.  */
+    uint64_t sector;
+    uint32_t sector_count;
+    uint32_t buflen;
+    bool started;
+    bool need_fua_emulation;
+    struct iovec iov;
+    QEMUIOVector qiov;
+    BlockAcctCookie acct;
+} UfsSCSIReq;
+
+static void ufs_scsi_free_request(SCSIRequest *req)
+{
+    UfsSCSIReq *r = DO_UPCAST(UfsSCSIReq, req, req);
+
+    qemu_vfree(r->iov.iov_base);
+}
+
+static void scsi_check_condition(UfsSCSIReq *r, SCSISense sense)
+{
+    trace_ufs_scsi_check_condition(r->req.tag, sense.key, sense.asc,
+                                   sense.ascq);
+    scsi_req_build_sense(&r->req, sense);
+    scsi_req_complete(&r->req, CHECK_CONDITION);
+}
+
+static int ufs_scsi_emulate_vpd_page(SCSIRequest *req, uint8_t *outbuf,
+                                     uint32_t outbuf_len)
+{
+    UfsHc *u = UFS(req->bus->qbus.parent);
+    UfsLu *lu = DO_UPCAST(UfsLu, qdev, req->dev);
+    uint8_t page_code = req->cmd.buf[2];
+    int start, buflen = 0;
+
+    if (outbuf_len < SCSI_INQUIRY_DATA_SIZE) {
+        return -1;
+    }
+
+    outbuf[buflen++] = lu->qdev.type & 0x1f;
+    outbuf[buflen++] = page_code;
+    outbuf[buflen++] = 0x00;
+    outbuf[buflen++] = 0x00;
+    start = buflen;
+
+    switch (page_code) {
+    case 0x00: /* Supported page codes, mandatory */
+    {
+        trace_ufs_scsi_emulate_vpd_page_00(req->cmd.xfer);
+        outbuf[buflen++] = 0x00; /* list of supported pages (this page) */
+        if (u->params.serial) {
+            outbuf[buflen++] = 0x80; /* unit serial number */
+        }
+        outbuf[buflen++] = 0x87; /* mode page policy */
+        break;
+    }
+    case 0x80: /* Device serial number, optional */
+    {
+        int l;
+
+        if (!u->params.serial) {
+            trace_ufs_scsi_emulate_vpd_page_80_not_supported();
+            return -1;
+        }
+
+        l = strlen(u->params.serial);
+        if (l > SCSI_INQUIRY_DATA_SIZE) {
+            l = SCSI_INQUIRY_DATA_SIZE;
+        }
+
+        trace_ufs_scsi_emulate_vpd_page_80(req->cmd.xfer);
+        memcpy(outbuf + buflen, u->params.serial, l);
+        buflen += l;
+        break;
+    }
+    case 0x87: /* Mode Page Policy, mandatory */
+    {
+        trace_ufs_scsi_emulate_vpd_page_87(req->cmd.xfer);
+        outbuf[buflen++] = 0x3f; /* apply to all mode pages and subpages */
+        outbuf[buflen++] = 0xff;
+        outbuf[buflen++] = 0; /* shared */
+        outbuf[buflen++] = 0;
+        break;
+    }
+    default:
+        return -1;
+    }
+    /* done with EVPD */
+    assert(buflen - start <= 255);
+    outbuf[start - 1] = buflen - start;
+    return buflen;
+}
+
+static int ufs_scsi_emulate_inquiry(SCSIRequest *req, uint8_t *outbuf,
+                                    uint32_t outbuf_len)
+{
+    int buflen = 0;
+
+    if (outbuf_len < SCSI_INQUIRY_DATA_SIZE) {
+        return -1;
+    }
+
+    if (req->cmd.buf[1] & 0x1) {
+        /* Vital product data */
+        return ufs_scsi_emulate_vpd_page(req, outbuf, outbuf_len);
+    }
+
+    /* Standard INQUIRY data */
+    if (req->cmd.buf[2] != 0) {
+        return -1;
+    }
+
+    /* PAGE CODE == 0 */
+    buflen = req->cmd.xfer;
+    if (buflen > SCSI_MAX_INQUIRY_LEN) {
+        buflen = SCSI_MAX_INQUIRY_LEN;
+    }
+
+    if (is_wlun(req->lun)) {
+        outbuf[0] = TYPE_WLUN;
+    } else {
+        outbuf[0] = 0;
+    }
+    outbuf[1] = 0;
+
+    strpadcpy((char *)&outbuf[16], 16, "QEMU UFS", ' ');
+    strpadcpy((char *)&outbuf[8], 8, "QEMU", ' ');
+
+    memset(&outbuf[32], 0, 4);
+
+    outbuf[2] = 0x06; /* SPC-4 */
+    outbuf[3] = 0x2;
+
+    if (buflen > SCSI_INQUIRY_DATA_SIZE) {
+        outbuf[4] = buflen - 5; /* Additional Length = (Len - 1) - 4 */
+    } else {
+        /*
+         * If the allocation length of CDB is too small, the additional
+         * length is not adjusted
+         */
+        outbuf[4] = SCSI_INQUIRY_DATA_SIZE - 5;
+    }
+
+    /* Support TCQ.  */
+    outbuf[7] = req->bus->info->tcq ? 0x02 : 0;
+    return buflen;
+}
+
+static int mode_sense_page(UfsLu *lu, int page, uint8_t **p_outbuf,
+                           int page_control)
+{
+    static const int mode_sense_valid[0x3f] = {
+        [MODE_PAGE_CACHING] = 1,
+        [MODE_PAGE_R_W_ERROR] = 1,
+        [MODE_PAGE_CONTROL] = 1,
+    };
+
+    uint8_t *p = *p_outbuf + 2;
+    int length;
+
+    assert(page < ARRAY_SIZE(mode_sense_valid));
+    if ((mode_sense_valid[page]) == 0) {
+        return -1;
+    }
+
+    /*
+     * If Changeable Values are requested, a mask denoting those mode parameters
+     * that are changeable shall be returned. As we currently don't support
+     * parameter changes via MODE_SELECT all bits are returned set to zero.
+     * The buffer was already memset to zero by the caller of this function.
+     */
+    switch (page) {
+    case MODE_PAGE_CACHING:
+        length = 0x12;
+        if (page_control == 1 || /* Changeable Values */
+            blk_enable_write_cache(lu->qdev.conf.blk)) {
+            p[0] = 4; /* WCE */
+        }
+        break;
+
+    case MODE_PAGE_R_W_ERROR:
+        length = 10;
+        if (page_control == 1) { /* Changeable Values */
+            break;
+        }
+        p[0] = 0x80; /* Automatic Write Reallocation Enabled */
+        break;
+
+    case MODE_PAGE_CONTROL:
+        length = 10;
+        if (page_control == 1) { /* Changeable Values */
+            break;
+        }
+        p[1] = 0x10; /* Queue Algorithm modifier */
+        p[8] = 0xff; /* Busy Timeout Period */
+        p[9] = 0xff;
+        break;
+
+    default:
+        return -1;
+    }
+
+    assert(length < 256);
+    (*p_outbuf)[0] = page;
+    (*p_outbuf)[1] = length;
+    *p_outbuf += length + 2;
+    return length + 2;
+}
+
+static int ufs_scsi_emulate_mode_sense(UfsSCSIReq *r, uint8_t *outbuf)
+{
+    UfsLu *lu = DO_UPCAST(UfsLu, qdev, r->req.dev);
+    bool dbd;
+    int page, buflen, ret, page_control;
+    uint8_t *p;
+    uint8_t dev_specific_param = 0;
+
+    dbd = (r->req.cmd.buf[1] & 0x8) != 0;
+    if (!dbd) {
+        return -1;
+    }
+
+    page = r->req.cmd.buf[2] & 0x3f;
+    page_control = (r->req.cmd.buf[2] & 0xc0) >> 6;
+
+    trace_ufs_scsi_emulate_mode_sense((r->req.cmd.buf[0] == MODE_SENSE) ? 6 :
+                                                                          10,
+                                      page, r->req.cmd.xfer, page_control);
+    memset(outbuf, 0, r->req.cmd.xfer);
+    p = outbuf;
+
+    if (!blk_is_writable(lu->qdev.conf.blk)) {
+        dev_specific_param |= 0x80; /* Readonly.  */
+    }
+
+    p[2] = 0; /* Medium type.  */
+    p[3] = dev_specific_param;
+    p[6] = p[7] = 0; /* Block descriptor length.  */
+    p += 8;
+
+    if (page_control == 3) {
+        /* Saved Values */
+        scsi_check_condition(r, SENSE_CODE(SAVING_PARAMS_NOT_SUPPORTED));
+        return -1;
+    }
+
+    if (page == 0x3f) {
+        for (page = 0; page <= 0x3e; page++) {
+            mode_sense_page(lu, page, &p, page_control);
+        }
+    } else {
+        ret = mode_sense_page(lu, page, &p, page_control);
+        if (ret == -1) {
+            return -1;
+        }
+    }
+
+    buflen = p - outbuf;
+    /*
+     * The mode data length field specifies the length in bytes of the
+     * following data that is available to be transferred. The mode data
+     * length does not include itself.
+     */
+    outbuf[0] = ((buflen - 2) >> 8) & 0xff;
+    outbuf[1] = (buflen - 2) & 0xff;
+    return buflen;
+}
+
+/*
+ * scsi_handle_rw_error has two return values.  False means that the error
+ * must be ignored, true means that the error has been processed and the
+ * caller should not do anything else for this request.  Note that
+ * scsi_handle_rw_error always manages its reference counts, independent
+ * of the return value.
+ */
+static bool scsi_handle_rw_error(UfsSCSIReq *r, int ret, bool acct_failed)
+{
+    bool is_read = (r->req.cmd.mode == SCSI_XFER_FROM_DEV);
+    UfsLu *lu = DO_UPCAST(UfsLu, qdev, r->req.dev);
+    SCSISense sense = SENSE_CODE(NO_SENSE);
+    int error = 0;
+    bool req_has_sense = false;
+    BlockErrorAction action;
+    int status;
+
+    if (ret < 0) {
+        status = scsi_sense_from_errno(-ret, &sense);
+        error = -ret;
+    } else {
+        /* A passthrough command has completed with nonzero status.  */
+        status = ret;
+        if (status == CHECK_CONDITION) {
+            req_has_sense = true;
+            error = scsi_sense_buf_to_errno(r->req.sense, sizeof(r->req.sense));
+        } else {
+            error = EINVAL;
+        }
+    }
+
+    /*
+     * Check whether the error has to be handled by the guest or should
+     * rather follow the rerror=/werror= settings.  Guest-handled errors
+     * are usually retried immediately, so do not post them to QMP and
+     * do not account them as failed I/O.
+     */
+    if (req_has_sense && scsi_sense_buf_is_guest_recoverable(
+                             r->req.sense, sizeof(r->req.sense))) {
+        action = BLOCK_ERROR_ACTION_REPORT;
+        acct_failed = false;
+    } else {
+        action = blk_get_error_action(lu->qdev.conf.blk, is_read, error);
+        blk_error_action(lu->qdev.conf.blk, action, is_read, error);
+    }
+
+    switch (action) {
+    case BLOCK_ERROR_ACTION_REPORT:
+        if (acct_failed) {
+            block_acct_failed(blk_get_stats(lu->qdev.conf.blk), &r->acct);
+        }
+        if (!req_has_sense && status == CHECK_CONDITION) {
+            scsi_req_build_sense(&r->req, sense);
+        }
+        scsi_req_complete(&r->req, status);
+        return true;
+
+    case BLOCK_ERROR_ACTION_IGNORE:
+        return false;
+
+    case BLOCK_ERROR_ACTION_STOP:
+        scsi_req_retry(&r->req);
+        return true;
+
+    default:
+        g_assert_not_reached();
+    }
+}
+
+static bool ufs_scsi_req_check_error(UfsSCSIReq *r, int ret, bool acct_failed)
+{
+    if (r->req.io_canceled) {
+        scsi_req_cancel_complete(&r->req);
+        return true;
+    }
+
+    if (ret < 0) {
+        return scsi_handle_rw_error(r, ret, acct_failed);
+    }
+
+    return false;
+}
+
+static void scsi_aio_complete(void *opaque, int ret)
+{
+    UfsSCSIReq *r = (UfsSCSIReq *)opaque;
+    UfsLu *lu = DO_UPCAST(UfsLu, qdev, r->req.dev);
+
+    assert(r->req.aiocb != NULL);
+    r->req.aiocb = NULL;
+    aio_context_acquire(blk_get_aio_context(lu->qdev.conf.blk));
+    if (ufs_scsi_req_check_error(r, ret, true)) {
+        goto done;
+    }
+
+    block_acct_done(blk_get_stats(lu->qdev.conf.blk), &r->acct);
+    scsi_req_complete(&r->req, GOOD);
+
+done:
+    aio_context_release(blk_get_aio_context(lu->qdev.conf.blk));
+    scsi_req_unref(&r->req);
+}
+
+static int32_t ufs_scsi_emulate_command(SCSIRequest *req, uint8_t *buf)
+{
+    UfsSCSIReq *r = DO_UPCAST(UfsSCSIReq, req, req);
+    UfsLu *lu = DO_UPCAST(UfsLu, qdev, req->dev);
+    uint32_t last_block = 0;
+    uint8_t *outbuf;
+    int buflen;
+
+    switch (req->cmd.buf[0]) {
+    case INQUIRY:
+    case MODE_SENSE_10:
+    case START_STOP:
+    case REQUEST_SENSE:
+        break;
+
+    default:
+        if (!blk_is_available(lu->qdev.conf.blk)) {
+            scsi_check_condition(r, SENSE_CODE(NO_MEDIUM));
+            return 0;
+        }
+        break;
+    }
+
+    /*
+     * FIXME: we shouldn't return anything bigger than 4k, but the code
+     * requires the buffer to be as big as req->cmd.xfer in several
+     * places.  So, do not allow CDBs with a very large ALLOCATION
+     * LENGTH.  The real fix would be to modify scsi_read_data and
+     * dma_buf_read, so that they return data beyond the buflen
+     * as all zeros.
+     */
+    if (req->cmd.xfer > 65536) {
+        goto illegal_request;
+    }
+    r->buflen = MAX(4096, req->cmd.xfer);
+
+    if (!r->iov.iov_base) {
+        r->iov.iov_base = blk_blockalign(lu->qdev.conf.blk, r->buflen);
+    }
+
+    outbuf = r->iov.iov_base;
+    memset(outbuf, 0, r->buflen);
+    switch (req->cmd.buf[0]) {
+    case TEST_UNIT_READY:
+        assert(blk_is_available(lu->qdev.conf.blk));
+        break;
+    case INQUIRY:
+        buflen = ufs_scsi_emulate_inquiry(req, outbuf, r->buflen);
+        if (buflen < 0) {
+            goto illegal_request;
+        }
+        break;
+    case MODE_SENSE_10:
+        buflen = ufs_scsi_emulate_mode_sense(r, outbuf);
+        if (buflen < 0) {
+            goto illegal_request;
+        }
+        break;
+    case READ_CAPACITY_10:
+        /* The normal LEN field for this command is zero.  */
+        memset(outbuf, 0, 8);
+        if (lu->qdev.max_lba > 0) {
+            last_block = lu->qdev.max_lba - 1;
+        };
+        outbuf[0] = (last_block >> 24) & 0xff;
+        outbuf[1] = (last_block >> 16) & 0xff;
+        outbuf[2] = (last_block >> 8) & 0xff;
+        outbuf[3] = last_block & 0xff;
+        outbuf[4] = (lu->qdev.blocksize >> 24) & 0xff;
+        outbuf[5] = (lu->qdev.blocksize >> 16) & 0xff;
+        outbuf[6] = (lu->qdev.blocksize >> 8) & 0xff;
+        outbuf[7] = lu->qdev.blocksize & 0xff;
+        break;
+    case REQUEST_SENSE:
+        /* Just return "NO SENSE".  */
+        buflen = scsi_convert_sense(NULL, 0, outbuf, r->buflen,
+                                    (req->cmd.buf[1] & 1) == 0);
+        if (buflen < 0) {
+            goto illegal_request;
+        }
+        break;
+    case SYNCHRONIZE_CACHE:
+        /* The request is used as the AIO opaque value, so add a ref.  */
+        scsi_req_ref(&r->req);
+        block_acct_start(blk_get_stats(lu->qdev.conf.blk), &r->acct, 0,
+                         BLOCK_ACCT_FLUSH);
+        r->req.aiocb = blk_aio_flush(lu->qdev.conf.blk, scsi_aio_complete, r);
+        return 0;
+    case VERIFY_10:
+        trace_ufs_scsi_emulate_command_VERIFY((req->cmd.buf[1] >> 1) & 3);
+        if (req->cmd.buf[1] & 6) {
+            goto illegal_request;
+        }
+        break;
+    case SERVICE_ACTION_IN_16:
+        /* Service Action In subcommands. */
+        if ((req->cmd.buf[1] & 31) == SAI_READ_CAPACITY_16) {
+            trace_ufs_scsi_emulate_command_SAI_16();
+            memset(outbuf, 0, req->cmd.xfer);
+
+            if (lu->qdev.max_lba > 0) {
+                last_block = lu->qdev.max_lba - 1;
+            };
+            outbuf[0] = 0;
+            outbuf[1] = 0;
+            outbuf[2] = 0;
+            outbuf[3] = 0;
+            outbuf[4] = (last_block >> 24) & 0xff;
+            outbuf[5] = (last_block >> 16) & 0xff;
+            outbuf[6] = (last_block >> 8) & 0xff;
+            outbuf[7] = last_block & 0xff;
+            outbuf[8] = (lu->qdev.blocksize >> 24) & 0xff;
+            outbuf[9] = (lu->qdev.blocksize >> 16) & 0xff;
+            outbuf[10] = (lu->qdev.blocksize >> 8) & 0xff;
+            outbuf[11] = lu->qdev.blocksize & 0xff;
+            outbuf[12] = 0;
+            outbuf[13] = get_physical_block_exp(&lu->qdev.conf);
+
+            if (lu->unit_desc.provisioning_type == 2 ||
+                lu->unit_desc.provisioning_type == 3) {
+                outbuf[14] = 0x80;
+            }
+            /* Protection, exponent and lowest lba field left blank. */
+            break;
+        }
+        trace_ufs_scsi_emulate_command_SAI_unsupported();
+        goto illegal_request;
+    case MODE_SELECT_10:
+        trace_ufs_scsi_emulate_command_MODE_SELECT_10(r->req.cmd.xfer);
+        break;
+    case START_STOP:
+        /*
+         * TODO: START_STOP is not yet implemented. It always returns success.
+         * Revisit it when ufs power management is implemented.
+         */
+        trace_ufs_scsi_emulate_command_START_STOP();
+        break;
+    case FORMAT_UNIT:
+        trace_ufs_scsi_emulate_command_FORMAT_UNIT();
+        break;
+    case SEND_DIAGNOSTIC:
+        trace_ufs_scsi_emulate_command_SEND_DIAGNOSTIC();
+        break;
+    default:
+        trace_ufs_scsi_emulate_command_UNKNOWN(buf[0],
+                                               scsi_command_name(buf[0]));
+        scsi_check_condition(r, SENSE_CODE(INVALID_OPCODE));
+        return 0;
+    }
+    assert(!r->req.aiocb);
+    r->iov.iov_len = MIN(r->buflen, req->cmd.xfer);
+    if (r->iov.iov_len == 0) {
+        scsi_req_complete(&r->req, GOOD);
+    }
+    if (r->req.cmd.mode == SCSI_XFER_TO_DEV) {
+        assert(r->iov.iov_len == req->cmd.xfer);
+        return -r->iov.iov_len;
+    } else {
+        return r->iov.iov_len;
+    }
+
+illegal_request:
+    if (r->req.status == -1) {
+        scsi_check_condition(r, SENSE_CODE(INVALID_FIELD));
+    }
+    return 0;
+}
+
+static void ufs_scsi_emulate_read_data(SCSIRequest *req)
+{
+    UfsSCSIReq *r = DO_UPCAST(UfsSCSIReq, req, req);
+    int buflen = r->iov.iov_len;
+
+    if (buflen) {
+        trace_ufs_scsi_emulate_read_data(buflen);
+        r->iov.iov_len = 0;
+        r->started = true;
+        scsi_req_data(&r->req, buflen);
+        return;
+    }
+
+    /* This also clears the sense buffer for REQUEST SENSE.  */
+    scsi_req_complete(&r->req, GOOD);
+}
+
+static int ufs_scsi_check_mode_select(UfsLu *lu, int page, uint8_t *inbuf,
+                                      int inlen)
+{
+    uint8_t mode_current[SCSI_MAX_MODE_LEN];
+    uint8_t mode_changeable[SCSI_MAX_MODE_LEN];
+    uint8_t *p;
+    int len, expected_len, changeable_len, i;
+
+    /*
+     * The input buffer does not include the page header, so it is
+     * off by 2 bytes.
+     */
+    expected_len = inlen + 2;
+    if (expected_len > SCSI_MAX_MODE_LEN) {
+        return -1;
+    }
+
+    /* MODE_PAGE_ALLS is only valid for MODE SENSE commands */
+    if (page == MODE_PAGE_ALLS) {
+        return -1;
+    }
+
+    p = mode_current;
+    memset(mode_current, 0, inlen + 2);
+    len = mode_sense_page(lu, page, &p, 0);
+    if (len < 0 || len != expected_len) {
+        return -1;
+    }
+
+    p = mode_changeable;
+    memset(mode_changeable, 0, inlen + 2);
+    changeable_len = mode_sense_page(lu, page, &p, 1);
+    assert(changeable_len == len);
+
+    /*
+     * Check that unchangeable bits are the same as what MODE SENSE
+     * would return.
+     */
+    for (i = 2; i < len; i++) {
+        if (((mode_current[i] ^ inbuf[i - 2]) & ~mode_changeable[i]) != 0) {
+            return -1;
+        }
+    }
+    return 0;
+}
+
+static void ufs_scsi_apply_mode_select(UfsLu *lu, int page, uint8_t *p)
+{
+    switch (page) {
+    case MODE_PAGE_CACHING:
+        blk_set_enable_write_cache(lu->qdev.conf.blk, (p[0] & 4) != 0);
+        break;
+
+    default:
+        break;
+    }
+}
+
+static int mode_select_pages(UfsSCSIReq *r, uint8_t *p, int len, bool change)
+{
+    UfsLu *lu = DO_UPCAST(UfsLu, qdev, r->req.dev);
+
+    while (len > 0) {
+        int page, page_len;
+
+        page = p[0] & 0x3f;
+        if (p[0] & 0x40) {
+            goto invalid_param;
+        } else {
+            if (len < 2) {
+                goto invalid_param_len;
+            }
+            page_len = p[1];
+            p += 2;
+            len -= 2;
+        }
+
+        if (page_len > len) {
+            goto invalid_param_len;
+        }
+
+        if (!change) {
+            if (ufs_scsi_check_mode_select(lu, page, p, page_len) < 0) {
+                goto invalid_param;
+            }
+        } else {
+            ufs_scsi_apply_mode_select(lu, page, p);
+        }
+
+        p += page_len;
+        len -= page_len;
+    }
+    return 0;
+
+invalid_param:
+    scsi_check_condition(r, SENSE_CODE(INVALID_PARAM));
+    return -1;
+
+invalid_param_len:
+    scsi_check_condition(r, SENSE_CODE(INVALID_PARAM_LEN));
+    return -1;
+}
+
+static void ufs_scsi_emulate_mode_select(UfsSCSIReq *r, uint8_t *inbuf)
+{
+    UfsLu *lu = DO_UPCAST(UfsLu, qdev, r->req.dev);
+    uint8_t *p = inbuf;
+    int len = r->req.cmd.xfer;
+    int hdr_len = 8;
+    int bd_len;
+    int pass;
+
+    /* We only support PF=1, SP=0.  */
+    if ((r->req.cmd.buf[1] & 0x11) != 0x10) {
+        goto invalid_field;
+    }
+
+    if (len < hdr_len) {
+        goto invalid_param_len;
+    }
+
+    bd_len = lduw_be_p(&p[6]);
+    if (bd_len != 0) {
+        goto invalid_param;
+    }
+
+    len -= hdr_len;
+    p += hdr_len;
+
+    /* Ensure no change is made if there is an error!  */
+    for (pass = 0; pass < 2; pass++) {
+        if (mode_select_pages(r, p, len, pass == 1) < 0) {
+            assert(pass == 0);
+            return;
+        }
+    }
+
+    if (!blk_enable_write_cache(lu->qdev.conf.blk)) {
+        /* The request is used as the AIO opaque value, so add a ref.  */
+        scsi_req_ref(&r->req);
+        block_acct_start(blk_get_stats(lu->qdev.conf.blk), &r->acct, 0,
+                         BLOCK_ACCT_FLUSH);
+        r->req.aiocb = blk_aio_flush(lu->qdev.conf.blk, scsi_aio_complete, r);
+        return;
+    }
+
+    scsi_req_complete(&r->req, GOOD);
+    return;
+
+invalid_param:
+    scsi_check_condition(r, SENSE_CODE(INVALID_PARAM));
+    return;
+
+invalid_param_len:
+    scsi_check_condition(r, SENSE_CODE(INVALID_PARAM_LEN));
+    return;
+
+invalid_field:
+    scsi_check_condition(r, SENSE_CODE(INVALID_FIELD));
+}
+
+/* block_num and nb_blocks expected to be in qdev blocksize */
+static inline bool check_lba_range(UfsLu *lu, uint64_t block_num,
+                                   uint32_t nb_blocks)
+{
+    /*
+     * The first line tests that no overflow happens when computing the last
+     * block.  The second line tests that the last accessed block is in
+     * range.
+     *
+     * Careful, the computations should not underflow for nb_blocks == 0,
+     * and a 0-block read to the first LBA beyond the end of device is
+     * valid.
+     */
+    return (block_num <= block_num + nb_blocks &&
+            block_num + nb_blocks <= lu->qdev.max_lba + 1);
+}
+
+static void ufs_scsi_emulate_write_data(SCSIRequest *req)
+{
+    UfsSCSIReq *r = DO_UPCAST(UfsSCSIReq, req, req);
+
+    if (r->iov.iov_len) {
+        int buflen = r->iov.iov_len;
+        trace_ufs_scsi_emulate_write_data(buflen);
+        r->iov.iov_len = 0;
+        scsi_req_data(&r->req, buflen);
+        return;
+    }
+
+    switch (req->cmd.buf[0]) {
+    case MODE_SELECT_10:
+        /* This also clears the sense buffer for REQUEST SENSE.  */
+        ufs_scsi_emulate_mode_select(r, r->iov.iov_base);
+        break;
+    default:
+        abort();
+    }
+}
+
+/* Return a pointer to the data buffer.  */
+static uint8_t *ufs_scsi_get_buf(SCSIRequest *req)
+{
+    UfsSCSIReq *r = DO_UPCAST(UfsSCSIReq, req, req);
+
+    return (uint8_t *)r->iov.iov_base;
+}
+
+static int32_t ufs_scsi_dma_command(SCSIRequest *req, uint8_t *buf)
+{
+    UfsSCSIReq *r = DO_UPCAST(UfsSCSIReq, req, req);
+    UfsLu *lu = DO_UPCAST(UfsLu, qdev, req->dev);
+    uint32_t len;
+    uint8_t command;
+
+    command = buf[0];
+
+    if (!blk_is_available(lu->qdev.conf.blk)) {
+        scsi_check_condition(r, SENSE_CODE(NO_MEDIUM));
+        return 0;
+    }
+
+    len = scsi_data_cdb_xfer(r->req.cmd.buf);
+    switch (command) {
+    case READ_6:
+    case READ_10:
+        trace_ufs_scsi_dma_command_READ(r->req.cmd.lba, len);
+        if (r->req.cmd.buf[1] & 0xe0) {
+            goto illegal_request;
+        }
+        if (!check_lba_range(lu, r->req.cmd.lba, len)) {
+            goto illegal_lba;
+        }
+        r->sector = r->req.cmd.lba * (lu->qdev.blocksize / BDRV_SECTOR_SIZE);
+        r->sector_count = len * (lu->qdev.blocksize / BDRV_SECTOR_SIZE);
+        break;
+    case WRITE_6:
+    case WRITE_10:
+        trace_ufs_scsi_dma_command_WRITE(r->req.cmd.lba, len);
+        if (!blk_is_writable(lu->qdev.conf.blk)) {
+            scsi_check_condition(r, SENSE_CODE(WRITE_PROTECTED));
+            return 0;
+        }
+        if (r->req.cmd.buf[1] & 0xe0) {
+            goto illegal_request;
+        }
+        if (!check_lba_range(lu, r->req.cmd.lba, len)) {
+            goto illegal_lba;
+        }
+        r->sector = r->req.cmd.lba * (lu->qdev.blocksize / BDRV_SECTOR_SIZE);
+        r->sector_count = len * (lu->qdev.blocksize / BDRV_SECTOR_SIZE);
+        break;
+    default:
+        abort();
+    illegal_request:
+        scsi_check_condition(r, SENSE_CODE(INVALID_FIELD));
+        return 0;
+    illegal_lba:
+        scsi_check_condition(r, SENSE_CODE(LBA_OUT_OF_RANGE));
+        return 0;
+    }
+    r->need_fua_emulation = ((r->req.cmd.buf[1] & 8) != 0);
+    if (r->sector_count == 0) {
+        scsi_req_complete(&r->req, GOOD);
+    }
+    assert(r->iov.iov_len == 0);
+    if (r->req.cmd.mode == SCSI_XFER_TO_DEV) {
+        return -r->sector_count * BDRV_SECTOR_SIZE;
+    } else {
+        return r->sector_count * BDRV_SECTOR_SIZE;
+    }
+}
+
+static void scsi_write_do_fua(UfsSCSIReq *r)
+{
+    UfsLu *lu = DO_UPCAST(UfsLu, qdev, r->req.dev);
+
+    assert(r->req.aiocb == NULL);
+    assert(!r->req.io_canceled);
+
+    if (r->need_fua_emulation) {
+        block_acct_start(blk_get_stats(lu->qdev.conf.blk), &r->acct, 0,
+                         BLOCK_ACCT_FLUSH);
+        r->req.aiocb = blk_aio_flush(lu->qdev.conf.blk, scsi_aio_complete, r);
+        return;
+    }
+
+    scsi_req_complete(&r->req, GOOD);
+    scsi_req_unref(&r->req);
+}
+
+static void scsi_dma_complete_noio(UfsSCSIReq *r, int ret)
+{
+    assert(r->req.aiocb == NULL);
+    if (ufs_scsi_req_check_error(r, ret, false)) {
+        goto done;
+    }
+
+    r->sector += r->sector_count;
+    r->sector_count = 0;
+    if (r->req.cmd.mode == SCSI_XFER_TO_DEV) {
+        scsi_write_do_fua(r);
+        return;
+    } else {
+        scsi_req_complete(&r->req, GOOD);
+    }
+
+done:
+    scsi_req_unref(&r->req);
+}
+
+static void scsi_dma_complete(void *opaque, int ret)
+{
+    UfsSCSIReq *r = (UfsSCSIReq *)opaque;
+    UfsLu *lu = DO_UPCAST(UfsLu, qdev, r->req.dev);
+
+    assert(r->req.aiocb != NULL);
+    r->req.aiocb = NULL;
+
+    aio_context_acquire(blk_get_aio_context(lu->qdev.conf.blk));
+    if (ret < 0) {
+        block_acct_failed(blk_get_stats(lu->qdev.conf.blk), &r->acct);
+    } else {
+        block_acct_done(blk_get_stats(lu->qdev.conf.blk), &r->acct);
+    }
+    scsi_dma_complete_noio(r, ret);
+    aio_context_release(blk_get_aio_context(lu->qdev.conf.blk));
+}
+
+static BlockAIOCB *scsi_dma_readv(int64_t offset, QEMUIOVector *iov,
+                                  BlockCompletionFunc *cb, void *cb_opaque,
+                                  void *opaque)
+{
+    UfsSCSIReq *r = opaque;
+    UfsLu *lu = DO_UPCAST(UfsLu, qdev, r->req.dev);
+    return blk_aio_preadv(lu->qdev.conf.blk, offset, iov, 0, cb, cb_opaque);
+}
+
+static void scsi_init_iovec(UfsSCSIReq *r, size_t size)
+{
+    UfsLu *lu = DO_UPCAST(UfsLu, qdev, r->req.dev);
+
+    if (!r->iov.iov_base) {
+        r->buflen = size;
+        r->iov.iov_base = blk_blockalign(lu->qdev.conf.blk, r->buflen);
+    }
+    r->iov.iov_len = MIN(r->sector_count * BDRV_SECTOR_SIZE, r->buflen);
+    qemu_iovec_init_external(&r->qiov, &r->iov, 1);
+}
+
+static void scsi_read_complete_noio(UfsSCSIReq *r, int ret)
+{
+    uint32_t n;
+
+    assert(r->req.aiocb == NULL);
+    if (ufs_scsi_req_check_error(r, ret, false)) {
+        goto done;
+    }
+
+    n = r->qiov.size / BDRV_SECTOR_SIZE;
+    r->sector += n;
+    r->sector_count -= n;
+    scsi_req_data(&r->req, r->qiov.size);
+
+done:
+    scsi_req_unref(&r->req);
+}
+
+static void scsi_read_complete(void *opaque, int ret)
+{
+    UfsSCSIReq *r = (UfsSCSIReq *)opaque;
+    UfsLu *lu = DO_UPCAST(UfsLu, qdev, r->req.dev);
+
+    assert(r->req.aiocb != NULL);
+    r->req.aiocb = NULL;
+    trace_ufs_scsi_read_data_count(r->sector_count);
+    aio_context_acquire(blk_get_aio_context(lu->qdev.conf.blk));
+    if (ret < 0) {
+        block_acct_failed(blk_get_stats(lu->qdev.conf.blk), &r->acct);
+    } else {
+        block_acct_done(blk_get_stats(lu->qdev.conf.blk), &r->acct);
+        trace_ufs_scsi_read_complete(r->req.tag, r->qiov.size);
+    }
+    scsi_read_complete_noio(r, ret);
+    aio_context_release(blk_get_aio_context(lu->qdev.conf.blk));
+}
+
+/* Actually issue a read to the block device.  */
+static void scsi_do_read(UfsSCSIReq *r, int ret)
+{
+    UfsLu *lu = DO_UPCAST(UfsLu, qdev, r->req.dev);
+
+    assert(r->req.aiocb == NULL);
+    if (ufs_scsi_req_check_error(r, ret, false)) {
+        goto done;
+    }
+
+    /* The request is used as the AIO opaque value, so add a ref.  */
+    scsi_req_ref(&r->req);
+
+    if (r->req.sg) {
+        dma_acct_start(lu->qdev.conf.blk, &r->acct, r->req.sg, BLOCK_ACCT_READ);
+        r->req.residual -= r->req.sg->size;
+        r->req.aiocb = dma_blk_io(
+            blk_get_aio_context(lu->qdev.conf.blk), r->req.sg,
+            r->sector << BDRV_SECTOR_BITS, BDRV_SECTOR_SIZE, scsi_dma_readv, r,
+            scsi_dma_complete, r, DMA_DIRECTION_FROM_DEVICE);
+    } else {
+        scsi_init_iovec(r, SCSI_DMA_BUF_SIZE);
+        block_acct_start(blk_get_stats(lu->qdev.conf.blk), &r->acct,
+                         r->qiov.size, BLOCK_ACCT_READ);
+        r->req.aiocb = scsi_dma_readv(r->sector << BDRV_SECTOR_BITS, &r->qiov,
+                                      scsi_read_complete, r, r);
+    }
+
+done:
+    scsi_req_unref(&r->req);
+}
+
+static void scsi_do_read_cb(void *opaque, int ret)
+{
+    UfsSCSIReq *r = (UfsSCSIReq *)opaque;
+    UfsLu *lu = DO_UPCAST(UfsLu, qdev, r->req.dev);
+
+    assert(r->req.aiocb != NULL);
+    r->req.aiocb = NULL;
+
+    aio_context_acquire(blk_get_aio_context(lu->qdev.conf.blk));
+    if (ret < 0) {
+        block_acct_failed(blk_get_stats(lu->qdev.conf.blk), &r->acct);
+    } else {
+        block_acct_done(blk_get_stats(lu->qdev.conf.blk), &r->acct);
+    }
+    scsi_do_read(opaque, ret);
+    aio_context_release(blk_get_aio_context(lu->qdev.conf.blk));
+}
+
+/* Read more data from scsi device into buffer.  */
+static void scsi_read_data(SCSIRequest *req)
+{
+    UfsSCSIReq *r = DO_UPCAST(UfsSCSIReq, req, req);
+    UfsLu *lu = DO_UPCAST(UfsLu, qdev, r->req.dev);
+    bool first;
+
+    trace_ufs_scsi_read_data_count(r->sector_count);
+    if (r->sector_count == 0) {
+        /* This also clears the sense buffer for REQUEST SENSE.  */
+        scsi_req_complete(&r->req, GOOD);
+        return;
+    }
+
+    /* No data transfer may already be in progress */
+    assert(r->req.aiocb == NULL);
+
+    /* The request is used as the AIO opaque value, so add a ref.  */
+    scsi_req_ref(&r->req);
+    if (r->req.cmd.mode == SCSI_XFER_TO_DEV) {
+        trace_ufs_scsi_read_data_invalid();
+        scsi_read_complete_noio(r, -EINVAL);
+        return;
+    }
+
+    if (!blk_is_available(req->dev->conf.blk)) {
+        scsi_read_complete_noio(r, -ENOMEDIUM);
+        return;
+    }
+
+    first = !r->started;
+    r->started = true;
+    if (first && r->need_fua_emulation) {
+        block_acct_start(blk_get_stats(lu->qdev.conf.blk), &r->acct, 0,
+                         BLOCK_ACCT_FLUSH);
+        r->req.aiocb = blk_aio_flush(lu->qdev.conf.blk, scsi_do_read_cb, r);
+    } else {
+        scsi_do_read(r, 0);
+    }
+}
+
+static void scsi_write_complete_noio(UfsSCSIReq *r, int ret)
+{
+    uint32_t n;
+
+    assert(r->req.aiocb == NULL);
+    if (ufs_scsi_req_check_error(r, ret, false)) {
+        goto done;
+    }
+
+    n = r->qiov.size / BDRV_SECTOR_SIZE;
+    r->sector += n;
+    r->sector_count -= n;
+    if (r->sector_count == 0) {
+        scsi_write_do_fua(r);
+        return;
+    } else {
+        scsi_init_iovec(r, SCSI_DMA_BUF_SIZE);
+        trace_ufs_scsi_write_complete_noio(r->req.tag, r->qiov.size);
+        scsi_req_data(&r->req, r->qiov.size);
+    }
+
+done:
+    scsi_req_unref(&r->req);
+}
+
+static void scsi_write_complete(void *opaque, int ret)
+{
+    UfsSCSIReq *r = (UfsSCSIReq *)opaque;
+    UfsLu *lu = DO_UPCAST(UfsLu, qdev, r->req.dev);
+
+    assert(r->req.aiocb != NULL);
+    r->req.aiocb = NULL;
+
+    aio_context_acquire(blk_get_aio_context(lu->qdev.conf.blk));
+    if (ret < 0) {
+        block_acct_failed(blk_get_stats(lu->qdev.conf.blk), &r->acct);
+    } else {
+        block_acct_done(blk_get_stats(lu->qdev.conf.blk), &r->acct);
+    }
+    scsi_write_complete_noio(r, ret);
+    aio_context_release(blk_get_aio_context(lu->qdev.conf.blk));
+}
+
+static BlockAIOCB *scsi_dma_writev(int64_t offset, QEMUIOVector *iov,
+                                   BlockCompletionFunc *cb, void *cb_opaque,
+                                   void *opaque)
+{
+    UfsSCSIReq *r = opaque;
+    UfsLu *lu = DO_UPCAST(UfsLu, qdev, r->req.dev);
+    return blk_aio_pwritev(lu->qdev.conf.blk, offset, iov, 0, cb, cb_opaque);
+}
+
+static void scsi_write_data(SCSIRequest *req)
+{
+    UfsSCSIReq *r = DO_UPCAST(UfsSCSIReq, req, req);
+    UfsLu *lu = DO_UPCAST(UfsLu, qdev, r->req.dev);
+
+    /* No data transfer may already be in progress */
+    assert(r->req.aiocb == NULL);
+
+    /* The request is used as the AIO opaque value, so add a ref.  */
+    scsi_req_ref(&r->req);
+    if (r->req.cmd.mode != SCSI_XFER_TO_DEV) {
+        trace_ufs_scsi_write_data_invalid();
+        scsi_write_complete_noio(r, -EINVAL);
+        return;
+    }
+
+    if (!r->req.sg && !r->qiov.size) {
+        /* Called for the first time.  Ask the driver to send us more data.  */
+        r->started = true;
+        scsi_write_complete_noio(r, 0);
+        return;
+    }
+    if (!blk_is_available(req->dev->conf.blk)) {
+        scsi_write_complete_noio(r, -ENOMEDIUM);
+        return;
+    }
+
+    if (r->req.sg) {
+        dma_acct_start(lu->qdev.conf.blk, &r->acct, r->req.sg,
+                       BLOCK_ACCT_WRITE);
+        r->req.residual -= r->req.sg->size;
+        r->req.aiocb = dma_blk_io(
+            blk_get_aio_context(lu->qdev.conf.blk), r->req.sg,
+            r->sector << BDRV_SECTOR_BITS, BDRV_SECTOR_SIZE, scsi_dma_writev, r,
+            scsi_dma_complete, r, DMA_DIRECTION_TO_DEVICE);
+    } else {
+        block_acct_start(blk_get_stats(lu->qdev.conf.blk), &r->acct,
+                         r->qiov.size, BLOCK_ACCT_WRITE);
+        r->req.aiocb = scsi_dma_writev(r->sector << BDRV_SECTOR_BITS, &r->qiov,
+                                       scsi_write_complete, r, r);
+    }
+}
+
+static const SCSIReqOps ufs_scsi_emulate_reqops = {
+    .size = sizeof(UfsSCSIReq),
+    .free_req = ufs_scsi_free_request,
+    .send_command = ufs_scsi_emulate_command,
+    .read_data = ufs_scsi_emulate_read_data,
+    .write_data = ufs_scsi_emulate_write_data,
+    .get_buf = ufs_scsi_get_buf,
+};
+
+static const SCSIReqOps ufs_scsi_dma_reqops = {
+    .size = sizeof(UfsSCSIReq),
+    .free_req = ufs_scsi_free_request,
+    .send_command = ufs_scsi_dma_command,
+    .read_data = scsi_read_data,
+    .write_data = scsi_write_data,
+    .get_buf = ufs_scsi_get_buf,
+};
+
+/*
+ * Following commands are not yet supported
+ * PRE_FETCH(10),
+ * UNMAP,
+ * WRITE_BUFFER, READ_BUFFER,
+ * SECURITY_PROTOCOL_IN, SECURITY_PROTOCOL_OUT
+ */
+static const SCSIReqOps *const ufs_scsi_reqops_dispatch[256] = {
+    [TEST_UNIT_READY] = &ufs_scsi_emulate_reqops,
+    [INQUIRY] = &ufs_scsi_emulate_reqops,
+    [MODE_SENSE_10] = &ufs_scsi_emulate_reqops,
+    [START_STOP] = &ufs_scsi_emulate_reqops,
+    [READ_CAPACITY_10] = &ufs_scsi_emulate_reqops,
+    [REQUEST_SENSE] = &ufs_scsi_emulate_reqops,
+    [SYNCHRONIZE_CACHE] = &ufs_scsi_emulate_reqops,
+    [MODE_SELECT_10] = &ufs_scsi_emulate_reqops,
+    [VERIFY_10] = &ufs_scsi_emulate_reqops,
+    [FORMAT_UNIT] = &ufs_scsi_emulate_reqops,
+    [SERVICE_ACTION_IN_16] = &ufs_scsi_emulate_reqops,
+    [SEND_DIAGNOSTIC] = &ufs_scsi_emulate_reqops,
+
+    [READ_6] = &ufs_scsi_dma_reqops,
+    [READ_10] = &ufs_scsi_dma_reqops,
+    [WRITE_6] = &ufs_scsi_dma_reqops,
+    [WRITE_10] = &ufs_scsi_dma_reqops,
+};
+
+static SCSIRequest *scsi_new_request(SCSIDevice *dev, uint32_t tag,
+                                     uint32_t lun, uint8_t *buf,
+                                     void *hba_private)
+{
+    UfsLu *lu = DO_UPCAST(UfsLu, qdev, dev);
+    SCSIRequest *req;
+    const SCSIReqOps *ops;
+    uint8_t command;
+
+    command = buf[0];
+    ops = ufs_scsi_reqops_dispatch[command];
+    if (!ops) {
+        ops = &ufs_scsi_emulate_reqops;
+    }
+    req = scsi_req_alloc(ops, &lu->qdev, tag, lun, hba_private);
+
+    return req;
+}
+
+static Property ufs_lu_props[] = {
+    DEFINE_PROP_DRIVE("drive", UfsLu, qdev.conf.blk),
+    DEFINE_PROP_END_OF_LIST(),
+};
+
+static bool ufs_lu_brdv_init(UfsLu *lu, Error **errp)
+{
+    SCSIDevice *dev = &lu->qdev;
+    bool read_only;
+
+    if (!lu->qdev.conf.blk) {
+        error_setg(errp, "drive property not set");
+        return false;
+    }
+
+    if (!blkconf_blocksizes(&lu->qdev.conf, errp)) {
+        return false;
+    }
+
+    if (blk_get_aio_context(lu->qdev.conf.blk) != qemu_get_aio_context() &&
+        !lu->qdev.hba_supports_iothread) {
+        error_setg(errp, "HBA does not support iothreads");
+        return false;
+    }
+
+    read_only = !blk_supports_write_perm(lu->qdev.conf.blk);
+
+    if (!blkconf_apply_backend_options(&dev->conf, read_only,
+                                       dev->type == TYPE_DISK, errp)) {
+        return false;
+    }
+
+    if (blk_is_sg(lu->qdev.conf.blk)) {
+        error_setg(errp, "unwanted /dev/sg*");
+        return false;
+    }
+
+    blk_iostatus_enable(lu->qdev.conf.blk);
+    return true;
+}
+
+static bool ufs_add_lu(UfsHc *u, UfsLu *lu, Error **errp)
+{
+    BlockBackend *blk = lu->qdev.conf.blk;
+    int64_t brdv_len = blk_getlength(blk);
+    uint64_t raw_dev_cap =
+        be64_to_cpu(u->geometry_desc.total_raw_device_capacity);
+
+    if (u->device_desc.number_lu >= UFS_MAX_LUS) {
+        error_setg(errp, "ufs host controller has too many logical units.");
+        return false;
+    }
+
+    if (u->lus[lu->lun] != NULL) {
+        error_setg(errp, "ufs logical unit %d already exists.", lu->lun);
+        return false;
+    }
+
+    u->lus[lu->lun] = lu;
+    u->device_desc.number_lu++;
+    raw_dev_cap += (brdv_len >> UFS_GEOMETRY_CAPACITY_SHIFT);
+    u->geometry_desc.total_raw_device_capacity = cpu_to_be64(raw_dev_cap);
+    return true;
+}
+
+static inline uint8_t ufs_log2(uint64_t input)
+{
+    int log = 0;
+    while (input >>= 1) {
+        log++;
+    }
+    return log;
+}
+
+static void ufs_init_lu(UfsLu *lu)
+{
+    BlockBackend *blk = lu->qdev.conf.blk;
+    int64_t brdv_len = blk_getlength(blk);
+
+    lu->lun = lu->qdev.lun;
+    memset(&lu->unit_desc, 0, sizeof(lu->unit_desc));
+    lu->unit_desc.length = sizeof(UnitDescriptor);
+    lu->unit_desc.descriptor_idn = QUERY_DESC_IDN_UNIT;
+    lu->unit_desc.lu_enable = 0x01;
+    lu->unit_desc.logical_block_size = ufs_log2(lu->qdev.blocksize);
+    lu->unit_desc.unit_index = lu->qdev.lun;
+    lu->unit_desc.logical_block_count =
+        cpu_to_be64(brdv_len / (1 << lu->unit_desc.logical_block_size));
+}
+
+static bool ufs_lu_check_constraints(UfsLu *lu, Error **errp)
+{
+    if (!lu->qdev.conf.blk) {
+        error_setg(errp, "drive property not set");
+        return false;
+    }
+
+    if (lu->qdev.channel != 0) {
+        error_setg(errp, "ufs logical unit does not support channel");
+        return false;
+    }
+
+    if (lu->qdev.lun >= UFS_MAX_LUS) {
+        error_setg(errp, "lun must be between 1 and %d", UFS_MAX_LUS - 1);
+        return false;
+    }
+
+    return true;
+}
+
+static void ufs_lu_realize(SCSIDevice *dev, Error **errp)
+{
+    UfsLu *lu = DO_UPCAST(UfsLu, qdev, dev);
+    BusState *s = qdev_get_parent_bus(&dev->qdev);
+    UfsHc *u = UFS(s->parent);
+    AioContext *ctx = NULL;
+    uint64_t nb_sectors, nb_blocks;
+
+    if (!ufs_lu_check_constraints(lu, errp)) {
+        return;
+    }
+
+    if (lu->qdev.conf.blk) {
+        ctx = blk_get_aio_context(lu->qdev.conf.blk);
+        aio_context_acquire(ctx);
+        if (!blkconf_blocksizes(&lu->qdev.conf, errp)) {
+            goto out;
+        }
+    }
+    lu->qdev.blocksize = UFS_BLOCK_SIZE;
+    blk_get_geometry(lu->qdev.conf.blk, &nb_sectors);
+    nb_blocks = nb_sectors / (lu->qdev.blocksize / BDRV_SECTOR_SIZE);
+    if (nb_blocks > UINT32_MAX) {
+        nb_blocks = UINT32_MAX;
+    }
+    lu->qdev.max_lba = nb_blocks;
+    lu->qdev.type = TYPE_DISK;
+
+    ufs_init_lu(lu);
+    if (!ufs_add_lu(u, lu, errp)) {
+        goto out;
+    }
+
+    ufs_lu_brdv_init(lu, errp);
+out:
+    if (ctx) {
+        aio_context_release(ctx);
+    }
+}
+
+static void ufs_lu_unrealize(SCSIDevice *dev)
+{
+    UfsLu *lu = DO_UPCAST(UfsLu, qdev, dev);
+
+    blk_drain(lu->qdev.conf.blk);
+}
+
+static void ufs_wlu_realize(DeviceState *qdev, Error **errp)
+{
+    UfsWLu *wlu = UFSWLU(qdev);
+    SCSIDevice *dev = &wlu->qdev;
+
+    if (!is_wlun(dev->lun)) {
+        error_setg(errp, "not well-known logical unit number");
+        return;
+    }
+
+    QTAILQ_INIT(&dev->requests);
+}
+
+static void ufs_lu_class_init(ObjectClass *oc, void *data)
+{
+    DeviceClass *dc = DEVICE_CLASS(oc);
+    SCSIDeviceClass *sc = SCSI_DEVICE_CLASS(oc);
+
+    sc->realize = ufs_lu_realize;
+    sc->unrealize = ufs_lu_unrealize;
+    sc->alloc_req = scsi_new_request;
+    dc->bus_type = TYPE_UFS_BUS;
+    device_class_set_props(dc, ufs_lu_props);
+    dc->desc = "Virtual UFS logical unit";
+}
+
+static void ufs_wlu_class_init(ObjectClass *oc, void *data)
+{
+    DeviceClass *dc = DEVICE_CLASS(oc);
+    SCSIDeviceClass *sc = SCSI_DEVICE_CLASS(oc);
+
+    /*
+     * The realize() function of TYPE_SCSI_DEVICE causes a segmentation fault
+     * if a block drive does not exist. Define a new realize function for
+     * well-known LUs that do not have a block drive.
+     */
+    dc->realize = ufs_wlu_realize;
+    sc->alloc_req = scsi_new_request;
+    dc->bus_type = TYPE_UFS_BUS;
+    dc->desc = "Virtual UFS well-known logical unit";
+}
+
+static const TypeInfo ufs_lu_info = {
+    .name = TYPE_UFS_LU,
+    .parent = TYPE_SCSI_DEVICE,
+    .class_init = ufs_lu_class_init,
+    .instance_size = sizeof(UfsLu),
+};
+
+static const TypeInfo ufs_wlu_info = {
+    .name = TYPE_UFS_WLU,
+    .parent = TYPE_SCSI_DEVICE,
+    .class_init = ufs_wlu_class_init,
+    .instance_size = sizeof(UfsWLu),
+};
+
+static void ufs_lu_register_types(void)
+{
+    type_register_static(&ufs_lu_info);
+    type_register_static(&ufs_wlu_info);
+}
+
+type_init(ufs_lu_register_types)
diff --git a/hw/ufs/ufs.c b/hw/ufs/ufs.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/ufs/ufs.c
+++ b/hw/ufs/ufs.c
@@ -XXX,XX +XXX,XX @@
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
+/**
+ * Reference Specs: https://www.jedec.org/, 3.1
+ *
+ * Usage
+ * -----
+ *
+ * Add options:
+ *      -drive file=<file>,if=none,id=<drive_id>
+ *      -device ufs,serial=<serial>,id=<bus_name>, \
+ *              nutrs=<N[optional]>,nutmrs=<N[optional]>
+ *      -device ufs-lu,drive=<drive_id>,bus=<bus_name>
+ */
+
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "migration/vmstate.h"
@@ -XXX,XX +XXX,XX @@ static const MemoryRegionOps ufs_mmio_ops = {
     },
 };
 
+static QEMUSGList *ufs_get_sg_list(SCSIRequest *scsi_req)
+{
+    UfsRequest *req = scsi_req->hba_private;
+    return req->sg;
+}
+
+static void ufs_build_upiu_sense_data(UfsRequest *req, SCSIRequest *scsi_req)
+{
+    req->rsp_upiu.sr.sense_data_len = cpu_to_be16(scsi_req->sense_len);
+    assert(scsi_req->sense_len <= SCSI_SENSE_LEN);
+    memcpy(req->rsp_upiu.sr.sense_data, scsi_req->sense, scsi_req->sense_len);
+}
+
 static void ufs_build_upiu_header(UfsRequest *req, uint8_t trans_type,
                                   uint8_t flags, uint8_t response,
                                   uint8_t scsi_status,
@@ -XXX,XX +XXX,XX @@ static void ufs_build_upiu_header(UfsRequest *req, uint8_t trans_type,
     req->rsp_upiu.header.data_segment_length = cpu_to_be16(data_segment_length);
 }
 
+static void ufs_scsi_command_complete(SCSIRequest *scsi_req, size_t resid)
+{
+    UfsRequest *req = scsi_req->hba_private;
+    int16_t status = scsi_req->status;
+    uint32_t expected_len = be32_to_cpu(req->req_upiu.sc.exp_data_transfer_len);
+    uint32_t transfered_len = scsi_req->cmd.xfer - resid;
+    uint8_t flags = 0, response = COMMAND_RESULT_SUCESS;
+    uint16_t data_segment_length;
+
+    if (expected_len > transfered_len) {
+        req->rsp_upiu.sr.residual_transfer_count =
+            cpu_to_be32(expected_len - transfered_len);
+        flags |= UFS_UPIU_FLAG_UNDERFLOW;
+    } else if (expected_len < transfered_len) {
+        req->rsp_upiu.sr.residual_transfer_count =
+            cpu_to_be32(transfered_len - expected_len);
+        flags |= UFS_UPIU_FLAG_OVERFLOW;
+    }
+
+    if (status != 0) {
+        ufs_build_upiu_sense_data(req, scsi_req);
+        response = COMMAND_RESULT_FAIL;
+    }
+
+    data_segment_length = cpu_to_be16(scsi_req->sense_len +
+                                      sizeof(req->rsp_upiu.sr.sense_data_len));
+    ufs_build_upiu_header(req, UPIU_TRANSACTION_RESPONSE, flags, response,
+                          status, data_segment_length);
+
+    ufs_complete_req(req, UFS_REQUEST_SUCCESS);
+
+    scsi_req->hba_private = NULL;
+    scsi_req_unref(scsi_req);
+}
+
+static const struct SCSIBusInfo ufs_scsi_info = {
+    .tcq = true,
+    .max_target = 0,
+    .max_lun = UFS_MAX_LUS,
+    .max_channel = 0,
+
+    .get_sg_list = ufs_get_sg_list,
+    .complete = ufs_scsi_command_complete,
+};
+
+static UfsReqResult ufs_exec_scsi_cmd(UfsRequest *req)
+{
+    UfsHc *u = req->hc;
+    uint8_t lun = req->req_upiu.header.lun;
+    uint8_t task_tag = req->req_upiu.header.task_tag;
+    SCSIDevice *dev = NULL;
+
+    trace_ufs_exec_scsi_cmd(req->slot, lun, req->req_upiu.sc.cdb[0]);
+
+    if (!is_wlun(lun)) {
+        if (lun >= u->device_desc.number_lu) {
+            trace_ufs_err_scsi_cmd_invalid_lun(lun);
+            return UFS_REQUEST_FAIL;
+        } else if (u->lus[lun] == NULL) {
+            trace_ufs_err_scsi_cmd_invalid_lun(lun);
+            return UFS_REQUEST_FAIL;
+        }
+    }
+
+    switch (lun) {
+    case UFS_UPIU_REPORT_LUNS_WLUN:
+        dev = &u->report_wlu->qdev;
+        break;
+    case UFS_UPIU_UFS_DEVICE_WLUN:
+        dev = &u->dev_wlu->qdev;
+        break;
+    case UFS_UPIU_BOOT_WLUN:
+        dev = &u->boot_wlu->qdev;
+        break;
+    case UFS_UPIU_RPMB_WLUN:
+        dev = &u->rpmb_wlu->qdev;
+        break;
+    default:
+        dev = &u->lus[lun]->qdev;
+    }
+
+    SCSIRequest *scsi_req = scsi_req_new(
+        dev, task_tag, lun, req->req_upiu.sc.cdb, UFS_CDB_SIZE, req);
+
+    uint32_t len = scsi_req_enqueue(scsi_req);
+    if (len) {
+        scsi_req_continue(scsi_req);
+    }
+
+    return UFS_REQUEST_NO_COMPLETE;
+}
+
 static UfsReqResult ufs_exec_nop_cmd(UfsRequest *req)
 {
     trace_ufs_exec_nop_cmd(req->slot);
@@ -XXX,XX +XXX,XX @@ static const RpmbUnitDescriptor rpmb_unit_desc = {
 
 static QueryRespCode ufs_read_unit_desc(UfsRequest *req)
 {
+    UfsHc *u = req->hc;
     uint8_t lun = req->req_upiu.qr.index;
 
-    if (lun != UFS_UPIU_RPMB_WLUN && lun > UFS_MAX_LUS) {
+    if (lun != UFS_UPIU_RPMB_WLUN &&
+        (lun > UFS_MAX_LUS || u->lus[lun] == NULL)) {
         trace_ufs_err_query_invalid_index(req->req_upiu.qr.opcode, lun);
         return QUERY_RESULT_INVALID_INDEX;
     }
@@ -XXX,XX +XXX,XX @@ static QueryRespCode ufs_read_unit_desc(UfsRequest *req)
     if (lun == UFS_UPIU_RPMB_WLUN) {
         memcpy(&req->rsp_upiu.qr.data, &rpmb_unit_desc, rpmb_unit_desc.length);
     } else {
-        /* unit descriptor is not yet supported */
-        return QUERY_RESULT_INVALID_INDEX;
+        memcpy(&req->rsp_upiu.qr.data, &u->lus[lun]->unit_desc,
+               sizeof(u->lus[lun]->unit_desc));
     }
 
     return QUERY_RESULT_SUCCESS;
@@ -XXX,XX +XXX,XX @@ static void ufs_exec_req(UfsRequest *req)
         req_result = ufs_exec_nop_cmd(req);
         break;
     case UPIU_TRANSACTION_COMMAND:
-        /* Not yet implemented */
-        req_result = UFS_REQUEST_FAIL;
+        req_result = ufs_exec_scsi_cmd(req);
         break;
     case UPIU_TRANSACTION_QUERY_REQ:
         req_result = ufs_exec_query_cmd(req);
@@ -XXX,XX +XXX,XX @@ static void ufs_exec_req(UfsRequest *req)
         req_result = UFS_REQUEST_FAIL;
     }
 
-    ufs_complete_req(req, req_result);
+    /*
+     * The ufs_complete_req for scsi commands is handled by the
+     * ufs_scsi_command_complete() callback function. Therefore, to avoid
+     * duplicate processing, ufs_complete_req() is not called for scsi commands.
+     */
+    if (req_result != UFS_REQUEST_NO_COMPLETE) {
+        ufs_complete_req(req, req_result);
+    }
 }
 
 static void ufs_process_req(void *opaque)
@@ -XXX,XX +XXX,XX @@ static void ufs_init_hc(UfsHc *u)
     u->flags.permanently_disable_fw_update = 1;
 }
 
+static bool ufs_init_wlu(UfsHc *u, UfsWLu **wlu, uint8_t wlun, Error **errp)
+{
+    UfsWLu *new_wlu = UFSWLU(qdev_new(TYPE_UFS_WLU));
+
+    qdev_prop_set_uint32(DEVICE(new_wlu), "lun", wlun);
+
+    /*
+     * The well-known lu shares the same bus as the normal lu. If the well-known
+     * lu writes the same channel value as the normal lu, the report will be
+     * made not only for the normal lu but also for the well-known lu at
+     * REPORT_LUN time. To prevent this, the channel value of normal lu is fixed
+     * to 0 and the channel value of well-known lu is fixed to 1.
+     */
+    qdev_prop_set_uint32(DEVICE(new_wlu), "channel", 1);
+    if (!qdev_realize_and_unref(DEVICE(new_wlu), BUS(&u->bus), errp)) {
+        return false;
+    }
+
+    *wlu = new_wlu;
+    return true;
+}
+
 static void ufs_realize(PCIDevice *pci_dev, Error **errp)
 {
     UfsHc *u = UFS(pci_dev);
@@ -XXX,XX +XXX,XX @@ static void ufs_realize(PCIDevice *pci_dev, Error **errp)
         return;
     }
 
+    qbus_init(&u->bus, sizeof(UfsBus), TYPE_UFS_BUS, &pci_dev->qdev,
+              u->parent_obj.qdev.id);
+    u->bus.parent_bus.info = &ufs_scsi_info;
+
     ufs_init_state(u);
     ufs_init_hc(u);
     ufs_init_pci(u, pci_dev);
+
+    if (!ufs_init_wlu(u, &u->report_wlu, UFS_UPIU_REPORT_LUNS_WLUN, errp)) {
+        return;
+    }
+
+    if (!ufs_init_wlu(u, &u->dev_wlu, UFS_UPIU_UFS_DEVICE_WLUN, errp)) {
+        return;
+    }
+
+    if (!ufs_init_wlu(u, &u->boot_wlu, UFS_UPIU_BOOT_WLUN, errp)) {
+        return;
+    }
+
+    if (!ufs_init_wlu(u, &u->rpmb_wlu, UFS_UPIU_RPMB_WLUN, errp)) {
+        return;
+    }
 }
 
 static void ufs_exit(PCIDevice *pci_dev)
 {
     UfsHc *u = UFS(pci_dev);
 
+    if (u->dev_wlu) {
+        object_unref(OBJECT(u->dev_wlu));
+        u->dev_wlu = NULL;
+    }
+
+    if (u->report_wlu) {
+        object_unref(OBJECT(u->report_wlu));
+        u->report_wlu = NULL;
+    }
+
+    if (u->rpmb_wlu) {
+        object_unref(OBJECT(u->rpmb_wlu));
+        u->rpmb_wlu = NULL;
+    }
+
+    if (u->boot_wlu) {
+        object_unref(OBJECT(u->boot_wlu));
+        u->boot_wlu = NULL;
+    }
+
     qemu_bh_delete(u->doorbell_bh);
     qemu_bh_delete(u->complete_bh);
 
@@ -XXX,XX +XXX,XX @@ static void ufs_class_init(ObjectClass *oc, void *data)
     dc->vmsd = &ufs_vmstate;
 }
 
+static bool ufs_bus_check_address(BusState *qbus, DeviceState *qdev,
+                                  Error **errp)
+{
+    SCSIDevice *dev = SCSI_DEVICE(qdev);
+    UfsBusClass *ubc = UFS_BUS_GET_CLASS(qbus);
+    UfsHc *u = UFS(qbus->parent);
+
+    if (strcmp(object_get_typename(OBJECT(dev)), TYPE_UFS_WLU) == 0) {
+        if (dev->lun != UFS_UPIU_REPORT_LUNS_WLUN &&
+            dev->lun != UFS_UPIU_UFS_DEVICE_WLUN &&
+            dev->lun != UFS_UPIU_BOOT_WLUN && dev->lun != UFS_UPIU_RPMB_WLUN) {
+            error_setg(errp, "bad well-known lun: %d", dev->lun);
+            return false;
+        }
+
+        if ((dev->lun == UFS_UPIU_REPORT_LUNS_WLUN && u->report_wlu != NULL) ||
+            (dev->lun == UFS_UPIU_UFS_DEVICE_WLUN && u->dev_wlu != NULL) ||
+            (dev->lun == UFS_UPIU_BOOT_WLUN && u->boot_wlu != NULL) ||
+            (dev->lun == UFS_UPIU_RPMB_WLUN && u->rpmb_wlu != NULL)) {
+            error_setg(errp, "well-known lun %d already exists", dev->lun);
+            return false;
+        }
+
+        return true;
+    }
+
+    if (strcmp(object_get_typename(OBJECT(dev)), TYPE_UFS_LU) != 0) {
+        error_setg(errp, "%s cannot be connected to ufs-bus",
+                   object_get_typename(OBJECT(dev)));
+        return false;
+    }
+
+    return ubc->parent_check_address(qbus, qdev, errp);
+}
+
+static void ufs_bus_class_init(ObjectClass *class, void *data)
+{
+    BusClass *bc = BUS_CLASS(class);
+    UfsBusClass *ubc = UFS_BUS_CLASS(class);
+    ubc->parent_check_address = bc->check_address;
+    bc->check_address = ufs_bus_check_address;
+}
+
 static const TypeInfo ufs_info = {
     .name = TYPE_UFS,
     .parent = TYPE_PCI_DEVICE,
@@ -XXX,XX +XXX,XX @@ static const TypeInfo ufs_info = {
     .interfaces = (InterfaceInfo[]){ { INTERFACE_PCIE_DEVICE }, {} },
 };
 
+static const TypeInfo ufs_bus_info = {
+    .name = TYPE_UFS_BUS,
+    .parent = TYPE_SCSI_BUS,
+    .class_init = ufs_bus_class_init,
+    .class_size = sizeof(UfsBusClass),
+    .instance_size = sizeof(UfsBus),
+};
+
 static void ufs_register_types(void)
 {
     type_register_static(&ufs_info);
+    type_register_static(&ufs_bus_info);
 }
 
 type_init(ufs_register_types)
diff --git a/hw/ufs/meson.build b/hw/ufs/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/hw/ufs/meson.build
+++ b/hw/ufs/meson.build
@@ -1 +1 @@
-system_ss.add(when: 'CONFIG_UFS_PCI', if_true: files('ufs.c'))
+system_ss.add(when: 'CONFIG_UFS_PCI', if_true: files('ufs.c', 'lu.c'))
diff --git a/hw/ufs/trace-events b/hw/ufs/trace-events
index XXXXXXX..XXXXXXX 100644
--- a/hw/ufs/trace-events
+++ b/hw/ufs/trace-events
@@ -XXX,XX +XXX,XX @@ ufs_exec_scsi_cmd(uint32_t slot, uint8_t lun, uint8_t opcode) "slot %"PRIu32", l
 ufs_exec_query_cmd(uint32_t slot, uint8_t opcode) "slot %"PRIu32", opcode 0x%"PRIx8""
 ufs_process_uiccmd(uint32_t uiccmd, uint32_t ucmdarg1, uint32_t ucmdarg2, uint32_t ucmdarg3) "uiccmd 0x%"PRIx32", ucmdarg1 0x%"PRIx32", ucmdarg2 0x%"PRIx32", ucmdarg3 0x%"PRIx32""
 
+# lu.c
+ufs_scsi_check_condition(uint32_t tag, uint8_t key, uint8_t asc, uint8_t ascq) "Command complete tag=0x%x sense=%d/%d/%d"
+ufs_scsi_read_complete(uint32_t tag, size_t size) "Data ready tag=0x%x len=%zd"
+ufs_scsi_read_data_count(uint32_t sector_count) "Read sector_count=%d"
+ufs_scsi_read_data_invalid(void) "Data transfer direction invalid"
+ufs_scsi_write_complete_noio(uint32_t tag, size_t size) "Write complete tag=0x%x more=%zd"
+ufs_scsi_write_data_invalid(void) "Data transfer direction invalid"
+ufs_scsi_emulate_vpd_page_00(size_t xfer) "Inquiry EVPD[Supported pages] buffer size %zd"
+ufs_scsi_emulate_vpd_page_80_not_supported(void) "Inquiry EVPD[Serial number] not supported"
+ufs_scsi_emulate_vpd_page_80(size_t xfer) "Inquiry EVPD[Serial number] buffer size %zd"
+ufs_scsi_emulate_vpd_page_87(size_t xfer) "Inquiry EVPD[Mode Page Policy] buffer size %zd"
+ufs_scsi_emulate_mode_sense(int cmd, int page, size_t xfer, int control) "Mode Sense(%d) (page %d, xfer %zd, page_control %d)"
+ufs_scsi_emulate_read_data(int buflen) "Read buf_len=%d"
+ufs_scsi_emulate_write_data(int buflen) "Write buf_len=%d"
+ufs_scsi_emulate_command_START_STOP(void) "START STOP UNIT"
+ufs_scsi_emulate_command_FORMAT_UNIT(void) "FORMAT UNIT"
+ufs_scsi_emulate_command_SEND_DIAGNOSTIC(void) "SEND DIAGNOSTIC"
+ufs_scsi_emulate_command_SAI_16(void) "SAI READ CAPACITY(16)"
+ufs_scsi_emulate_command_SAI_unsupported(void) "Unsupported Service Action In"
+ufs_scsi_emulate_command_MODE_SELECT_10(size_t xfer) "Mode Select(10) (len %zd)"
+ufs_scsi_emulate_command_VERIFY(int bytchk) "Verify (bytchk %d)"
+ufs_scsi_emulate_command_UNKNOWN(int cmd, const char *name) "Unknown SCSI command (0x%2.2x=%s)"
+ufs_scsi_dma_command_READ(uint64_t lba, uint32_t len) "Read (block %" PRIu64 ", count %u)"
+ufs_scsi_dma_command_WRITE(uint64_t lba, int len) "Write (block %" PRIu64 ", count %u)"
+
 # error condition
 ufs_err_dma_read_utrd(uint32_t slot, uint64_t addr) "failed to read utrd. UTRLDBR slot %"PRIu32", UTRD dma addr %"PRIu64""
 ufs_err_dma_read_req_upiu(uint32_t slot, uint64_t addr) "failed to read req upiu. UTRLDBR slot %"PRIu32", request upiu addr %"PRIu64""
-- 
2.41.0

From: Jeuk Kim <jeuk20.kim@gmail.com>

This patch includes the following tests
  Test mmio read
  Test ufs device initialization and ufs-lu recognition
  Test I/O (Performs a write followed by a read to verify)

Signed-off-by: Jeuk Kim <jeuk20.kim@samsung.com>
Acked-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: af6b8d54c049490b3533a784a0aeac4798bb9217.1691062912.git.jeuk20.kim@samsung.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 MAINTAINERS             |   1 +
 tests/qtest/ufs-test.c  | 584 ++++++++++++++++++++++++++++++++++++++++
 tests/qtest/meson.build |   1 +
 3 files changed, 586 insertions(+)
 create mode 100644 tests/qtest/ufs-test.c

diff --git a/MAINTAINERS b/MAINTAINERS
index XXXXXXX..XXXXXXX 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -XXX,XX +XXX,XX @@ M: Jeuk Kim <jeuk20.kim@samsung.com>
 S: Supported
 F: hw/ufs/*
 F: include/block/ufs.h
+F: tests/qtest/ufs-test.c
 
 megasas
 M: Hannes Reinecke <hare@suse.com>
diff --git a/tests/qtest/ufs-test.c b/tests/qtest/ufs-test.c
new file mode 100644
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/tests/qtest/ufs-test.c
@@ -XXX,XX +XXX,XX @@
+/*
+ * QTest testcase for UFS
+ *
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd. All rights reserved.
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+#include "qemu/osdep.h"
+#include "qemu/module.h"
+#include "qemu/units.h"
+#include "libqtest.h"
+#include "libqos/qgraph.h"
+#include "libqos/pci.h"
+#include "scsi/constants.h"
+#include "include/block/ufs.h"
+
+/* Test images sizes in Bytes */
+#define TEST_IMAGE_SIZE (64 * 1024 * 1024)
+/* Timeout for various operations, in seconds. */
+#define TIMEOUT_SECONDS 10
+/* Maximum PRD entry count */
+#define MAX_PRD_ENTRY_COUNT 10
+#define PRD_ENTRY_DATA_SIZE 4096
+/* Constants to build upiu */
+#define UTP_COMMAND_DESCRIPTOR_SIZE 4096
+#define UTP_RESPONSE_UPIU_OFFSET 1024
+#define UTP_PRDT_UPIU_OFFSET 2048
+
+typedef struct QUfs QUfs;
+
+struct QUfs {
+    QOSGraphObject obj;
+    QPCIDevice dev;
+    QPCIBar bar;
+
+    uint64_t utrlba;
+    uint64_t utmrlba;
+    uint64_t cmd_desc_addr;
+    uint64_t data_buffer_addr;
+
+    bool enabled;
+};
+
+static inline uint32_t ufs_rreg(QUfs *ufs, size_t offset)
+{
+    return qpci_io_readl(&ufs->dev, ufs->bar, offset);
+}
+
+static inline void ufs_wreg(QUfs *ufs, size_t offset, uint32_t value)
+{
+    qpci_io_writel(&ufs->dev, ufs->bar, offset, value);
+}
+
+static void ufs_wait_for_irq(QUfs *ufs)
+{
+    uint64_t end_time;
+    uint32_t is;
+    /* Wait for device to reset as the linux driver does. */
+    end_time = g_get_monotonic_time() + TIMEOUT_SECONDS * G_TIME_SPAN_SECOND;
+    do {
+        qtest_clock_step(ufs->dev.bus->qts, 100);
+        is = ufs_rreg(ufs, A_IS);
+    } while (is == 0 && g_get_monotonic_time() < end_time);
+}
+
+static UtpTransferReqDesc ufs_build_req_utrd(uint64_t cmd_desc_addr,
+                                             uint8_t slot,
+                                             uint32_t data_direction,
+                                             uint16_t prd_table_length)
+{
+    UtpTransferReqDesc req = { 0 };
+    uint64_t command_desc_base_addr =
+        cmd_desc_addr + slot * UTP_COMMAND_DESCRIPTOR_SIZE;
+
+    req.header.dword_0 =
+        cpu_to_le32(1 << 28 | data_direction | UTP_REQ_DESC_INT_CMD);
+    req.header.dword_2 = cpu_to_le32(OCS_INVALID_COMMAND_STATUS);
+
+    req.command_desc_base_addr_hi = cpu_to_le32(command_desc_base_addr >> 32);
+    req.command_desc_base_addr_lo =
+        cpu_to_le32(command_desc_base_addr & 0xffffffff);
+    req.response_upiu_offset =
+        cpu_to_le16(UTP_RESPONSE_UPIU_OFFSET / sizeof(uint32_t));
+    req.response_upiu_length = cpu_to_le16(sizeof(UtpUpiuRsp));
+    req.prd_table_offset = cpu_to_le16(UTP_PRDT_UPIU_OFFSET / sizeof(uint32_t));
+    req.prd_table_length = cpu_to_le16(prd_table_length);
+    return req;
+}
+
+static void ufs_send_nop_out(QUfs *ufs, uint8_t slot,
+                             UtpTransferReqDesc *utrd_out, UtpUpiuRsp *rsp_out)
+{
+    /* Build up utp transfer request descriptor */
+    UtpTransferReqDesc utrd =
+        ufs_build_req_utrd(ufs->cmd_desc_addr, slot, UTP_NO_DATA_TRANSFER, 0);
+    uint64_t utrd_addr = ufs->utrlba + slot * sizeof(UtpTransferReqDesc);
+    uint64_t req_upiu_addr =
+        ufs->cmd_desc_addr + slot * UTP_COMMAND_DESCRIPTOR_SIZE;
+    uint64_t rsp_upiu_addr = req_upiu_addr + UTP_RESPONSE_UPIU_OFFSET;
+    qtest_memwrite(ufs->dev.bus->qts, utrd_addr, &utrd, sizeof(utrd));
+
+    /* Build up request upiu */
+    UtpUpiuReq req_upiu = { 0 };
+    req_upiu.header.trans_type = UPIU_TRANSACTION_NOP_OUT;
+    req_upiu.header.task_tag = slot;
+    qtest_memwrite(ufs->dev.bus->qts, req_upiu_addr, &req_upiu,
+                   sizeof(req_upiu));
+
+    /* Ring Doorbell */
+    ufs_wreg(ufs, A_UTRLDBR, 1);
+    ufs_wait_for_irq(ufs);
+    g_assert_true(FIELD_EX32(ufs_rreg(ufs, A_IS), IS, UTRCS));
+    ufs_wreg(ufs, A_IS, FIELD_DP32(0, IS, UTRCS, 1));
+
+    qtest_memread(ufs->dev.bus->qts, utrd_addr, utrd_out, sizeof(*utrd_out));
+    qtest_memread(ufs->dev.bus->qts, rsp_upiu_addr, rsp_out, sizeof(*rsp_out));
+}
+
+static void ufs_send_query(QUfs *ufs, uint8_t slot, uint8_t query_function,
+                           uint8_t query_opcode, uint8_t idn, uint8_t index,
+                           UtpTransferReqDesc *utrd_out, UtpUpiuRsp *rsp_out)
+{
+    /* Build up utp transfer request descriptor */
+    UtpTransferReqDesc utrd =
+        ufs_build_req_utrd(ufs->cmd_desc_addr, slot, UTP_NO_DATA_TRANSFER, 0);
+    uint64_t utrd_addr = ufs->utrlba + slot * sizeof(UtpTransferReqDesc);
+    uint64_t req_upiu_addr =
+        ufs->cmd_desc_addr + slot * UTP_COMMAND_DESCRIPTOR_SIZE;
+    uint64_t rsp_upiu_addr = req_upiu_addr + UTP_RESPONSE_UPIU_OFFSET;
+    qtest_memwrite(ufs->dev.bus->qts, utrd_addr, &utrd, sizeof(utrd));
+
+    /* Build up request upiu */
+    UtpUpiuReq req_upiu = { 0 };
+    req_upiu.header.trans_type = UPIU_TRANSACTION_QUERY_REQ;
+    req_upiu.header.query_func = query_function;
+    req_upiu.header.task_tag = slot;
+    /*
+     * QEMU UFS does not currently support Write descriptor and Write attribute,
+     * so the value of data_segment_length is always 0.
+     */
+    req_upiu.header.data_segment_length = 0;
+    req_upiu.qr.opcode = query_opcode;
+    req_upiu.qr.idn = idn;
+    req_upiu.qr.index = index;
+    qtest_memwrite(ufs->dev.bus->qts, req_upiu_addr, &req_upiu,
+                   sizeof(req_upiu));
+
+    /* Ring Doorbell */
+    ufs_wreg(ufs, A_UTRLDBR, 1);
+    ufs_wait_for_irq(ufs);
+    g_assert_true(FIELD_EX32(ufs_rreg(ufs, A_IS), IS, UTRCS));
+    ufs_wreg(ufs, A_IS, FIELD_DP32(0, IS, UTRCS, 1));
+
+    qtest_memread(ufs->dev.bus->qts, utrd_addr, utrd_out, sizeof(*utrd_out));
+    qtest_memread(ufs->dev.bus->qts, rsp_upiu_addr, rsp_out, sizeof(*rsp_out));
+}
+
+static void ufs_send_scsi_command(QUfs *ufs, uint8_t slot, uint8_t lun,
+                                  const uint8_t *cdb, const uint8_t *data_in,
+                                  size_t data_in_len, uint8_t *data_out,
+                                  size_t data_out_len,
+                                  UtpTransferReqDesc *utrd_out,
+                                  UtpUpiuRsp *rsp_out)
+
+{
+    /* Build up PRDT */
+    UfshcdSgEntry entries[MAX_PRD_ENTRY_COUNT] = {
+        0,
+    };
+    uint8_t flags;
+    uint16_t prd_table_length, i;
+    uint32_t data_direction, data_len;
+    uint64_t req_upiu_addr =
+        ufs->cmd_desc_addr + slot * UTP_COMMAND_DESCRIPTOR_SIZE;
+    uint64_t prdt_addr = req_upiu_addr + UTP_PRDT_UPIU_OFFSET;
+
+    g_assert_true(data_in_len < MAX_PRD_ENTRY_COUNT * PRD_ENTRY_DATA_SIZE);
+    g_assert_true(data_out_len < MAX_PRD_ENTRY_COUNT * PRD_ENTRY_DATA_SIZE);
+    if (data_in_len > 0) {
+        g_assert_nonnull(data_in);
+        data_direction = UTP_HOST_TO_DEVICE;
+        data_len = data_in_len;
+        flags = UPIU_CMD_FLAGS_WRITE;
+    } else if (data_out_len > 0) {
+        g_assert_nonnull(data_out);
+        data_direction = UTP_DEVICE_TO_HOST;
+        data_len = data_out_len;
+        flags = UPIU_CMD_FLAGS_READ;
+    } else {
+        data_direction = UTP_NO_DATA_TRANSFER;
+        data_len = 0;
+        flags = UPIU_CMD_FLAGS_NONE;
+    }
+    prd_table_length = DIV_ROUND_UP(data_len, PRD_ENTRY_DATA_SIZE);
+
+    qtest_memset(ufs->dev.bus->qts, ufs->data_buffer_addr, 0,
+                 MAX_PRD_ENTRY_COUNT * PRD_ENTRY_DATA_SIZE);
+    if (data_in_len) {
+        qtest_memwrite(ufs->dev.bus->qts, ufs->data_buffer_addr, data_in,
+                       data_in_len);
+    }
+
+    for (i = 0; i < prd_table_length; i++) {
+        entries[i].addr =
+            cpu_to_le64(ufs->data_buffer_addr + i * sizeof(UfshcdSgEntry));
+        if (i + 1 != prd_table_length) {
+            entries[i].size = cpu_to_le32(PRD_ENTRY_DATA_SIZE - 1);
+        } else {
+            entries[i].size = cpu_to_le32(
+                data_len - (PRD_ENTRY_DATA_SIZE * (prd_table_length - 1)) - 1);
+        }
+    }
+    qtest_memwrite(ufs->dev.bus->qts, prdt_addr, entries,
+                   prd_table_length * sizeof(UfshcdSgEntry));
+
+    /* Build up utp transfer request descriptor */
+    UtpTransferReqDesc utrd = ufs_build_req_utrd(
+        ufs->cmd_desc_addr, slot, data_direction, prd_table_length);
+    uint64_t utrd_addr = ufs->utrlba + slot * sizeof(UtpTransferReqDesc);
+    uint64_t rsp_upiu_addr = req_upiu_addr + UTP_RESPONSE_UPIU_OFFSET;
+    qtest_memwrite(ufs->dev.bus->qts, utrd_addr, &utrd, sizeof(utrd));
+
+    /* Build up request upiu */
+    UtpUpiuReq req_upiu = { 0 };
+    req_upiu.header.trans_type = UPIU_TRANSACTION_COMMAND;
+    req_upiu.header.flags = flags;
+    req_upiu.header.lun = lun;
+    req_upiu.header.task_tag = slot;
+    req_upiu.sc.exp_data_transfer_len = cpu_to_be32(data_len);
+    memcpy(req_upiu.sc.cdb, cdb, UFS_CDB_SIZE);
+    qtest_memwrite(ufs->dev.bus->qts, req_upiu_addr, &req_upiu,
+                   sizeof(req_upiu));
+
+    /* Ring Doorbell */
+    ufs_wreg(ufs, A_UTRLDBR, 1);
+    ufs_wait_for_irq(ufs);
+    g_assert_true(FIELD_EX32(ufs_rreg(ufs, A_IS), IS, UTRCS));
+    ufs_wreg(ufs, A_IS, FIELD_DP32(0, IS, UTRCS, 1));
+
+    qtest_memread(ufs->dev.bus->qts, utrd_addr, utrd_out, sizeof(*utrd_out));
+    qtest_memread(ufs->dev.bus->qts, rsp_upiu_addr, rsp_out, sizeof(*rsp_out));
+    if (data_out_len) {
+        qtest_memread(ufs->dev.bus->qts, ufs->data_buffer_addr, data_out,
+                      data_out_len);
+    }
+}
+
+/**
+ * Initialize Ufs host controller and logical unit.
+ * After running this function, you can make a transfer request to the UFS.
+ */
+static void ufs_init(QUfs *ufs, QGuestAllocator *alloc)
+{
+    uint64_t end_time;
+    uint32_t nutrs, nutmrs;
+    uint32_t hcs, is, ucmdarg2, cap;
+    uint32_t hce = 0, ie = 0;
+    UtpTransferReqDesc utrd;
+    UtpUpiuRsp rsp_upiu;
+
+    ufs->bar = qpci_iomap(&ufs->dev, 0, NULL);
+    qpci_device_enable(&ufs->dev);
+
+    /* Start host controller initialization */
+    hce = FIELD_DP32(hce, HCE, HCE, 1);
+    ufs_wreg(ufs, A_HCE, hce);
+
+    /* Wait for device to reset */
+    end_time = g_get_monotonic_time() + TIMEOUT_SECONDS * G_TIME_SPAN_SECOND;
+    do {
+        qtest_clock_step(ufs->dev.bus->qts, 100);
+        hce = FIELD_EX32(ufs_rreg(ufs, A_HCE), HCE, HCE);
+    } while (hce == 0 && g_get_monotonic_time() < end_time);
+    g_assert_cmpuint(hce, ==, 1);
+
+    /* Enable interrupt */
+    ie = FIELD_DP32(ie, IE, UCCE, 1);
+    ie = FIELD_DP32(ie, IE, UHESE, 1);
+    ie = FIELD_DP32(ie, IE, UHXSE, 1);
+    ie = FIELD_DP32(ie, IE, UPMSE, 1);
+    ufs_wreg(ufs, A_IE, ie);
+
+    /* Send DME_LINK_STARTUP uic command */
+    hcs = ufs_rreg(ufs, A_HCS);
+    g_assert_true(FIELD_EX32(hcs, HCS, UCRDY));
+
+    ufs_wreg(ufs, A_UCMDARG1, 0);
+    ufs_wreg(ufs, A_UCMDARG2, 0);
+    ufs_wreg(ufs, A_UCMDARG3, 0);
+    ufs_wreg(ufs, A_UICCMD, UIC_CMD_DME_LINK_STARTUP);
+
+    is = ufs_rreg(ufs, A_IS);
+    g_assert_true(FIELD_EX32(is, IS, UCCS));
+    ufs_wreg(ufs, A_IS, FIELD_DP32(0, IS, UCCS, 1));
+
+    ucmdarg2 = ufs_rreg(ufs, A_UCMDARG2);
+    g_assert_cmpuint(ucmdarg2, ==, 0);
+    is = ufs_rreg(ufs, A_IS);
+    g_assert_cmpuint(is, ==, 0);
+    hcs = ufs_rreg(ufs, A_HCS);
+    g_assert_true(FIELD_EX32(hcs, HCS, DP));
+    g_assert_true(FIELD_EX32(hcs, HCS, UTRLRDY));
+    g_assert_true(FIELD_EX32(hcs, HCS, UTMRLRDY));
+    g_assert_true(FIELD_EX32(hcs, HCS, UCRDY));
+
+    /* Enable all interrupt functions */
+    ie = FIELD_DP32(ie, IE, UTRCE, 1);
+    ie = FIELD_DP32(ie, IE, UEE, 1);
+    ie = FIELD_DP32(ie, IE, UPMSE, 1);
+    ie = FIELD_DP32(ie, IE, UHXSE, 1);
+    ie = FIELD_DP32(ie, IE, UHESE, 1);
+    ie = FIELD_DP32(ie, IE, UTMRCE, 1);
+    ie = FIELD_DP32(ie, IE, UCCE, 1);
+    ie = FIELD_DP32(ie, IE, DFEE, 1);
+    ie = FIELD_DP32(ie, IE, HCFEE, 1);
+    ie = FIELD_DP32(ie, IE, SBFEE, 1);
+    ie = FIELD_DP32(ie, IE, CEFEE, 1);
+    ufs_wreg(ufs, A_IE, ie);
+    ufs_wreg(ufs, A_UTRIACR, 0);
+
+    /* Enable tranfer request and task management request */
+    cap = ufs_rreg(ufs, A_CAP);
+    nutrs = FIELD_EX32(cap, CAP, NUTRS) + 1;
+    nutmrs = FIELD_EX32(cap, CAP, NUTMRS) + 1;
+    ufs->cmd_desc_addr =
+        guest_alloc(alloc, nutrs * UTP_COMMAND_DESCRIPTOR_SIZE);
+    ufs->data_buffer_addr =
+        guest_alloc(alloc, MAX_PRD_ENTRY_COUNT * PRD_ENTRY_DATA_SIZE);
+    ufs->utrlba = guest_alloc(alloc, nutrs * sizeof(UtpTransferReqDesc));
+    ufs->utmrlba = guest_alloc(alloc, nutmrs * sizeof(UtpTaskReqDesc));
+
+    ufs_wreg(ufs, A_UTRLBA, ufs->utrlba & 0xffffffff);
+    ufs_wreg(ufs, A_UTRLBAU, ufs->utrlba >> 32);
+    ufs_wreg(ufs, A_UTMRLBA, ufs->utmrlba & 0xffffffff);
+    ufs_wreg(ufs, A_UTMRLBAU, ufs->utmrlba >> 32);
+    ufs_wreg(ufs, A_UTRLRSR, 1);
+    ufs_wreg(ufs, A_UTMRLRSR, 1);
+
+    /* Send nop out to test transfer request */
+    ufs_send_nop_out(ufs, 0, &utrd, &rsp_upiu);
+    g_assert_cmpuint(le32_to_cpu(utrd.header.dword_2), ==, OCS_SUCCESS);
+
+    /* Set fDeviceInit flag via query request */
+    ufs_send_query(ufs, 0, UPIU_QUERY_FUNC_STANDARD_WRITE_REQUEST,
+                   UPIU_QUERY_OPCODE_SET_FLAG, QUERY_FLAG_IDN_FDEVICEINIT, 0,
+                   &utrd, &rsp_upiu);
+    g_assert_cmpuint(le32_to_cpu(utrd.header.dword_2), ==, OCS_SUCCESS);
+
+    /* Wait for device to reset */
+    end_time = g_get_monotonic_time() + TIMEOUT_SECONDS * G_TIME_SPAN_SECOND;
+    do {
+        qtest_clock_step(ufs->dev.bus->qts, 100);
+        ufs_send_query(ufs, 0, UPIU_QUERY_FUNC_STANDARD_READ_REQUEST,
+                       UPIU_QUERY_OPCODE_READ_FLAG, QUERY_FLAG_IDN_FDEVICEINIT,
+                       0, &utrd, &rsp_upiu);
+    } while (be32_to_cpu(rsp_upiu.qr.value) != 0 &&
+             g_get_monotonic_time() < end_time);
+    g_assert_cmpuint(be32_to_cpu(rsp_upiu.qr.value), ==, 0);
+
+    ufs->enabled = true;
+}
+
+static void ufs_exit(QUfs *ufs, QGuestAllocator *alloc)
+{
+    if (ufs->enabled) {
+        guest_free(alloc, ufs->utrlba);
+        guest_free(alloc, ufs->utmrlba);
+        guest_free(alloc, ufs->cmd_desc_addr);
+        guest_free(alloc, ufs->data_buffer_addr);
+    }
+
+    qpci_iounmap(&ufs->dev, ufs->bar);
+}
+
+static void *ufs_get_driver(void *obj, const char *interface)
+{
+    QUfs *ufs = obj;
+
+    if (!g_strcmp0(interface, "pci-device")) {
+        return &ufs->dev;
+    }
+
+    fprintf(stderr, "%s not present in ufs\n", interface);
+    g_assert_not_reached();
+}
+
+static void *ufs_create(void *pci_bus, QGuestAllocator *alloc, void *addr)
+{
+    QUfs *ufs = g_new0(QUfs, 1);
+    QPCIBus *bus = pci_bus;
+
+    qpci_device_init(&ufs->dev, bus, addr);
+    ufs->obj.get_driver = ufs_get_driver;
+
+    return &ufs->obj;
+}
+
+static void ufstest_reg_read(void *obj, void *data, QGuestAllocator *alloc)
+{
+    QUfs *ufs = obj;
+    uint32_t cap;
+
+    ufs->bar = qpci_iomap(&ufs->dev, 0, NULL);
+    qpci_device_enable(&ufs->dev);
+
+    cap = ufs_rreg(ufs, A_CAP);
+    g_assert_cmpuint(FIELD_EX32(cap, CAP, NUTRS), ==, 31);
+    g_assert_cmpuint(FIELD_EX32(cap, CAP, NUTMRS), ==, 7);
+    g_assert_cmpuint(FIELD_EX32(cap, CAP, 64AS), ==, 1);
+
+    qpci_iounmap(&ufs->dev, ufs->bar);
+}
+
+static void ufstest_init(void *obj, void *data, QGuestAllocator *alloc)
+{
+    QUfs *ufs = obj;
+
+    uint8_t buf[4096] = { 0 };
+    const uint8_t report_luns_cdb[UFS_CDB_SIZE] = {
+        /* allocation length 4096 */
+        REPORT_LUNS, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00,        0x00, 0x10, 0x00, 0x00, 0x00
+    };
+    const uint8_t test_unit_ready_cdb[UFS_CDB_SIZE] = {
+        TEST_UNIT_READY,
+    };
+    UtpTransferReqDesc utrd;
+    UtpUpiuRsp rsp_upiu;
+
+    ufs_init(ufs, alloc);
+
+    /* Check REPORT_LUNS */
+    ufs_send_scsi_command(ufs, 0, 0, report_luns_cdb, NULL, 0, buf, sizeof(buf),
+                          &utrd, &rsp_upiu);
+    g_assert_cmpuint(le32_to_cpu(utrd.header.dword_2), ==, OCS_SUCCESS);
+    g_assert_cmpuint(rsp_upiu.header.scsi_status, ==, GOOD);
+    /* LUN LIST LENGTH should be 8, in big endian */
+    g_assert_cmpuint(buf[3], ==, 8);
+    /* There is one logical unit whose lun is 0 */
+    g_assert_cmpuint(buf[9], ==, 0);
+
+    /* Check TEST_UNIT_READY */
+    ufs_send_scsi_command(ufs, 0, 0, test_unit_ready_cdb, NULL, 0, NULL, 0,
+                          &utrd, &rsp_upiu);
+    g_assert_cmpuint(le32_to_cpu(utrd.header.dword_2), ==, OCS_SUCCESS);
+    g_assert_cmpuint(rsp_upiu.header.scsi_status, ==, GOOD);
+
+    ufs_exit(ufs, alloc);
+}
+
+static void ufstest_read_write(void *obj, void *data, QGuestAllocator *alloc)
+{
+    QUfs *ufs = obj;
+    uint8_t read_buf[4096] = { 0 };
+    uint8_t write_buf[4096] = { 0 };
+    const uint8_t read_capacity_cdb[UFS_CDB_SIZE] = {
+        /* allocation length 4096 */
+        SERVICE_ACTION_IN_16,
+        SAI_READ_CAPACITY_16,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x10,
+        0x00,
+        0x00,
+        0x00
+    };
+    const uint8_t read_cdb[UFS_CDB_SIZE] = {
+        /* READ(10) to LBA 0, transfer length 1 */
+        READ_10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00
+    };
+    const uint8_t write_cdb[UFS_CDB_SIZE] = {
+        /* WRITE(10) to LBA 0, transfer length 1 */
+        WRITE_10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00
+    };
+    uint32_t block_size;
+    UtpTransferReqDesc utrd;
+    UtpUpiuRsp rsp_upiu;
+
+    ufs_init(ufs, alloc);
+
+    /* Read capacity */
+    ufs_send_scsi_command(ufs, 0, 1, read_capacity_cdb, NULL, 0, read_buf,
+                          sizeof(read_buf), &utrd, &rsp_upiu);
+    g_assert_cmpuint(le32_to_cpu(utrd.header.dword_2), ==, OCS_SUCCESS);
+    g_assert_cmpuint(rsp_upiu.header.scsi_status, ==, COMMAND_RESULT_SUCESS);
+    block_size = ldl_be_p(&read_buf[8]);
+    g_assert_cmpuint(block_size, ==, 4096);
+
+    /* Write data */
+    memset(write_buf, rand() % 255 + 1, block_size);
+    ufs_send_scsi_command(ufs, 0, 1, write_cdb, write_buf, block_size, NULL, 0,
+                          &utrd, &rsp_upiu);
+    g_assert_cmpuint(le32_to_cpu(utrd.header.dword_2), ==, OCS_SUCCESS);
+    g_assert_cmpuint(rsp_upiu.header.scsi_status, ==, COMMAND_RESULT_SUCESS);
+
+    /* Read data and verify */
+    ufs_send_scsi_command(ufs, 0, 1, read_cdb, NULL, 0, read_buf, block_size,
+                          &utrd, &rsp_upiu);
+    g_assert_cmpuint(le32_to_cpu(utrd.header.dword_2), ==, OCS_SUCCESS);
+    g_assert_cmpuint(rsp_upiu.header.scsi_status, ==, COMMAND_RESULT_SUCESS);
+    g_assert_cmpint(memcmp(read_buf, write_buf, block_size), ==, 0);
+
+    ufs_exit(ufs, alloc);
+}
+
+static void drive_destroy(void *path)
+{
+    unlink(path);
+    g_free(path);
+    qos_invalidate_command_line();
+}
+
+static char *drive_create(void)
+{
+    int fd, ret;
+    char *t_path;
+
+    /* Create a temporary raw image */
+    fd = g_file_open_tmp("qtest-ufs.XXXXXX", &t_path, NULL);
+    g_assert_cmpint(fd, >=, 0);
+    ret = ftruncate(fd, TEST_IMAGE_SIZE);
+    g_assert_cmpint(ret, ==, 0);
+    close(fd);
+
+    g_test_queue_destroy(drive_destroy, t_path);
+    return t_path;
+}
+
+static void *ufs_blk_test_setup(GString *cmd_line, void *arg)
+{
+    char *tmp_path = drive_create();
+
+    g_string_append_printf(cmd_line,
+                           " -blockdev file,filename=%s,node-name=drv1 "
+                           "-device ufs-lu,bus=ufs0,drive=drv1,lun=1 ",
+                           tmp_path);
+
+    return arg;
+}
+
+static void ufs_register_nodes(void)
+{
+    const char *arch;
+    QOSGraphEdgeOptions edge_opts = {
+        .before_cmd_line = "-blockdev null-co,node-name=drv0,read-zeroes=on",
+        .after_cmd_line = "-device ufs-lu,bus=ufs0,drive=drv0,lun=0",
+        .extra_device_opts = "addr=04.0,id=ufs0,nutrs=32,nutmrs=8"
+    };
+
+    QOSGraphTestOptions io_test_opts = {
+        .before = ufs_blk_test_setup,
+    };
+
+    add_qpci_address(&edge_opts, &(QPCIAddress){ .devfn = QPCI_DEVFN(4, 0) });
+
+    qos_node_create_driver("ufs", ufs_create);
+    qos_node_consumes("ufs", "pci-bus", &edge_opts);
+    qos_node_produces("ufs", "pci-device");
+
+    qos_add_test("reg-read", "ufs", ufstest_reg_read, NULL);
+
+    /*
+     * Check architecture
+     * TODO: Enable ufs io tests for ppc64
+     */
+    arch = qtest_get_arch();
+    if (!strcmp(arch, "ppc64")) {
+        g_test_message("Skipping ufs io tests for ppc64");
+        return;
+    }
+    qos_add_test("init", "ufs", ufstest_init, NULL);
+    qos_add_test("read-write", "ufs", ufstest_read_write, &io_test_opts);
+}
+
+libqos_init(ufs_register_nodes);
diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/tests/qtest/meson.build
+++ b/tests/qtest/meson.build
@@ -XXX,XX +XXX,XX @@ qos_test_ss.add(
   'virtio-iommu-test.c',
   'vmxnet3-test.c',
   'igb-test.c',
+  'ufs-test.c',
 )
 
 if config_all_devices.has_key('CONFIG_VIRTIO_SERIAL')
-- 
2.41.0

From: Fabiano Rosas <farosas@suse.de>

We can fail the blk_insert_bs() at init_blk_migration(), leaving the
BlkMigDevState without a dirty_bitmap and BlockDriverState. Account
for the possibly missing elements when doing cleanup.

Fix the following crashes:

Thread 1 "qemu-system-x86" received signal SIGSEGV, Segmentation fault.
0x0000555555ec83ef in bdrv_release_dirty_bitmap (bitmap=0x0) at ../block/dirty-bitmap.c:359
359         BlockDriverState *bs = bitmap->bs;
 #0  0x0000555555ec83ef in bdrv_release_dirty_bitmap (bitmap=0x0) at ../block/dirty-bitmap.c:359
 #1  0x0000555555bba331 in unset_dirty_tracking () at ../migration/block.c:371
 #2  0x0000555555bbad98 in block_migration_cleanup_bmds () at ../migration/block.c:681

Thread 1 "qemu-system-x86" received signal SIGSEGV, Segmentation fault.
0x0000555555e971ff in bdrv_op_unblock (bs=0x0, op=BLOCK_OP_TYPE_BACKUP_SOURCE, reason=0x0) at ../block.c:7073
7073        QLIST_FOREACH_SAFE(blocker, &bs->op_blockers[op], list, next) {
 #0  0x0000555555e971ff in bdrv_op_unblock (bs=0x0, op=BLOCK_OP_TYPE_BACKUP_SOURCE, reason=0x0) at ../block.c:7073
 #1  0x0000555555e9734a in bdrv_op_unblock_all (bs=0x0, reason=0x0) at ../block.c:7095
 #2  0x0000555555bbae13 in block_migration_cleanup_bmds () at ../migration/block.c:690

Signed-off-by: Fabiano Rosas <farosas@suse.de>
Message-id: 20230731203338.27581-1-farosas@suse.de
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 migration/block.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/migration/block.c b/migration/block.c
index XXXXXXX..XXXXXXX 100644
--- a/migration/block.c
+++ b/migration/block.c
@@ -XXX,XX +XXX,XX @@ static void unset_dirty_tracking(void)
     BlkMigDevState *bmds;
 
     QSIMPLEQ_FOREACH(bmds, &block_mig_state.bmds_list, entry) {
-        bdrv_release_dirty_bitmap(bmds->dirty_bitmap);
+        if (bmds->dirty_bitmap) {
+            bdrv_release_dirty_bitmap(bmds->dirty_bitmap);
+        }
     }
 }
 
@@ -XXX,XX +XXX,XX @@ static int64_t get_remaining_dirty(void)
 static void block_migration_cleanup_bmds(void)
 {
     BlkMigDevState *bmds;
+    BlockDriverState *bs;
     AioContext *ctx;
 
     unset_dirty_tracking();
 
     while ((bmds = QSIMPLEQ_FIRST(&block_mig_state.bmds_list)) != NULL) {
         QSIMPLEQ_REMOVE_HEAD(&block_mig_state.bmds_list, entry);
-        bdrv_op_unblock_all(blk_bs(bmds->blk), bmds->blocker);
+
+        bs = blk_bs(bmds->blk);
+        if (bs) {
+            bdrv_op_unblock_all(bs, bmds->blocker);
+        }
         error_free(bmds->blocker);
 
         /* Save ctx, because bmds->blk can disappear during blk_unref.  */
-- 
2.41.0

From: Andrey Drobyshev <andrey.drobyshev@virtuozzo.com>

This is going to be used in the subsequent commit as requests alignment
(in particular, during copy-on-read).  This value only makes sense for
the formats which support subclusters (currently QCOW2 only).  If this
field isn't set by driver's own bdrv_get_info() implementation, we
simply set it equal to the cluster size thus treating each cluster as
having a single subcluster.

Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Denis V. Lunev <den@openvz.org>
Signed-off-by: Andrey Drobyshev <andrey.drobyshev@virtuozzo.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-ID: <20230711172553.234055-2-andrey.drobyshev@virtuozzo.com>
---
 include/block/block-common.h | 5 +++++
 block.c                      | 7 +++++++
 block/qcow2.c                | 1 +
 3 files changed, 13 insertions(+)

diff --git a/include/block/block-common.h b/include/block/block-common.h
index XXXXXXX..XXXXXXX 100644
--- a/include/block/block-common.h
+++ b/include/block/block-common.h
@@ -XXX,XX +XXX,XX @@ typedef struct BlockZoneWps {
 typedef struct BlockDriverInfo {
     /* in bytes, 0 if irrelevant */
     int cluster_size;
+    /*
+     * A fraction of cluster_size, if supported (currently QCOW2 only); if
+     * disabled or unsupported, set equal to cluster_size.
+     */
+    int subcluster_size;
     /* offset at which the VM state can be saved (0 if not possible) */
     int64_t vm_state_offset;
     bool is_dirty;
diff --git a/block.c b/block.c
index XXXXXXX..XXXXXXX 100644
--- a/block.c
+++ b/block.c
@@ -XXX,XX +XXX,XX @@ int coroutine_fn bdrv_co_get_info(BlockDriverState *bs, BlockDriverInfo *bdi)
     }
     memset(bdi, 0, sizeof(*bdi));
     ret = drv->bdrv_co_get_info(bs, bdi);
+    if (bdi->subcluster_size == 0) {
+        /*
+         * If the driver left this unset, subclusters are not supported.
+         * Then it is safe to treat each cluster as having only one subcluster.
+         */
+        bdi->subcluster_size = bdi->cluster_size;
+    }
     if (ret < 0) {
         return ret;
     }
diff --git a/block/qcow2.c b/block/qcow2.c
index XXXXXXX..XXXXXXX 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -XXX,XX +XXX,XX @@ qcow2_co_get_info(BlockDriverState *bs, BlockDriverInfo *bdi)
 {
     BDRVQcow2State *s = bs->opaque;
     bdi->cluster_size = s->cluster_size;
+    bdi->subcluster_size = s->subcluster_size;
     bdi->vm_state_offset = qcow2_vm_state_offset(s);
     bdi->is_dirty = s->incompatible_features & QCOW2_INCOMPAT_DIRTY;
     return 0;
-- 
2.41.0

From: Andrey Drobyshev <andrey.drobyshev@virtuozzo.com>

When target image is using subclusters, and we align the request during
copy-on-read, it makes sense to align to subcluster_size rather than
cluster_size.  Otherwise we end up with unnecessary allocations.

This commit renames bdrv_round_to_clusters() to bdrv_round_to_subclusters()
and utilizes subcluster_size field of BlockDriverInfo to make necessary
alignments.  It affects copy-on-read as well as mirror job (which is
using bdrv_round_to_clusters()).

This change also fixes the following bug with failing assert (covered by
the test in the subsequent commit):

qemu-img create -f qcow2 base.qcow2 64K
qemu-img create -f qcow2 -o extended_l2=on,backing_file=base.qcow2,backing_fmt=qcow2 img.qcow2 64K
qemu-io -c "write -P 0xaa 0 2K" img.qcow2
qemu-io -C -c "read -P 0x00 2K 62K" img.qcow2

qemu-io: ../block/io.c:1236: bdrv_co_do_copy_on_readv: Assertion `skip_bytes < pnum' failed.

Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Denis V. Lunev <den@openvz.org>
Signed-off-by: Andrey Drobyshev <andrey.drobyshev@virtuozzo.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-ID: <20230711172553.234055-3-andrey.drobyshev@virtuozzo.com>
---
 include/block/block-io.h |  8 +++----
 block/io.c               | 50 ++++++++++++++++++++--------------------
 block/mirror.c           |  8 +++----
 3 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/include/block/block-io.h b/include/block/block-io.h
index XXXXXXX..XXXXXXX 100644
--- a/include/block/block-io.h
+++ b/include/block/block-io.h
@@ -XXX,XX +XXX,XX @@ bdrv_get_info(BlockDriverState *bs, BlockDriverInfo *bdi);
 ImageInfoSpecific *bdrv_get_specific_info(BlockDriverState *bs,
                                           Error **errp);
 BlockStatsSpecific *bdrv_get_specific_stats(BlockDriverState *bs);
-void bdrv_round_to_clusters(BlockDriverState *bs,
-                            int64_t offset, int64_t bytes,
-                            int64_t *cluster_offset,
-                            int64_t *cluster_bytes);
+void bdrv_round_to_subclusters(BlockDriverState *bs,
+                               int64_t offset, int64_t bytes,
+                               int64_t *cluster_offset,
+                               int64_t *cluster_bytes);
 
 void bdrv_get_backing_filename(BlockDriverState *bs,
                                char *filename, int filename_size);
diff --git a/block/io.c b/block/io.c
index XXXXXXX..XXXXXXX 100644
--- a/block/io.c
+++ b/block/io.c
@@ -XXX,XX +XXX,XX @@ BdrvTrackedRequest *coroutine_fn bdrv_co_get_self_request(BlockDriverState *bs)
 }
 
 /**
- * Round a region to cluster boundaries
+ * Round a region to subcluster (if supported) or cluster boundaries
  */
 void coroutine_fn GRAPH_RDLOCK
-bdrv_round_to_clusters(BlockDriverState *bs, int64_t offset, int64_t bytes,
-                       int64_t *cluster_offset, int64_t *cluster_bytes)
+bdrv_round_to_subclusters(BlockDriverState *bs, int64_t offset, int64_t bytes,
+                          int64_t *align_offset, int64_t *align_bytes)
 {
     BlockDriverInfo bdi;
     IO_CODE();
-    if (bdrv_co_get_info(bs, &bdi) < 0 || bdi.cluster_size == 0) {
-        *cluster_offset = offset;
-        *cluster_bytes = bytes;
+    if (bdrv_co_get_info(bs, &bdi) < 0 || bdi.subcluster_size == 0) {
+        *align_offset = offset;
+        *align_bytes = bytes;
     } else {
-        int64_t c = bdi.cluster_size;
-        *cluster_offset = QEMU_ALIGN_DOWN(offset, c);
-        *cluster_bytes = QEMU_ALIGN_UP(offset - *cluster_offset + bytes, c);
+        int64_t c = bdi.subcluster_size;
+        *align_offset = QEMU_ALIGN_DOWN(offset, c);
+        *align_bytes = QEMU_ALIGN_UP(offset - *align_offset + bytes, c);
     }
 }
 
@@ -XXX,XX +XXX,XX @@ bdrv_co_do_copy_on_readv(BdrvChild *child, int64_t offset, int64_t bytes,
     void *bounce_buffer = NULL;
 
     BlockDriver *drv = bs->drv;
-    int64_t cluster_offset;
-    int64_t cluster_bytes;
+    int64_t align_offset;
+    int64_t align_bytes;
     int64_t skip_bytes;
     int ret;
     int max_transfer = MIN_NON_ZERO(bs->bl.max_transfer,
@@ -XXX,XX +XXX,XX @@ bdrv_co_do_copy_on_readv(BdrvChild *child, int64_t offset, int64_t bytes,
      * BDRV_REQUEST_MAX_BYTES (even when the original read did not), which
      * is one reason we loop rather than doing it all at once.
      */
-    bdrv_round_to_clusters(bs, offset, bytes, &cluster_offset, &cluster_bytes);
-    skip_bytes = offset - cluster_offset;
+    bdrv_round_to_subclusters(bs, offset, bytes, &align_offset, &align_bytes);
+    skip_bytes = offset - align_offset;
 
     trace_bdrv_co_do_copy_on_readv(bs, offset, bytes,
-                                   cluster_offset, cluster_bytes);
+                                   align_offset, align_bytes);
 
-    while (cluster_bytes) {
+    while (align_bytes) {
         int64_t pnum;
 
         if (skip_write) {
             ret = 1; /* "already allocated", so nothing will be copied */
-            pnum = MIN(cluster_bytes, max_transfer);
+            pnum = MIN(align_bytes, max_transfer);
         } else {
-            ret = bdrv_is_allocated(bs, cluster_offset,
-                                    MIN(cluster_bytes, max_transfer), &pnum);
+            ret = bdrv_is_allocated(bs, align_offset,
+                                    MIN(align_bytes, max_transfer), &pnum);
             if (ret < 0) {
                 /*
                  * Safe to treat errors in querying allocation as if
                  * unallocated; we'll probably fail again soon on the
                  * read, but at least that will set a decent errno.
                  */
-                pnum = MIN(cluster_bytes, max_transfer);
+                pnum = MIN(align_bytes, max_transfer);
             }
 
             /* Stop at EOF if the image ends in the middle of the cluster */
@@ -XXX,XX +XXX,XX @@ bdrv_co_do_copy_on_readv(BdrvChild *child, int64_t offset, int64_t bytes,
             /* Must copy-on-read; use the bounce buffer */
             pnum = MIN(pnum, MAX_BOUNCE_BUFFER);
             if (!bounce_buffer) {
-                int64_t max_we_need = MAX(pnum, cluster_bytes - pnum);
+                int64_t max_we_need = MAX(pnum, align_bytes - pnum);
                 int64_t max_allowed = MIN(max_transfer, MAX_BOUNCE_BUFFER);
                 int64_t bounce_buffer_len = MIN(max_we_need, max_allowed);
 
@@ -XXX,XX +XXX,XX @@ bdrv_co_do_copy_on_readv(BdrvChild *child, int64_t offset, int64_t bytes,
             }
             qemu_iovec_init_buf(&local_qiov, bounce_buffer, pnum);
 
-            ret = bdrv_driver_preadv(bs, cluster_offset, pnum,
+            ret = bdrv_driver_preadv(bs, align_offset, pnum,
                                      &local_qiov, 0, 0);
             if (ret < 0) {
                 goto err;
@@ -XXX,XX +XXX,XX @@ bdrv_co_do_copy_on_readv(BdrvChild *child, int64_t offset, int64_t bytes,
                 /* FIXME: Should we (perhaps conditionally) be setting
                  * BDRV_REQ_MAY_UNMAP, if it will allow for a sparser copy
                  * that still correctly reads as zero? */
-                ret = bdrv_co_do_pwrite_zeroes(bs, cluster_offset, pnum,
+                ret = bdrv_co_do_pwrite_zeroes(bs, align_offset, pnum,
                                                BDRV_REQ_WRITE_UNCHANGED);
             } else {
                 /* This does not change the data on the disk, it is not
                  * necessary to flush even in cache=writethrough mode.
                  */
-                ret = bdrv_driver_pwritev(bs, cluster_offset, pnum,
+                ret = bdrv_driver_pwritev(bs, align_offset, pnum,
                                           &local_qiov, 0,
                                           BDRV_REQ_WRITE_UNCHANGED);
             }
@@ -XXX,XX +XXX,XX @@ bdrv_co_do_copy_on_readv(BdrvChild *child, int64_t offset, int64_t bytes,
             }
         }
 
-        cluster_offset += pnum;
-        cluster_bytes -= pnum;
+        align_offset += pnum;
+        align_bytes -= pnum;
         progress += pnum - skip_bytes;
         skip_bytes = 0;
     }
diff --git a/block/mirror.c b/block/mirror.c
index XXXXXXX..XXXXXXX 100644
--- a/block/mirror.c
+++ b/block/mirror.c
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn mirror_cow_align(MirrorBlockJob *s, int64_t *offset,
     need_cow |= !test_bit((*offset + *bytes - 1) / s->granularity,
                           s->cow_bitmap);
     if (need_cow) {
-        bdrv_round_to_clusters(blk_bs(s->target), *offset, *bytes,
-                               &align_offset, &align_bytes);
+        bdrv_round_to_subclusters(blk_bs(s->target), *offset, *bytes,
+                                  &align_offset, &align_bytes);
     }
 
     if (align_bytes > max_bytes) {
@@ -XXX,XX +XXX,XX @@ static void coroutine_fn mirror_iteration(MirrorBlockJob *s)
             int64_t target_offset;
             int64_t target_bytes;
             WITH_GRAPH_RDLOCK_GUARD() {
-                bdrv_round_to_clusters(blk_bs(s->target), offset, io_bytes,
-                                       &target_offset, &target_bytes);
+                bdrv_round_to_subclusters(blk_bs(s->target), offset, io_bytes,
+                                          &target_offset, &target_bytes);
             }
             if (target_offset == offset &&
                 target_bytes == io_bytes) {
-- 
2.41.0

From: Andrey Drobyshev <andrey.drobyshev@virtuozzo.com>

Add testcase which checks that allocations during copy-on-read are
performed on the subcluster basis when subclusters are enabled in target
image.

This testcase also triggers the following assert with previous commit
not being applied, so we check that as well:

qemu-io: ../block/io.c:1236: bdrv_co_do_copy_on_readv: Assertion `skip_bytes < pnum' failed.

Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Denis V. Lunev <den@openvz.org>
Signed-off-by: Andrey Drobyshev <andrey.drobyshev@virtuozzo.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-ID: <20230711172553.234055-4-andrey.drobyshev@virtuozzo.com>
---
 tests/qemu-iotests/197     | 29 +++++++++++++++++++++++++++++
 tests/qemu-iotests/197.out | 24 ++++++++++++++++++++++++
 2 files changed, 53 insertions(+)

diff --git a/tests/qemu-iotests/197 b/tests/qemu-iotests/197
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/197
+++ b/tests/qemu-iotests/197
@@ -XXX,XX +XXX,XX @@ $QEMU_IO -f qcow2 -C -c 'read 0 1024' "$TEST_WRAP" | _filter_qemu_io
 $QEMU_IO -f qcow2 -c map "$TEST_WRAP"
 _check_test_img
 
+echo
+echo '=== Copy-on-read with subclusters ==='
+echo
+
+# Create base and top images 64K (1 cluster) each.  Make subclusters enabled
+# for the top image
+_make_test_img 64K
+IMGPROTO=file IMGFMT=qcow2 TEST_IMG_FILE="$TEST_WRAP" \
+    _make_test_img --no-opts -o extended_l2=true -F "$IMGFMT" -b "$TEST_IMG" \
+    64K | _filter_img_create
+
+$QEMU_IO -c "write -P 0xaa 0 64k" "$TEST_IMG" | _filter_qemu_io
+
+# Allocate individual subclusters in the top image, and not the whole cluster
+$QEMU_IO -c "write -P 0xbb 28K 2K" -c "write -P 0xcc 34K 2K" "$TEST_WRAP" \
+    | _filter_qemu_io
+
+# Only 2 subclusters should be allocated in the top image at this point
+$QEMU_IMG map "$TEST_WRAP" | _filter_qemu_img_map
+
+# Actual copy-on-read operation
+$QEMU_IO -C -c "read -P 0xaa 30K 4K" "$TEST_WRAP" | _filter_qemu_io
+
+# And here we should have 4 subclusters allocated right in the middle of the
+# top image. Make sure the whole cluster remains unallocated
+$QEMU_IMG map "$TEST_WRAP" | _filter_qemu_img_map
+
+_check_test_img
+
 # success, all done
 echo '*** done'
 status=0
diff --git a/tests/qemu-iotests/197.out b/tests/qemu-iotests/197.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/197.out
+++ b/tests/qemu-iotests/197.out
@@ -XXX,XX +XXX,XX @@ read 1024/1024 bytes at offset 0
 1 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 1 KiB (0x400) bytes     allocated at offset 0 bytes (0x0)
 No errors were found on the image.
+
+=== Copy-on-read with subclusters ===
+
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=65536
+Formatting 'TEST_DIR/t.wrap.IMGFMT', fmt=IMGFMT size=65536 backing_file=TEST_DIR/t.IMGFMT backing_fmt=IMGFMT
+wrote 65536/65536 bytes at offset 0
+64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+wrote 2048/2048 bytes at offset 28672
+2 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+wrote 2048/2048 bytes at offset 34816
+2 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+Offset          Length          File
+0               0x7000          TEST_DIR/t.IMGFMT
+0x7000          0x800           TEST_DIR/t.wrap.IMGFMT
+0x7800          0x1000          TEST_DIR/t.IMGFMT
+0x8800          0x800           TEST_DIR/t.wrap.IMGFMT
+0x9000          0x7000          TEST_DIR/t.IMGFMT
+read 4096/4096 bytes at offset 30720
+4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+Offset          Length          File
+0               0x7000          TEST_DIR/t.IMGFMT
+0x7000          0x2000          TEST_DIR/t.wrap.IMGFMT
+0x9000          0x7000          TEST_DIR/t.IMGFMT
+No errors were found on the image.
 *** done
-- 
2.41.0