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

cov: handle teoretical sysconf failure

Browse Source 
sysconf() may also return -1 although rather theoretically.
Default to 4K when such case would happen.
Also in function call it just once and keep as static variable.
This commit is contained in:
Zdenek Kabelac 2021-09-19 20:23:24 +02:00
parent f410035181
commit ce907bcd26
5 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/device/bcache.c
View File

@ -358,10 +358,16 @@ static unsigned _async_max_io(struct io_engine *e)
struct io_engine *create_async_io_engine(void) struct io_engine *create_async_io_engine(void)
{ {
static int _pagesize = 0;
int r; int r;
struct async_engine *e = malloc(sizeof(*e)); struct async_engine *e;
if (!e) if ((_pagesize <= 0) && (_pagesize = sysconf(_SC_PAGESIZE)) < 0) {
log_warn("_SC_PAGESIZE returns negative value.");
return NULL;
}
if (!(e = malloc(sizeof(*e))))
return NULL; return NULL;
e->e.destroy = _async_destroy; e->e.destroy = _async_destroy;
@ -384,7 +390,7 @@ struct io_engine *create_async_io_engine(void)
return NULL; return NULL;
} }
e->page_mask = sysconf(_SC_PAGESIZE) - 1; e->page_mask = (unsigned) _pagesize - 1;
return &e->e; return &e->e;
} }
@ -1087,12 +1093,12 @@ static void _preemptive_writeback(struct bcache *cache)
struct bcache *bcache_create(sector_t block_sectors, unsigned nr_cache_blocks, struct bcache *bcache_create(sector_t block_sectors, unsigned nr_cache_blocks,
struct io_engine *engine) struct io_engine *engine)
{ {
static long _pagesize = 0;
struct bcache *cache; struct bcache *cache;
unsigned max_io = engine->max_io(engine); unsigned max_io = engine->max_io(engine);
long pgsize = sysconf(_SC_PAGESIZE);
int i; int i;
if (pgsize < 0) { if ((_pagesize <= 0) && ((_pagesize = sysconf(_SC_PAGESIZE)) < 0)) {
log_warn("WARNING: _SC_PAGESIZE returns negative value."); log_warn("WARNING: _SC_PAGESIZE returns negative value.");
return NULL; return NULL;
} }
@ -1107,7 +1113,7 @@ struct bcache *bcache_create(sector_t block_sectors, unsigned nr_cache_blocks,
return NULL; return NULL;
} }
if (block_sectors & ((pgsize >> SECTOR_SHIFT) - 1)) { if (block_sectors & ((_pagesize >> SECTOR_SHIFT) - 1)) {
log_warn("bcache block size must be a multiple of page size"); log_warn("bcache block size must be a multiple of page size");
return NULL; return NULL;
} }
@ -1144,7 +1150,7 @@ struct bcache *bcache_create(sector_t block_sectors, unsigned nr_cache_blocks,
cache->write_misses = 0; cache->write_misses = 0;
cache->prefetches = 0; cache->prefetches = 0;
if (!_init_free_list(cache, nr_cache_blocks, pgsize)) { if (!_init_free_list(cache, nr_cache_blocks, _pagesize)) {
cache->engine->destroy(cache->engine); cache->engine->destroy(cache->engine);
radix_tree_destroy(cache->rtree); radix_tree_destroy(cache->rtree);
free(cache); free(cache);

2
test/unit/bcache_t.c
View File

@ -380,7 +380,7 @@ static void _large_fixture_exit(void *context)
*--------------------------------------------------------------*/ *--------------------------------------------------------------*/
#define MEG 2048 #define MEG 2048
#define SECTOR_SHIFT 9 #define SECTOR_SHIFT 9
#define PAGE_SIZE_SECTORS (sysconf(_SC_PAGE_SIZE) >> SECTOR_SHIFT) #define PAGE_SIZE_SECTORS ((PAGE_SIZE) >> SECTOR_SHIFT)
static void good_create(sector_t block_size, unsigned nr_cache_blocks) static void good_create(sector_t block_size, unsigned nr_cache_blocks)
{ {

2
test/unit/bcache_utils_t.c
View File

@ -26,7 +26,7 @@
//---------------------------------------------------------------- //----------------------------------------------------------------
#define T_BLOCK_SIZE sysconf(_SC_PAGESIZE) #define T_BLOCK_SIZE (PAGE_SIZE)
#define NR_BLOCKS 64 #define NR_BLOCKS 64
#define INIT_PATTERN 123 #define INIT_PATTERN 123

2
test/unit/framework.h
View File

@ -44,6 +44,8 @@ void test_fail(const char *fmt, ...)
extern jmp_buf test_k; extern jmp_buf test_k;
#define TEST_FAILED 1 #define TEST_FAILED 1
#define PAGE_SIZE ({ int ps = sysconf(_SC_PAGESIZE); (ps > 0) ? ps : 4096 ; })
//----------------------------------------------------------------- //-----------------------------------------------------------------
#endif #endif

3
test/unit/io_engine_t.c
View File

@ -28,8 +28,7 @@
#define SECTOR_SHIFT 9 #define SECTOR_SHIFT 9
#define SECTOR_SIZE 512 #define SECTOR_SIZE 512
#define BLOCK_SIZE_SECTORS 8 #define BLOCK_SIZE_SECTORS 8
#define PAGE_SIZE sysconf(_SC_PAGESIZE) #define PAGE_SIZE_SECTORS ((PAGE_SIZE) >> SECTOR_SHIFT)
#define PAGE_SIZE_SECTORS (PAGE_SIZE >> SECTOR_SHIFT)
#define NR_BLOCKS 64 #define NR_BLOCKS 64
struct fixture { struct fixture {