mirror of
https://github.com/xen-project/xen.git
synced 2026-10-29 02:30:03 +01:00
kfraser@localhost.localdomain
bc79267989
While the kernel side of blktap drivers is using 64-bit sector numbers correctly when reporting disk sizing, the userspace parts where this dat is actually generated is truncating at 32-bit. There are 3 variables related to disk sizing which are used in the kernel/userspace code 'size', 'sector size' & 'info'. In kernel space these are treated as being unsigned long long, unsigned long, and unsigned int, respectively. In the blktap userspace code this were all varyingly long, unsigned long. This mismatch caused 32-bit wraparound on large disks. The attached patch updates the blktap userspace to use the same data types as kernel space for all these params, thus both fixing the 32-bit bug & giving the code consistency. This patch has been tested both by comparing /proc/partitions in the guest, with the image size seen in the host, and by using Stephen Tweedie's 'verify-data' tool on a variety of multi-TB sized disks. Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
56 lines
2.0 KiB
C
56 lines
2.0 KiB
C
/* blktapctrl.h
|
|
*
|
|
* controller image utils.
|
|
*
|
|
* (c) 2004-6 Andrew Warfield and Julian Chesterfield
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License version 2
|
|
* as published by the Free Software Foundation; or, when distributed
|
|
* separately from the Linux kernel or incorporated into other
|
|
* software packages, subject to the following license:
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
* of this source file (the "Software"), to deal in the Software without
|
|
* restriction, including without limitation the rights to use, copy, modify,
|
|
* merge, publish, distribute, sublicense, and/or sell copies of the Software,
|
|
* and to permit persons to whom the Software is furnished to do so, subject to
|
|
* the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in
|
|
* all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
|
* IN THE SOFTWARE.
|
|
*/
|
|
|
|
|
|
static inline unsigned long long tapdisk_get_size(blkif_t *blkif)
|
|
{
|
|
image_t *img = (image_t *)blkif->prv;
|
|
return img->size;
|
|
}
|
|
|
|
static inline unsigned long tapdisk_get_secsize(blkif_t *blkif)
|
|
{
|
|
image_t *img = (image_t *)blkif->prv;
|
|
return img->secsize;
|
|
}
|
|
|
|
static inline unsigned int tapdisk_get_info(blkif_t *blkif)
|
|
{
|
|
image_t *img = (image_t *)blkif->prv;
|
|
return img->info;
|
|
}
|
|
|
|
struct blkif_ops tapdisk_ops = {
|
|
.get_size = tapdisk_get_size,
|
|
.get_secsize = tapdisk_get_secsize,
|
|
.get_info = tapdisk_get_info,
|
|
};
|