[LLC]: Do better struct sock accounting on skbs (04e4223f) · Commits · e / devices / android_kernel_samsung_universal8895

include/net/llc_sap.h

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -12,11 +12,13 @@
	* See the GNU General Public License for more details.		* See the GNU General Public License for more details.
	*/		*/
	struct llc_sap;		struct llc_sap;
	struct sk_buff;
	struct net_device;		struct net_device;
			struct sk_buff;
			struct sock;

	extern void llc_sap_rtn_pdu(struct llc_sap sap, struct sk_buff skb);		extern void llc_sap_rtn_pdu(struct llc_sap sap, struct sk_buff skb);
	extern void llc_save_primitive(struct sk_buff* skb, unsigned char prim);		extern void llc_save_primitive(struct sock sk, struct sk_buff skb,
			unsigned char prim);
	extern struct sk_buff llc_alloc_frame(struct net_device dev);		extern struct sk_buff llc_alloc_frame(struct net_device dev);

	extern void llc_build_and_send_test_pkt(struct llc_sap *sap,		extern void llc_build_and_send_test_pkt(struct llc_sap *sap,

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -628,7 +628,6 @@ static int llc_ui_accept(struct socket sock, struct socket newsock, int flags)
	/* put original socket back into a clean listen state. */		/* put original socket back into a clean listen state. */
	sk->sk_state = TCP_LISTEN;		sk->sk_state = TCP_LISTEN;
	sk->sk_ack_backlog--;		sk->sk_ack_backlog--;
	skb->sk = NULL;
	dprintk("%s: ok success on %02X, client on %02X\n", __FUNCTION__,		dprintk("%s: ok success on %02X, client on %02X\n", __FUNCTION__,
	llc_sk(sk)->addr.sllc_sap, newllc->daddr.lsap);		llc_sk(sk)->addr.sllc_sap, newllc->daddr.lsap);
	frees:		frees:
	@@ -740,7 +739,6 @@ static int llc_ui_sendmsg(struct kiocb iocb, struct socket sock,
	lock_sock(sk);		lock_sock(sk);
	if (!skb)		if (!skb)
	goto release;		goto release;
	skb->sk = sk;
	skb->dev = llc->dev;		skb->dev = llc->dev;
	skb->protocol = llc_proto_type(addr->sllc_arphrd);		skb->protocol = llc_proto_type(addr->sllc_arphrd);
	skb_reserve(skb, hdrlen);		skb_reserve(skb, hdrlen);

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1335,7 +1335,7 @@ static void llc_conn_tmr_common_cb(unsigned long timeout_data, u8 type)
	if (skb) {		if (skb) {
	struct llc_conn_state_ev *ev = llc_conn_ev(skb);		struct llc_conn_state_ev *ev = llc_conn_ev(skb);

	skb->sk = sk;		skb_set_owner_r(skb, sk);
	ev->type = type;		ev->type = type;
	llc_process_tmr_ev(sk, skb);		llc_process_tmr_ev(sk, skb);
	}		}

+9 −5

Original line number	Original line	Diff line number	Diff line
	@@ -90,8 +90,8 @@ int llc_conn_state_process(struct sock sk, struct sk_buff skb)

	switch (ev->ind_prim) {		switch (ev->ind_prim) {
	case LLC_DATA_PRIM:		case LLC_DATA_PRIM:
	llc_save_primitive(skb, LLC_DATA_PRIM);		llc_save_primitive(sk, skb, LLC_DATA_PRIM);
	if (sock_queue_rcv_skb(sk, skb)) {		if (unlikely(sock_queue_rcv_skb(sk, skb))) {
	/*		/*
	* shouldn't happen		* shouldn't happen
	*/		*/
	@@ -103,6 +103,11 @@ int llc_conn_state_process(struct sock sk, struct sk_buff skb)
	case LLC_CONN_PRIM: {		case LLC_CONN_PRIM: {
	struct sock *parent = skb->sk;		struct sock *parent = skb->sk;

			skb_orphan(skb);
			/*
			* Set the skb->sk to the new struct sock, so that at accept
			* type the upper layer can get the newly created struct sock.
			*/
	skb->sk = sk;		skb->sk = sk;
	skb_queue_tail(&parent->sk_receive_queue, skb);		skb_queue_tail(&parent->sk_receive_queue, skb);
	sk->sk_state_change(parent);		sk->sk_state_change(parent);
	@@ -702,10 +707,9 @@ void llc_conn_handler(struct llc_sap sap, struct sk_buff skb)
	memcpy(&llc->daddr, &saddr, sizeof(llc->daddr));		memcpy(&llc->daddr, &saddr, sizeof(llc->daddr));
	llc_sap_add_socket(sap, sk);		llc_sap_add_socket(sap, sk);
	sock_hold(sk);		sock_hold(sk);
			skb_set_owner_r(skb, parent);
	sock_put(parent);		sock_put(parent);
	skb->sk = parent;		}
	} else
	skb->sk = sk;
	bh_lock_sock(sk);		bh_lock_sock(sk);
	if (!sock_owned_by_user(sk))		if (!sock_owned_by_user(sk))
	llc_conn_rcv(sk, skb);		llc_conn_rcv(sk, skb);

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -45,12 +45,12 @@ struct sk_buff llc_alloc_frame(struct net_device dev)
	return skb;		return skb;
	}		}

	void llc_save_primitive(struct sk_buff* skb, u8 prim)		void llc_save_primitive(struct sock sk, struct sk_buff skb, u8 prim)
	{		{
	struct sockaddr_llc *addr = llc_ui_skb_cb(skb);		struct sockaddr_llc *addr = llc_ui_skb_cb(skb);

	/* save primitive for use by the user. */		/* save primitive for use by the user. */
	addr->sllc_family = skb->sk->sk_family;		addr->sllc_family = sk->sk_family;
	addr->sllc_arphrd = skb->dev->type;		addr->sllc_arphrd = skb->dev->type;
	addr->sllc_test = prim == LLC_TEST_PRIM;		addr->sllc_test = prim == LLC_TEST_PRIM;
	addr->sllc_xid = prim == LLC_XID_PRIM;		addr->sllc_xid = prim == LLC_XID_PRIM;
	@@ -190,7 +190,7 @@ static void llc_sap_state_process(struct llc_sap sap, struct sk_buff skb)
	if (skb->sk->sk_state == TCP_LISTEN)		if (skb->sk->sk_state == TCP_LISTEN)
	kfree_skb(skb);		kfree_skb(skb);
	else {		else {
	llc_save_primitive(skb, ev->prim);		llc_save_primitive(skb->sk, skb, ev->prim);

	/* queue skb to the user. */		/* queue skb to the user. */
	if (sock_queue_rcv_skb(skb->sk, skb))		if (sock_queue_rcv_skb(skb->sk, skb))
	@@ -309,7 +309,7 @@ void llc_sap_handler(struct llc_sap sap, struct sk_buff skb)

	sk = llc_lookup_dgram(sap, &laddr);		sk = llc_lookup_dgram(sap, &laddr);
	if (sk) {		if (sk) {
	skb->sk = sk;		skb_set_owner_r(skb, sk);
	llc_sap_rcv(sap, skb);		llc_sap_rcv(sap, skb);
	sock_put(sk);		sock_put(sk);
	} else		} else