Commit 920c1cca authored by Kozlowski Mateusz's avatar Kozlowski Mateusz Committed by Jim Harris
Browse files

ftl: Change metadata to use structure packing 



Don't rely on compiler for metadata packing to 4KiB size and add
reserved fields manually. For compatibility reasons against metadata
relying on automatic padding the reserved fields are also added in-between
existing fields as needed.

Signed-off-by: default avatarKozlowski Mateusz <mateusz.kozlowski@intel.com>
Change-Id: I5e342d5bf5948c213d455590d09597ae120b3c62
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/14307


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent c3321813

lib/ftl/ftl_band.h

+7 −1
Original line number Diff line number Diff line
@@ -64,6 +64,9 @@ struct ftl_band_md { 
	/* nv_cache p2l md region associated with band */

	enum ftl_layout_region_type	p2l_md_region;



	/* Reserved */

	uint8_t				reserved[4];



	/* Sequence ID when band was opened */

	uint64_t			seq;
@@ -78,7 +81,10 @@ struct ftl_band_md { 


	/* CRC32 checksum of the associated P2L map when band is in closed state */

	uint32_t			p2l_map_checksum;

} __attribute__((aligned(FTL_BLOCK_SIZE)));



	/* Reserved */

	uint8_t				reserved2[4028];

} __attribute__((packed));



SPDK_STATIC_ASSERT(sizeof(struct ftl_band_md) == FTL_BLOCK_SIZE, "Incorrect metadata size");

lib/ftl/ftl_nv_cache.h

+4 −1
Original line number Diff line number Diff line
@@ -83,7 +83,10 @@ struct ftl_nv_cache_chunk_md { 


	/* CRC32 checksum of the associated P2L map when chunk is in closed state */

	uint32_t p2l_map_checksum;

} __attribute__((aligned(FTL_BLOCK_SIZE)));



	/* Reserved */

	uint8_t reserved[4052];

} __attribute__((packed));



#define FTL_NV_CACHE_CHUNK_MD_SIZE sizeof(struct ftl_nv_cache_chunk_md)

SPDK_STATIC_ASSERT(FTL_NV_CACHE_CHUNK_MD_SIZE == FTL_BLOCK_SIZE,

lib/ftl/ftl_sb_common.h

+9 −3
Original line number Diff line number Diff line
@@ -33,13 +33,17 @@ struct ftl_superblock_gc_info { 
	uint64_t band_phys_id;

	/* May be updating multiple fields at the same time, clearing/setting this marks the transaction */

	uint64_t is_valid;

};

} __attribute__((packed));

SPDK_STATIC_ASSERT(sizeof(struct ftl_superblock_gc_info) == 32,

		   "ftl_superblock_gc_info incorrect size");



struct ftl_superblock_header {

	uint64_t magic;

	uint64_t crc;

	uint64_t version;

};

} __attribute__((packed));

SPDK_STATIC_ASSERT(sizeof(struct ftl_superblock_header) == 24,

		   "ftl_superblock_header incorrect size");



struct ftl_superblock_md_region {

	uint32_t		type;
@@ -47,7 +51,9 @@ struct ftl_superblock_md_region { 
	uint64_t		blk_offs;

	uint64_t		blk_sz;

	ftl_df_obj_id		df_next;

};

} __attribute__((packed));

SPDK_STATIC_ASSERT(sizeof(struct ftl_superblock_md_region) == 32,

		   "ftl_superblock_md_region incorrect size");



struct ftl_superblock_shm {

	/* SHM initialization completed */

lib/ftl/ftl_sb_current.h

+3 −7
Original line number Diff line number Diff line
@@ -32,12 +32,8 @@ struct ftl_superblock { 
	/* Maximum IO depth per band relocate */

	uint64_t			max_reloc_qdepth;



	/* Reserved fields */

	uint64_t			reserved;



	bool				reserved3;



	uint32_t			reserved2;

	/* Reserved field */

	uint8_t				reserved3[16];



	/* Last L2P checkpoint +1 (i.e. min_seq_id, 0:no ckpt) */

	uint64_t			ckpt_seq_id;
@@ -45,7 +41,7 @@ struct ftl_superblock { 
	struct ftl_superblock_gc_info	gc_info;



	struct ftl_superblock_md_region	md_layout_head;

};

} __attribute__((packed));



SPDK_STATIC_ASSERT(offsetof(struct ftl_superblock, header) == 0,

		   "Invalid placement of header");