emo/thin-provisioning-tools
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[functional-tests] Move get-dev-size to C code

Browse Source 
Saves forking blockdev
This commit is contained in:
Joe Thornber 2017-12-15 15:35:24 +00:00
parent 8d26c3729f
commit 0dc237c356
3 changed files with 69 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ft-lib/dm-ioctl.c
View File

@ -1,5 +1,6 @@
#include <linux/dm-ioctl.h>
#include <linux/kdev_t.h>
#include <linux/fs.h>
#include <stdbool.h>
#include <stdint.h>
#include <stdlib.h>
@ -596,4 +597,18 @@ int dm_message(struct dm_interface *dmi, const char *name, uint64_t sector,
return r;
}
int get_dev_size(const char *path, uint64_t *sectors)
{
int r, fd;
fd = open(path, O_RDONLY);
if (fd < 0)
return -EINVAL;
r = ioctl(fd, BLKGETSIZE64, sectors);
(*sectors) /= 512;
close(fd);
return r;
}
//----------------------------------------------------------------

17
functional-tests/device-mapper/dm-tests.scm
View File

@ -19,24 +19,18 @@
;; to run.
(define (register-dm-tests) #t)
;; FIXME: use memoisation to avoid running blockdev so much
;; FIXME: return a disk-size, and take a dm-device
(define (get-dev-size dev)
(run-ok-rcv (stdout stderr) (fmt #f "blockdev --getsz " dev)
(string->number (chomp stdout))))
;; Hard coded, get these from the command line
(define fast-dev "/dev/vda")
(define mk-fast-allocator
(let ((size (get-dev-size fast-dev)))
(lambda ()
(make-allocator fast-dev size))))
(make-allocator fast-dev (to-sectors size)))))
(define slow-dev "/dev/vdb")
(define mk-slow-allocator
(let ((size (get-dev-size slow-dev)))
(lambda ()
(make-allocator slow-dev size))))
(make-allocator slow-dev (to-sectors size)))))
(define-record-type segment (fields (mutable dev)
(mutable start)
@ -105,7 +99,7 @@
(define (pool-table md-dev data-dev block-size opts)
(let ((opts-str (expand-thin-options opts))
(data-size (sectors (get-dev-size (dm-device-path data-dev)))))
(data-size (get-dev-size (dm-device-path data-dev))))
(list
(make-target (to-sectors data-size) "thin-pool"
(apply build-args-string
@ -123,9 +117,8 @@
(case-lambda
((dev)
(zero-dev dev
(sectors
(get-dev-size
(dm-device-path dev)))))
(get-dev-size
(dm-device-path dev))))
((dev size)
(run-ok (dd-cmd "if=/dev/zero"
(string-append "of=" (dm-device-path dev))

80
functional-tests/device-mapper/ioctl.scm
View File

@ -42,9 +42,12 @@
get-status
get-table
message)
message
get-dev-size)
(import (chezscheme)
(disk-units)
(fmt fmt)
(srfi s8 receive)
(utils))
@ -107,7 +110,24 @@
(define (free-u32 p)
(foreign-free (ftype-pointer-address p)))
;; FIXME: make a with-u32s macro
(define-syntax with-u32
(syntax-rules ()
((_ (v) b1 b2 ...)
(let ((v (alloc-u32)))
(dynamic-wind
(lambda () #f)
(lambda () b1 b2 ...)
(lambda () (free-u32 v)))))))
(define-syntax with-u32s
(syntax-rules ()
((_ (v) b1 b2 ...)
(with-u32 (v) b1 b2 ...))
((_ (v rest ...) b1 b2 ...)
(with-u32 (v)
(with-u32s (rest ...) b1 b2 ...)))))
(define (get-version)
(define get
(foreign-procedure "dm_version" ((* DMIoctlInterface)
@ -115,22 +135,13 @@
(* unsigned-32)
(* unsigned-32)) int))
(let ((major (alloc-u32))
(minor (alloc-u32))
(patch (alloc-u32)))
(dynamic-wind
(lambda () #f)
(lambda ()
(if (zero? (get (current-dm-interface) major minor patch))
(let ((r (make-dm-version (deref-u32 major)
(deref-u32 minor)
(deref-u32 patch))))
r)
(fail "couldn't get dm version")))
(lambda ()
(free-u32 major)
(free-u32 minor)
(free-u32 patch)))))
(with-u32s (major minor patch)
(if (zero? (get (current-dm-interface) major minor patch))
(let ((r (make-dm-version (deref-u32 major)
(deref-u32 minor)
(deref-u32 patch))))
r)
(fail "couldn't get dm version"))))
(define (remove-all)
(define do-it
@ -195,18 +206,11 @@
(define create
(foreign-procedure "dm_create_device" ((* DMIoctlInterface) string string (* unsigned-32) (* unsigned-32)) int))
(let* ((major (alloc-u32))
(minor (alloc-u32)))
(dynamic-wind
(lambda () #f)
(lambda ()
(let ((r (create (current-dm-interface) name uuid major minor)))
(if (zero? r)
(make-dm-device name (deref-u32 major) (deref-u32 minor))
(fail (fmt #f "create-device failed with error code " r)))))
(lambda ()
(free-u32 major)
(free-u32 minor)))))
(with-u32s (major minor)
(let ((r (create (current-dm-interface) name uuid major minor)))
(if (zero? r)
(make-dm-device name (deref-u32 major) (deref-u32 minor))
(fail (fmt #f "create-device failed with error code " r))))))
(define-syntax define-dev-cmd
(syntax-rules ()
@ -373,4 +377,18 @@
(unless (zero? (c-message (current-dm-interface) (dm-device-name dev) sector msg))
(fail (fmt #f "message ioctl failed"))))
)
;; Works with either a raw path, or a dm-device. Returns a disk-size.
(define (get-dev-size dev)
(define c-get-size
(foreign-procedure "get_dev_size" (string (* unsigned-64)) int))
(let* ((path (if (string? dev) dev (dm-device-path dev)))
(size (make-ftype-pointer unsigned-64 (foreign-alloc (ftype-sizeof unsigned-64))))
(r (c-get-size path size)))
(let ((result (ftype-ref unsigned-64 () size)))
(foreign-free (ftype-pointer-address size))
(if (zero? r)
(sectors result)
(fail (fmt #f "get-dev-size failed: " r))))))
)