Commit 09620859 authored by Willem de Bruijn's avatar Willem de Bruijn Committed by Jakub Kicinski
Browse files

ipv6: replace ipcm6_init calls with ipcm6_init_sk 



This initializes tclass and dontfrag before cmsg parsing, removing the
need for explicit checks against -1 in each caller.

Leave hlimit set to -1, because its full initialization
(in ip6_sk_dst_hoplimit) requires more state (dst, flowi6, ..).

This also prepares for calling sockcm_init in a follow-on patch.

Signed-off-by: default avatarWillem de Bruijn <willemb@google.com>
Reviewed-by: default avatarDavid Ahern <dsahern@kernel.org>
Link: https://patch.msgid.link/20250214222720.3205500-7-willemdebruijn.kernel@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent e8485911

include/net/ipv6.h

+0 −9
Original line number Diff line number Diff line
@@ -363,15 +363,6 @@ struct ipcm6_cookie { 
	struct ipv6_txoptions *opt;

};



static inline void ipcm6_init(struct ipcm6_cookie *ipc6)

{

	*ipc6 = (struct ipcm6_cookie) {

		.hlimit = -1,

		.tclass = -1,

		.dontfrag = -1,

	};

}



static inline void ipcm6_init_sk(struct ipcm6_cookie *ipc6,

				 const struct sock *sk)

{

net/ipv6/raw.c

+1 −7
Original line number Diff line number Diff line
@@ -777,7 +777,7 @@ static int rawv6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len) 
	fl6.flowi6_mark = READ_ONCE(sk->sk_mark);

	fl6.flowi6_uid = sk->sk_uid;



	ipcm6_init(&ipc6);

	ipcm6_init_sk(&ipc6, sk);

	ipc6.sockc.tsflags = READ_ONCE(sk->sk_tsflags);

	ipc6.sockc.mark = fl6.flowi6_mark;

	ipc6.sockc.priority = READ_ONCE(sk->sk_priority);
@@ -891,9 +891,6 @@ static int rawv6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len) 
	if (hdrincl)

		fl6.flowi6_flags |= FLOWI_FLAG_KNOWN_NH;



	if (ipc6.tclass < 0)

		ipc6.tclass = np->tclass;



	fl6.flowlabel = ip6_make_flowinfo(ipc6.tclass, fl6.flowlabel);



	dst = ip6_dst_lookup_flow(sock_net(sk), sk, &fl6, final_p);
@@ -904,9 +901,6 @@ static int rawv6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len) 
	if (ipc6.hlimit < 0)

		ipc6.hlimit = ip6_sk_dst_hoplimit(np, &fl6, dst);



	if (ipc6.dontfrag < 0)

		ipc6.dontfrag = inet6_test_bit(DONTFRAG, sk);



	if (msg->msg_flags&MSG_CONFIRM)

		goto do_confirm;

net/ipv6/udp.c

+1 −6
Original line number Diff line number Diff line
@@ -1494,7 +1494,7 @@ int udpv6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len) 
	int is_udplite = IS_UDPLITE(sk);

	int (*getfrag)(void *, char *, int, int, int, struct sk_buff *);



	ipcm6_init(&ipc6);

	ipcm6_init_sk(&ipc6, sk);

	ipc6.gso_size = READ_ONCE(up->gso_size);

	ipc6.sockc.tsflags = READ_ONCE(sk->sk_tsflags);

	ipc6.sockc.mark = READ_ONCE(sk->sk_mark);
@@ -1704,9 +1704,6 @@ int udpv6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len) 


	security_sk_classify_flow(sk, flowi6_to_flowi_common(fl6));



	if (ipc6.tclass < 0)

		ipc6.tclass = np->tclass;



	fl6->flowlabel = ip6_make_flowinfo(ipc6.tclass, fl6->flowlabel);



	dst = ip6_sk_dst_lookup_flow(sk, fl6, final_p, connected);
@@ -1752,8 +1749,6 @@ int udpv6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len) 
	WRITE_ONCE(up->pending, AF_INET6);



do_append_data:

	if (ipc6.dontfrag < 0)

		ipc6.dontfrag = inet6_test_bit(DONTFRAG, sk);

	up->len += ulen;

	err = ip6_append_data(sk, getfrag, msg, ulen, sizeof(struct udphdr),

			      &ipc6, fl6, dst_rt6_info(dst),

net/l2tp/l2tp_ip6.c

+1 −7
Original line number Diff line number Diff line
@@ -547,7 +547,7 @@ static int l2tp_ip6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len) 
	fl6.flowi6_mark = READ_ONCE(sk->sk_mark);

	fl6.flowi6_uid = sk->sk_uid;



	ipcm6_init(&ipc6);

	ipcm6_init_sk(&ipc6, sk);



	if (lsa) {

		if (addr_len < SIN6_LEN_RFC2133)
@@ -634,9 +634,6 @@ static int l2tp_ip6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len) 


	security_sk_classify_flow(sk, flowi6_to_flowi_common(&fl6));



	if (ipc6.tclass < 0)

		ipc6.tclass = np->tclass;



	fl6.flowlabel = ip6_make_flowinfo(ipc6.tclass, fl6.flowlabel);



	dst = ip6_dst_lookup_flow(sock_net(sk), sk, &fl6, final_p);
@@ -648,9 +645,6 @@ static int l2tp_ip6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len) 
	if (ipc6.hlimit < 0)

		ipc6.hlimit = ip6_sk_dst_hoplimit(np, &fl6, dst);



	if (ipc6.dontfrag < 0)

		ipc6.dontfrag = inet6_test_bit(DONTFRAG, sk);



	if (msg->msg_flags & MSG_CONFIRM)

		goto do_confirm;