aboutsummaryrefslogtreecommitdiff
path: root/lib/libmuser.c
diff options
context:
space:
mode:
authorThanos Makatos <thanos.makatos@nutanix.com>2019-09-05 09:51:16 -0400
committerFelipe Franciosi <felipe@nutanix.com>2019-09-05 16:45:35 +0100
commit87fb9ed200f49db51f2ced578647a3529c1105dc (patch)
treea4874bde500171ed5badbc5d0296e35f1ef27509 /lib/libmuser.c
parent85f4828c74c01ae8ff17f56614f5f46563d88b1c (diff)
downloadlibvfio-user-87fb9ed200f49db51f2ced578647a3529c1105dc.zip
libvfio-user-87fb9ed200f49db51f2ced578647a3529c1105dc.tar.gz
libvfio-user-87fb9ed200f49db51f2ced578647a3529c1105dc.tar.bz2
remove unnecessary loop for retrieving region
Signed-off-by: Thanos Makatos <thanos.makatos@nutanix.com>
Diffstat (limited to 'lib/libmuser.c')
-rw-r--r--lib/libmuser.c39
1 files changed, 19 insertions, 20 deletions
diff --git a/lib/libmuser.c b/lib/libmuser.c
index 95d24a0..f9ce245 100644
--- a/lib/libmuser.c
+++ b/lib/libmuser.c
@@ -418,13 +418,20 @@ dev_get_sparse_mmap_cap(lm_ctx_t *lm_ctx, lm_reg_info_t *lm_reg,
}
#define LM_REGION_SHIFT 40
+#define LM_REGION_MASK ((1ULL << LM_REGION_SHIFT) - 1)
uint64_t
-region_offset(const uint32_t region)
+region_to_offset(const uint32_t region)
{
return (uint64_t)region << LM_REGION_SHIFT;
}
+uint32_t
+offset_to_region(const uint64_t offset)
+{
+ return (offset >> LM_REGION_SHIFT) & LM_REGION_MASK;
+}
+
static long
dev_get_reginfo(lm_ctx_t * lm_ctx, struct vfio_region_info *vfio_reg)
{
@@ -441,7 +448,7 @@ dev_get_reginfo(lm_ctx_t * lm_ctx, struct vfio_region_info *vfio_reg)
return -EINVAL;
}
- vfio_reg->offset = region_offset(vfio_reg->index);
+ vfio_reg->offset = region_to_offset(vfio_reg->index);
vfio_reg->flags = lm_reg->flags;
vfio_reg->size = lm_reg->size;
@@ -573,7 +580,7 @@ static int muser_mmap(lm_ctx_t * lm_ctx, struct muser_cmd *cmd)
unsigned long len = cmd->mmap.request.len;
unsigned long pgoff = cmd->mmap.request.pgoff;
- region = lm_get_region(lm_ctx, pgoff, len, &pgoff);
+ region = lm_get_region(pgoff, len, &pgoff);
if (region < 0) {
lm_log(lm_ctx, LM_ERR, "bad region %d\n", region);
err = region;
@@ -630,26 +637,18 @@ post_read(lm_ctx_t * const lm_ctx, struct muser_cmd *const cmd, ssize_t ret)
}
int
-lm_get_region(lm_ctx_t * const lm_ctx, const loff_t pos, const size_t count,
- loff_t * const off)
+lm_get_region(const loff_t pos, const size_t count, loff_t * const off)
{
- assert(lm_ctx);
- assert(off);
- lm_pci_info_t *pci_info = &lm_ctx->pci_info;
+ int r;
- int i;
+ assert(off);
- for (i = 0; i < LM_DEV_NUM_REGS; i++) {
- const lm_reg_info_t * const reg_info = &pci_info->reg_info[i];
- const uint64_t _region_offset = region_offset(i);
- if (pos >= _region_offset) {
- if (pos - _region_offset + count <= reg_info->size) {
- *off = pos - _region_offset;
- return i;
- }
- }
+ r = offset_to_region(pos);
+ if (offset_to_region(pos + count) != r) {
+ return -ENOENT;
}
- return -ENOENT;
+ *off = pos - region_to_offset(r);
+ return r;
}
static ssize_t
@@ -689,7 +688,7 @@ do_access(lm_ctx_t * const lm_ctx, char * const buf, size_t count, loff_t pos,
assert(count > 0);
pci_info = &lm_ctx->pci_info;
- idx = lm_get_region(lm_ctx, pos, count, &offset);
+ idx = lm_get_region(pos, count, &offset);
if (idx < 0) {
lm_log(lm_ctx, LM_ERR, "invalid region %d\n", idx);
return idx;