qemu-commits
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] bc8afa: hw/block/nvme: remove redundant inval

From: Peter Maydell
Subject: [Qemu-commits] [qemu/qemu] bc8afa: hw/block/nvme: remove redundant invalid_lba_range ...
Date: Tue, 18 May 2021 04:27:56 -0700 
  Branch: refs/heads/staging
  Home:   https://github.com/qemu/qemu
  Commit: bc8afa62b4ce389b9847080a65e7c58696a30c06
      
https://github.com/qemu/qemu/commit/bc8afa62b4ce389b9847080a65e7c58696a30c06
  Author: Gollu Appalanaidu <anaidu.gollu@samsung.com>
  Date:   2021-05-17 (Mon, 17 May 2021)

  Changed paths:
    M hw/block/nvme.c

  Log Message:
  -----------
  hw/block/nvme: remove redundant invalid_lba_range trace

Currently pci_nvme_err_invalid_lba_range trace is called individually at
each nvme_check_bounds() call site.

Move the trace event to nvme_check_bounds() and remove the redundant
events.

Signed-off-by: Gollu Appalanaidu <anaidu.gollu@samsung.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
[k.jensen: commit message fixup]
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>


  Commit: 9a31c61583cd7577a1716e1ed6bdd463f591e810
      
https://github.com/qemu/qemu/commit/9a31c61583cd7577a1716e1ed6bdd463f591e810
  Author: Gollu Appalanaidu <anaidu.gollu@samsung.com>
  Date:   2021-05-17 (Mon, 17 May 2021)

  Changed paths:
    M include/block/nvme.h

  Log Message:
  -----------
  hw/block/nvme: rename reserved fields declarations

Align the 'rsvd1' reserved field declaration in NvmeBar with existing
style.

Signed-off-by: Gollu Appalanaidu <anaidu.gollu@samsung.com>
[k.jensen: minor commit message fixup]
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>


  Commit: b4a983239343efd0a2d8a6cdf0690d0d707ec4ea
      
https://github.com/qemu/qemu/commit/b4a983239343efd0a2d8a6cdf0690d0d707ec4ea
  Author: Gollu Appalanaidu <anaidu.gollu@samsung.com>
  Date:   2021-05-17 (Mon, 17 May 2021)

  Changed paths:
    M hw/block/nvme.c

  Log Message:
  -----------
  hw/block/nvme: consider metadata read aio return value in compare

Currently in compare command metadata aio read blk_aio_preadv return
value ignored. Consider it and complete the block accounting.

Signed-off-by: Gollu Appalanaidu <anaidu.gollu@samsung.com>
Fixes: 0a384f923f51 ("hw/block/nvme: add compare command")
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>


  Commit: e5360eabd2a58f740ca92549461f6a23b3c3d8dc
      
https://github.com/qemu/qemu/commit/e5360eabd2a58f740ca92549461f6a23b3c3d8dc
  Author: Gollu Appalanaidu <anaidu.gollu@samsung.com>
  Date:   2021-05-17 (Mon, 17 May 2021)

  Changed paths:
    M hw/block/nvme.c

  Log Message:
  -----------
  hw/block/nvme: fix io-command set profile feature

Currently IO Command Set Profile feature is supported, but the feature
support flag not set. Further, this feature is changable. Fix that.

Additionally, remove filling default value of the CQE result with zero,
since it will fall back to the default case anyway.

Signed-off-by: Gollu Appalanaidu <anaidu.gollu@samsung.com>
[k.jensen: fix up commit message]
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>


  Commit: 8e8555a38d6bb68242e2653bf3243d49501200a9
      
https://github.com/qemu/qemu/commit/8e8555a38d6bb68242e2653bf3243d49501200a9
  Author: Gollu Appalanaidu <anaidu.gollu@samsung.com>
  Date:   2021-05-17 (Mon, 17 May 2021)

  Changed paths:
    M hw/block/nvme.c

  Log Message:
  -----------
  hw/block/nvme: function formatting fix

nvme_map_addr_pmr function arguments not aligned, fix that.

Signed-off-by: Gollu Appalanaidu <anaidu.gollu@samsung.com>
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>


  Commit: 312c3531bba416e589f106db8c8241fc6e7e6332
      
https://github.com/qemu/qemu/commit/312c3531bba416e589f106db8c8241fc6e7e6332
  Author: Gollu Appalanaidu <anaidu.gollu@samsung.com>
  Date:   2021-05-17 (Mon, 17 May 2021)

  Changed paths:
    M hw/block/nvme-ns.c
    M hw/block/nvme.c
    M include/block/nvme.h

  Log Message:
  -----------
  hw/block/nvme: align with existing style

While QEMU coding style prefers lowercase hexadecimals in constants, the
NVMe subsystem uses the format from the NVMe specifications in comments,
i.e. 'h' suffix instead of '0x' prefix.

Fix this up across the code base.

Signed-off-by: Gollu Appalanaidu <anaidu.gollu@samsung.com>
[k.jensen: updated message; added conversion in a couple of missing comments]
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>


  Commit: c6dfa9d6b4b460a7dcf033478606fb17f8c5b0fa
      
https://github.com/qemu/qemu/commit/c6dfa9d6b4b460a7dcf033478606fb17f8c5b0fa
  Author: Klaus Jensen <k.jensen@samsung.com>
  Date:   2021-05-17 (Mon, 17 May 2021)

  Changed paths:
    M hw/block/nvme.c

  Log Message:
  -----------
  hw/block/nvme: rename __nvme_zrm_open

Get rid of the (reserved) double underscore use. Rename the "generic"
zone open function to nvme_zrm_open_flags() and add a generic `int
flags` argument instead which allows more flags to be easily added in
the future. There is at least one TP under standardization that would
add an additional flag.

Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Cc: Thomas Huth <thuth@redhat.com>
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Keith Busch <kbusch@kernel.org>


  Commit: 7dbe53778ecba4c59de082e69f06c64d47d6eecb
      
https://github.com/qemu/qemu/commit/7dbe53778ecba4c59de082e69f06c64d47d6eecb
  Author: Klaus Jensen <k.jensen@samsung.com>
  Date:   2021-05-17 (Mon, 17 May 2021)

  Changed paths:
    M hw/block/nvme.c

  Log Message:
  -----------
  hw/block/nvme: rename __nvme_advance_zone_wp

Get rid of the (reserved) double underscore use.

Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Cc: Thomas Huth <thuth@redhat.com>
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Keith Busch <kbusch@kernel.org>


  Commit: 42821d28648ff9fc456786192f944ce233aea0d3
      
https://github.com/qemu/qemu/commit/42821d28648ff9fc456786192f944ce233aea0d3
  Author: Klaus Jensen <k.jensen@samsung.com>
  Date:   2021-05-17 (Mon, 17 May 2021)

  Changed paths:
    M hw/block/nvme.c

  Log Message:
  -----------
  hw/block/nvme: rename __nvme_select_ns_iocs

Get rid of the (reserved) double underscore use.

Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Cc: Thomas Huth <thuth@redhat.com>
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Keith Busch <kbusch@kernel.org>


  Commit: d88e784f349591786ea673e55fc0c87383f2430c
      
https://github.com/qemu/qemu/commit/d88e784f349591786ea673e55fc0c87383f2430c
  Author: Klaus Jensen <k.jensen@samsung.com>
  Date:   2021-05-17 (Mon, 17 May 2021)

  Changed paths:
    M hw/block/nvme-dif.c
    R hw/block/nvme-dif.h
    M hw/block/nvme-ns.c
    R hw/block/nvme-ns.h
    M hw/block/nvme-subsys.c
    R hw/block/nvme-subsys.h
    M hw/block/nvme.c
    M hw/block/nvme.h

  Log Message:
  -----------
  hw/block/nvme: consolidate header files

In preparation for moving the nvme device into its own subtree, merge
the header files into one.

Also add missing copyright notice and add list of authors with
substantial contributions.

Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
Reviewed-by: Keith Busch <kbusch@kernel.org>


  Commit: 7ef37c1c59d62ace4417b33d81b430f165f102a4
      
https://github.com/qemu/qemu/commit/7ef37c1c59d62ace4417b33d81b430f165f102a4
  Author: Klaus Jensen <k.jensen@samsung.com>
  Date:   2021-05-17 (Mon, 17 May 2021)

  Changed paths:
    M hw/block/nvme-dif.c
    M hw/block/nvme-ns.c
    M hw/block/nvme-subsys.c
    M hw/block/nvme.c

  Log Message:
  -----------
  hw/block/nvme: cleanup includes

Clean up includes.

Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
Reviewed-by: Keith Busch <kbusch@kernel.org>


  Commit: de482d1fad184d142433b939cdff9681f5cfc668
      
https://github.com/qemu/qemu/commit/de482d1fad184d142433b939cdff9681f5cfc668
  Author: Klaus Jensen <k.jensen@samsung.com>
  Date:   2021-05-17 (Mon, 17 May 2021)

  Changed paths:
    M hw/block/nvme-ns.c
    M hw/block/nvme.c
    M hw/block/nvme.h

  Log Message:
  -----------
  hw/block/nvme: remove non-shared defines from header file

Remove non-shared defines from the shared header.

Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
Reviewed-by: Keith Busch <kbusch@kernel.org>


  Commit: 0c76fee2f8e3332b8d7db89da13e4edfdcc5a4f0
      
https://github.com/qemu/qemu/commit/0c76fee2f8e3332b8d7db89da13e4edfdcc5a4f0
  Author: Klaus Jensen <k.jensen@samsung.com>
  Date:   2021-05-17 (Mon, 17 May 2021)

  Changed paths:
    M hw/block/nvme.c
    M hw/block/nvme.h

  Log Message:
  -----------
  hw/block/nvme: replace nvme_ns_status

The inline nvme_ns_status() helper only has a single call site. Remove
it from the header file and inline it for real.

Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
Reviewed-by: Keith Busch <kbusch@kernel.org>


  Commit: 6146f3dd35cd71b4ac594b2e4a86c4bb3af52b09
      
https://github.com/qemu/qemu/commit/6146f3dd35cd71b4ac594b2e4a86c4bb3af52b09
  Author: Klaus Jensen <k.jensen@samsung.com>
  Date:   2021-05-17 (Mon, 17 May 2021)

  Changed paths:
    M hw/block/nvme-dif.c
    M hw/block/nvme-ns.c
    M hw/block/nvme.c
    M hw/block/nvme.h

  Log Message:
  -----------
  hw/block/nvme: cache lba and ms sizes

There is no need to look up the lba size and metadata size in the LBA
Format structure everytime we want to use it. And we use it a lot.

Cache the values in the NvmeNamespace and update them if the namespace
is formatted.

Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
Reviewed-by: Keith Busch <kbusch@kernel.org>


  Commit: 3ef73f9462a0c142dce80ce5b4ff8789b39f2f64
      
https://github.com/qemu/qemu/commit/3ef73f9462a0c142dce80ce5b4ff8789b39f2f64
  Author: Klaus Jensen <k.jensen@samsung.com>
  Date:   2021-05-17 (Mon, 17 May 2021)

  Changed paths:
    M hw/block/nvme-dif.c
    M hw/block/nvme-ns.c
    M hw/block/nvme.c
    M hw/block/nvme.h

  Log Message:
  -----------
  hw/block/nvme: add metadata offset helper

Add an nvme_moff() helper.

Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
Reviewed-by: Keith Busch <kbusch@kernel.org>


  Commit: 72ea5c2c2067086ced90c7f5e4d98c93072a0fc2
      
https://github.com/qemu/qemu/commit/72ea5c2c2067086ced90c7f5e4d98c93072a0fc2
  Author: Klaus Jensen <k.jensen@samsung.com>
  Date:   2021-05-17 (Mon, 17 May 2021)

  Changed paths:
    M hw/block/nvme.c
    M hw/block/nvme.h

  Log Message:
  -----------
  hw/block/nvme: streamline namespace array indexing

Streamline namespace array indexing such that both the subsystem and
controller namespaces arrays are 1-indexed.

Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
Reviewed-by: Keith Busch <kbusch@kernel.org>


  Commit: 9d394c80f19b86c5a0a8ca30d976bf2a25c3b645
      
https://github.com/qemu/qemu/commit/9d394c80f19b86c5a0a8ca30d976bf2a25c3b645
  Author: Klaus Jensen <k.jensen@samsung.com>
  Date:   2021-05-17 (Mon, 17 May 2021)

  Changed paths:
    M hw/block/nvme.c
    M hw/block/nvme.h

  Log Message:
  -----------
  hw/block/nvme: remove num_namespaces member

The NvmeCtrl num_namespaces member is just an indirection for the
NVME_MAX_NAMESPACES constant.

Remove the indirection.

Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
Reviewed-by: Keith Busch <kbusch@kernel.org>


  Commit: 83e85b614ddab2810b75583c6b3106ff42207a57
      
https://github.com/qemu/qemu/commit/83e85b614ddab2810b75583c6b3106ff42207a57
  Author: Klaus Jensen <k.jensen@samsung.com>
  Date:   2021-05-17 (Mon, 17 May 2021)

  Changed paths:
    M hw/block/nvme-ns.c

  Log Message:
  -----------
  hw/block/nvme: remove irrelevant zone resource checks

It is not an error to report more active/open zones supported than the
number of zones in the namespace.

Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
Reviewed-by: Keith Busch <kbusch@kernel.org>


  Commit: 49ad39c55a2086637bbde4616491dfee17a142e7
      
https://github.com/qemu/qemu/commit/49ad39c55a2086637bbde4616491dfee17a142e7
  Author: Klaus Jensen <k.jensen@samsung.com>
  Date:   2021-05-17 (Mon, 17 May 2021)

  Changed paths:
    M hw/block/nvme-ns.c

  Log Message:
  -----------
  hw/block/nvme: move zoned constraints checks

Validation of the max_active and max_open zoned parameters are
independent of any other state, so move them to the early
nvme_ns_check_constraints parameter checks.

Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
Reviewed-by: Keith Busch <kbusch@kernel.org>


  Commit: 88eea45c536470cd3c43440cbb1cd4d3b9fa519c
      
https://github.com/qemu/qemu/commit/88eea45c536470cd3c43440cbb1cd4d3b9fa519c
  Author: Klaus Jensen <k.jensen@samsung.com>
  Date:   2021-05-17 (Mon, 17 May 2021)

  Changed paths:
    M MAINTAINERS
    M hw/Kconfig
    M hw/block/Kconfig
    M hw/block/meson.build
    R hw/block/nvme-dif.c
    R hw/block/nvme-ns.c
    R hw/block/nvme-subsys.c
    R hw/block/nvme.c
    R hw/block/nvme.h
    M hw/block/trace-events
    M hw/meson.build
    A hw/nvme/Kconfig
    A hw/nvme/ctrl.c
    A hw/nvme/dif.c
    A hw/nvme/meson.build
    A hw/nvme/ns.c
    A hw/nvme/nvme.h
    A hw/nvme/subsys.c
    A hw/nvme/trace-events
    A hw/nvme/trace.h
    M meson.build

  Log Message:
  -----------
  hw/nvme: move nvme emulation out of hw/block

With the introduction of the nvme-subsystem device we are really
cluttering up the hw/block directory.

As suggested by Philippe previously, move the nvme emulation to hw/nvme.

Suggested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
Reviewed-by: Keith Busch <kbusch@kernel.org>


  Commit: 15e147b3c778f9f4c08c79b99747b848b6e2117b
      
https://github.com/qemu/qemu/commit/15e147b3c778f9f4c08c79b99747b848b6e2117b
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2021-05-18 (Tue, 18 May 2021)

  Changed paths:
    M MAINTAINERS
    M hw/Kconfig
    M hw/block/Kconfig
    M hw/block/meson.build
    R hw/block/nvme-dif.c
    R hw/block/nvme-dif.h
    R hw/block/nvme-ns.c
    R hw/block/nvme-ns.h
    R hw/block/nvme-subsys.c
    R hw/block/nvme-subsys.h
    R hw/block/nvme.c
    R hw/block/nvme.h
    M hw/block/trace-events
    M hw/meson.build
    A hw/nvme/Kconfig
    A hw/nvme/ctrl.c
    A hw/nvme/dif.c
    A hw/nvme/meson.build
    A hw/nvme/ns.c
    A hw/nvme/nvme.h
    A hw/nvme/subsys.c
    A hw/nvme/trace-events
    A hw/nvme/trace.h
    M include/block/nvme.h
    M meson.build

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/nvme/tags/nvme-next-pull-request' into 
staging

emulated nvme updates

* various fixes (Gollu Appalanaidu)
* refactoring (me)
* move to hw/nvme from hw/block (me)

# gpg: Signature made Mon 17 May 2021 10:16:01 BST
# gpg:                using RSA key 522833AA75E2DCE6A24766C04DE1AF316D4F0DE9
# gpg: Good signature from "Klaus Jensen <its@irrelevant.dk>" [unknown]
# gpg:                 aka "Klaus Jensen <k.jensen@samsung.com>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: DDCA 4D9C 9EF9 31CC 3468  4272 63D5 6FC5 E55D A838
#      Subkey fingerprint: 5228 33AA 75E2 DCE6 A247  66C0 4DE1 AF31 6D4F 0DE9

* remotes/nvme/tags/nvme-next-pull-request:
  hw/nvme: move nvme emulation out of hw/block
  hw/block/nvme: move zoned constraints checks
  hw/block/nvme: remove irrelevant zone resource checks
  hw/block/nvme: remove num_namespaces member
  hw/block/nvme: streamline namespace array indexing
  hw/block/nvme: add metadata offset helper
  hw/block/nvme: cache lba and ms sizes
  hw/block/nvme: replace nvme_ns_status
  hw/block/nvme: remove non-shared defines from header file
  hw/block/nvme: cleanup includes
  hw/block/nvme: consolidate header files
  hw/block/nvme: rename __nvme_select_ns_iocs
  hw/block/nvme: rename __nvme_advance_zone_wp
  hw/block/nvme: rename __nvme_zrm_open
  hw/block/nvme: align with existing style
  hw/block/nvme: function formatting fix
  hw/block/nvme: fix io-command set profile feature
  hw/block/nvme: consider metadata read aio return value in compare
  hw/block/nvme: rename reserved fields declarations
  hw/block/nvme: remove redundant invalid_lba_range trace

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>


Compare: https://github.com/qemu/qemu/compare/8e22b27994db...15e147b3c778
reply via email to
[Prev in Thread] Current Thread [Next in Thread]