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

Commit 22bd5b9b authored by David S. Miller's avatar David S. Miller
Browse files

ipv4: Pass ipv4 flow objects into fib_lookup() paths. 



To start doing these conversions, we need to add some temporary
flow4_* macros which will eventually go away when all the protocol
code paths are changed to work on AF specific flowi objects.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 59b1a94c

include/net/flow.h

+8 −0
Original line number Diff line number Diff line
@@ -50,6 +50,14 @@ union flowi_uli { 


struct flowi4 {

	struct flowi_common	__fl_common;

#define flowi4_oif		__fl_common.flowic_oif

#define flowi4_iif		__fl_common.flowic_iif

#define flowi4_mark		__fl_common.flowic_mark

#define flowi4_tos		__fl_common.flowic_tos

#define flowi4_scope		__fl_common.flowic_scope

#define flowi4_proto		__fl_common.flowic_proto

#define flowi4_flags		__fl_common.flowic_flags

#define flowi4_secid		__fl_common.flowic_secid

	__be32			daddr;

	__be32			saddr;

	union flowi_uli		uli;

include/net/ip_fib.h

+3 −3
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ struct fib_table { 
	unsigned char	tb_data[0];

};



extern int fib_table_lookup(struct fib_table *tb, const struct flowi *flp,

extern int fib_table_lookup(struct fib_table *tb, const struct flowi4 *flp,

			    struct fib_result *res, int fib_flags);

extern int fib_table_insert(struct fib_table *, struct fib_config *);

extern int fib_table_delete(struct fib_table *, struct fib_config *);
@@ -186,7 +186,7 @@ static inline struct fib_table *fib_new_table(struct net *net, u32 id) 
	return fib_get_table(net, id);

}



static inline int fib_lookup(struct net *net, const struct flowi *flp,

static inline int fib_lookup(struct net *net, const struct flowi4 *flp,

			     struct fib_result *res)

{

	struct fib_table *table;
@@ -209,7 +209,7 @@ extern void __net_exit fib4_rules_exit(struct net *net); 
extern u32 fib_rules_tclass(const struct fib_result *res);

#endif



extern int fib_lookup(struct net *n, struct flowi *flp, struct fib_result *res);

extern int fib_lookup(struct net *n, struct flowi4 *flp, struct fib_result *res);



extern struct fib_table *fib_new_table(struct net *net, u32 id);

extern struct fib_table *fib_get_table(struct net *net, u32 id);

net/ipv4/fib_frontend.c

+4 −4
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ static inline unsigned __inet_dev_addr_type(struct net *net, 
	if (local_table) {

		ret = RTN_UNICAST;

		rcu_read_lock();

		if (!fib_table_lookup(local_table, &fl, &res, FIB_LOOKUP_NOREF)) {

		if (!fib_table_lookup(local_table, &fl.u.ip4, &res, FIB_LOOKUP_NOREF)) {

			if (!dev || dev == res.fi->fib_dev)

				ret = res.type;

		}
@@ -222,7 +222,7 @@ int fib_validate_source(__be32 src, __be32 dst, u8 tos, int oif, 
		goto e_inval;



	net = dev_net(dev);

	if (fib_lookup(net, &fl, &res))

	if (fib_lookup(net, &fl.u.ip4, &res))

		goto last_resort;

	if (res.type != RTN_UNICAST) {

		if (res.type != RTN_LOCAL || !accept_local)
@@ -256,7 +256,7 @@ int fib_validate_source(__be32 src, __be32 dst, u8 tos, int oif, 
	fl.flowi_oif = dev->ifindex;



	ret = 0;

	if (fib_lookup(net, &fl, &res) == 0) {

	if (fib_lookup(net, &fl.u.ip4, &res) == 0) {

		if (res.type == RTN_UNICAST) {

			*spec_dst = FIB_RES_PREFSRC(res);

			ret = FIB_RES_NH(res).nh_scope >= RT_SCOPE_HOST;
@@ -813,7 +813,7 @@ static void nl_fib_lookup(struct fib_result_nl *frn, struct fib_table *tb) 


		frn->tb_id = tb->tb_id;

		rcu_read_lock();

		frn->err = fib_table_lookup(tb, &fl, &res, FIB_LOOKUP_NOREF);

		frn->err = fib_table_lookup(tb, &fl.u.ip4, &res, FIB_LOOKUP_NOREF);



		if (!frn->err) {

			frn->prefixlen = res.prefixlen;

net/ipv4/fib_rules.c

+3 −3
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ u32 fib_rules_tclass(const struct fib_result *res) 
}

#endif



int fib_lookup(struct net *net, struct flowi *flp, struct fib_result *res)

int fib_lookup(struct net *net, struct flowi4 *flp, struct fib_result *res)

{

	struct fib_lookup_arg arg = {

		.result = res,
@@ -61,7 +61,7 @@ int fib_lookup(struct net *net, struct flowi *flp, struct fib_result *res) 
	};

	int err;



	err = fib_rules_lookup(net->ipv4.rules_ops, flp, 0, &arg);

	err = fib_rules_lookup(net->ipv4.rules_ops, flowi4_to_flowi(flp), 0, &arg);

	res->r = arg.rule;



	return err;
@@ -95,7 +95,7 @@ static int fib4_rule_action(struct fib_rule *rule, struct flowi *flp, 
	if (!tbl)

		goto errout;



	err = fib_table_lookup(tbl, flp, (struct fib_result *) arg->result, arg->flags);

	err = fib_table_lookup(tbl, &flp->u.ip4, (struct fib_result *) arg->result, arg->flags);

	if (err > 0)

		err = -EAGAIN;

errout:

net/ipv4/fib_semantics.c

+1 −1
Original line number Diff line number Diff line
@@ -569,7 +569,7 @@ static int fib_check_nh(struct fib_config *cfg, struct fib_info *fi, 
			/* It is not necessary, but requires a bit of thinking */

			if (fl.fl4_scope < RT_SCOPE_LINK)

				fl.fl4_scope = RT_SCOPE_LINK;

			err = fib_lookup(net, &fl, &res);

			err = fib_lookup(net, &fl.u.ip4, &res);

			if (err) {

				rcu_read_unlock();

				return err;