Skip to content

Commit 86aa666

Browse files
kvaneeshdjbw
authored andcommitted
libnvdimm: Fix endian conversion issues 
nd_label->dpa issue was observed when trying to enable the namespace created with little-endian kernel on a big-endian kernel. That made me run `sparse` on the rest of the code and other changes are the result of that. Fixes: d9b83c7 ("libnvdimm, btt: rework error clearing") Fixes: 9dedc73 ("libnvdimm/btt: Fix LBA masking during 'free list' population") Reviewed-by: Vishal Verma <[email protected]> Signed-off-by: Aneesh Kumar K.V <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Dan Williams <[email protected]>
1 parent f537669 commit 86aa666

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

drivers/nvdimm/btt.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -392,9 +392,9 @@ static int btt_flog_write(struct arena_info *arena, u32 lane, u32 sub,
392392
arena->freelist[lane].sub = 1 - arena->freelist[lane].sub;
393393
if (++(arena->freelist[lane].seq) == 4)
394394
arena->freelist[lane].seq = 1;
395-
if (ent_e_flag(ent->old_map))
395+
if (ent_e_flag(le32_to_cpu(ent->old_map)))
396396
arena->freelist[lane].has_err = 1;
397-
arena->freelist[lane].block = le32_to_cpu(ent_lba(ent->old_map));
397+
arena->freelist[lane].block = ent_lba(le32_to_cpu(ent->old_map));
398398

399399
return ret;
400400
}
@@ -560,8 +560,8 @@ static int btt_freelist_init(struct arena_info *arena)
560560
* FIXME: if error clearing fails during init, we want to make
561561
* the BTT read-only
562562
*/
563-
if (ent_e_flag(log_new.old_map) &&
564-
!ent_normal(log_new.old_map)) {
563+
if (ent_e_flag(le32_to_cpu(log_new.old_map)) &&
564+
!ent_normal(le32_to_cpu(log_new.old_map))) {
565565
arena->freelist[i].has_err = 1;
566566
ret = arena_clear_freelist_error(arena, i);
567567
if (ret)

drivers/nvdimm/namespace_devs.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1987,7 +1987,7 @@ static struct device *create_namespace_pmem(struct nd_region *nd_region,
19871987
nd_mapping = &nd_region->mapping[i];
19881988
label_ent = list_first_entry_or_null(&nd_mapping->labels,
19891989
typeof(*label_ent), list);
1990-
label0 = label_ent ? label_ent->label : 0;
1990+
label0 = label_ent ? label_ent->label : NULL;
19911991

19921992
if (!label0) {
19931993
WARN_ON(1);
@@ -2322,8 +2322,9 @@ static struct device **scan_labels(struct nd_region *nd_region)
23222322
continue;
23232323

23242324
/* skip labels that describe extents outside of the region */
2325-
if (nd_label->dpa < nd_mapping->start || nd_label->dpa > map_end)
2326-
continue;
2325+
if (__le64_to_cpu(nd_label->dpa) < nd_mapping->start ||
2326+
__le64_to_cpu(nd_label->dpa) > map_end)
2327+
continue;
23272328

23282329
i = add_namespace_resource(nd_region, nd_label, devs, count);
23292330
if (i < 0)

0 commit comments

Comments
 (0)