shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

libdm: support cache metadata2 feature flag

Browse Source 
Dm cache target version 1.10 introduces new cache metadata format
(upstream kernel >=4.11).

New format is enable by passing new target feature flag metadata2.
Interace side on libdm uses DM_CACHE_FEATURE_METADATA2.
This feature bit is now also recognized on status
and set in 'feature_flags' field of dm_status_cache structure.

Code also adds check for 'highest' supported feature flag bit.
So it rejects properly any 'unknown' feature bit set by application.
This commit is contained in:
Zdenek Kabelac 2017-02-23 23:38:06 +01:00
parent bf79fb1a33
commit ddd5a76801
4 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
WHATS_NEW_DM
View File

@ -1,5 +1,6 @@
Version 1.02.138 - Version 1.02.138 -
===================================== =====================================
Support DM_CACHE_FEATURE_METADATA2, new cache metadata format 2.
Improve code to handle mode mask for cache nodes. Improve code to handle mode mask for cache nodes.
Cache status check for passthrough also require trailing space. Cache status check for passthrough also require trailing space.
Add extra memory page when limiting pthread stack size in dmeventd. Add extra memory page when limiting pthread stack size in dmeventd.

3
libdm/libdevmapper.h
View File

@ -359,7 +359,7 @@ struct dm_status_cache {
uint64_t demotions; uint64_t demotions;
uint64_t promotions; uint64_t promotions;
uint64_t feature_flags; uint64_t feature_flags; /* DM_CACHE_FEATURE_? */
int core_argc; int core_argc;
char **core_argv; char **core_argv;
@ -1886,6 +1886,7 @@ int dm_tree_node_add_raid_target_with_params_v2(struct dm_tree_node *node,
#define DM_CACHE_FEATURE_WRITEBACK 0x00000001 #define DM_CACHE_FEATURE_WRITEBACK 0x00000001
#define DM_CACHE_FEATURE_WRITETHROUGH 0x00000002 #define DM_CACHE_FEATURE_WRITETHROUGH 0x00000002
#define DM_CACHE_FEATURE_PASSTHROUGH 0x00000004 #define DM_CACHE_FEATURE_PASSTHROUGH 0x00000004
#define DM_CACHE_FEATURE_METADATA2 0x00000008 /* cache v1.10 */
struct dm_config_node; struct dm_config_node;
/* /*

22
libdm/libdm-deptree.c
View File

@ -2514,12 +2514,17 @@ static int _cache_emit_segment_line(struct dm_task *dmt,
/* Features */ /* Features */
/* feature_count = hweight32(seg->flags); */ /* feature_count = hweight32(seg->flags); */
/* EMIT_PARAMS(pos, " %u", feature_count); */ /* EMIT_PARAMS(pos, " %u", feature_count); */
if (seg->flags & DM_CACHE_FEATURE_METADATA2)
EMIT_PARAMS(pos, " 2 metadata2 ");
else
EMIT_PARAMS(pos, " 1 ");
if (seg->flags & DM_CACHE_FEATURE_PASSTHROUGH) if (seg->flags & DM_CACHE_FEATURE_PASSTHROUGH)
EMIT_PARAMS(pos, " 1 passthrough"); EMIT_PARAMS(pos, "passthrough");
else if (seg->flags & DM_CACHE_FEATURE_WRITETHROUGH) else if (seg->flags & DM_CACHE_FEATURE_WRITEBACK)
EMIT_PARAMS(pos, " 1 writethrough"); EMIT_PARAMS(pos, "writeback");
else if (seg->flags & DM_CACHE_FEATURE_WRITEBACK) else
EMIT_PARAMS(pos, " 1 writeback"); EMIT_PARAMS(pos, "writethrough");
/* Cache Policy */ /* Cache Policy */
name = seg->policy_name ? : "default"; name = seg->policy_name ? : "default";
@ -3403,6 +3408,13 @@ int dm_tree_node_add_cache_target(struct dm_tree_node *node,
DM_CACHE_FEATURE_WRITETHROUGH | DM_CACHE_FEATURE_WRITETHROUGH |
DM_CACHE_FEATURE_WRITEBACK; DM_CACHE_FEATURE_WRITEBACK;
/* Detect unknown (bigger) feature bit */
if (feature_flags >= (DM_CACHE_FEATURE_METADATA2 * 2)) {
log_error("Unsupported cache's feature flags set " FMTu64 ".",
feature_flags);
return 0;
}
switch (feature_flags & _modemask) { switch (feature_flags & _modemask) {
case DM_CACHE_FEATURE_PASSTHROUGH: case DM_CACHE_FEATURE_PASSTHROUGH:
case DM_CACHE_FEATURE_WRITEBACK: case DM_CACHE_FEATURE_WRITEBACK:

2
libdm/libdm-targets.c
View File

@ -276,6 +276,8 @@ int dm_get_status_cache(struct dm_pool *mem, const char *params,
s->feature_flags |= DM_CACHE_FEATURE_WRITEBACK; s->feature_flags |= DM_CACHE_FEATURE_WRITEBACK;
else if (!strncmp(p, "passthrough ", 12)) else if (!strncmp(p, "passthrough ", 12))
s->feature_flags |= DM_CACHE_FEATURE_PASSTHROUGH; s->feature_flags |= DM_CACHE_FEATURE_PASSTHROUGH;
else if (!strncmp(p, "metadata2 ", 10))
s->feature_flags |= DM_CACHE_FEATURE_METADATA2;
else else
log_error("Unknown feature in status: %s", params); log_error("Unknown feature in status: %s", params);