Commit be1f4a26 authored Jun 06, 2023 by Jakub Kicinski

Merge branch 'ipv4-remove-rt_conn_flags-calls-in-flowi4_init_output'

Guillaume Nault says:

====================
ipv4: Remove RT_CONN_FLAGS() calls in flowi4_init_output().

Remove a few RT_CONN_FLAGS() calls used inside flowi4_init_output().
These users can be easily converted to set the scope properly, instead
of overloading the tos parameter with scope information as done by
RT_CONN_FLAGS().

The objective is to eventually remove RT_CONN_FLAGS() entirely, which
will then allow to also remove RTO_ONLINK and to finally convert
->flowi4_tos to dscp_t.
====================

Link: https://lore.kernel.org/r/cover.1685999117.git.gnault@redhat.com


Signed-off-by: Jakub Kicinski <kuba@kernel.org>

parents fe109f6b 6f8a76f8

net/ipv4/inet_connection_sock.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -792,7 +792,7 @@ struct dst_entry inet_csk_route_req(const struct sock sk,
		opt = rcu_dereference(ireq->ireq_opt);

		flowi4_init_output(fl4, ireq->ir_iif, ireq->ir_mark,
		RT_CONN_FLAGS(sk), RT_SCOPE_UNIVERSE,
		ip_sock_rt_tos(sk), ip_sock_rt_scope(sk),
		sk->sk_protocol, inet_sk_flowi_flags(sk),
		(opt && opt->opt.srr) ? opt->opt.faddr : ireq->ir_rmt_addr,
		ireq->ir_loc_addr, ireq->ir_rmt_port,
		@@ -830,7 +830,7 @@ struct dst_entry inet_csk_route_child_sock(const struct sock sk,
		fl4 = &newinet->cork.fl.u.ip4;

		flowi4_init_output(fl4, ireq->ir_iif, ireq->ir_mark,
		RT_CONN_FLAGS(sk), RT_SCOPE_UNIVERSE,
		ip_sock_rt_tos(sk), ip_sock_rt_scope(sk),
		sk->sk_protocol, inet_sk_flowi_flags(sk),
		(opt && opt->opt.srr) ? opt->opt.faddr : ireq->ir_rmt_addr,
		ireq->ir_loc_addr, ireq->ir_rmt_port,

net/ipv4/syncookies.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -418,8 +418,8 @@ struct sock cookie_v4_check(struct sock sk, struct sk_buff *skb)
		* no easy way to do this.
		*/
		flowi4_init_output(&fl4, ireq->ir_iif, ireq->ir_mark,
		RT_CONN_FLAGS(sk), RT_SCOPE_UNIVERSE, IPPROTO_TCP,
		inet_sk_flowi_flags(sk),
		ip_sock_rt_tos(sk), ip_sock_rt_scope(sk),
		IPPROTO_TCP, inet_sk_flowi_flags(sk),
		opt->srr ? opt->faddr : ireq->ir_rmt_addr,
		ireq->ir_loc_addr, th->source, th->dest, sk->sk_uid);
		security_req_classify_flow(req, flowi4_to_flowi_common(&fl4));