Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 21956ab2 authored by Jozsef Kadlecsik's avatar Jozsef Kadlecsik
Browse files

netfilter: ipset: Make struct htype per ipset family 



Before this patch struct htype created at the first source
of ip_set_hash_gen.h and it is common for both IPv4 and IPv6
set variants.

Make struct htype per ipset family and use NLEN to make
nets array fixed size to simplify struct htype allocation.

Ported from a patch proposed by Sergey Popovich <popovich_sergei@mail.ua>.

Signed-off-by: default avatarJozsef Kadlecsik <kadlec@blackhole.kfki.hu>
parent 961509ac

net/netfilter/ipset/ip_set_hash_gen.h

+20 −31
Original line number Diff line number Diff line
@@ -166,6 +166,18 @@ htable_bits(u32 hashsize) 


#endif /* _IP_SET_HASH_GEN_H */



#ifndef MTYPE

#error "MTYPE is not defined!"

#endif



#ifndef HTYPE

#error "HTYPE is not defined!"

#endif



#ifndef HOST_MASK

#error "HOST_MASK is not defined!"

#endif



/* Family dependent templates */



#undef ahash_data
@@ -189,7 +201,6 @@ htable_bits(u32 hashsize) 
#undef mtype_same_set

#undef mtype_kadt

#undef mtype_uadt

#undef mtype



#undef mtype_add

#undef mtype_del
@@ -205,6 +216,7 @@ htable_bits(u32 hashsize) 
#undef mtype_variant

#undef mtype_data_match



#undef htype

#undef HKEY



#define mtype_data_equal	IPSET_TOKEN(MTYPE, _data_equal)
@@ -231,7 +243,6 @@ htable_bits(u32 hashsize) 
#define mtype_same_set		IPSET_TOKEN(MTYPE, _same_set)

#define mtype_kadt		IPSET_TOKEN(MTYPE, _kadt)

#define mtype_uadt		IPSET_TOKEN(MTYPE, _uadt)

#define mtype			MTYPE



#define mtype_add		IPSET_TOKEN(MTYPE, _add)

#define mtype_del		IPSET_TOKEN(MTYPE, _del)
@@ -247,18 +258,12 @@ htable_bits(u32 hashsize) 
#define mtype_variant		IPSET_TOKEN(MTYPE, _variant)

#define mtype_data_match	IPSET_TOKEN(MTYPE, _data_match)



#ifndef MTYPE

#error "MTYPE is not defined!"

#endif



#ifndef HOST_MASK

#error "HOST_MASK is not defined!"

#endif



#ifndef HKEY_DATALEN

#define HKEY_DATALEN		sizeof(struct mtype_elem)

#endif



#define htype			MTYPE



#define HKEY(data, initval, htable_bits)			\

({								\

	const u32 *__k = (const u32 *)data;			\
@@ -269,33 +274,26 @@ htable_bits(u32 hashsize) 
	jhash2(__k, __l, initval) & jhash_mask(htable_bits);	\

})



#ifndef htype

#ifndef HTYPE

#error "HTYPE is not defined!"

#endif /* HTYPE */

#define htype			HTYPE



/* The generic hash structure */

struct htype {

	struct htable __rcu *table; /* the hash table */

	struct timer_list gc;	/* garbage collection when timeout enabled */

	u32 maxelem;		/* max elements in the hash */

	u32 initval;		/* random jhash init value */

#ifdef IP_SET_HASH_WITH_MARKMASK

	u32 markmask;		/* markmask value for mark mask to store */

#endif

	struct timer_list gc;	/* garbage collection when timeout enabled */

	struct mtype_elem next; /* temporary storage for uadd */

#ifdef IP_SET_HASH_WITH_MULTI

	u8 ahash_max;		/* max elements in an array block */

#endif

#ifdef IP_SET_HASH_WITH_NETMASK

	u8 netmask;		/* netmask value for subnets to store */

#endif

	struct mtype_elem next; /* temporary storage for uadd */

#ifdef IP_SET_HASH_WITH_NETS

	struct net_prefixes nets[0]; /* book-keeping of prefixes */

	struct net_prefixes nets[NLEN]; /* book-keeping of prefixes */

#endif

};

#endif /* htype */



#ifdef IP_SET_HASH_WITH_NETS

/* Network cidr size book keeping when the hash stores different
@@ -348,13 +346,7 @@ mtype_del_cidr(struct htype *h, u8 cidr, u8 n) 
static size_t

mtype_ahash_memsize(const struct htype *h, const struct htable *t)

{

	size_t memsize = sizeof(*h) + sizeof(*t);



#ifdef IP_SET_HASH_WITH_NETS

	memsize += sizeof(struct net_prefixes) * NLEN;

#endif



	return memsize;

	return sizeof(*h) + sizeof(*t);

}



/* Get the ith element from the array block n */
@@ -392,7 +384,7 @@ mtype_flush(struct ip_set *set) 
		kfree_rcu(n, rcu);

	}

#ifdef IP_SET_HASH_WITH_NETS

	memset(h->nets, 0, sizeof(struct net_prefixes) * NLEN);

	memset(h->nets, 0, sizeof(h->nets));

#endif

	set->elements = 0;

	set->ext_size = 0;
@@ -1290,9 +1282,6 @@ IPSET_TOKEN(HTYPE, _create)(struct net *net, struct ip_set *set, 
		maxelem = ip_set_get_h32(tb[IPSET_ATTR_MAXELEM]);



	hsize = sizeof(*h);

#ifdef IP_SET_HASH_WITH_NETS

	hsize += sizeof(struct net_prefixes) * NLEN;

#endif

	h = kzalloc(hsize, GFP_KERNEL);

	if (!h)

		return -ENOMEM;

net/netfilter/ipset/ip_set_hash_ip.c

+5 −5
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ hash_ip4_kadt(struct ip_set *set, const struct sk_buff *skb, 
	      const struct xt_action_param *par,

	      enum ipset_adt adt, struct ip_set_adt_opt *opt)

{

	const struct hash_ip *h = set->data;

	const struct hash_ip4 *h = set->data;

	ipset_adtfn adtfn = set->variant->adt[adt];

	struct hash_ip4_elem e = { 0 };

	struct ip_set_ext ext = IP_SET_INIT_KEXT(skb, opt, set);
@@ -101,7 +101,7 @@ static int 
hash_ip4_uadt(struct ip_set *set, struct nlattr *tb[],

	      enum ipset_adt adt, u32 *lineno, u32 flags, bool retried)

{

	const struct hash_ip *h = set->data;

	const struct hash_ip4 *h = set->data;

	ipset_adtfn adtfn = set->variant->adt[adt];

	struct hash_ip4_elem e = { 0 };

	struct ip_set_ext ext = IP_SET_INIT_UEXT(set);
@@ -199,7 +199,7 @@ hash_ip6_data_list(struct sk_buff *skb, const struct hash_ip6_elem *e) 
}



static inline void

hash_ip6_data_next(struct hash_ip4_elem *next, const struct hash_ip6_elem *e)

hash_ip6_data_next(struct hash_ip6_elem *next, const struct hash_ip6_elem *e)

{

}
@@ -217,7 +217,7 @@ hash_ip6_kadt(struct ip_set *set, const struct sk_buff *skb, 
	      const struct xt_action_param *par,

	      enum ipset_adt adt, struct ip_set_adt_opt *opt)

{

	const struct hash_ip *h = set->data;

	const struct hash_ip6 *h = set->data;

	ipset_adtfn adtfn = set->variant->adt[adt];

	struct hash_ip6_elem e = { { .all = { 0 } } };

	struct ip_set_ext ext = IP_SET_INIT_KEXT(skb, opt, set);
@@ -234,7 +234,7 @@ static int 
hash_ip6_uadt(struct ip_set *set, struct nlattr *tb[],

	      enum ipset_adt adt, u32 *lineno, u32 flags, bool retried)

{

	const struct hash_ip *h = set->data;

	const struct hash_ip6 *h = set->data;

	ipset_adtfn adtfn = set->variant->adt[adt];

	struct hash_ip6_elem e = { { .all = { 0 } } };

	struct ip_set_ext ext = IP_SET_INIT_UEXT(set);

net/netfilter/ipset/ip_set_hash_ipmark.c

+5 −5
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ hash_ipmark4_kadt(struct ip_set *set, const struct sk_buff *skb, 
		  const struct xt_action_param *par,

		  enum ipset_adt adt, struct ip_set_adt_opt *opt)

{

	const struct hash_ipmark *h = set->data;

	const struct hash_ipmark4 *h = set->data;

	ipset_adtfn adtfn = set->variant->adt[adt];

	struct hash_ipmark4_elem e = { };

	struct ip_set_ext ext = IP_SET_INIT_KEXT(skb, opt, set);
@@ -101,7 +101,7 @@ static int 
hash_ipmark4_uadt(struct ip_set *set, struct nlattr *tb[],

		  enum ipset_adt adt, u32 *lineno, u32 flags, bool retried)

{

	const struct hash_ipmark *h = set->data;

	const struct hash_ipmark4 *h = set->data;

	ipset_adtfn adtfn = set->variant->adt[adt];

	struct hash_ipmark4_elem e = { };

	struct ip_set_ext ext = IP_SET_INIT_UEXT(set);
@@ -193,7 +193,7 @@ hash_ipmark6_data_list(struct sk_buff *skb, 
}



static inline void

hash_ipmark6_data_next(struct hash_ipmark4_elem *next,

hash_ipmark6_data_next(struct hash_ipmark6_elem *next,

		       const struct hash_ipmark6_elem *d)

{

}
@@ -211,7 +211,7 @@ hash_ipmark6_kadt(struct ip_set *set, const struct sk_buff *skb, 
		  const struct xt_action_param *par,

		  enum ipset_adt adt, struct ip_set_adt_opt *opt)

{

	const struct hash_ipmark *h = set->data;

	const struct hash_ipmark6 *h = set->data;

	ipset_adtfn adtfn = set->variant->adt[adt];

	struct hash_ipmark6_elem e = { };

	struct ip_set_ext ext = IP_SET_INIT_KEXT(skb, opt, set);
@@ -227,7 +227,7 @@ static int 
hash_ipmark6_uadt(struct ip_set *set, struct nlattr *tb[],

		  enum ipset_adt adt, u32 *lineno, u32 flags, bool retried)

{

	const struct hash_ipmark *h = set->data;

	const struct hash_ipmark6 *h = set->data;

	ipset_adtfn adtfn = set->variant->adt[adt];

	struct hash_ipmark6_elem e = { };

	struct ip_set_ext ext = IP_SET_INIT_UEXT(set);

net/netfilter/ipset/ip_set_hash_ipport.c

+3 −3
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ static int 
hash_ipport4_uadt(struct ip_set *set, struct nlattr *tb[],

		  enum ipset_adt adt, u32 *lineno, u32 flags, bool retried)

{

	const struct hash_ipport *h = set->data;

	const struct hash_ipport4 *h = set->data;

	ipset_adtfn adtfn = set->variant->adt[adt];

	struct hash_ipport4_elem e = { .ip = 0 };

	struct ip_set_ext ext = IP_SET_INIT_UEXT(set);
@@ -231,7 +231,7 @@ hash_ipport6_data_list(struct sk_buff *skb, 
}



static inline void

hash_ipport6_data_next(struct hash_ipport4_elem *next,

hash_ipport6_data_next(struct hash_ipport6_elem *next,

		       const struct hash_ipport6_elem *d)

{

	next->port = d->port;
@@ -266,7 +266,7 @@ static int 
hash_ipport6_uadt(struct ip_set *set, struct nlattr *tb[],

		  enum ipset_adt adt, u32 *lineno, u32 flags, bool retried)

{

	const struct hash_ipport *h = set->data;

	const struct hash_ipport6 *h = set->data;

	ipset_adtfn adtfn = set->variant->adt[adt];

	struct hash_ipport6_elem e = { .ip = { .all = { 0 } } };

	struct ip_set_ext ext = IP_SET_INIT_UEXT(set);

net/netfilter/ipset/ip_set_hash_ipportip.c

+3 −3
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ static int 
hash_ipportip4_uadt(struct ip_set *set, struct nlattr *tb[],

		    enum ipset_adt adt, u32 *lineno, u32 flags, bool retried)

{

	const struct hash_ipportip *h = set->data;

	const struct hash_ipportip4 *h = set->data;

	ipset_adtfn adtfn = set->variant->adt[adt];

	struct hash_ipportip4_elem e = { .ip = 0 };

	struct ip_set_ext ext = IP_SET_INIT_UEXT(set);
@@ -241,7 +241,7 @@ hash_ipportip6_data_list(struct sk_buff *skb, 
}



static inline void

hash_ipportip6_data_next(struct hash_ipportip4_elem *next,

hash_ipportip6_data_next(struct hash_ipportip6_elem *next,

			 const struct hash_ipportip6_elem *d)

{

	next->port = d->port;
@@ -277,7 +277,7 @@ static int 
hash_ipportip6_uadt(struct ip_set *set, struct nlattr *tb[],

		    enum ipset_adt adt, u32 *lineno, u32 flags, bool retried)

{

	const struct hash_ipportip *h = set->data;

	const struct hash_ipportip6 *h = set->data;

	ipset_adtfn adtfn = set->variant->adt[adt];

	struct hash_ipportip6_elem e = {  .ip = { .all = { 0 } } };

	struct ip_set_ext ext = IP_SET_INIT_UEXT(set);