From: "Matias Bjørling" <matias@cnexlabs.com>
To: <axboe@fb.com>
Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org,
"Matias Bjørling" <matias@cnexlabs.com>
Subject: [GIT PULL 06/19] lightnvm: enable nvme size compile asserts
Date: Sat, 15 Apr 2017 20:55:40 +0200 [thread overview]
Message-ID: <20170415185553.16098-7-matias@cnexlabs.com> (raw)
In-Reply-To: <20170415185553.16098-1-matias@cnexlabs.com>
The asserts in _nvme_nvm_check_size are not compiled due to the function
not begin called. Make sure that it is called, and also fix the wrong
sizes of asserts for nvme_nvm_addr_format, and nvme_nvm_bb_tbl, which
checked for number of bits instead of bytes.
Reported-by: Scott Bauer <scott.bauer@intel.com>
Signed-off-by: Matias Bjørling <matias@cnexlabs.com>
---
drivers/nvme/host/lightnvm.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/nvme/host/lightnvm.c b/drivers/nvme/host/lightnvm.c
index 4ea9c93..12c5a40 100644
--- a/drivers/nvme/host/lightnvm.c
+++ b/drivers/nvme/host/lightnvm.c
@@ -241,9 +241,9 @@ static inline void _nvme_nvm_check_size(void)
BUILD_BUG_ON(sizeof(struct nvme_nvm_l2ptbl) != 64);
BUILD_BUG_ON(sizeof(struct nvme_nvm_erase_blk) != 64);
BUILD_BUG_ON(sizeof(struct nvme_nvm_id_group) != 960);
- BUILD_BUG_ON(sizeof(struct nvme_nvm_addr_format) != 128);
+ BUILD_BUG_ON(sizeof(struct nvme_nvm_addr_format) != 16);
BUILD_BUG_ON(sizeof(struct nvme_nvm_id) != 4096);
- BUILD_BUG_ON(sizeof(struct nvme_nvm_bb_tbl) != 512);
+ BUILD_BUG_ON(sizeof(struct nvme_nvm_bb_tbl) != 64);
}
static int init_grps(struct nvm_id *nvm_id, struct nvme_nvm_id *nvme_nvm_id)
@@ -797,6 +797,8 @@ int nvme_nvm_register(struct nvme_ns *ns, char *disk_name, int node)
struct request_queue *q = ns->queue;
struct nvm_dev *dev;
+ _nvme_nvm_check_size();
+
dev = nvm_alloc_dev(node);
if (!dev)
return -ENOMEM;
--
2.9.3
next prev parent reply other threads:[~2017-04-15 19:00 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-15 18:55 [GIT PULL 00/19] LightNVM patches for 4.12 Matias Bjørling
2017-04-15 18:55 ` [GIT PULL 01/19] lightnvm: Fix error handling Matias Bjørling
2017-04-15 18:55 ` [GIT PULL 02/19] nvme/lightnvm: Prevent small buffer overflow in nvme_nvm_identify Matias Bjørling
2017-04-15 18:55 ` [GIT PULL 03/19] lightnvm: submit erases using the I/O path Matias Bjørling
2017-04-15 18:55 ` [GIT PULL 04/19] lightnvm: rename scrambler controller hint Matias Bjørling
2017-04-15 18:55 ` [GIT PULL 05/19] lightnvm: free reverse device map Matias Bjørling
2017-04-15 18:55 ` Matias Bjørling [this message]
2017-04-15 18:55 ` [GIT PULL 07/19] lightnvm: don't check for failure from mempool_alloc() Matias Bjørling
2017-04-15 18:55 ` [GIT PULL 08/19] lightnvm: double-clear of dev->lun_map on target init error Matias Bjørling
2017-04-15 18:55 ` [GIT PULL 09/19] lightnvm: fix cleanup order of disk on " Matias Bjørling
2017-04-15 18:55 ` [GIT PULL 10/19] lightnvm: bad type conversion for nvme control bits Matias Bjørling
2017-04-15 18:55 ` [GIT PULL 11/19] lightnvm: allow to init targets on factory mode Matias Bjørling
2017-04-15 18:55 ` [GIT PULL 12/19] lightnvm: make nvm_free static Matias Bjørling
2017-04-15 18:55 ` [GIT PULL 13/19] lightnvm: clean unused variable Matias Bjørling
2017-04-15 18:55 ` [GIT PULL 14/19] lightnvm: fix type checks on rrpc Matias Bjørling
2017-04-15 18:55 ` [GIT PULL 15/19] lightnvm: convert sprintf into strlcpy Matias Bjørling
2017-04-15 18:55 ` [GIT PULL 16/19] lightnvm: physical block device (pblk) target Matias Bjørling
2017-04-15 18:55 ` [GIT PULL 17/19] lightnvm: pblk-gc: fix an error pointer dereference in init Matias Bjørling
2017-04-15 18:55 ` [GIT PULL 18/19] lightnvm: fix some WARN() messages Matias Bjørling
2017-04-15 18:55 ` [GIT PULL 19/19] lightnvm: fix some error code in pblk-init.c Matias Bjørling
2017-04-16 20:37 ` [GIT PULL 00/19] LightNVM patches for 4.12 Jens Axboe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170415185553.16098-7-matias@cnexlabs.com \
--to=matias@cnexlabs.com \
--cc=axboe@fb.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®