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

Commit e5fc9e7a authored by Changli Gao's avatar Changli Gao Committed by Patrick McHardy
Browse files

netfilter: nf_conntrack: don't always initialize ct->proto 



ct->proto is big(60 bytes) due to structure ip_ct_tcp, and we don't need
to initialize the whole for all the other protocols. This patch moves
proto to the end of structure nf_conn, and pushes the initialization down
to the individual protocols.

Signed-off-by: default avatarChangli Gao <xiaosuo@gmail.com>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parent c7537967

include/net/netfilter/nf_conntrack.h

+3 −3
Original line number Diff line number Diff line
@@ -116,14 +116,14 @@ struct nf_conn { 
	u_int32_t secmark;

#endif



	/* Storage reserved for other modules: */

	union nf_conntrack_proto proto;



	/* Extensions */

	struct nf_ct_ext *ext;

#ifdef CONFIG_NET_NS

	struct net *ct_net;

#endif



	/* Storage reserved for other modules, must be the last member */

	union nf_conntrack_proto proto;

};



static inline struct nf_conn *

net/netfilter/nf_conntrack_core.c

+2 −1
Original line number Diff line number Diff line
@@ -651,7 +651,8 @@ __nf_conntrack_alloc(struct net *net, u16 zone, 
	 * and ct->tuplehash[IP_CT_DIR_REPLY].hnnode.next unchanged.

	 */

	memset(&ct->tuplehash[IP_CT_DIR_MAX], 0,

	       sizeof(*ct) - offsetof(struct nf_conn, tuplehash[IP_CT_DIR_MAX]));

	       offsetof(struct nf_conn, proto) -

	       offsetof(struct nf_conn, tuplehash[IP_CT_DIR_MAX]));

	spin_lock_init(&ct->lock);

	ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple = *orig;

	ct->tuplehash[IP_CT_DIR_ORIGINAL].hnnode.pprev = NULL;

net/netfilter/nf_conntrack_netlink.c

+1 −0
Original line number Diff line number Diff line
@@ -1375,6 +1375,7 @@ ctnetlink_create_conntrack(struct net *net, u16 zone, 
	}

#endif



	memset(&ct->proto, 0, sizeof(ct->proto));

	if (cda[CTA_PROTOINFO]) {

		err = ctnetlink_change_protoinfo(ct, cda);

		if (err < 0)

net/netfilter/nf_conntrack_proto_dccp.c

+3 −0
Original line number Diff line number Diff line
@@ -452,6 +452,9 @@ static bool dccp_new(struct nf_conn *ct, const struct sk_buff *skb, 
	ct->proto.dccp.role[IP_CT_DIR_ORIGINAL] = CT_DCCP_ROLE_CLIENT;

	ct->proto.dccp.role[IP_CT_DIR_REPLY] = CT_DCCP_ROLE_SERVER;

	ct->proto.dccp.state = CT_DCCP_NONE;

	ct->proto.dccp.last_pkt = DCCP_PKT_REQUEST;

	ct->proto.dccp.last_dir = IP_CT_DIR_ORIGINAL;

	ct->proto.dccp.handshake_seq = 0;

	return true;



out_invalid:

net/netfilter/nf_conntrack_proto_sctp.c

+1 −0
Original line number Diff line number Diff line
@@ -413,6 +413,7 @@ static bool sctp_new(struct nf_conn *ct, const struct sk_buff *skb, 
	    test_bit(SCTP_CID_COOKIE_ACK, map))

		return false;



	memset(&ct->proto.sctp, 0, sizeof(ct->proto.sctp));

	new_state = SCTP_CONNTRACK_MAX;

	for_each_sctp_chunk (skb, sch, _sch, offset, dataoff, count) {

		/* Don't need lock here: this conntrack not in circulation yet */