Skip to contentSkip to conversation

lightnvm: base 2.0 implementation

PATCH Superseded Matias Bjørling 2 participants 7 messages Feb 9, 2018 – Feb 15, 2018

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

v2 cover lightnvm: base 2.0 implementation

QSBjb3VwbGUgb2YgcGF0Y2hlcyBmb3IgMi4wIHN1cHBvcnQgZm9yIHRoZSBsaWdodG52bSBzdWJz eXN0ZW0uIFRoZXkKZm9ybSB0aGUgYmFzaXMgZm9yIGludGVncmF0aW5nIDIuMCBzdXBwb3J0LgoK Rm9yIHRoZSByZXN0IG9mIHRoZSBzdXBwb3J0LCBKYXZpZXIgaGFzIGNvZGUgdGhhdCBpbXBsZW1l bnRzIHJlcG9ydApjaHVuayBhbmQgc2V0cyB1cCB0aGUgTEJBIGZvcm1hdCBkYXRhIHN0cnVjdHVy ZS4gSGUgYWxzbyBoYXMgYSBidW5jaApvZiBwYXRjaGVzIHRoYXQgYnJpbmdzIHBibGsgdXAgdG8g c3BlZWQuCgpUaGUgZmlyc3QgdHdvIHBhdGNoZXMgaXMgcHJlcGFyYXRpb24gZm9yIHRoZSAyLjAg d29yay4gVGhlIHRoaXJkIHBhdGNoCmltcGxlbWVudHMgdGhlIDIuMCBkYXRhIHN0cnVjdHVyZXMs IHRoZSBnZW9tZXRyeSBjb21tYW5kLCBhbmQgZXhwb3Nlcwp0aGUgc3lzZnMgYXR0cmlidXRlcyB0 aGF0IGNvbWVzIHdpdGggdGhlIDIuMCBzcGVjaWZpY2F0aW9uLiBOb3RlIHRoYXQKdGhlIGF0dHJp YnV0ZXMgYmV0d2VlbiAxLjIgYW5kIDIuMCBhcmUgZGlmZmVyZW50LCBhbmQgaXQgaXMgZXhwZWN0 ZWQKdGhhdCB1c2VyLXNwYWNlIHNoYWxsIHVzZSB0aGUgdmVyc2lvbiBzeXNmcyBhdHRyaWJ1dGUg dG8ga25vdyB3aGljaAphdHRyaWJ1dGVzIHdpbGwgYmUgYXZhaWxhYmxlLgoKVGhlIGxhc3QgcGF0 Y2ggaW1wbGVtZW50cyBzdXBwb3J0IGZvciB1c2luZyB0aGUgbnZtZSBuYW1lc3BhY2UgbG9naWNh bApibG9jayBhbmQgbWV0YWRhdGEgZmllbGRzIGFuZCBzeW5jIGl0IHdpdGggdGhlIGludGVybmFs IGxpZ2h0bnZtCmlkZW50aWZ5IHN0cnVjdHVyZXMuCgpDaGFuZ2VzIHNpbmNlIHYxOgoKIC0gcHJf ZXJyIGZpeCBmcm9tIFJhbmR5LgogLSBBZGRyZXNzIHR5cGUgZml4IGZyb20gSmF2aWVyLgogLSBB bHNvIENDIHRoZSBudm1lIG1haWxpbmcgbGlzdC4KCk1hdGlhcyBCasO4cmxpbmcgKDQpOgogIGxp Z2h0bnZtOiBtYWtlIDEuMiBkYXRhIHN0cnVjdHVyZXMgZXhwbGljaXQKICBsaWdodG52bTogZmxh dHRlbiBudm1faWRfZ3JvdXAgaW50byBudm1faWQKICBsaWdodG52bTogYWRkIDIuMCBnZW9tZXRy eSBpZGVudGlmaWNhdGlvbgogIG52bWU6IGxpZ2h0bnZtOiBhZGQgbGF0ZSBzZXR1cCBvZiBibG9j ayBzaXplIGFuZCBtZXRhZGF0YQoKIGRyaXZlcnMvbGlnaHRudm0vY29yZS5jICAgICAgfCAgMzMg KystCiBkcml2ZXJzL252bWUvaG9zdC9jb3JlLmMgICAgIHwgICAyICsKIGRyaXZlcnMvbnZtZS9o b3N0L2xpZ2h0bnZtLmMgfCA1MDggKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKystLS0t LS0tLS0tLQogZHJpdmVycy9udm1lL2hvc3QvbnZtZS5oICAgICB8ICAgMiArCiBpbmNsdWRlL2xp bnV4L2xpZ2h0bnZtLmggICAgIHwgIDY0ICsrKy0tLQogNSBmaWxlcyBjaGFuZ2VkLCA0MjggaW5z ZXJ0aW9ucygrKSwgMTgxIGRlbGV0aW9ucygtKQoKLS0gCjIuMTEuMAoKCl9fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkxpbnV4LW52bWUgbWFpbGluZyBsaXN0 CkxpbnV4LW52bWVAbGlzdHMuaW5mcmFkZWFkLm9yZwpodHRwOi8vbGlzdHMuaW5mcmFkZWFkLm9y Zy9tYWlsbWFuL2xpc3RpbmZvL2xpbnV4LW52bWUK

#1 lore raw

PATCH v2 1/4 lightnvm: make 1.2 data structures explicit

TWFrZSB0aGUgMS4yIGRhdGEgc3RydWN0dXJlcyBleHBsaWNpdCwgc28gaXQgd2lsbCBiZSBlYXN5 IHRvIGlkZW50aWZ5CnRoZSAyLjAgZGF0YSBzdHJ1Y3R1cmVzLiBBbHNvIGZpeCB0aGUgb3JkZXIg b2Ygd2hpY2ggdGhlIG52bWVfbnZtXyoKYXJlIGRlY2xhcmVkLCBzdWNoIHRoYXQgdGhleSBmb2xs b3cgdGhlIG52bWVfbnZtX2NvbW1hbmQgb3JkZXIuCgpTaWduZWQtb2ZmLWJ5OiBNYXRpYXMgQmrD uHJsaW5nIDxtYkBsaWdodG52bS5pbz4KLS0tCiBkcml2ZXJzL252bWUvaG9zdC9saWdodG52bS5j IHwgODIgKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmls ZSBjaGFuZ2VkLCA0MSBpbnNlcnRpb25zKCspLCA0MSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQg YS9kcml2ZXJzL252bWUvaG9zdC9saWdodG52bS5jIGIvZHJpdmVycy9udm1lL2hvc3QvbGlnaHRu dm0uYwppbmRleCBkYzBiMTMzNWM3YzYuLjYwZGIzZjFiNTlkYSAxMDA2NDQKLS0tIGEvZHJpdmVy cy9udm1lL2hvc3QvbGlnaHRudm0uYworKysgYi9kcml2ZXJzL252bWUvaG9zdC9saWdodG52bS5j CkBAIC01MSw2ICs1MSwyMSBAQCBzdHJ1Y3QgbnZtZV9udm1fcGhfcncgewogCV9fbGU2NAkJCXJl c3Y7CiB9OwogCitzdHJ1Y3QgbnZtZV9udm1fZXJhc2VfYmxrIHsKKwlfX3U4CQkJb3Bjb2RlOwor CV9fdTgJCQlmbGFnczsKKwlfX3UxNgkJCWNvbW1hbmRfaWQ7CisJX19sZTMyCQkJbnNpZDsKKwlf X3U2NAkJCXJzdmRbMl07CisJX19sZTY0CQkJcHJwMTsKKwlfX2xlNjQJCQlwcnAyOworCV9fbGU2 NAkJCXNwYmE7CisJX19sZTE2CQkJbGVuZ3RoOworCV9fbGUxNgkJCWNvbnRyb2w7CisJX19sZTMy CQkJZHNtZ210OworCV9fbGU2NAkJCXJlc3Y7Cit9OworCiBzdHJ1Y3QgbnZtZV9udm1faWRlbnRp dHkgewogCV9fdTgJCQlvcGNvZGU7CiAJX191OAkJCWZsYWdzOwpAQCAtODksMzMgKzEwNCwxOCBA QCBzdHJ1Y3QgbnZtZV9udm1fc2V0YmJ0YmwgewogCV9fdTMyCQkJcnN2ZDRbM107CiB9OwogCi1z dHJ1Y3QgbnZtZV9udm1fZXJhc2VfYmxrIHsKLQlfX3U4CQkJb3Bjb2RlOwotCV9fdTgJCQlmbGFn czsKLQlfX3UxNgkJCWNvbW1hbmRfaWQ7Ci0JX19sZTMyCQkJbnNpZDsKLQlfX3U2NAkJCXJzdmRb Ml07Ci0JX19sZTY0CQkJcHJwMTsKLQlfX2xlNjQJCQlwcnAyOwotCV9fbGU2NAkJCXNwYmE7Ci0J X19sZTE2CQkJbGVuZ3RoOwotCV9fbGUxNgkJCWNvbnRyb2w7Ci0JX19sZTMyCQkJZHNtZ210Owot CV9fbGU2NAkJCXJlc3Y7Ci19OwotCiBzdHJ1Y3QgbnZtZV9udm1fY29tbWFuZCB7CiAJdW5pb24g ewogCQlzdHJ1Y3QgbnZtZV9jb21tb25fY29tbWFuZCBjb21tb247Ci0JCXN0cnVjdCBudm1lX252 bV9pZGVudGl0eSBpZGVudGl0eTsKIAkJc3RydWN0IG52bWVfbnZtX3BoX3J3IHBoX3J3OworCQlz dHJ1Y3QgbnZtZV9udm1fZXJhc2VfYmxrIGVyYXNlOworCQlzdHJ1Y3QgbnZtZV9udm1faWRlbnRp dHkgaWRlbnRpdHk7CiAJCXN0cnVjdCBudm1lX252bV9nZXRiYnRibCBnZXRfYmI7CiAJCXN0cnVj dCBudm1lX252bV9zZXRiYnRibCBzZXRfYmI7Ci0JCXN0cnVjdCBudm1lX252bV9lcmFzZV9ibGsg ZXJhc2U7CiAJfTsKIH07CiAKLXN0cnVjdCBudm1lX252bV9pZF9ncm91cCB7CitzdHJ1Y3QgbnZt ZV9udm1faWQxMl9ncnAgewogCV9fdTgJCQltdHlwZTsKIAlfX3U4CQkJZm10eXBlOwogCV9fbGUx NgkJCXJlczE2OwpAQCAtMTQxLDcgKzE0MSw3IEBAIHN0cnVjdCBudm1lX252bV9pZF9ncm91cCB7 CiAJX191OAkJCXJlc2VydmVkWzkwNl07CiB9IF9fcGFja2VkOwogCi1zdHJ1Y3QgbnZtZV9udm1f YWRkcl9mb3JtYXQgeworc3RydWN0IG52bWVfbnZtX2lkMTJfYWRkcmYgewogCV9fdTgJCQljaF9v ZmZzZXQ7CiAJX191OAkJCWNoX2xlbjsKIAlfX3U4CQkJbHVuX29mZnNldDsKQEAgLTE1NywxNiAr MTU3LDE2IEBAIHN0cnVjdCBudm1lX252bV9hZGRyX2Zvcm1hdCB7CiAJX191OAkJCXJlc1s0XTsK IH0gX19wYWNrZWQ7CiAKLXN0cnVjdCBudm1lX252bV9pZCB7CitzdHJ1Y3QgbnZtZV9udm1faWQx MiB7CiAJX191OAkJCXZlcl9pZDsKIAlfX3U4CQkJdm1udDsKIAlfX3U4CQkJY2dycHM7CiAJX191 OAkJCXJlczsKIAlfX2xlMzIJCQljYXA7CiAJX19sZTMyCQkJZG9tOwotCXN0cnVjdCBudm1lX252 bV9hZGRyX2Zvcm1hdCBwcGFmOworCXN0cnVjdCBudm1lX252bV9pZDEyX2FkZHJmIHBwYWY7CiAJ X191OAkJCXJlc3ZbMjI4XTsKLQlzdHJ1Y3QgbnZtZV9udm1faWRfZ3JvdXAgZ3JvdXA7CisJc3Ry dWN0IG52bWVfbnZtX2lkMTJfZ3JwIGdycDsKIAlfX3U4CQkJcmVzdjJbMjg4MF07CiB9IF9fcGFj a2VkOwogCkBAIC0xOTEsMjUgKzE5MSwyNSBAQCBzdGF0aWMgaW5saW5lIHZvaWQgX252bWVfbnZt X2NoZWNrX3NpemUodm9pZCkKIHsKIAlCVUlMRF9CVUdfT04oc2l6ZW9mKHN0cnVjdCBudm1lX252 bV9pZGVudGl0eSkgIT0gNjQpOwogCUJVSUxEX0JVR19PTihzaXplb2Yoc3RydWN0IG52bWVfbnZt X3BoX3J3KSAhPSA2NCk7CisJQlVJTERfQlVHX09OKHNpemVvZihzdHJ1Y3QgbnZtZV9udm1fZXJh c2VfYmxrKSAhPSA2NCk7CiAJQlVJTERfQlVHX09OKHNpemVvZihzdHJ1Y3QgbnZtZV9udm1fZ2V0 YmJ0YmwpICE9IDY0KTsKIAlCVUlMRF9CVUdfT04oc2l6ZW9mKHN0cnVjdCBudm1lX252bV9zZXRi YnRibCkgIT0gNjQpOwotCUJVSUxEX0JVR19PTihzaXplb2Yoc3RydWN0IG52bWVfbnZtX2VyYXNl X2JsaykgIT0gNjQpOwotCUJVSUxEX0JVR19PTihzaXplb2Yoc3RydWN0IG52bWVfbnZtX2lkX2dy b3VwKSAhPSA5NjApOwotCUJVSUxEX0JVR19PTihzaXplb2Yoc3RydWN0IG52bWVfbnZtX2FkZHJf Zm9ybWF0KSAhPSAxNik7Ci0JQlVJTERfQlVHX09OKHNpemVvZihzdHJ1Y3QgbnZtZV9udm1faWQp ICE9IE5WTUVfSURFTlRJRllfREFUQV9TSVpFKTsKKwlCVUlMRF9CVUdfT04oc2l6ZW9mKHN0cnVj dCBudm1lX252bV9pZDEyX2dycCkgIT0gOTYwKTsKKwlCVUlMRF9CVUdfT04oc2l6ZW9mKHN0cnVj dCBudm1lX252bV9pZDEyX2FkZHJmKSAhPSAxNik7CisJQlVJTERfQlVHX09OKHNpemVvZihzdHJ1 Y3QgbnZtZV9udm1faWQxMikgIT0gTlZNRV9JREVOVElGWV9EQVRBX1NJWkUpOwogCUJVSUxEX0JV R19PTihzaXplb2Yoc3RydWN0IG52bWVfbnZtX2JiX3RibCkgIT0gNjQpOwogfQogCi1zdGF0aWMg aW50IGluaXRfZ3JwcyhzdHJ1Y3QgbnZtX2lkICpudm1faWQsIHN0cnVjdCBudm1lX252bV9pZCAq bnZtZV9udm1faWQpCitzdGF0aWMgaW50IGluaXRfZ3JwKHN0cnVjdCBudm1faWQgKm52bV9pZCwg c3RydWN0IG52bWVfbnZtX2lkMTIgKmlkMTIpCiB7Ci0Jc3RydWN0IG52bWVfbnZtX2lkX2dyb3Vw ICpzcmM7CisJc3RydWN0IG52bWVfbnZtX2lkMTJfZ3JwICpzcmM7CiAJc3RydWN0IG52bV9pZF9n cm91cCAqZ3JwOwogCWludCBzZWNfcGVyX3BnLCBzZWNfcGVyX3BsLCBwZ19wZXJfYmxrOwogCi0J aWYgKG52bWVfbnZtX2lkLT5jZ3JwcyAhPSAxKQorCWlmIChpZDEyLT5jZ3JwcyAhPSAxKQogCQly ZXR1cm4gLUVJTlZBTDsKIAotCXNyYyA9ICZudm1lX252bV9pZC0+Z3JvdXA7CisJc3JjID0gJmlk MTItPmdycDsKIAlncnAgPSAmbnZtX2lkLT5ncnA7CiAKIAlncnAtPm10eXBlID0gc3JjLT5tdHlw ZTsKQEAgLTI2MSwzNCArMjYxLDM0IEBAIHN0YXRpYyBpbnQgaW5pdF9ncnBzKHN0cnVjdCBudm1f aWQgKm52bV9pZCwgc3RydWN0IG52bWVfbnZtX2lkICpudm1lX252bV9pZCkKIHN0YXRpYyBpbnQg bnZtZV9udm1faWRlbnRpdHkoc3RydWN0IG52bV9kZXYgKm52bWRldiwgc3RydWN0IG52bV9pZCAq bnZtX2lkKQogewogCXN0cnVjdCBudm1lX25zICpucyA9IG52bWRldi0+cS0+cXVldWVkYXRhOwot CXN0cnVjdCBudm1lX252bV9pZCAqbnZtZV9udm1faWQ7CisJc3RydWN0IG52bWVfbnZtX2lkMTIg KmlkOwogCXN0cnVjdCBudm1lX252bV9jb21tYW5kIGMgPSB7fTsKIAlpbnQgcmV0OwogCiAJYy5p ZGVudGl0eS5vcGNvZGUgPSBudm1lX252bV9hZG1pbl9pZGVudGl0eTsKIAljLmlkZW50aXR5Lm5z aWQgPSBjcHVfdG9fbGUzMihucy0+aGVhZC0+bnNfaWQpOwogCi0JbnZtZV9udm1faWQgPSBrbWFs bG9jKHNpemVvZihzdHJ1Y3QgbnZtZV9udm1faWQpLCBHRlBfS0VSTkVMKTsKLQlpZiAoIW52bWVf bnZtX2lkKQorCWlkID0ga21hbGxvYyhzaXplb2Yoc3RydWN0IG52bWVfbnZtX2lkMTIpLCBHRlBf S0VSTkVMKTsKKwlpZiAoIWlkKQogCQlyZXR1cm4gLUVOT01FTTsKIAogCXJldCA9IG52bWVfc3Vi bWl0X3N5bmNfY21kKG5zLT5jdHJsLT5hZG1pbl9xLCAoc3RydWN0IG52bWVfY29tbWFuZCAqKSZj LAotCQkJCW52bWVfbnZtX2lkLCBzaXplb2Yoc3RydWN0IG52bWVfbnZtX2lkKSk7CisJCQkJaWQs IHNpemVvZihzdHJ1Y3QgbnZtZV9udm1faWQxMikpOwogCWlmIChyZXQpIHsKIAkJcmV0ID0gLUVJ TzsKIAkJZ290byBvdXQ7CiAJfQogCi0JbnZtX2lkLT52ZXJfaWQgPSBudm1lX252bV9pZC0+dmVy X2lkOwotCW52bV9pZC0+dm1udCA9IG52bWVfbnZtX2lkLT52bW50OwotCW52bV9pZC0+Y2FwID0g bGUzMl90b19jcHUobnZtZV9udm1faWQtPmNhcCk7Ci0JbnZtX2lkLT5kb20gPSBsZTMyX3RvX2Nw dShudm1lX252bV9pZC0+ZG9tKTsKLQltZW1jcHkoJm52bV9pZC0+cHBhZiwgJm52bWVfbnZtX2lk LT5wcGFmLAorCW52bV9pZC0+dmVyX2lkID0gaWQtPnZlcl9pZDsKKwludm1faWQtPnZtbnQgPSBp ZC0+dm1udDsKKwludm1faWQtPmNhcCA9IGxlMzJfdG9fY3B1KGlkLT5jYXApOworCW52bV9pZC0+ ZG9tID0gbGUzMl90b19jcHUoaWQtPmRvbSk7CisJbWVtY3B5KCZudm1faWQtPnBwYWYsICZpZC0+ cHBhZiwKIAkJCQkJc2l6ZW9mKHN0cnVjdCBudm1fYWRkcl9mb3JtYXQpKTsKIAotCXJldCA9IGlu aXRfZ3Jwcyhudm1faWQsIG52bWVfbnZtX2lkKTsKKwlyZXQgPSBpbml0X2dycChudm1faWQsIGlk KTsKIG91dDoKLQlrZnJlZShudm1lX252bV9pZCk7CisJa2ZyZWUoaWQpOwogCXJldHVybiByZXQ7 CiB9CiAKLS0gCjIuMTEuMAoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCkxpbnV4LW52bWUgbWFpbGluZyBsaXN0CkxpbnV4LW52bWVAbGlzdHMuaW5mcmFk ZWFkLm9yZwpodHRwOi8vbGlzdHMuaW5mcmFkZWFkLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2xpbnV4 LW52bWUK

#2 lore raw

PATCH v2 2/4 lightnvm: flatten nvm_id_group into nvm_id

In reply to Matias Bjørling

There are no groups in the 2.0 specification, make sure that the nvm_id structure is flattened before 2.0 data structures are added.

Signed-off-by Matias Bj?rling <mb at lightnvm.io>
---
 drivers/lightnvm/core.c      |  25 ++++++-----
 drivers/nvme/host/lightnvm.c | 100 +++++++++++++++++++++----------------------
 include/linux/lightnvm.h     |  53 +++++++++++------------
 3 files changed, 86 insertions(+), 92 deletions(-)
drivers/lightnvm/core.c +12 -13
index dcc9e621e651..c72863b36439 100644
@@ -851,33 +851,32 @@ EXPORT_SYMBOL(nvm_get_tgt_bb_tbl);
 static int nvm_core_init(struct nvm_dev *dev)
 {
 	struct nvm_id *id = &dev->identity;
-	struct nvm_id_group *grp = &id->grp;
 	struct nvm_geo *geo = &dev->geo;
 	int ret;
 
 	memcpy(&geo->ppaf, &id->ppaf, sizeof(struct nvm_addr_format));
 
-	if (grp->mtype != 0) {
+	if (id->mtype != 0) {
 		pr_err("nvm: memory type not supported\n");
 		return -EINVAL;
 	}
 
 	/* Whole device values */
-	geo->nr_chnls = grp->num_ch;
-	geo->nr_luns = grp->num_lun;
+	geo->nr_chnls = id->num_ch;
+	geo->nr_luns = id->num_lun;
 
 	/* Generic device geometry values */
-	geo->ws_min = grp->ws_min;
-	geo->ws_opt = grp->ws_opt;
-	geo->ws_seq = grp->ws_seq;
-	geo->ws_per_chk = grp->ws_per_chk;
-	geo->nr_chks = grp->num_chk;
-	geo->sec_size = grp->csecs;
-	geo->oob_size = grp->sos;
-	geo->mccap = grp->mccap;
+	geo->ws_min = id->ws_min;
+	geo->ws_opt = id->ws_opt;
+	geo->ws_seq = id->ws_seq;
+	geo->ws_per_chk = id->ws_per_chk;
+	geo->nr_chks = id->num_chk;
+	geo->sec_size = id->csecs;
+	geo->oob_size = id->sos;
+	geo->mccap = id->mccap;
 	geo->max_rq_size = dev->ops->max_phys_sect * geo->sec_size;
 
-	geo->sec_per_chk = grp->clba;
+	geo->sec_per_chk = id->clba;
 	geo->sec_per_lun = geo->sec_per_chk * geo->nr_chks;
 	geo->all_luns = geo->nr_luns * geo->nr_chnls;
 
drivers/nvme/host/lightnvm.c +48 -52

160 lines not on this page · raw message

include/linux/lightnvm.h +26 -27

68 lines not on this page · raw message

Signature · 1 line
2.11.0
#3 lore raw

PATCH v2 3/4 lightnvm: add 2.0 geometry identification

In reply to Matias Bjørling

Implement the geometry data structures for 2.0 and enable a drive to be identified as one, including exposing the appropriate 2.0 sysfs entries.

Signed-off-by Matias Bj?rling <mb at lightnvm.io>
---
 drivers/lightnvm/core.c      |   8 +-
 drivers/nvme/host/lightnvm.c | 334 +++++++++++++++++++++++++++++++++++++------
 include/linux/lightnvm.h     |  11 +-
 3 files changed, 297 insertions(+), 56 deletions(-)
drivers/lightnvm/core.c +3 -5
index c72863b36439..9b1255b3e05e 100644
@@ -931,11 +931,9 @@ static int nvm_init(struct nvm_dev *dev)
 		goto err;
 	}
 
-	pr_debug("nvm: ver:%x nvm_vendor:%x\n",
-			dev->identity.ver_id, dev->identity.vmnt);
-
-	if (dev->identity.ver_id != 1) {
-		pr_err("nvm: device not supported by kernel.");
+	if (dev->identity.ver_id != 1 && dev->identity.ver_id != 2) {
+		pr_err("nvm: device ver_id %d not supported by kernel.\n",
+				dev->identity.ver_id);
 		goto err;
 	}
 
drivers/nvme/host/lightnvm.c +287 -47

416 lines not on this page · raw message

include/linux/lightnvm.h +7 -4
index 94b704a8d83d..b717c000b712 100644
@@ -184,10 +184,9 @@ struct nvm_id {
 	u16	csecs;
 	u16	sos;
 
-	u16	ws_min;
-	u16	ws_opt;
-	u16	ws_seq;
-	u16	ws_per_chk;
+	u32	ws_min;
+	u32	ws_opt;
+	u32	mw_cunits;
 
 	u32	trdt;
 	u32	trdm;
@@ -199,6 +198,10 @@ struct nvm_id {
 	u32	mccap;
 	u16	cpar;
 
+	/* calculated values */
+	u16	ws_seq;
+	u16	ws_per_chk;
+
 	/* 1.2 compatibility */
 	u8	mtype;
 	u8	fmtype;
Signature · 1 line
2.11.0
#4 lore raw

PATCH v2 4/4 nvme: lightnvm: add late setup of block size and metadata

In reply to Matias Bjørling

The nvme driver sets up the size of the nvme namespace in two steps. First it initializes the device with standard logical block and metadata sizes, and then sets the correct logical block and metadata size. Due to the OCSSD 2.0 specification relies on the namespace to expose these sizes for correct initialization, let it be updated appropriately on the LightNVM side as well.

Signed-off-by Matias Bj?rling <mb at lightnvm.io>
---
 drivers/nvme/host/core.c     | 2 ++
 drivers/nvme/host/lightnvm.c | 8 ++++++++
 drivers/nvme/host/nvme.h     | 2 ++
 3 files changed, 12 insertions(+)
drivers/nvme/host/core.c +2 -0
index f837d666cbd4..740ceb28067c 100644
@@ -1379,6 +1379,8 @@ static void __nvme_revalidate_disk(struct gendisk *disk, struct nvme_id_ns *id)
 	if (ns->noiob)
 		nvme_set_chunk_size(ns);
 	nvme_update_disk_info(disk, ns, id);
+	if (ns->ndev)
+		nvme_nvm_update_nvm_info(ns);
 #ifdef CONFIG_NVME_MULTIPATH
 	if (ns->head->disk)
 		nvme_update_disk_info(ns->head->disk, ns, id);
drivers/nvme/host/lightnvm.c +8 -0
index 8b243af8a949..a19e85f0cbae 100644
@@ -814,6 +814,14 @@ int nvme_nvm_ioctl(struct nvme_ns *ns, unsigned int cmd, unsigned long arg)
 	}
 }
 
+void nvme_nvm_update_nvm_info(struct nvme_ns *ns)
+{
+	struct nvm_dev *ndev = ns->ndev;
+
+	ndev->identity.csecs = ndev->geo.sec_size = 1 << ns->lba_shift;
+	ndev->identity.sos = ndev->geo.oob_size = ns->ms;
+}
+
 int nvme_nvm_register(struct nvme_ns *ns, char *disk_name, int node)
 {
 	struct request_queue *q = ns->queue;
drivers/nvme/host/nvme.h +2 -0
index ea1aa5283e8e..1ca08f4993ba 100644
@@ -451,12 +451,14 @@ static inline void nvme_mpath_clear_current_path(struct nvme_ns *ns)
 #endif /* CONFIG_NVME_MULTIPATH */
 
 #ifdef CONFIG_NVM
+void nvme_nvm_update_nvm_info(struct nvme_ns *ns);
 int nvme_nvm_register(struct nvme_ns *ns, char *disk_name, int node);
 void nvme_nvm_unregister(struct nvme_ns *ns);
 int nvme_nvm_register_sysfs(struct nvme_ns *ns);
 void nvme_nvm_unregister_sysfs(struct nvme_ns *ns);
 int nvme_nvm_ioctl(struct nvme_ns *ns, unsigned int cmd, unsigned long arg);
 #else
+static inline void nvme_nvm_update_nvm_info(struct nvme_ns *ns) {};
 static inline int nvme_nvm_register(struct nvme_ns *ns, char *disk_name,
 				    int node)
 {
Signature · 1 line
2.11.0
#5 lore raw

Re: [PATCH V2 4/4] nvme: lightnvm: add late setup of block size and metadata

Quoted 10 lines · Matias Bj?rling

The nvme driver sets up the size of the nvme namespace in two steps. First it initializes the device with standard logical block and metadata sizes, and then sets the correct logical block and metadata size. Due to the OCSSD 2.0 specification relies on the namespace to expose these sizes for correct initialization, let it be updated appropriately on the LightNVM side as well.

Quoted 3 lines
Signed-off-by Matias Bj?rling <mb at lightnvm.io>

---

This late initialization breaks ligthnvm's core init since the sector size (csecs) is used on the first init part to set the logical block size.

nvm_core_init -> blk_queue_logical_block_size(dev->q, dev_geo->c.csecs);

We can do do a nvme_nvm_revalidate and set this on the revalidation path instead of simply updating the info as in nvme_nvm_update_nvm_info().

Javier
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: Message signed with OpenPGP
URL: <http://lists.infradead.org/pipermail/linux-nvme/attachments/20180212/f59e90cc/attachment.sig>

#6 lore raw

Re: [PATCH V2 4/4] nvme: lightnvm: add late setup of block size and metadata

Quoted 14 lines · Javier Gonzalez
Quoted 10 lines · Matias Bj?rling

The nvme driver sets up the size of the nvme namespace in two steps. First it initializes the device with standard logical block and metadata sizes, and then sets the correct logical block and metadata size. Due to the OCSSD 2.0 specification relies on the namespace to expose these sizes for correct initialization, let it be updated appropriately on the LightNVM side as well.

Quoted 3 lines
Signed-off-by Matias Bj?rling <mb at lightnvm.io>

---

Quoted 7 lines

This late initialization breaks ligthnvm's core init since the sector size (csecs) is used on the first init part to set the logical block size.

nvm_core_init -> blk_queue_logical_block_size(dev->q, dev_geo->c.csecs);

We can do do a nvme_nvm_revalidate and set this on the revalidation path instead of simply updating the info as in nvme_nvm_update_nvm_info().'

I believe that is what the patch does (nvme_nvm_update_nvm_info is called from the nvme_revalidate_disk context).

The nvm_core_init initialization of the block size is redundant and should be removed. I'll update the patch.