Commit aefd232d authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'net-deduplicate-cookie-logic' 

Willem de Bruijn says:

====================
net: deduplicate cookie logic

Reuse standard sk, ip and ipv6 cookie init handlers where possible.

Avoid repeated open coding of the same logic.
Harmonize feature sets across protocols.
Make IPv4 and IPv6 logic more alike.
Simplify adding future new fields with a single init point.
====================

Link: https://patch.msgid.link/20250214222720.3205500-1-willemdebruijn.kernel@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 3a03f9ec 5cd2f788

include/net/ip.h

+5 −11
Original line number Diff line number Diff line
@@ -92,11 +92,12 @@ static inline void ipcm_init(struct ipcm_cookie *ipcm) 
static inline void ipcm_init_sk(struct ipcm_cookie *ipcm,

				const struct inet_sock *inet)

{

	ipcm_init(ipcm);

	*ipcm = (struct ipcm_cookie) {

		.tos = READ_ONCE(inet->tos),

	};



	sockcm_init(&ipcm->sockc, &inet->sk);



	ipcm->sockc.mark = READ_ONCE(inet->sk.sk_mark);

	ipcm->sockc.priority = READ_ONCE(inet->sk.sk_priority);

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

	ipcm->oif = READ_ONCE(inet->sk.sk_bound_dev_if);

	ipcm->addr = inet->inet_saddr;

	ipcm->protocol = inet->inet_num;
@@ -257,13 +258,6 @@ static inline u8 ip_sendmsg_scope(const struct inet_sock *inet, 
	return RT_SCOPE_UNIVERSE;

}



static inline __u8 get_rttos(struct ipcm_cookie* ipc, struct inet_sock *inet)

{

	u8 dsfield = ipc->tos != -1 ? ipc->tos : READ_ONCE(inet->tos);



	return dsfield & INET_DSCP_MASK;

}



/* datagram.c */

int __ip4_datagram_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len);

int ip4_datagram_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len);

include/net/ipv6.h

+2 −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)

{
@@ -380,6 +371,8 @@ static inline void ipcm6_init_sk(struct ipcm6_cookie *ipc6, 
		.tclass = inet6_sk(sk)->tclass,

		.dontfrag = inet6_test_bit(DONTFRAG, sk),

	};



	sockcm_init(&ipc6->sockc, sk);

}



static inline struct ipv6_txoptions *txopt_get(const struct ipv6_pinfo *np)

include/net/sock.h

+1 −0
Original line number Diff line number Diff line
@@ -1829,6 +1829,7 @@ static inline void sockcm_init(struct sockcm_cookie *sockc, 
			       const struct sock *sk)

{

	*sockc = (struct sockcm_cookie) {

		.mark = READ_ONCE(sk->sk_mark),

		.tsflags = READ_ONCE(sk->sk_tsflags),

		.priority = READ_ONCE(sk->sk_priority),

	};

net/can/raw.c

+1 −1
Original line number Diff line number Diff line
@@ -963,7 +963,7 @@ static int raw_sendmsg(struct socket *sock, struct msghdr *msg, size_t size) 


	skb->dev = dev;

	skb->priority = sockc.priority;

	skb->mark = READ_ONCE(sk->sk_mark);

	skb->mark = sockc.mark;

	skb->tstamp = sockc.transmit_time;



	skb_setup_tx_timestamp(skb, &sockc);

net/ipv4/icmp.c

+2 −4
Original line number Diff line number Diff line
@@ -405,7 +405,6 @@ static void icmp_reply(struct icmp_bxm *icmp_param, struct sk_buff *skb) 
	struct ipcm_cookie ipc;

	struct flowi4 fl4;

	struct sock *sk;

	struct inet_sock *inet;

	__be32 daddr, saddr;

	u32 mark = IP4_REPLY_MARK(net, skb->mark);

	int type = icmp_param->data.icmph.type;
@@ -424,12 +423,11 @@ static void icmp_reply(struct icmp_bxm *icmp_param, struct sk_buff *skb) 
	sk = icmp_xmit_lock(net);

	if (!sk)

		goto out_bh_enable;

	inet = inet_sk(sk);



	icmp_param->data.icmph.checksum = 0;



	ipcm_init(&ipc);

	inet->tos = ip_hdr(skb)->tos;

	ipc.tos = ip_hdr(skb)->tos;

	ipc.sockc.mark = mark;

	daddr = ipc.addr = ip_hdr(skb)->saddr;

	saddr = fib_compute_spec_dst(skb);
@@ -737,8 +735,8 @@ void __icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info, 
	icmp_param.data.icmph.checksum	 = 0;

	icmp_param.skb	  = skb_in;

	icmp_param.offset = skb_network_offset(skb_in);

	inet_sk(sk)->tos = tos;

	ipcm_init(&ipc);

	ipc.tos = tos;

	ipc.addr = iph->saddr;

	ipc.opt = &icmp_param.replyopts.opt;

	ipc.sockc.mark = mark;