dm: Use kzalloc for all structs with embedded biosets/mempools

koverstreet · axboe · commit d37753540568 · 2018-06-05T08:47:43.000-06:00
mempool_init()/bioset_init() require that the mempools/biosets be zeroed
first; they probably should not _require_ this, but not allocating those
structs with kzalloc is a fairly nonsensical thing to do (calling
mempool_exit()/bioset_exit() on an uninitialized mempool/bioset is legal
and safe, but only works if said memory was zeroed.)

Acked-by: Mike Snitzer &lt;snitzer@redhat.com&gt;
Signed-off-by: Kent Overstreet &lt;kent.overstreet@gmail.com&gt;
Signed-off-by: Jens Axboe &lt;axboe@kernel.dk&gt;
diff --git a/drivers/md/dm-bio-prison-v1.c b/drivers/md/dm-bio-prison-v1.c
@@ -33,7 +33,7 @@ static struct kmem_cache *_cell_cache;
  */
 struct dm_bio_prison *dm_bio_prison_create(void)
 {
-	struct dm_bio_prison *prison = kmalloc(sizeof(*prison), GFP_KERNEL);
+	struct dm_bio_prison *prison = kzalloc(sizeof(*prison), GFP_KERNEL);
 	int ret;
 
 	if (!prison)
diff --git a/drivers/md/dm-bio-prison-v2.c b/drivers/md/dm-bio-prison-v2.c
@@ -35,7 +35,7 @@ static struct kmem_cache *_cell_cache;
  */
 struct dm_bio_prison_v2 *dm_bio_prison_create_v2(struct workqueue_struct *wq)
 {
-	struct dm_bio_prison_v2 *prison = kmalloc(sizeof(*prison), GFP_KERNEL);
+	struct dm_bio_prison_v2 *prison = kzalloc(sizeof(*prison), GFP_KERNEL);
 	int ret;
 
 	if (!prison)
diff --git a/drivers/md/dm-io.c b/drivers/md/dm-io.c
@@ -51,7 +51,7 @@ struct dm_io_client *dm_io_client_create(void)
 	unsigned min_ios = dm_get_reserved_bio_based_ios();
 	int ret;
 
-	client = kmalloc(sizeof(*client), GFP_KERNEL);
+	client = kzalloc(sizeof(*client), GFP_KERNEL);
 	if (!client)
 		return ERR_PTR(-ENOMEM);
 
diff --git a/drivers/md/dm-kcopyd.c b/drivers/md/dm-kcopyd.c
@@ -882,7 +882,7 @@ struct dm_kcopyd_client *dm_kcopyd_client_create(struct dm_kcopyd_throttle *thro
 	int r;
 	struct dm_kcopyd_client *kc;
 
-	kc = kmalloc(sizeof(*kc), GFP_KERNEL);
+	kc = kzalloc(sizeof(*kc), GFP_KERNEL);
 	if (!kc)
 		return ERR_PTR(-ENOMEM);
 
diff --git a/drivers/md/dm-region-hash.c b/drivers/md/dm-region-hash.c
@@ -180,7 +180,7 @@ struct dm_region_hash *dm_region_hash_create(
 		;
 	nr_buckets >>= 1;
 
-	rh = kmalloc(sizeof(*rh), GFP_KERNEL);
+	rh = kzalloc(sizeof(*rh), GFP_KERNEL);
 	if (!rh) {
 		DMERR("unable to allocate region hash memory");
 		return ERR_PTR(-ENOMEM);
diff --git a/drivers/md/dm-snap.c b/drivers/md/dm-snap.c
@@ -1120,7 +1120,7 @@ static int snapshot_ctr(struct dm_target *ti, unsigned int argc, char **argv)
 		origin_mode = FMODE_WRITE;
 	}
 
-	s = kmalloc(sizeof(*s), GFP_KERNEL);
+	s = kzalloc(sizeof(*s), GFP_KERNEL);
 	if (!s) {
 		ti->error = "Cannot allocate private snapshot structure";
 		r = -ENOMEM;
diff --git a/drivers/md/dm-thin.c b/drivers/md/dm-thin.c
@@ -2861,7 +2861,7 @@ static struct pool *pool_create(struct mapped_device *pool_md,
 		return (struct pool *)pmd;
 	}
 
-	pool = kmalloc(sizeof(*pool), GFP_KERNEL);
+	pool = kzalloc(sizeof(*pool), GFP_KERNEL);
 	if (!pool) {
 		*error = "Error allocating memory for pool";
 		err_p = ERR_PTR(-ENOMEM);

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ static struct kmem_cache *_cell_cache;`
`33`	`33`	`*/`
`34`	`34`	`struct dm_bio_prison *dm_bio_prison_create(void)`
`35`	`35`	`{`
`36`		`- struct dm_bio_prison prison = kmalloc(sizeof(prison), GFP_KERNEL);`
	`36`	`+ struct dm_bio_prison prison = kzalloc(sizeof(prison), GFP_KERNEL);`
`37`	`37`	`int ret;`
`38`	`38`
`39`	`39`	`if (!prison)`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ static struct kmem_cache *_cell_cache;`
`35`	`35`	`*/`
`36`	`36`	`struct dm_bio_prison_v2 dm_bio_prison_create_v2(struct workqueue_struct wq)`
`37`	`37`	`{`
`38`		`- struct dm_bio_prison_v2 prison = kmalloc(sizeof(prison), GFP_KERNEL);`
	`38`	`+ struct dm_bio_prison_v2 prison = kzalloc(sizeof(prison), GFP_KERNEL);`
`39`	`39`	`int ret;`
`40`	`40`
`41`	`41`	`if (!prison)`
Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,7 @@ struct dm_region_hash *dm_region_hash_create(`
`180`	`180`	`;`
`181`	`181`	`nr_buckets >>= 1;`
`182`	`182`
`183`		`- rh = kmalloc(sizeof(*rh), GFP_KERNEL);`
	`183`	`+ rh = kzalloc(sizeof(*rh), GFP_KERNEL);`
`184`	`184`	`if (!rh) {`
`185`	`185`	`DMERR("unable to allocate region hash memory");`
`186`	`186`	`return ERR_PTR(-ENOMEM);`
Original file line number	Diff line number	Diff line change
`@@ -1120,7 +1120,7 @@ static int snapshot_ctr(struct dm_target ti, unsigned int argc, char *argv)`
`1120`	`1120`	`origin_mode = FMODE_WRITE;`
`1121`	`1121`	`}`
`1122`	`1122`
`1123`		`- s = kmalloc(sizeof(*s), GFP_KERNEL);`
	`1123`	`+ s = kzalloc(sizeof(*s), GFP_KERNEL);`
`1124`	`1124`	`if (!s) {`
`1125`	`1125`	`ti->error = "Cannot allocate private snapshot structure";`
`1126`	`1126`	`r = -ENOMEM;`
Original file line number	Diff line number	Diff line change
`@@ -2861,7 +2861,7 @@ static struct pool pool_create(struct mapped_device pool_md,`
`2861`	`2861`	`return (struct pool *)pmd;`
`2862`	`2862`	`}`
`2863`	`2863`
`2864`		`- pool = kmalloc(sizeof(*pool), GFP_KERNEL);`
	`2864`	`+ pool = kzalloc(sizeof(*pool), GFP_KERNEL);`
`2865`	`2865`	`if (!pool) {`
`2866`	`2866`	`*error = "Error allocating memory for pool";`
`2867`	`2867`	`err_p = ERR_PTR(-ENOMEM);`