Reduces size of upcoming rhashtable conversion.
Unified · Split
| @@ -195,6 +195,7 @@ static const union nf_inet_addr zeromask = {}; · 194 unmodified lines | |||
| 195 | #undef mtype_ext_cleanup | 195 | #undef mtype_ext_cleanup |
| 196 | #undef mtype_add_cidr | 196 | #undef mtype_add_cidr |
| 197 | #undef mtype_del_cidr | 197 | #undef mtype_del_cidr |
| 198 | #undef mtype_del_cidr_all | ||
| 198 | #undef mtype_ahash_memsize | 199 | #undef mtype_ahash_memsize |
| 199 | #undef mtype_flush | 200 | #undef mtype_flush |
| 200 | #undef mtype_destroy | 201 | #undef mtype_destroy |
| @@ -242,6 +243,7 @@ static const union nf_inet_addr zeromask = {}; · 41 unmodified lines | |||
| 242 | #define mtype_ext_cleanup IPSET_TOKEN(MTYPE, _ext_cleanup) | 243 | #define mtype_ext_cleanup IPSET_TOKEN(MTYPE, _ext_cleanup) |
| 243 | #define mtype_add_cidr IPSET_TOKEN(MTYPE, _add_cidr) | 244 | #define mtype_add_cidr IPSET_TOKEN(MTYPE, _add_cidr) |
| 244 | #define mtype_del_cidr IPSET_TOKEN(MTYPE, _del_cidr) | 245 | #define mtype_del_cidr IPSET_TOKEN(MTYPE, _del_cidr) |
| 246 | #define mtype_del_cidr_all IPSET_TOKEN(MTYPE, _del_cidr_all) | ||
| 245 | #define mtype_ahash_memsize IPSET_TOKEN(MTYPE, _ahash_memsize) | 247 | #define mtype_ahash_memsize IPSET_TOKEN(MTYPE, _ahash_memsize) |
| 246 | #define mtype_flush IPSET_TOKEN(MTYPE, _flush) | 248 | #define mtype_flush IPSET_TOKEN(MTYPE, _flush) |
| 247 | #define mtype_destroy IPSET_TOKEN(MTYPE, _destroy) | 249 | #define mtype_destroy IPSET_TOKEN(MTYPE, _destroy) |
| @@ -410,6 +412,17 @@ unlock: · 162 unmodified lines | |||
| 410 | } | 412 | } |
| 411 | #endif | 413 | #endif |
| 412 | 414 | ||
| 415 | static void | ||
| 416 | mtype_del_cidr_all(struct ip_set *set, struct htype *h, const struct mtype_elem *data) | ||
| 417 | { | ||
| 418 | #ifdef IP_SET_HASH_WITH_NETS | ||
| 419 | int k; | ||
| 420 | |||
| 421 | for (k = 0; k < IPSET_NET_COUNT; k++) | ||
| 422 | mtype_del_cidr(set, h, DCIDR_GET(data->cidr, k), k); | ||
| 423 | #endif | ||
| 424 | } | ||
| 425 | |||
| 413 | /* Calculate the actual memory size of the set data */ | 426 | /* Calculate the actual memory size of the set data */ |
| 414 | static size_t | 427 | static size_t |
| 415 | mtype_ahash_memsize(const struct htype *h, const struct htable *t) | 428 | mtype_ahash_memsize(const struct htype *h, const struct htable *t) |
| @@ -551,9 +564,6 @@ mtype_gc_do(struct ip_set *set, struct htype *h, struct htable *t, u32 r) · 135 unmodified lines | |||
| 551 | struct mtype_elem *data; | 564 | struct mtype_elem *data; |
| 552 | u32 i, j, d; | 565 | u32 i, j, d; |
| 553 | size_t dsize = set->dsize; | 566 | size_t dsize = set->dsize; |
| 554 | #ifdef IP_SET_HASH_WITH_NETS | ||
| 555 | u8 k; | ||
| 556 | #endif | ||
| 557 | u8 pos, htable_bits = t->htable_bits; | 567 | u8 pos, htable_bits = t->htable_bits; |
| 558 | 568 | ||
| 559 | spin_lock_bh(&t->hregion[r].lock); | 569 | spin_lock_bh(&t->hregion[r].lock); |
| @@ -574,11 +584,7 @@ mtype_gc_do(struct ip_set *set, struct htype *h, struct htable *t, u32 r) · 14 unmodified lines | |||
| 574 | pr_debug("expired %u/%u\n", i, j); | 584 | pr_debug("expired %u/%u\n", i, j); |
| 575 | clear_bit(j, n->used); | 585 | clear_bit(j, n->used); |
| 576 | smp_mb__after_atomic(); | 586 | smp_mb__after_atomic(); |
| 577 | #ifdef IP_SET_HASH_WITH_NETS | 587 | mtype_del_cidr_all(set, h, data); |
| 578 | for (k = 0; k < IPSET_NET_COUNT; k++) | ||
| 579 | mtype_del_cidr(set, h, | ||
| 580 | DCIDR_GET(data->cidr, k), k); | ||
| 581 | #endif | ||
| 582 | t->hregion[r].elements--; | 588 | t->hregion[r].elements--; |
| 583 | ip_set_ext_destroy(set, data); | 589 | ip_set_ext_destroy(set, data); |
| 584 | d++; | 590 | d++; |
| @@ -1004,11 +1010,7 @@ mtype_add(struct ip_set *set, void *value, const struct ip_set_ext *ext, · 419 unmodified lines | |||
| 1004 | j = 0; | 1010 | j = 0; |
| 1005 | data = ahash_data(n, j, set->dsize); | 1011 | data = ahash_data(n, j, set->dsize); |
| 1006 | if (!deleted) { | 1012 | if (!deleted) { |
| 1007 | #ifdef IP_SET_HASH_WITH_NETS | 1013 | mtype_del_cidr_all(set, h, data); |
| 1008 | for (i = 0; i < IPSET_NET_COUNT; i++) | ||
| 1009 | mtype_del_cidr(set, h, | ||
| 1010 | DCIDR_GET(data->cidr, i), i); | ||
| 1011 | #endif | ||
| 1012 | ip_set_ext_destroy(set, data); | 1014 | ip_set_ext_destroy(set, data); |
| 1013 | t->hregion[r].elements--; | 1015 | t->hregion[r].elements--; |
| 1014 | } | 1016 | } |
| @@ -1163,11 +1165,7 @@ mtype_del(struct ip_set *set, void *value, const struct ip_set_ext *ext, · 148 unmodified lines | |||
| 1163 | if (i + 1 == pos) | 1165 | if (i + 1 == pos) |
| 1164 | smp_store_release(&n->pos, --pos); | 1166 | smp_store_release(&n->pos, --pos); |
| 1165 | t->hregion[r].elements--; | 1167 | t->hregion[r].elements--; |
| 1166 | #ifdef IP_SET_HASH_WITH_NETS | 1168 | mtype_del_cidr_all(set, h, d); |
| 1167 | for (j = 0; j < IPSET_NET_COUNT; j++) | ||
| 1168 | mtype_del_cidr(set, h, | ||
| 1169 | DCIDR_GET(d->cidr, j), j); | ||
| 1170 | #endif | ||
| 1171 | ip_set_ext_destroy(set, data); | 1169 | ip_set_ext_destroy(set, data); |
| 1172 | 1170 | ||
| 1173 | if (t->resizing && ext && ext->target) { | 1171 | if (t->resizing && ext && ext->target) { |