2019-12-19 19:53:55 +00:00
|
|
|
/*
|
|
|
|
* This file and its contents are supplied under the terms of the
|
|
|
|
* Common Development and Distribution License ("CDDL"), version 1.0.
|
|
|
|
* You may only use this file in accordance with the terms of version
|
|
|
|
* 1.0 of the CDDL.
|
|
|
|
*
|
|
|
|
* A full copy of the text of the CDDL should have accompanied this
|
|
|
|
* source. A copy of the CDDL is also available via the Internet at
|
|
|
|
* http://www.illumos.org/license/CDDL.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Copyright (c) 2019 by Delphix. All rights reserved.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
2022-09-28 00:09:21 +00:00
|
|
|
#include <string.h>
|
2019-12-19 19:53:55 +00:00
|
|
|
#include <sys/avl.h>
|
|
|
|
#include <sys/btree.h>
|
|
|
|
#include <sys/time.h>
|
|
|
|
#include <sys/resource.h>
|
|
|
|
|
|
|
|
#define BUFSIZE 256
|
|
|
|
|
2022-10-18 18:05:32 +00:00
|
|
|
static int seed = 0;
|
|
|
|
static int stress_timeout = 180;
|
|
|
|
static int contents_frequency = 100;
|
|
|
|
static int tree_limit = 64 * 1024;
|
|
|
|
static boolean_t stress_only = B_FALSE;
|
2019-12-19 19:53:55 +00:00
|
|
|
|
|
|
|
static void
|
|
|
|
usage(int exit_value)
|
|
|
|
{
|
|
|
|
(void) fprintf(stderr, "Usage:\tbtree_test -n <test_name>\n");
|
|
|
|
(void) fprintf(stderr, "\tbtree_test -s [-r <seed>] [-l <limit>] "
|
|
|
|
"[-t timeout>] [-c check_contents]\n");
|
|
|
|
(void) fprintf(stderr, "\tbtree_test [-r <seed>] [-l <limit>] "
|
|
|
|
"[-t timeout>] [-c check_contents]\n");
|
|
|
|
(void) fprintf(stderr, "\n With the -n option, run the named "
|
|
|
|
"negative test. With the -s option,\n");
|
|
|
|
(void) fprintf(stderr, " run the stress test according to the "
|
|
|
|
"other options passed. With\n");
|
|
|
|
(void) fprintf(stderr, " neither, run all the positive tests, "
|
|
|
|
"including the stress test with\n");
|
|
|
|
(void) fprintf(stderr, " the default options.\n");
|
|
|
|
(void) fprintf(stderr, "\n Options that control the stress test\n");
|
|
|
|
(void) fprintf(stderr, "\t-c stress iterations after which to compare "
|
|
|
|
"tree contents [default: 100]\n");
|
|
|
|
(void) fprintf(stderr, "\t-l the largest value to allow in the tree "
|
|
|
|
"[default: 1M]\n");
|
|
|
|
(void) fprintf(stderr, "\t-r random seed [default: from "
|
|
|
|
"gettimeofday()]\n");
|
|
|
|
(void) fprintf(stderr, "\t-t seconds to let the stress test run "
|
|
|
|
"[default: 180]\n");
|
|
|
|
exit(exit_value);
|
|
|
|
}
|
|
|
|
|
|
|
|
typedef struct int_node {
|
|
|
|
avl_node_t node;
|
|
|
|
uint64_t data;
|
|
|
|
} int_node_t;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Utility functions
|
|
|
|
*/
|
|
|
|
|
|
|
|
static int
|
|
|
|
avl_compare(const void *v1, const void *v2)
|
|
|
|
{
|
|
|
|
const int_node_t *n1 = v1;
|
|
|
|
const int_node_t *n2 = v2;
|
|
|
|
uint64_t a = n1->data;
|
|
|
|
uint64_t b = n2->data;
|
|
|
|
|
|
|
|
return (TREE_CMP(a, b));
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
zfs_btree_compare(const void *v1, const void *v2)
|
|
|
|
{
|
|
|
|
const uint64_t *a = v1;
|
|
|
|
const uint64_t *b = v2;
|
|
|
|
|
|
|
|
return (TREE_CMP(*a, *b));
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
verify_contents(avl_tree_t *avl, zfs_btree_t *bt)
|
|
|
|
{
|
|
|
|
static int count = 0;
|
|
|
|
zfs_btree_index_t bt_idx = {0};
|
|
|
|
int_node_t *node;
|
|
|
|
uint64_t *data;
|
|
|
|
|
|
|
|
boolean_t forward = count % 2 == 0 ? B_TRUE : B_FALSE;
|
|
|
|
count++;
|
|
|
|
|
|
|
|
ASSERT3U(avl_numnodes(avl), ==, zfs_btree_numnodes(bt));
|
|
|
|
if (forward == B_TRUE) {
|
|
|
|
node = avl_first(avl);
|
|
|
|
data = zfs_btree_first(bt, &bt_idx);
|
|
|
|
} else {
|
|
|
|
node = avl_last(avl);
|
|
|
|
data = zfs_btree_last(bt, &bt_idx);
|
|
|
|
}
|
|
|
|
|
|
|
|
while (node != NULL) {
|
|
|
|
ASSERT3U(*data, ==, node->data);
|
|
|
|
if (forward == B_TRUE) {
|
|
|
|
data = zfs_btree_next(bt, &bt_idx, &bt_idx);
|
|
|
|
node = AVL_NEXT(avl, node);
|
|
|
|
} else {
|
|
|
|
data = zfs_btree_prev(bt, &bt_idx, &bt_idx);
|
|
|
|
node = AVL_PREV(avl, node);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
verify_node(avl_tree_t *avl, zfs_btree_t *bt, int_node_t *node)
|
|
|
|
{
|
|
|
|
zfs_btree_index_t bt_idx = {0};
|
|
|
|
zfs_btree_index_t bt_idx2 = {0};
|
|
|
|
int_node_t *inp;
|
|
|
|
uint64_t data = node->data;
|
|
|
|
uint64_t *rv = NULL;
|
|
|
|
|
|
|
|
ASSERT3U(avl_numnodes(avl), ==, zfs_btree_numnodes(bt));
|
|
|
|
ASSERT3P((rv = (uint64_t *)zfs_btree_find(bt, &data, &bt_idx)), !=,
|
|
|
|
NULL);
|
|
|
|
ASSERT3S(*rv, ==, data);
|
|
|
|
ASSERT3P(zfs_btree_get(bt, &bt_idx), !=, NULL);
|
|
|
|
ASSERT3S(data, ==, *(uint64_t *)zfs_btree_get(bt, &bt_idx));
|
|
|
|
|
|
|
|
if ((inp = AVL_NEXT(avl, node)) != NULL) {
|
|
|
|
ASSERT3P((rv = zfs_btree_next(bt, &bt_idx, &bt_idx2)), !=,
|
|
|
|
NULL);
|
|
|
|
ASSERT3P(rv, ==, zfs_btree_get(bt, &bt_idx2));
|
|
|
|
ASSERT3S(inp->data, ==, *rv);
|
|
|
|
} else {
|
|
|
|
ASSERT3U(data, ==, *(uint64_t *)zfs_btree_last(bt, &bt_idx));
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((inp = AVL_PREV(avl, node)) != NULL) {
|
|
|
|
ASSERT3P((rv = zfs_btree_prev(bt, &bt_idx, &bt_idx2)), !=,
|
|
|
|
NULL);
|
|
|
|
ASSERT3P(rv, ==, zfs_btree_get(bt, &bt_idx2));
|
|
|
|
ASSERT3S(inp->data, ==, *rv);
|
|
|
|
} else {
|
|
|
|
ASSERT3U(data, ==, *(uint64_t *)zfs_btree_first(bt, &bt_idx));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Tests
|
|
|
|
*/
|
|
|
|
|
|
|
|
/* Verify that zfs_btree_find works correctly with a NULL index. */
|
|
|
|
static int
|
|
|
|
find_without_index(zfs_btree_t *bt, char *why)
|
|
|
|
{
|
|
|
|
u_longlong_t *p, i = 12345;
|
|
|
|
|
|
|
|
zfs_btree_add(bt, &i);
|
|
|
|
if ((p = (u_longlong_t *)zfs_btree_find(bt, &i, NULL)) == NULL ||
|
|
|
|
*p != i) {
|
2022-09-28 00:09:21 +00:00
|
|
|
(void) snprintf(why, BUFSIZE, "Unexpectedly found %llu\n",
|
2019-12-19 19:53:55 +00:00
|
|
|
p == NULL ? 0 : *p);
|
|
|
|
return (1);
|
|
|
|
}
|
|
|
|
|
|
|
|
i++;
|
|
|
|
|
|
|
|
if ((p = (u_longlong_t *)zfs_btree_find(bt, &i, NULL)) != NULL) {
|
2022-09-28 00:09:21 +00:00
|
|
|
(void) snprintf(why, BUFSIZE, "Found bad value: %llu\n", *p);
|
2019-12-19 19:53:55 +00:00
|
|
|
return (1);
|
|
|
|
}
|
|
|
|
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Verify simple insertion and removal from the tree. */
|
|
|
|
static int
|
|
|
|
insert_find_remove(zfs_btree_t *bt, char *why)
|
|
|
|
{
|
|
|
|
u_longlong_t *p, i = 12345;
|
|
|
|
zfs_btree_index_t bt_idx = {0};
|
|
|
|
|
|
|
|
/* Insert 'i' into the tree, and attempt to find it again. */
|
|
|
|
zfs_btree_add(bt, &i);
|
|
|
|
if ((p = (u_longlong_t *)zfs_btree_find(bt, &i, &bt_idx)) == NULL) {
|
2022-09-28 00:09:21 +00:00
|
|
|
(void) snprintf(why, BUFSIZE, "Didn't find value in tree\n");
|
2019-12-19 19:53:55 +00:00
|
|
|
return (1);
|
|
|
|
} else if (*p != i) {
|
2022-09-28 00:09:21 +00:00
|
|
|
(void) snprintf(why, BUFSIZE, "Found (%llu) in tree\n", *p);
|
2019-12-19 19:53:55 +00:00
|
|
|
return (1);
|
|
|
|
}
|
|
|
|
ASSERT3S(zfs_btree_numnodes(bt), ==, 1);
|
|
|
|
zfs_btree_verify(bt);
|
|
|
|
|
|
|
|
/* Remove 'i' from the tree, and verify it is not found. */
|
|
|
|
zfs_btree_remove(bt, &i);
|
|
|
|
if ((p = (u_longlong_t *)zfs_btree_find(bt, &i, &bt_idx)) != NULL) {
|
2022-09-28 00:09:21 +00:00
|
|
|
(void) snprintf(why, BUFSIZE,
|
|
|
|
"Found removed value (%llu)\n", *p);
|
2019-12-19 19:53:55 +00:00
|
|
|
return (1);
|
|
|
|
}
|
|
|
|
ASSERT3S(zfs_btree_numnodes(bt), ==, 0);
|
|
|
|
zfs_btree_verify(bt);
|
|
|
|
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Add a number of random entries into a btree and avl tree. Then walk them
|
|
|
|
* backwards and forwards while emptying the tree, verifying the trees look
|
|
|
|
* the same.
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
drain_tree(zfs_btree_t *bt, char *why)
|
|
|
|
{
|
|
|
|
avl_tree_t avl;
|
|
|
|
int i = 0;
|
|
|
|
int_node_t *node;
|
|
|
|
avl_index_t avl_idx = {0};
|
|
|
|
zfs_btree_index_t bt_idx = {0};
|
|
|
|
|
|
|
|
avl_create(&avl, avl_compare, sizeof (int_node_t),
|
|
|
|
offsetof(int_node_t, node));
|
|
|
|
|
|
|
|
/* Fill both trees with the same data */
|
|
|
|
for (i = 0; i < 64 * 1024; i++) {
|
|
|
|
u_longlong_t randval = random();
|
Cleanup: Address Clang's static analyzer's unused code complaints
These were categorized as the following:
* Dead assignment 23
* Dead increment 4
* Dead initialization 6
* Dead nested assignment 18
Most of these are harmless, but since actual issues can hide among them,
we correct them.
That said, there were a few return values that were being ignored that
appeared to merit some correction:
* `destroy_callback()` in `cmd/zfs/zfs_main.c` ignored the error from
`destroy_batched()`. We handle it by returning -1 if there is an
error.
* `zfs_do_upgrade()` in `cmd/zfs/zfs_main.c` ignored the error from
`zfs_for_each()`. We handle it by doing a binary OR of the error
value from the subsequent `zfs_for_each()` call to the existing
value. This is how errors are mostly handled inside `zfs_for_each()`.
The error value here is passed to exit from the zfs command, so doing
a binary or on it is better than what we did previously.
* `get_zap_prop()` in `module/zfs/zcp_get.c` ignored the error from
`dsl_prop_get_ds()` when the property is not of type string. We
return an error when it does. There is a small concern that the
`zfs_get_temporary_prop()` call would handle things, but in the case
that it does not, we would be pushing an uninitialized numval onto
the lua stack. It is expected that `dsl_prop_get_ds()` will succeed
anytime that `zfs_get_temporary_prop()` does, so that not giving it a
chance to fix things is not a problem.
* `draid_merge_impl()` in `tests/zfs-tests/cmd/draid.c` used
`nvlist_add_nvlist()` twice in ways in which errors are expected to
be impossible, so we switch to `fnvlist_add_nvlist()`.
A few notable ones did not merit use of the return value, so we
suppressed it with `(void)`:
* `write_free_diffs()` in `lib/libzfs/libzfs_diff.c` ignored the error
value from `describe_free()`. A look through the commit history
revealed that this was intentional.
* `arc_evict_hdr()` in `module/zfs/arc.c` did not need to use the
returned handle from `arc_hdr_realloc()` because it is already
referenced in lists.
* `spa_vdev_detach()` in `module/zfs/spa.c` has a comment explicitly
saying not to use the error from `vdev_label_init()` because whatever
causes the error could be the reason why a detach is being done.
Unfortunately, I am not presently able to analyze the kernel modules
with Clang's static analyzer, so I could have missed some cases of this.
In cases where reports were present in code that is duplicated between
Linux and FreeBSD, I made a conscious effort to fix the FreeBSD version
too.
After this commit is merged, regressions like dee8934 should become
extremely obvious with Clang's static analyzer since a regression would
appear in the results as the only instance of unused code. That assumes
that Coverity does not catch the issue first.
My local branch with fixes from all of my outstanding non-draft pull
requests shows 118 reports from Clang's static anlayzer after this
patch. That is down by 51 from 169.
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Cedric Berger <cedric@precidata.com>
Signed-off-by: Richard Yao <richard.yao@alumni.stonybrook.edu>
Closes #13986
2022-10-14 20:37:54 +00:00
|
|
|
if (zfs_btree_find(bt, &randval, &bt_idx) != NULL) {
|
2019-12-19 19:53:55 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
zfs_btree_add_idx(bt, &randval, &bt_idx);
|
|
|
|
|
2022-09-23 23:55:26 +00:00
|
|
|
node = malloc(sizeof (int_node_t));
|
Handle possible null pointers from malloc/strdup/strndup()
GCC 12.1.1_p20220625's static analyzer caught these.
Of the two in the btree test, one had previously been caught by Coverity
and Smatch, but GCC flagged it as a false positive. Upon examining how
other test cases handle this, the solution was changed from
`ASSERT3P(node, !=, NULL);` to using `perror()` to be consistent with
the fixes to the other fixes done to the ZTS code.
That approach was also used in ZED since I did not see a better way of
handling this there. Also, upon inspection, additional unchecked
pointers from malloc()/calloc()/strdup() were found in ZED, so those
were handled too.
In other parts of the code, the existing methods to avoid issues from
memory allocators returning NULL were used, such as using
`umem_alloc(size, UMEM_NOFAIL)` or returning `ENOMEM`.
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Signed-off-by: Richard Yao <richard.yao@alumni.stonybrook.edu>
Closes #13979
2022-10-07 00:18:40 +00:00
|
|
|
if (node == NULL) {
|
|
|
|
perror("malloc");
|
|
|
|
exit(EXIT_FAILURE);
|
|
|
|
}
|
2022-09-28 00:09:21 +00:00
|
|
|
|
2019-12-19 19:53:55 +00:00
|
|
|
node->data = randval;
|
Cleanup: Address Clang's static analyzer's unused code complaints
These were categorized as the following:
* Dead assignment 23
* Dead increment 4
* Dead initialization 6
* Dead nested assignment 18
Most of these are harmless, but since actual issues can hide among them,
we correct them.
That said, there were a few return values that were being ignored that
appeared to merit some correction:
* `destroy_callback()` in `cmd/zfs/zfs_main.c` ignored the error from
`destroy_batched()`. We handle it by returning -1 if there is an
error.
* `zfs_do_upgrade()` in `cmd/zfs/zfs_main.c` ignored the error from
`zfs_for_each()`. We handle it by doing a binary OR of the error
value from the subsequent `zfs_for_each()` call to the existing
value. This is how errors are mostly handled inside `zfs_for_each()`.
The error value here is passed to exit from the zfs command, so doing
a binary or on it is better than what we did previously.
* `get_zap_prop()` in `module/zfs/zcp_get.c` ignored the error from
`dsl_prop_get_ds()` when the property is not of type string. We
return an error when it does. There is a small concern that the
`zfs_get_temporary_prop()` call would handle things, but in the case
that it does not, we would be pushing an uninitialized numval onto
the lua stack. It is expected that `dsl_prop_get_ds()` will succeed
anytime that `zfs_get_temporary_prop()` does, so that not giving it a
chance to fix things is not a problem.
* `draid_merge_impl()` in `tests/zfs-tests/cmd/draid.c` used
`nvlist_add_nvlist()` twice in ways in which errors are expected to
be impossible, so we switch to `fnvlist_add_nvlist()`.
A few notable ones did not merit use of the return value, so we
suppressed it with `(void)`:
* `write_free_diffs()` in `lib/libzfs/libzfs_diff.c` ignored the error
value from `describe_free()`. A look through the commit history
revealed that this was intentional.
* `arc_evict_hdr()` in `module/zfs/arc.c` did not need to use the
returned handle from `arc_hdr_realloc()` because it is already
referenced in lists.
* `spa_vdev_detach()` in `module/zfs/spa.c` has a comment explicitly
saying not to use the error from `vdev_label_init()` because whatever
causes the error could be the reason why a detach is being done.
Unfortunately, I am not presently able to analyze the kernel modules
with Clang's static analyzer, so I could have missed some cases of this.
In cases where reports were present in code that is duplicated between
Linux and FreeBSD, I made a conscious effort to fix the FreeBSD version
too.
After this commit is merged, regressions like dee8934 should become
extremely obvious with Clang's static analyzer since a regression would
appear in the results as the only instance of unused code. That assumes
that Coverity does not catch the issue first.
My local branch with fixes from all of my outstanding non-draft pull
requests shows 118 reports from Clang's static anlayzer after this
patch. That is down by 51 from 169.
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Cedric Berger <cedric@precidata.com>
Signed-off-by: Richard Yao <richard.yao@alumni.stonybrook.edu>
Closes #13986
2022-10-14 20:37:54 +00:00
|
|
|
if (avl_find(&avl, node, &avl_idx) != NULL) {
|
2022-09-28 00:09:21 +00:00
|
|
|
(void) snprintf(why, BUFSIZE,
|
|
|
|
"Found in avl: %llu\n", randval);
|
2019-12-19 19:53:55 +00:00
|
|
|
return (1);
|
|
|
|
}
|
|
|
|
avl_insert(&avl, node, avl_idx);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Remove data from either side of the trees, comparing the data */
|
|
|
|
while (avl_numnodes(&avl) != 0) {
|
|
|
|
uint64_t *data;
|
|
|
|
|
|
|
|
ASSERT3U(avl_numnodes(&avl), ==, zfs_btree_numnodes(bt));
|
|
|
|
if (avl_numnodes(&avl) % 2 == 0) {
|
|
|
|
node = avl_first(&avl);
|
|
|
|
data = zfs_btree_first(bt, &bt_idx);
|
|
|
|
} else {
|
|
|
|
node = avl_last(&avl);
|
|
|
|
data = zfs_btree_last(bt, &bt_idx);
|
|
|
|
}
|
|
|
|
ASSERT3U(node->data, ==, *data);
|
|
|
|
zfs_btree_remove_idx(bt, &bt_idx);
|
|
|
|
avl_remove(&avl, node);
|
|
|
|
|
|
|
|
if (avl_numnodes(&avl) == 0) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
node = avl_first(&avl);
|
|
|
|
ASSERT3U(node->data, ==,
|
|
|
|
*(uint64_t *)zfs_btree_first(bt, NULL));
|
|
|
|
node = avl_last(&avl);
|
|
|
|
ASSERT3U(node->data, ==, *(uint64_t *)zfs_btree_last(bt, NULL));
|
|
|
|
}
|
|
|
|
ASSERT3S(zfs_btree_numnodes(bt), ==, 0);
|
|
|
|
|
|
|
|
void *avl_cookie = NULL;
|
|
|
|
while ((node = avl_destroy_nodes(&avl, &avl_cookie)) != NULL)
|
|
|
|
free(node);
|
|
|
|
avl_destroy(&avl);
|
|
|
|
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* This test uses an avl and btree, and continually processes new random
|
|
|
|
* values. Each value is either removed or inserted, depending on whether
|
|
|
|
* or not it is found in the tree. The test periodically checks that both
|
|
|
|
* trees have the same data and does consistency checks. This stress
|
|
|
|
* option can also be run on its own from the command line.
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
stress_tree(zfs_btree_t *bt, char *why)
|
|
|
|
{
|
2021-12-11 01:24:35 +00:00
|
|
|
(void) why;
|
2019-12-19 19:53:55 +00:00
|
|
|
avl_tree_t avl;
|
|
|
|
int_node_t *node;
|
|
|
|
struct timeval tp;
|
|
|
|
time_t t0;
|
|
|
|
int insertions = 0, removals = 0, iterations = 0;
|
|
|
|
u_longlong_t max = 0, min = UINT64_MAX;
|
|
|
|
|
|
|
|
(void) gettimeofday(&tp, NULL);
|
|
|
|
t0 = tp.tv_sec;
|
|
|
|
|
|
|
|
avl_create(&avl, avl_compare, sizeof (int_node_t),
|
|
|
|
offsetof(int_node_t, node));
|
|
|
|
|
|
|
|
while (1) {
|
|
|
|
zfs_btree_index_t bt_idx = {0};
|
|
|
|
avl_index_t avl_idx = {0};
|
|
|
|
|
|
|
|
uint64_t randval = random() % tree_limit;
|
|
|
|
node = malloc(sizeof (*node));
|
Handle possible null pointers from malloc/strdup/strndup()
GCC 12.1.1_p20220625's static analyzer caught these.
Of the two in the btree test, one had previously been caught by Coverity
and Smatch, but GCC flagged it as a false positive. Upon examining how
other test cases handle this, the solution was changed from
`ASSERT3P(node, !=, NULL);` to using `perror()` to be consistent with
the fixes to the other fixes done to the ZTS code.
That approach was also used in ZED since I did not see a better way of
handling this there. Also, upon inspection, additional unchecked
pointers from malloc()/calloc()/strdup() were found in ZED, so those
were handled too.
In other parts of the code, the existing methods to avoid issues from
memory allocators returning NULL were used, such as using
`umem_alloc(size, UMEM_NOFAIL)` or returning `ENOMEM`.
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Signed-off-by: Richard Yao <richard.yao@alumni.stonybrook.edu>
Closes #13979
2022-10-07 00:18:40 +00:00
|
|
|
if (node == NULL) {
|
|
|
|
perror("malloc");
|
|
|
|
exit(EXIT_FAILURE);
|
|
|
|
}
|
2019-12-19 19:53:55 +00:00
|
|
|
node->data = randval;
|
|
|
|
|
|
|
|
max = randval > max ? randval : max;
|
|
|
|
min = randval < min ? randval : min;
|
|
|
|
|
|
|
|
void *ret = avl_find(&avl, node, &avl_idx);
|
|
|
|
if (ret == NULL) {
|
|
|
|
insertions++;
|
|
|
|
avl_insert(&avl, node, avl_idx);
|
|
|
|
ASSERT3P(zfs_btree_find(bt, &randval, &bt_idx), ==,
|
|
|
|
NULL);
|
|
|
|
zfs_btree_add_idx(bt, &randval, &bt_idx);
|
|
|
|
verify_node(&avl, bt, node);
|
|
|
|
} else {
|
|
|
|
removals++;
|
|
|
|
verify_node(&avl, bt, ret);
|
|
|
|
zfs_btree_remove(bt, &randval);
|
|
|
|
avl_remove(&avl, ret);
|
|
|
|
free(ret);
|
|
|
|
free(node);
|
|
|
|
}
|
|
|
|
|
|
|
|
zfs_btree_verify(bt);
|
|
|
|
|
|
|
|
iterations++;
|
|
|
|
if (iterations % contents_frequency == 0) {
|
|
|
|
verify_contents(&avl, bt);
|
|
|
|
}
|
|
|
|
|
|
|
|
zfs_btree_verify(bt);
|
|
|
|
|
|
|
|
(void) gettimeofday(&tp, NULL);
|
|
|
|
if (tp.tv_sec > t0 + stress_timeout) {
|
|
|
|
fprintf(stderr, "insertions/removals: %u/%u\nmax/min: "
|
|
|
|
"%llu/%llu\n", insertions, removals, max, min);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void *avl_cookie = NULL;
|
|
|
|
while ((node = avl_destroy_nodes(&avl, &avl_cookie)) != NULL)
|
|
|
|
free(node);
|
|
|
|
avl_destroy(&avl);
|
|
|
|
|
|
|
|
if (stress_only) {
|
|
|
|
zfs_btree_index_t *idx = NULL;
|
Cleanup: Address Clang's static analyzer's unused code complaints
These were categorized as the following:
* Dead assignment 23
* Dead increment 4
* Dead initialization 6
* Dead nested assignment 18
Most of these are harmless, but since actual issues can hide among them,
we correct them.
That said, there were a few return values that were being ignored that
appeared to merit some correction:
* `destroy_callback()` in `cmd/zfs/zfs_main.c` ignored the error from
`destroy_batched()`. We handle it by returning -1 if there is an
error.
* `zfs_do_upgrade()` in `cmd/zfs/zfs_main.c` ignored the error from
`zfs_for_each()`. We handle it by doing a binary OR of the error
value from the subsequent `zfs_for_each()` call to the existing
value. This is how errors are mostly handled inside `zfs_for_each()`.
The error value here is passed to exit from the zfs command, so doing
a binary or on it is better than what we did previously.
* `get_zap_prop()` in `module/zfs/zcp_get.c` ignored the error from
`dsl_prop_get_ds()` when the property is not of type string. We
return an error when it does. There is a small concern that the
`zfs_get_temporary_prop()` call would handle things, but in the case
that it does not, we would be pushing an uninitialized numval onto
the lua stack. It is expected that `dsl_prop_get_ds()` will succeed
anytime that `zfs_get_temporary_prop()` does, so that not giving it a
chance to fix things is not a problem.
* `draid_merge_impl()` in `tests/zfs-tests/cmd/draid.c` used
`nvlist_add_nvlist()` twice in ways in which errors are expected to
be impossible, so we switch to `fnvlist_add_nvlist()`.
A few notable ones did not merit use of the return value, so we
suppressed it with `(void)`:
* `write_free_diffs()` in `lib/libzfs/libzfs_diff.c` ignored the error
value from `describe_free()`. A look through the commit history
revealed that this was intentional.
* `arc_evict_hdr()` in `module/zfs/arc.c` did not need to use the
returned handle from `arc_hdr_realloc()` because it is already
referenced in lists.
* `spa_vdev_detach()` in `module/zfs/spa.c` has a comment explicitly
saying not to use the error from `vdev_label_init()` because whatever
causes the error could be the reason why a detach is being done.
Unfortunately, I am not presently able to analyze the kernel modules
with Clang's static analyzer, so I could have missed some cases of this.
In cases where reports were present in code that is duplicated between
Linux and FreeBSD, I made a conscious effort to fix the FreeBSD version
too.
After this commit is merged, regressions like dee8934 should become
extremely obvious with Clang's static analyzer since a regression would
appear in the results as the only instance of unused code. That assumes
that Coverity does not catch the issue first.
My local branch with fixes from all of my outstanding non-draft pull
requests shows 118 reports from Clang's static anlayzer after this
patch. That is down by 51 from 169.
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Cedric Berger <cedric@precidata.com>
Signed-off-by: Richard Yao <richard.yao@alumni.stonybrook.edu>
Closes #13986
2022-10-14 20:37:54 +00:00
|
|
|
while (zfs_btree_destroy_nodes(bt, &idx) != NULL)
|
2019-12-19 19:53:55 +00:00
|
|
|
;
|
|
|
|
zfs_btree_verify(bt);
|
|
|
|
}
|
|
|
|
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Verify inserting a duplicate value will cause a crash.
|
|
|
|
* Note: negative test; return of 0 is a failure.
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
insert_duplicate(zfs_btree_t *bt)
|
|
|
|
{
|
Cleanup: Address Clang's static analyzer's unused code complaints
These were categorized as the following:
* Dead assignment 23
* Dead increment 4
* Dead initialization 6
* Dead nested assignment 18
Most of these are harmless, but since actual issues can hide among them,
we correct them.
That said, there were a few return values that were being ignored that
appeared to merit some correction:
* `destroy_callback()` in `cmd/zfs/zfs_main.c` ignored the error from
`destroy_batched()`. We handle it by returning -1 if there is an
error.
* `zfs_do_upgrade()` in `cmd/zfs/zfs_main.c` ignored the error from
`zfs_for_each()`. We handle it by doing a binary OR of the error
value from the subsequent `zfs_for_each()` call to the existing
value. This is how errors are mostly handled inside `zfs_for_each()`.
The error value here is passed to exit from the zfs command, so doing
a binary or on it is better than what we did previously.
* `get_zap_prop()` in `module/zfs/zcp_get.c` ignored the error from
`dsl_prop_get_ds()` when the property is not of type string. We
return an error when it does. There is a small concern that the
`zfs_get_temporary_prop()` call would handle things, but in the case
that it does not, we would be pushing an uninitialized numval onto
the lua stack. It is expected that `dsl_prop_get_ds()` will succeed
anytime that `zfs_get_temporary_prop()` does, so that not giving it a
chance to fix things is not a problem.
* `draid_merge_impl()` in `tests/zfs-tests/cmd/draid.c` used
`nvlist_add_nvlist()` twice in ways in which errors are expected to
be impossible, so we switch to `fnvlist_add_nvlist()`.
A few notable ones did not merit use of the return value, so we
suppressed it with `(void)`:
* `write_free_diffs()` in `lib/libzfs/libzfs_diff.c` ignored the error
value from `describe_free()`. A look through the commit history
revealed that this was intentional.
* `arc_evict_hdr()` in `module/zfs/arc.c` did not need to use the
returned handle from `arc_hdr_realloc()` because it is already
referenced in lists.
* `spa_vdev_detach()` in `module/zfs/spa.c` has a comment explicitly
saying not to use the error from `vdev_label_init()` because whatever
causes the error could be the reason why a detach is being done.
Unfortunately, I am not presently able to analyze the kernel modules
with Clang's static analyzer, so I could have missed some cases of this.
In cases where reports were present in code that is duplicated between
Linux and FreeBSD, I made a conscious effort to fix the FreeBSD version
too.
After this commit is merged, regressions like dee8934 should become
extremely obvious with Clang's static analyzer since a regression would
appear in the results as the only instance of unused code. That assumes
that Coverity does not catch the issue first.
My local branch with fixes from all of my outstanding non-draft pull
requests shows 118 reports from Clang's static anlayzer after this
patch. That is down by 51 from 169.
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Cedric Berger <cedric@precidata.com>
Signed-off-by: Richard Yao <richard.yao@alumni.stonybrook.edu>
Closes #13986
2022-10-14 20:37:54 +00:00
|
|
|
uint64_t i = 23456;
|
2019-12-19 19:53:55 +00:00
|
|
|
zfs_btree_index_t bt_idx = {0};
|
|
|
|
|
Cleanup: Address Clang's static analyzer's unused code complaints
These were categorized as the following:
* Dead assignment 23
* Dead increment 4
* Dead initialization 6
* Dead nested assignment 18
Most of these are harmless, but since actual issues can hide among them,
we correct them.
That said, there were a few return values that were being ignored that
appeared to merit some correction:
* `destroy_callback()` in `cmd/zfs/zfs_main.c` ignored the error from
`destroy_batched()`. We handle it by returning -1 if there is an
error.
* `zfs_do_upgrade()` in `cmd/zfs/zfs_main.c` ignored the error from
`zfs_for_each()`. We handle it by doing a binary OR of the error
value from the subsequent `zfs_for_each()` call to the existing
value. This is how errors are mostly handled inside `zfs_for_each()`.
The error value here is passed to exit from the zfs command, so doing
a binary or on it is better than what we did previously.
* `get_zap_prop()` in `module/zfs/zcp_get.c` ignored the error from
`dsl_prop_get_ds()` when the property is not of type string. We
return an error when it does. There is a small concern that the
`zfs_get_temporary_prop()` call would handle things, but in the case
that it does not, we would be pushing an uninitialized numval onto
the lua stack. It is expected that `dsl_prop_get_ds()` will succeed
anytime that `zfs_get_temporary_prop()` does, so that not giving it a
chance to fix things is not a problem.
* `draid_merge_impl()` in `tests/zfs-tests/cmd/draid.c` used
`nvlist_add_nvlist()` twice in ways in which errors are expected to
be impossible, so we switch to `fnvlist_add_nvlist()`.
A few notable ones did not merit use of the return value, so we
suppressed it with `(void)`:
* `write_free_diffs()` in `lib/libzfs/libzfs_diff.c` ignored the error
value from `describe_free()`. A look through the commit history
revealed that this was intentional.
* `arc_evict_hdr()` in `module/zfs/arc.c` did not need to use the
returned handle from `arc_hdr_realloc()` because it is already
referenced in lists.
* `spa_vdev_detach()` in `module/zfs/spa.c` has a comment explicitly
saying not to use the error from `vdev_label_init()` because whatever
causes the error could be the reason why a detach is being done.
Unfortunately, I am not presently able to analyze the kernel modules
with Clang's static analyzer, so I could have missed some cases of this.
In cases where reports were present in code that is duplicated between
Linux and FreeBSD, I made a conscious effort to fix the FreeBSD version
too.
After this commit is merged, regressions like dee8934 should become
extremely obvious with Clang's static analyzer since a regression would
appear in the results as the only instance of unused code. That assumes
that Coverity does not catch the issue first.
My local branch with fixes from all of my outstanding non-draft pull
requests shows 118 reports from Clang's static anlayzer after this
patch. That is down by 51 from 169.
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Cedric Berger <cedric@precidata.com>
Signed-off-by: Richard Yao <richard.yao@alumni.stonybrook.edu>
Closes #13986
2022-10-14 20:37:54 +00:00
|
|
|
if (zfs_btree_find(bt, &i, &bt_idx) != NULL) {
|
2019-12-19 19:53:55 +00:00
|
|
|
fprintf(stderr, "Found value in empty tree.\n");
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
zfs_btree_add_idx(bt, &i, &bt_idx);
|
Cleanup: Address Clang's static analyzer's unused code complaints
These were categorized as the following:
* Dead assignment 23
* Dead increment 4
* Dead initialization 6
* Dead nested assignment 18
Most of these are harmless, but since actual issues can hide among them,
we correct them.
That said, there were a few return values that were being ignored that
appeared to merit some correction:
* `destroy_callback()` in `cmd/zfs/zfs_main.c` ignored the error from
`destroy_batched()`. We handle it by returning -1 if there is an
error.
* `zfs_do_upgrade()` in `cmd/zfs/zfs_main.c` ignored the error from
`zfs_for_each()`. We handle it by doing a binary OR of the error
value from the subsequent `zfs_for_each()` call to the existing
value. This is how errors are mostly handled inside `zfs_for_each()`.
The error value here is passed to exit from the zfs command, so doing
a binary or on it is better than what we did previously.
* `get_zap_prop()` in `module/zfs/zcp_get.c` ignored the error from
`dsl_prop_get_ds()` when the property is not of type string. We
return an error when it does. There is a small concern that the
`zfs_get_temporary_prop()` call would handle things, but in the case
that it does not, we would be pushing an uninitialized numval onto
the lua stack. It is expected that `dsl_prop_get_ds()` will succeed
anytime that `zfs_get_temporary_prop()` does, so that not giving it a
chance to fix things is not a problem.
* `draid_merge_impl()` in `tests/zfs-tests/cmd/draid.c` used
`nvlist_add_nvlist()` twice in ways in which errors are expected to
be impossible, so we switch to `fnvlist_add_nvlist()`.
A few notable ones did not merit use of the return value, so we
suppressed it with `(void)`:
* `write_free_diffs()` in `lib/libzfs/libzfs_diff.c` ignored the error
value from `describe_free()`. A look through the commit history
revealed that this was intentional.
* `arc_evict_hdr()` in `module/zfs/arc.c` did not need to use the
returned handle from `arc_hdr_realloc()` because it is already
referenced in lists.
* `spa_vdev_detach()` in `module/zfs/spa.c` has a comment explicitly
saying not to use the error from `vdev_label_init()` because whatever
causes the error could be the reason why a detach is being done.
Unfortunately, I am not presently able to analyze the kernel modules
with Clang's static analyzer, so I could have missed some cases of this.
In cases where reports were present in code that is duplicated between
Linux and FreeBSD, I made a conscious effort to fix the FreeBSD version
too.
After this commit is merged, regressions like dee8934 should become
extremely obvious with Clang's static analyzer since a regression would
appear in the results as the only instance of unused code. That assumes
that Coverity does not catch the issue first.
My local branch with fixes from all of my outstanding non-draft pull
requests shows 118 reports from Clang's static anlayzer after this
patch. That is down by 51 from 169.
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Cedric Berger <cedric@precidata.com>
Signed-off-by: Richard Yao <richard.yao@alumni.stonybrook.edu>
Closes #13986
2022-10-14 20:37:54 +00:00
|
|
|
if (zfs_btree_find(bt, &i, &bt_idx) == NULL) {
|
2019-12-19 19:53:55 +00:00
|
|
|
fprintf(stderr, "Did not find expected value.\n");
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Crash on inserting a duplicate */
|
|
|
|
zfs_btree_add_idx(bt, &i, NULL);
|
|
|
|
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Verify removing a non-existent value will cause a crash.
|
|
|
|
* Note: negative test; return of 0 is a failure.
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
remove_missing(zfs_btree_t *bt)
|
|
|
|
{
|
Cleanup: Address Clang's static analyzer's unused code complaints
These were categorized as the following:
* Dead assignment 23
* Dead increment 4
* Dead initialization 6
* Dead nested assignment 18
Most of these are harmless, but since actual issues can hide among them,
we correct them.
That said, there were a few return values that were being ignored that
appeared to merit some correction:
* `destroy_callback()` in `cmd/zfs/zfs_main.c` ignored the error from
`destroy_batched()`. We handle it by returning -1 if there is an
error.
* `zfs_do_upgrade()` in `cmd/zfs/zfs_main.c` ignored the error from
`zfs_for_each()`. We handle it by doing a binary OR of the error
value from the subsequent `zfs_for_each()` call to the existing
value. This is how errors are mostly handled inside `zfs_for_each()`.
The error value here is passed to exit from the zfs command, so doing
a binary or on it is better than what we did previously.
* `get_zap_prop()` in `module/zfs/zcp_get.c` ignored the error from
`dsl_prop_get_ds()` when the property is not of type string. We
return an error when it does. There is a small concern that the
`zfs_get_temporary_prop()` call would handle things, but in the case
that it does not, we would be pushing an uninitialized numval onto
the lua stack. It is expected that `dsl_prop_get_ds()` will succeed
anytime that `zfs_get_temporary_prop()` does, so that not giving it a
chance to fix things is not a problem.
* `draid_merge_impl()` in `tests/zfs-tests/cmd/draid.c` used
`nvlist_add_nvlist()` twice in ways in which errors are expected to
be impossible, so we switch to `fnvlist_add_nvlist()`.
A few notable ones did not merit use of the return value, so we
suppressed it with `(void)`:
* `write_free_diffs()` in `lib/libzfs/libzfs_diff.c` ignored the error
value from `describe_free()`. A look through the commit history
revealed that this was intentional.
* `arc_evict_hdr()` in `module/zfs/arc.c` did not need to use the
returned handle from `arc_hdr_realloc()` because it is already
referenced in lists.
* `spa_vdev_detach()` in `module/zfs/spa.c` has a comment explicitly
saying not to use the error from `vdev_label_init()` because whatever
causes the error could be the reason why a detach is being done.
Unfortunately, I am not presently able to analyze the kernel modules
with Clang's static analyzer, so I could have missed some cases of this.
In cases where reports were present in code that is duplicated between
Linux and FreeBSD, I made a conscious effort to fix the FreeBSD version
too.
After this commit is merged, regressions like dee8934 should become
extremely obvious with Clang's static analyzer since a regression would
appear in the results as the only instance of unused code. That assumes
that Coverity does not catch the issue first.
My local branch with fixes from all of my outstanding non-draft pull
requests shows 118 reports from Clang's static anlayzer after this
patch. That is down by 51 from 169.
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Cedric Berger <cedric@precidata.com>
Signed-off-by: Richard Yao <richard.yao@alumni.stonybrook.edu>
Closes #13986
2022-10-14 20:37:54 +00:00
|
|
|
uint64_t i = 23456;
|
2019-12-19 19:53:55 +00:00
|
|
|
zfs_btree_index_t bt_idx = {0};
|
|
|
|
|
Cleanup: Address Clang's static analyzer's unused code complaints
These were categorized as the following:
* Dead assignment 23
* Dead increment 4
* Dead initialization 6
* Dead nested assignment 18
Most of these are harmless, but since actual issues can hide among them,
we correct them.
That said, there were a few return values that were being ignored that
appeared to merit some correction:
* `destroy_callback()` in `cmd/zfs/zfs_main.c` ignored the error from
`destroy_batched()`. We handle it by returning -1 if there is an
error.
* `zfs_do_upgrade()` in `cmd/zfs/zfs_main.c` ignored the error from
`zfs_for_each()`. We handle it by doing a binary OR of the error
value from the subsequent `zfs_for_each()` call to the existing
value. This is how errors are mostly handled inside `zfs_for_each()`.
The error value here is passed to exit from the zfs command, so doing
a binary or on it is better than what we did previously.
* `get_zap_prop()` in `module/zfs/zcp_get.c` ignored the error from
`dsl_prop_get_ds()` when the property is not of type string. We
return an error when it does. There is a small concern that the
`zfs_get_temporary_prop()` call would handle things, but in the case
that it does not, we would be pushing an uninitialized numval onto
the lua stack. It is expected that `dsl_prop_get_ds()` will succeed
anytime that `zfs_get_temporary_prop()` does, so that not giving it a
chance to fix things is not a problem.
* `draid_merge_impl()` in `tests/zfs-tests/cmd/draid.c` used
`nvlist_add_nvlist()` twice in ways in which errors are expected to
be impossible, so we switch to `fnvlist_add_nvlist()`.
A few notable ones did not merit use of the return value, so we
suppressed it with `(void)`:
* `write_free_diffs()` in `lib/libzfs/libzfs_diff.c` ignored the error
value from `describe_free()`. A look through the commit history
revealed that this was intentional.
* `arc_evict_hdr()` in `module/zfs/arc.c` did not need to use the
returned handle from `arc_hdr_realloc()` because it is already
referenced in lists.
* `spa_vdev_detach()` in `module/zfs/spa.c` has a comment explicitly
saying not to use the error from `vdev_label_init()` because whatever
causes the error could be the reason why a detach is being done.
Unfortunately, I am not presently able to analyze the kernel modules
with Clang's static analyzer, so I could have missed some cases of this.
In cases where reports were present in code that is duplicated between
Linux and FreeBSD, I made a conscious effort to fix the FreeBSD version
too.
After this commit is merged, regressions like dee8934 should become
extremely obvious with Clang's static analyzer since a regression would
appear in the results as the only instance of unused code. That assumes
that Coverity does not catch the issue first.
My local branch with fixes from all of my outstanding non-draft pull
requests shows 118 reports from Clang's static anlayzer after this
patch. That is down by 51 from 169.
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Cedric Berger <cedric@precidata.com>
Signed-off-by: Richard Yao <richard.yao@alumni.stonybrook.edu>
Closes #13986
2022-10-14 20:37:54 +00:00
|
|
|
if (zfs_btree_find(bt, &i, &bt_idx) != NULL) {
|
2019-12-19 19:53:55 +00:00
|
|
|
fprintf(stderr, "Found value in empty tree.\n");
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Crash removing a nonexistent entry */
|
|
|
|
zfs_btree_remove(bt, &i);
|
|
|
|
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
do_negative_test(zfs_btree_t *bt, char *test_name)
|
|
|
|
{
|
|
|
|
int rval = 0;
|
|
|
|
struct rlimit rlim = {0};
|
2022-09-28 00:09:21 +00:00
|
|
|
|
|
|
|
(void) setrlimit(RLIMIT_CORE, &rlim);
|
2019-12-19 19:53:55 +00:00
|
|
|
|
|
|
|
if (strcmp(test_name, "insert_duplicate") == 0) {
|
|
|
|
rval = insert_duplicate(bt);
|
|
|
|
} else if (strcmp(test_name, "remove_missing") == 0) {
|
|
|
|
rval = remove_missing(bt);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Return 0, since callers will expect non-zero return values for
|
|
|
|
* these tests, and we should have crashed before getting here anyway.
|
|
|
|
*/
|
|
|
|
(void) fprintf(stderr, "Test: %s returned %d.\n", test_name, rval);
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
|
|
|
typedef struct btree_test {
|
|
|
|
const char *name;
|
|
|
|
int (*func)(zfs_btree_t *, char *);
|
|
|
|
} btree_test_t;
|
|
|
|
|
|
|
|
static btree_test_t test_table[] = {
|
|
|
|
{ "insert_find_remove", insert_find_remove },
|
|
|
|
{ "find_without_index", find_without_index },
|
|
|
|
{ "drain_tree", drain_tree },
|
|
|
|
{ "stress_tree", stress_tree },
|
|
|
|
{ NULL, NULL }
|
|
|
|
};
|
|
|
|
|
|
|
|
int
|
|
|
|
main(int argc, char *argv[])
|
|
|
|
{
|
|
|
|
char *negative_test = NULL;
|
|
|
|
int failed_tests = 0;
|
|
|
|
struct timeval tp;
|
|
|
|
zfs_btree_t bt;
|
2020-12-17 18:19:30 +00:00
|
|
|
int c;
|
2019-12-19 19:53:55 +00:00
|
|
|
|
|
|
|
while ((c = getopt(argc, argv, "c:l:n:r:st:")) != -1) {
|
|
|
|
switch (c) {
|
|
|
|
case 'c':
|
|
|
|
contents_frequency = atoi(optarg);
|
|
|
|
break;
|
|
|
|
case 'l':
|
|
|
|
tree_limit = atoi(optarg);
|
|
|
|
break;
|
|
|
|
case 'n':
|
|
|
|
negative_test = optarg;
|
|
|
|
break;
|
|
|
|
case 'r':
|
|
|
|
seed = atoi(optarg);
|
|
|
|
break;
|
|
|
|
case 's':
|
|
|
|
stress_only = B_TRUE;
|
|
|
|
break;
|
|
|
|
case 't':
|
|
|
|
stress_timeout = atoi(optarg);
|
|
|
|
break;
|
|
|
|
case 'h':
|
|
|
|
default:
|
|
|
|
usage(1);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (seed == 0) {
|
|
|
|
(void) gettimeofday(&tp, NULL);
|
|
|
|
seed = tp.tv_sec;
|
|
|
|
}
|
|
|
|
srandom(seed);
|
|
|
|
|
|
|
|
zfs_btree_init();
|
2023-05-26 17:03:12 +00:00
|
|
|
zfs_btree_create(&bt, zfs_btree_compare, NULL, sizeof (uint64_t));
|
2019-12-19 19:53:55 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* This runs the named negative test. None of them should
|
|
|
|
* return, as they both cause crashes.
|
|
|
|
*/
|
|
|
|
if (negative_test) {
|
|
|
|
return (do_negative_test(&bt, negative_test));
|
|
|
|
}
|
|
|
|
|
|
|
|
fprintf(stderr, "Seed: %u\n", seed);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* This is a stress test that does operations on a btree over the
|
|
|
|
* requested timeout period, verifying them against identical
|
|
|
|
* operations in an avl tree.
|
|
|
|
*/
|
|
|
|
if (stress_only != 0) {
|
|
|
|
return (stress_tree(&bt, NULL));
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Do the positive tests */
|
|
|
|
btree_test_t *test = &test_table[0];
|
|
|
|
while (test->name) {
|
|
|
|
int retval;
|
|
|
|
char why[BUFSIZE] = {0};
|
|
|
|
zfs_btree_index_t *idx = NULL;
|
|
|
|
|
|
|
|
(void) fprintf(stdout, "%-20s", test->name);
|
|
|
|
retval = test->func(&bt, why);
|
|
|
|
|
|
|
|
if (retval == 0) {
|
|
|
|
(void) fprintf(stdout, "ok\n");
|
|
|
|
} else {
|
|
|
|
(void) fprintf(stdout, "failed with %d\n", retval);
|
|
|
|
if (strlen(why) != 0)
|
|
|
|
(void) fprintf(stdout, "\t%s\n", why);
|
|
|
|
why[0] = '\0';
|
|
|
|
failed_tests++;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Remove all the elements and re-verify the tree */
|
Cleanup: Address Clang's static analyzer's unused code complaints
These were categorized as the following:
* Dead assignment 23
* Dead increment 4
* Dead initialization 6
* Dead nested assignment 18
Most of these are harmless, but since actual issues can hide among them,
we correct them.
That said, there were a few return values that were being ignored that
appeared to merit some correction:
* `destroy_callback()` in `cmd/zfs/zfs_main.c` ignored the error from
`destroy_batched()`. We handle it by returning -1 if there is an
error.
* `zfs_do_upgrade()` in `cmd/zfs/zfs_main.c` ignored the error from
`zfs_for_each()`. We handle it by doing a binary OR of the error
value from the subsequent `zfs_for_each()` call to the existing
value. This is how errors are mostly handled inside `zfs_for_each()`.
The error value here is passed to exit from the zfs command, so doing
a binary or on it is better than what we did previously.
* `get_zap_prop()` in `module/zfs/zcp_get.c` ignored the error from
`dsl_prop_get_ds()` when the property is not of type string. We
return an error when it does. There is a small concern that the
`zfs_get_temporary_prop()` call would handle things, but in the case
that it does not, we would be pushing an uninitialized numval onto
the lua stack. It is expected that `dsl_prop_get_ds()` will succeed
anytime that `zfs_get_temporary_prop()` does, so that not giving it a
chance to fix things is not a problem.
* `draid_merge_impl()` in `tests/zfs-tests/cmd/draid.c` used
`nvlist_add_nvlist()` twice in ways in which errors are expected to
be impossible, so we switch to `fnvlist_add_nvlist()`.
A few notable ones did not merit use of the return value, so we
suppressed it with `(void)`:
* `write_free_diffs()` in `lib/libzfs/libzfs_diff.c` ignored the error
value from `describe_free()`. A look through the commit history
revealed that this was intentional.
* `arc_evict_hdr()` in `module/zfs/arc.c` did not need to use the
returned handle from `arc_hdr_realloc()` because it is already
referenced in lists.
* `spa_vdev_detach()` in `module/zfs/spa.c` has a comment explicitly
saying not to use the error from `vdev_label_init()` because whatever
causes the error could be the reason why a detach is being done.
Unfortunately, I am not presently able to analyze the kernel modules
with Clang's static analyzer, so I could have missed some cases of this.
In cases where reports were present in code that is duplicated between
Linux and FreeBSD, I made a conscious effort to fix the FreeBSD version
too.
After this commit is merged, regressions like dee8934 should become
extremely obvious with Clang's static analyzer since a regression would
appear in the results as the only instance of unused code. That assumes
that Coverity does not catch the issue first.
My local branch with fixes from all of my outstanding non-draft pull
requests shows 118 reports from Clang's static anlayzer after this
patch. That is down by 51 from 169.
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Cedric Berger <cedric@precidata.com>
Signed-off-by: Richard Yao <richard.yao@alumni.stonybrook.edu>
Closes #13986
2022-10-14 20:37:54 +00:00
|
|
|
while (zfs_btree_destroy_nodes(&bt, &idx) != NULL)
|
2019-12-19 19:53:55 +00:00
|
|
|
;
|
|
|
|
zfs_btree_verify(&bt);
|
|
|
|
|
|
|
|
test++;
|
|
|
|
}
|
|
|
|
|
|
|
|
zfs_btree_verify(&bt);
|
|
|
|
zfs_btree_fini();
|
|
|
|
|
|
|
|
return (failed_tests);
|
|
|
|
}
|