fbarray: fix detach in --no-shconf mode
[dpdk.git] / lib / librte_eal / common / eal_common_fbarray.c
index d17611b..ba6c4ae 100644 (file)
@@ -231,7 +231,7 @@ find_next_n(const struct rte_fbarray *arr, unsigned int start, unsigned int n,
                return MASK_GET_IDX(msk_idx, run_start);
        }
        /* we didn't find anything */
-       rte_errno = used ? -ENOENT : -ENOSPC;
+       rte_errno = used ? ENOENT : ENOSPC;
        return -1;
 }
 
@@ -287,7 +287,7 @@ find_next(const struct rte_fbarray *arr, unsigned int start, bool used)
                return MASK_GET_IDX(idx, found);
        }
        /* we didn't find anything */
-       rte_errno = used ? -ENOENT : -ENOSPC;
+       rte_errno = used ? ENOENT : ENOSPC;
        return -1;
 }
 
@@ -352,6 +352,277 @@ find_contig(const struct rte_fbarray *arr, unsigned int start, bool used)
        return result;
 }
 
+static int
+find_prev_n(const struct rte_fbarray *arr, unsigned int start, unsigned int n,
+               bool used)
+{
+       const struct used_mask *msk = get_used_mask(arr->data, arr->elt_sz,
+                       arr->len);
+       unsigned int msk_idx, lookbehind_idx, first, first_mod;
+       uint64_t ignore_msk;
+
+       /*
+        * mask only has granularity of MASK_ALIGN, but start may not be aligned
+        * on that boundary, so construct a special mask to exclude anything we
+        * don't want to see to avoid confusing ctz.
+        */
+       first = MASK_LEN_TO_IDX(start);
+       first_mod = MASK_LEN_TO_MOD(start);
+       /* we're going backwards, so mask must start from the top */
+       ignore_msk = first_mod == MASK_ALIGN - 1 ?
+                               -1ULL : /* prevent overflow */
+                               ~(-1ULL << (first_mod + 1));
+
+       /* go backwards, include zero */
+       msk_idx = first;
+       do {
+               uint64_t cur_msk, lookbehind_msk;
+               unsigned int run_start, run_end, ctz, left;
+               bool found = false;
+               /*
+                * The process of getting n consecutive bits from the top for
+                * arbitrary n is a bit involved, but here it is in a nutshell:
+                *
+                *  1. let n be the number of consecutive bits we're looking for
+                *  2. check if n can fit in one mask, and if so, do n-1
+                *     lshift-ands to see if there is an appropriate run inside
+                *     our current mask
+                *    2a. if we found a run, bail out early
+                *    2b. if we didn't find a run, proceed
+                *  3. invert the mask and count trailing zeroes (that is, count
+                *     how many consecutive set bits we had starting from the
+                *     start of current mask) as k
+                *    3a. if k is 0, continue to next mask
+                *    3b. if k is not 0, we have a potential run
+                *  4. to satisfy our requirements, next mask must have n-k
+                *     consecutive set bits at the end, so we will do (n-k-1)
+                *     lshift-ands and check if last bit is set.
+                *
+                * Step 4 will need to be repeated if (n-k) > MASK_ALIGN until
+                * we either run out of masks, lose the run, or find what we
+                * were looking for.
+                */
+               cur_msk = msk->data[msk_idx];
+               left = n;
+
+               /* if we're looking for free spaces, invert the mask */
+               if (!used)
+                       cur_msk = ~cur_msk;
+
+               /* if we have an ignore mask, ignore once */
+               if (ignore_msk) {
+                       cur_msk &= ignore_msk;
+                       ignore_msk = 0;
+               }
+
+               /* if n can fit in within a single mask, do a search */
+               if (n <= MASK_ALIGN) {
+                       uint64_t tmp_msk = cur_msk;
+                       unsigned int s_idx;
+                       for (s_idx = 0; s_idx < n - 1; s_idx++)
+                               tmp_msk &= tmp_msk << 1ULL;
+                       /* we found what we were looking for */
+                       if (tmp_msk != 0) {
+                               /* clz will give us offset from end of mask, and
+                                * we only get the end of our run, not start,
+                                * so adjust result to point to where start
+                                * would have been.
+                                */
+                               run_start = MASK_ALIGN -
+                                               __builtin_clzll(tmp_msk) - n;
+                               return MASK_GET_IDX(msk_idx, run_start);
+                       }
+               }
+
+               /*
+                * we didn't find our run within the mask, or n > MASK_ALIGN,
+                * so we're going for plan B.
+                */
+
+               /* count trailing zeroes on inverted mask */
+               if (~cur_msk == 0)
+                       ctz = sizeof(cur_msk) * 8;
+               else
+                       ctz = __builtin_ctzll(~cur_msk);
+
+               /* if there aren't any runs at the start either, just
+                * continue
+                */
+               if (ctz == 0)
+                       continue;
+
+               /* we have a partial run at the start, so try looking behind */
+               run_end = MASK_GET_IDX(msk_idx, ctz);
+               left -= ctz;
+
+               /* go backwards, include zero */
+               lookbehind_idx = msk_idx - 1;
+
+               /* we can't lookbehind as we've run out of masks, so stop */
+               if (msk_idx == 0)
+                       break;
+
+               do {
+                       const uint64_t last_bit = 1ULL << (MASK_ALIGN - 1);
+                       unsigned int s_idx, need;
+
+                       lookbehind_msk = msk->data[lookbehind_idx];
+
+                       /* if we're looking for free space, invert the mask */
+                       if (!used)
+                               lookbehind_msk = ~lookbehind_msk;
+
+                       /* figure out how many consecutive bits we need here */
+                       need = RTE_MIN(left, MASK_ALIGN);
+
+                       for (s_idx = 0; s_idx < need - 1; s_idx++)
+                               lookbehind_msk &= lookbehind_msk << 1ULL;
+
+                       /* if last bit is not set, we've lost the run */
+                       if ((lookbehind_msk & last_bit) == 0) {
+                               /*
+                                * we've scanned this far, so we know there are
+                                * no runs in the space we've lookbehind-scanned
+                                * as well, so skip that on next iteration.
+                                */
+                               ignore_msk = -1ULL << need;
+                               msk_idx = lookbehind_idx;
+                               break;
+                       }
+
+                       left -= need;
+
+                       /* check if we've found what we were looking for */
+                       if (left == 0) {
+                               found = true;
+                               break;
+                       }
+               } while ((lookbehind_idx--) != 0); /* decrement after check to
+                                                   * include zero
+                                                   */
+
+               /* we didn't find anything, so continue */
+               if (!found)
+                       continue;
+
+               /* we've found what we were looking for, but we only know where
+                * the run ended, so calculate start position.
+                */
+               return run_end - n;
+       } while (msk_idx-- != 0); /* decrement after check to include zero */
+       /* we didn't find anything */
+       rte_errno = used ? ENOENT : ENOSPC;
+       return -1;
+}
+
+static int
+find_prev(const struct rte_fbarray *arr, unsigned int start, bool used)
+{
+       const struct used_mask *msk = get_used_mask(arr->data, arr->elt_sz,
+                       arr->len);
+       unsigned int idx, first, first_mod;
+       uint64_t ignore_msk;
+
+       /*
+        * mask only has granularity of MASK_ALIGN, but start may not be aligned
+        * on that boundary, so construct a special mask to exclude anything we
+        * don't want to see to avoid confusing clz.
+        */
+       first = MASK_LEN_TO_IDX(start);
+       first_mod = MASK_LEN_TO_MOD(start);
+       /* we're going backwards, so mask must start from the top */
+       ignore_msk = first_mod == MASK_ALIGN - 1 ?
+                               -1ULL : /* prevent overflow */
+                               ~(-1ULL << (first_mod + 1));
+
+       /* go backwards, include zero */
+       idx = first;
+       do {
+               uint64_t cur = msk->data[idx];
+               int found;
+
+               /* if we're looking for free entries, invert mask */
+               if (!used)
+                       cur = ~cur;
+
+               /* ignore everything before start on first iteration */
+               if (idx == first)
+                       cur &= ignore_msk;
+
+               /* check if we have any entries */
+               if (cur == 0)
+                       continue;
+
+               /*
+                * find last set bit - that will correspond to whatever it is
+                * that we're looking for. we're counting trailing zeroes, thus
+                * the value we get is counted from end of mask, so calculate
+                * position from start of mask.
+                */
+               found = MASK_ALIGN - __builtin_clzll(cur) - 1;
+
+               return MASK_GET_IDX(idx, found);
+       } while (idx-- != 0); /* decrement after check  to include zero*/
+
+       /* we didn't find anything */
+       rte_errno = used ? ENOENT : ENOSPC;
+       return -1;
+}
+
+static int
+find_rev_contig(const struct rte_fbarray *arr, unsigned int start, bool used)
+{
+       const struct used_mask *msk = get_used_mask(arr->data, arr->elt_sz,
+                       arr->len);
+       unsigned int idx, first, first_mod;
+       unsigned int need_len, result = 0;
+
+       first = MASK_LEN_TO_IDX(start);
+       first_mod = MASK_LEN_TO_MOD(start);
+
+       /* go backwards, include zero */
+       idx = first;
+       do {
+               uint64_t cur = msk->data[idx];
+               unsigned int run_len;
+
+               need_len = MASK_ALIGN;
+
+               /* if we're looking for free entries, invert mask */
+               if (!used)
+                       cur = ~cur;
+
+               /* ignore everything after start on first iteration */
+               if (idx == first) {
+                       unsigned int end_len = MASK_ALIGN - first_mod - 1;
+                       cur <<= end_len;
+                       /* at the start, we don't need the full mask len */
+                       need_len -= end_len;
+               }
+
+               /* we will be looking for zeroes, so invert the mask */
+               cur = ~cur;
+
+               /* if mask is zero, we have a complete run */
+               if (cur == 0)
+                       goto endloop;
+
+               /*
+                * see where run ends, starting from the end.
+                */
+               run_len = __builtin_clzll(cur);
+
+               /* add however many zeroes we've had in the last run and quit */
+               if (run_len < need_len) {
+                       result += run_len;
+                       break;
+               }
+endloop:
+               result += need_len;
+       } while (idx-- != 0); /* decrement after check to include zero */
+       return result;
+}
+
 static int
 set_used(struct rte_fbarray *arr, unsigned int idx, bool used)
 {
@@ -434,39 +705,52 @@ rte_fbarray_init(struct rte_fbarray *arr, const char *name, unsigned int len,
        if (data == NULL)
                goto fail;
 
-       eal_get_fbarray_path(path, sizeof(path), name);
+       if (internal_config.no_shconf) {
+               /* remap virtual area as writable */
+               void *new_data = mmap(data, mmap_len, PROT_READ | PROT_WRITE,
+                               MAP_FIXED | MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+               if (new_data == MAP_FAILED) {
+                       RTE_LOG(DEBUG, EAL, "%s(): couldn't remap anonymous memory: %s\n",
+                                       __func__, strerror(errno));
+                       goto fail;
+               }
+       } else {
+               eal_get_fbarray_path(path, sizeof(path), name);
 
-       /*
-        * Each fbarray is unique to process namespace, i.e. the filename
-        * depends on process prefix. Try to take out a lock and see if we
-        * succeed. If we don't, someone else is using it already.
-        */
-       fd = open(path, O_CREAT | O_RDWR, 0600);
-       if (fd < 0) {
-               RTE_LOG(DEBUG, EAL, "%s(): couldn't open %s: %s\n", __func__,
-                               path, strerror(errno));
-               rte_errno = errno;
-               goto fail;
-       } else if (flock(fd, LOCK_EX | LOCK_NB)) {
-               RTE_LOG(DEBUG, EAL, "%s(): couldn't lock %s: %s\n", __func__,
-                               path, strerror(errno));
-               rte_errno = EBUSY;
-               goto fail;
-       }
+               /*
+                * Each fbarray is unique to process namespace, i.e. the
+                * filename depends on process prefix. Try to take out a lock
+                * and see if we succeed. If we don't, someone else is using it
+                * already.
+                */
+               fd = open(path, O_CREAT | O_RDWR, 0600);
+               if (fd < 0) {
+                       RTE_LOG(DEBUG, EAL, "%s(): couldn't open %s: %s\n",
+                                       __func__, path, strerror(errno));
+                       rte_errno = errno;
+                       goto fail;
+               } else if (flock(fd, LOCK_EX | LOCK_NB)) {
+                       RTE_LOG(DEBUG, EAL, "%s(): couldn't lock %s: %s\n",
+                                       __func__, path, strerror(errno));
+                       rte_errno = EBUSY;
+                       goto fail;
+               }
 
-       /* take out a non-exclusive lock, so that other processes could still
-        * attach to it, but no other process could reinitialize it.
-        */
-       if (flock(fd, LOCK_SH | LOCK_NB)) {
-               rte_errno = errno;
-               goto fail;
-       }
+               /* take out a non-exclusive lock, so that other processes could
+                * still attach to it, but no other process could reinitialize
+                * it.
+                */
+               if (flock(fd, LOCK_SH | LOCK_NB)) {
+                       rte_errno = errno;
+                       goto fail;
+               }
 
-       if (resize_and_map(fd, data, mmap_len))
-               goto fail;
+               if (resize_and_map(fd, data, mmap_len))
+                       goto fail;
 
-       /* we've mmap'ed the file, we can now close the fd */
-       close(fd);
+               /* we've mmap'ed the file, we can now close the fd */
+               close(fd);
+       }
 
        /* initialize the data */
        memset(data, 0, mmap_len);
@@ -572,6 +856,9 @@ rte_fbarray_detach(struct rte_fbarray *arr)
 
        size_t page_sz = sysconf(_SC_PAGESIZE);
 
+       if (page_sz == (size_t)-1)
+               return -1;
+
        /* this may already be unmapped (e.g. repeated call from previously
         * failed destroy(), but this is on user, we can't (easily) know if this
         * is still mapped.
@@ -591,6 +878,10 @@ rte_fbarray_destroy(struct rte_fbarray *arr)
        if (ret)
                return ret;
 
+       /* with no shconf, there were never any files to begin with */
+       if (internal_config.no_shconf)
+               return 0;
+
        /* try deleting the file */
        eal_get_fbarray_path(path, sizeof(path), arr->name);
 
@@ -672,8 +963,8 @@ rte_fbarray_is_used(struct rte_fbarray *arr, unsigned int idx)
        return ret;
 }
 
-int __rte_experimental
-rte_fbarray_find_next_free(struct rte_fbarray *arr, unsigned int start)
+static int
+fbarray_find(struct rte_fbarray *arr, unsigned int start, bool next, bool used)
 {
        int ret = -1;
 
@@ -685,36 +976,106 @@ rte_fbarray_find_next_free(struct rte_fbarray *arr, unsigned int start)
        /* prevent array from changing under us */
        rte_rwlock_read_lock(&arr->rwlock);
 
-       if (arr->len == arr->count) {
-               rte_errno = ENOSPC;
-               goto out;
+       /* cheap checks to prevent doing useless work */
+       if (!used) {
+               if (arr->len == arr->count) {
+                       rte_errno = ENOSPC;
+                       goto out;
+               }
+               if (arr->count == 0) {
+                       ret = start;
+                       goto out;
+               }
+       } else {
+               if (arr->count == 0) {
+                       rte_errno = ENOENT;
+                       goto out;
+               }
+               if (arr->len == arr->count) {
+                       ret = start;
+                       goto out;
+               }
        }
-
-       ret = find_next(arr, start, false);
+       if (next)
+               ret = find_next(arr, start, used);
+       else
+               ret = find_prev(arr, start, used);
 out:
        rte_rwlock_read_unlock(&arr->rwlock);
        return ret;
 }
 
+int __rte_experimental
+rte_fbarray_find_next_free(struct rte_fbarray *arr, unsigned int start)
+{
+       return fbarray_find(arr, start, true, false);
+}
+
 int __rte_experimental
 rte_fbarray_find_next_used(struct rte_fbarray *arr, unsigned int start)
+{
+       return fbarray_find(arr, start, true, true);
+}
+
+int __rte_experimental
+rte_fbarray_find_prev_free(struct rte_fbarray *arr, unsigned int start)
+{
+       return fbarray_find(arr, start, false, false);
+}
+
+int __rte_experimental
+rte_fbarray_find_prev_used(struct rte_fbarray *arr, unsigned int start)
+{
+       return fbarray_find(arr, start, false, true);
+}
+
+static int
+fbarray_find_n(struct rte_fbarray *arr, unsigned int start, unsigned int n,
+               bool next, bool used)
 {
        int ret = -1;
 
-       if (arr == NULL || start >= arr->len) {
+       if (arr == NULL || start >= arr->len || n > arr->len || n == 0) {
                rte_errno = EINVAL;
                return -1;
        }
+       if (next && (arr->len - start) < n) {
+               rte_errno = used ? ENOENT : ENOSPC;
+               return -1;
+       }
+       if (!next && start < (n - 1)) {
+               rte_errno = used ? ENOENT : ENOSPC;
+               return -1;
+       }
 
        /* prevent array from changing under us */
        rte_rwlock_read_lock(&arr->rwlock);
 
-       if (arr->count == 0) {
-               rte_errno = ENOENT;
-               goto out;
+       /* cheap checks to prevent doing useless work */
+       if (!used) {
+               if (arr->len == arr->count || arr->len - arr->count < n) {
+                       rte_errno = ENOSPC;
+                       goto out;
+               }
+               if (arr->count == 0) {
+                       ret = next ? start : start - n + 1;
+                       goto out;
+               }
+       } else {
+               if (arr->count < n) {
+                       rte_errno = ENOENT;
+                       goto out;
+               }
+               if (arr->count == arr->len) {
+                       ret = next ? start : start - n + 1;
+                       goto out;
+               }
        }
 
-       ret = find_next(arr, start, true);
+       if (next)
+               ret = find_next_n(arr, start, n, used);
+       else
+               ret = find_prev_n(arr, start, n, used);
 out:
        rte_rwlock_read_unlock(&arr->rwlock);
        return ret;
@@ -724,54 +1085,33 @@ int __rte_experimental
 rte_fbarray_find_next_n_free(struct rte_fbarray *arr, unsigned int start,
                unsigned int n)
 {
-       int ret = -1;
-
-       if (arr == NULL || start >= arr->len || n > arr->len) {
-               rte_errno = EINVAL;
-               return -1;
-       }
-
-       /* prevent array from changing under us */
-       rte_rwlock_read_lock(&arr->rwlock);
-
-       if (arr->len == arr->count || arr->len - arr->count < n) {
-               rte_errno = ENOSPC;
-               goto out;
-       }
-
-       ret = find_next_n(arr, start, n, false);
-out:
-       rte_rwlock_read_unlock(&arr->rwlock);
-       return ret;
+       return fbarray_find_n(arr, start, n, true, false);
 }
 
 int __rte_experimental
 rte_fbarray_find_next_n_used(struct rte_fbarray *arr, unsigned int start,
                unsigned int n)
 {
-       int ret = -1;
-
-       if (arr == NULL || start >= arr->len || n > arr->len) {
-               rte_errno = EINVAL;
-               return -1;
-       }
-
-       /* prevent array from changing under us */
-       rte_rwlock_read_lock(&arr->rwlock);
-
-       if (arr->count < n) {
-               rte_errno = ENOENT;
-               goto out;
-       }
+       return fbarray_find_n(arr, start, n, true, true);
+}
 
-       ret = find_next_n(arr, start, n, true);
-out:
-       rte_rwlock_read_unlock(&arr->rwlock);
-       return ret;
+int __rte_experimental
+rte_fbarray_find_prev_n_free(struct rte_fbarray *arr, unsigned int start,
+               unsigned int n)
+{
+       return fbarray_find_n(arr, start, n, false, false);
 }
 
 int __rte_experimental
-rte_fbarray_find_contig_free(struct rte_fbarray *arr, unsigned int start)
+rte_fbarray_find_prev_n_used(struct rte_fbarray *arr, unsigned int start,
+               unsigned int n)
+{
+       return fbarray_find_n(arr, start, n, false, true);
+}
+
+static int
+fbarray_find_contig(struct rte_fbarray *arr, unsigned int start, bool next,
+               bool used)
 {
        int ret = -1;
 
@@ -783,39 +1123,66 @@ rte_fbarray_find_contig_free(struct rte_fbarray *arr, unsigned int start)
        /* prevent array from changing under us */
        rte_rwlock_read_lock(&arr->rwlock);
 
-       if (arr->len == arr->count) {
-               rte_errno = ENOSPC;
-               goto out;
-       }
-
-       if (arr->count == 0) {
-               ret = arr->len - start;
-               goto out;
+       /* cheap checks to prevent doing useless work */
+       if (used) {
+               if (arr->count == 0) {
+                       ret = 0;
+                       goto out;
+               }
+               if (next && arr->count == arr->len) {
+                       ret = arr->len - start;
+                       goto out;
+               }
+               if (!next && arr->count == arr->len) {
+                       ret = start + 1;
+                       goto out;
+               }
+       } else {
+               if (arr->len == arr->count) {
+                       ret = 0;
+                       goto out;
+               }
+               if (next && arr->count == 0) {
+                       ret = arr->len - start;
+                       goto out;
+               }
+               if (!next && arr->count == 0) {
+                       ret = start + 1;
+                       goto out;
+               }
        }
 
-       ret = find_contig(arr, start, false);
+       if (next)
+               ret = find_contig(arr, start, used);
+       else
+               ret = find_rev_contig(arr, start, used);
 out:
        rte_rwlock_read_unlock(&arr->rwlock);
        return ret;
 }
 
 int __rte_experimental
-rte_fbarray_find_contig_used(struct rte_fbarray *arr, unsigned int start)
+rte_fbarray_find_contig_free(struct rte_fbarray *arr, unsigned int start)
 {
-       int ret = -1;
-
-       if (arr == NULL || start >= arr->len) {
-               rte_errno = EINVAL;
-               return -1;
-       }
+       return fbarray_find_contig(arr, start, true, false);
+}
 
-       /* prevent array from changing under us */
-       rte_rwlock_read_lock(&arr->rwlock);
+int __rte_experimental
+rte_fbarray_find_contig_used(struct rte_fbarray *arr, unsigned int start)
+{
+       return fbarray_find_contig(arr, start, true, true);
+}
 
-       ret = find_contig(arr, start, true);
+int __rte_experimental
+rte_fbarray_find_rev_contig_free(struct rte_fbarray *arr, unsigned int start)
+{
+       return fbarray_find_contig(arr, start, false, false);
+}
 
-       rte_rwlock_read_unlock(&arr->rwlock);
-       return ret;
+int __rte_experimental
+rte_fbarray_find_rev_contig_used(struct rte_fbarray *arr, unsigned int start)
+{
+       return fbarray_find_contig(arr, start, false, true);
 }
 
 int __rte_experimental