d/numam-spdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "nvmf: Support physical block size if exposed by bdev"

Browse Source 
This reverts commit b32cfc467b.

This commit fails the ABI checks and only got through because the checks
were disabled until 21.04 hit.

Signed-off-by: Ben Walker <benjamin.walker@intel.com>
Change-Id: Id26b8f8ba551193d99b1ccbd31b35378b4095a20
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/7731
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Community-CI: Broadcom CI
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
This commit is contained in:
Ben Walker 2021-05-03 15:40:35 -07:00 committed by Jim Harris
parent b32cfc467b
commit 63642befd3
10 changed files with 2 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/nvme/identify/identify.c
View File

@ -1014,10 +1014,6 @@ print_namespace(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_ns *ns)
printf(" Atomic Write Unit (PFail): %d\n", nsdata->nawupf + 1);
}
if (nsdata->npwg) {
printf(" Preferred Write Granularity: %d\n", nsdata->npwg + 1);
}
if (nsdata->nacwu) {
printf(" Atomic Compare & Write Unit: %d\n", nsdata->nacwu + 1);
}

8
include/spdk/bdev.h
View File

@ -590,14 +590,6 @@ bool spdk_bdev_is_zoned(const struct spdk_bdev *bdev);
*/
uint32_t spdk_bdev_get_data_block_size(const struct spdk_bdev *bdev);
/**
* Get block device physical block size.
*
* \param bdev Block device to query.
* \return Size of physical block size for this bdev in bytes.
*/
uint32_t spdk_bdev_get_physical_block_size(const struct spdk_bdev *bdev);
/**
* Get DIF type of the block device.
*

3
include/spdk/bdev_module.h
View File

@ -265,9 +265,6 @@ struct spdk_bdev {
/** Size in bytes of a logical block for the backend */
uint32_t blocklen;
/** Size in bytes of a physical block for the backend */
uint32_t phys_blocklen;
/** Number of blocks */
uint64_t blockcnt;

10
lib/bdev/bdev.c
View File

@ -3291,12 +3291,6 @@ spdk_bdev_get_data_block_size(const struct spdk_bdev *bdev)
}
}
uint32_t
spdk_bdev_get_physical_block_size(const struct spdk_bdev *bdev)
{
return bdev->phys_blocklen;
}
static uint32_t
_bdev_get_block_size_with_md(const struct spdk_bdev *bdev)
{
@ -5470,10 +5464,6 @@ bdev_init(struct spdk_bdev *bdev)
bdev->acwu = 1;
}
if (bdev->phys_blocklen == 0) {
bdev->phys_blocklen = spdk_bdev_get_data_block_size(bdev);
}
TAILQ_INIT(&bdev->internal.open_descs);
TAILQ_INIT(&bdev->internal.locked_ranges);
TAILQ_INIT(&bdev->internal.pending_locked_ranges);

1
lib/bdev/spdk_bdev.map
View File

@ -40,7 +40,6 @@
spdk_bdev_is_md_separate;
spdk_bdev_is_zoned;
spdk_bdev_get_data_block_size;
spdk_bdev_get_physical_block_size;
spdk_bdev_get_dif_type;
spdk_bdev_is_dif_head_of_md;
spdk_bdev_is_dif_check_enabled;

10
lib/nvmf/ctrlr_bdev.c
View File

@ -140,7 +140,6 @@ nvmf_bdev_ctrlr_identify_ns(struct spdk_nvmf_ns *ns, struct spdk_nvme_ns_data *n
{
struct spdk_bdev *bdev = ns->bdev;
uint64_t num_blocks;
uint32_t phys_blocklen;
num_blocks = spdk_bdev_get_num_blocks(bdev);
@ -182,15 +181,6 @@ nvmf_bdev_ctrlr_identify_ns(struct spdk_nvmf_ns *ns, struct spdk_nvme_ns_data *n
nsdata->lbaf[0].ms = 0;
nsdata->lbaf[0].lbads = spdk_u32log2(spdk_bdev_get_data_block_size(bdev));
}
phys_blocklen = spdk_bdev_get_physical_block_size(bdev);
assert(phys_blocklen > 0);
/* Linux driver uses min(nawupf, npwg) to set physical_block_size */
nsdata->nsfeat.optperf = 1;
nsdata->nsfeat.ns_atomic_write_unit = 1;
nsdata->npwg = (phys_blocklen >> nsdata->lbaf[0].lbads) - 1;
nsdata->nawupf = nsdata->npwg;
nsdata->noiob = spdk_bdev_get_optimal_io_boundary(bdev);
nsdata->nmic.can_share = 1;
if (ns->ptpl_file != NULL) {

7
lib/scsi/scsi_bdev.c
View File

@ -1620,16 +1620,9 @@ bdev_scsi_process_block(struct spdk_scsi_task *task)
switch (cdb[1] & 0x1f) { /* SERVICE ACTION */
case SPDK_SBC_SAI_READ_CAPACITY_16: {
uint8_t buffer[32] = {0};
uint32_t lbppb;
to_be64(&buffer[0], spdk_bdev_get_num_blocks(bdev) - 1);
to_be32(&buffer[8], spdk_bdev_get_data_block_size(bdev));
lbppb = spdk_bdev_get_physical_block_size(bdev) / spdk_bdev_get_data_block_size(bdev);
if (spdk_u32log2(lbppb) > 0xf) {
SPDK_ERRLOG("lbppbe(0x%x) > 0xf\n", spdk_u32log2(lbppb));
} else {
buffer[13] = spdk_u32log2(lbppb);
}
/*
* Set the TPE bit to 1 to indicate thin provisioning.
* The position of TPE bit is the 7th bit in 14th byte

7
module/bdev/iscsi/bdev_iscsi.c
View File

@ -623,8 +623,7 @@ static const struct spdk_bdev_fn_table iscsi_fn_table = {
static int
create_iscsi_lun(struct iscsi_context *context, int lun_id, char *url, char *initiator_iqn,
char *name,
uint64_t num_blocks, uint32_t block_size, struct spdk_bdev **bdev, bool unmap_supported,
uint8_t lbppbe)
uint64_t num_blocks, uint32_t block_size, struct spdk_bdev **bdev, bool unmap_supported)
{
struct bdev_iscsi_lun *lun;
int rc;
@ -646,7 +645,6 @@ create_iscsi_lun(struct iscsi_context *context, int lun_id, char *url, char *ini
lun->bdev.product_name = "iSCSI LUN";
lun->bdev.module = &g_iscsi_bdev_module;
lun->bdev.blocklen = block_size;
lun->bdev.phys_blocklen = block_size * (1 << lbppbe);
lun->bdev.blockcnt = num_blocks;
lun->bdev.ctxt = lun;
lun->unmap_supported = unmap_supported;
@ -693,8 +691,7 @@ iscsi_readcapacity16_cb(struct iscsi_context *iscsi, int status,
}
status = create_iscsi_lun(req->context, req->lun, req->url, req->initiator_iqn, req->bdev_name,
readcap16->returned_lba + 1, readcap16->block_length, &bdev, req->unmap_supported,
readcap16->lbppbe);
readcap16->returned_lba + 1, readcap16->block_length, &bdev, req->unmap_supported);
if (status) {
SPDK_ERRLOG("Unable to create iscsi bdev: %s (%d)\n", spdk_strerror(-status), status);
}

3
test/unit/lib/nvmf/ctrlr_bdev.c/ctrlr_bdev_ut.c
View File

@ -51,9 +51,6 @@ DEFINE_STUB(spdk_bdev_get_acwu, uint16_t, (const struct spdk_bdev *bdev), 0);
DEFINE_STUB(spdk_bdev_get_data_block_size, uint32_t,
(const struct spdk_bdev *bdev), 512);
DEFINE_STUB(spdk_bdev_get_physical_block_size, uint32_t,
(const struct spdk_bdev *bdev), 4096);
DEFINE_STUB(nvmf_ctrlr_process_admin_cmd, int, (struct spdk_nvmf_request *req), 0);
DEFINE_STUB(spdk_bdev_comparev_blocks, int, (struct spdk_bdev_desc *desc,

3
test/unit/lib/scsi/scsi_bdev.c/scsi_bdev_ut.c
View File

@ -77,9 +77,6 @@ DEFINE_STUB(spdk_bdev_is_md_interleaved, bool,
DEFINE_STUB(spdk_bdev_get_data_block_size, uint32_t,
(const struct spdk_bdev *bdev), 512);
DEFINE_STUB(spdk_bdev_get_physical_block_size, uint32_t,
(const struct spdk_bdev *bdev), 4096);
uint64_t
spdk_bdev_get_num_blocks(const struct spdk_bdev *bdev)
{