Merge "net: qrtr: Move resume-tx transmission to recvmsg" (4e5b8c60) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/char/diag/diagfwd_socket.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -52,6 +52,10 @@
		#define INST_ID_DCI_CMD 3
		#define INST_ID_DCI 4

		#define MAX_BUF_SIZE 0x4400
		#define MAX_NO_PACKETS 10
		#define DIAG_SO_RCVBUF_SIZE (MAX_BUF_SIZE * MAX_NO_PACKETS)

		struct qmi_handle *cntl_qmi;
		static uint64_t bootup_req[NUM_SOCKET_SUBSYSTEMS];

		@@ -438,6 +442,7 @@ static void socket_open_server(struct diag_socket_info *info)
		struct kvec iv = { &pkt, sizeof(pkt) };
		int ret;
		int sl = sizeof(sq);
		unsigned int size = DIAG_SO_RCVBUF_SIZE;

		if (!info \|\| info->port_type != PORT_TYPE_SERVER)
		return;
		@@ -456,6 +461,9 @@ static void socket_open_server(struct diag_socket_info *info)
		return;
		}

		kernel_setsockopt(info->hdl, SOL_SOCKET, SO_RCVBUF,
		(char *)&size, sizeof(size));

		write_lock_bh(&info->hdl->sk->sk_callback_lock);
		info->hdl->sk->sk_user_data = (void *)(info);
		info->hdl->sk->sk_data_ready = socket_data_ready;

net/qrtr/qrtr.c

+34 −25

Original line number	Diff line number	Diff line
		@@ -372,23 +372,13 @@ static void qrtr_port_put(struct qrtr_sock *ipc);
		static void qrtr_node_rx_work(struct work_struct *work)
		{
		struct qrtr_node *node = container_of(work, struct qrtr_node, work);
		struct qrtr_ctrl_pkt *pkt;
		struct sockaddr_qrtr dst;
		struct sockaddr_qrtr src;
		struct sk_buff *skb;

		while ((skb = skb_dequeue(&node->rx_queue)) != NULL) {
		struct qrtr_sock *ipc;
		struct qrtr_cb *cb;
		int confirm;

		cb = (struct qrtr_cb *)skb->cb;
		src.sq_node = cb->src_node;
		src.sq_port = cb->src_port;
		dst.sq_node = cb->dst_node;
		dst.sq_port = cb->dst_port;
		confirm = !!cb->confirm_rx;

		qrtr_node_assign(node, cb->src_node);

		ipc = qrtr_port_lookup(cb->dst_port);
		@@ -400,20 +390,6 @@ static void qrtr_node_rx_work(struct work_struct *work)

		qrtr_port_put(ipc);
		}

		if (confirm) {
		skb = qrtr_alloc_ctrl_packet(&pkt);
		if (!skb)
		break;

		pkt->cmd = cpu_to_le32(QRTR_TYPE_RESUME_TX);
		pkt->client.node = cpu_to_le32(dst.sq_node);
		pkt->client.port = cpu_to_le32(dst.sq_port);

		if (qrtr_node_enqueue(node, skb, QRTR_TYPE_RESUME_TX,
		&dst, &src))
		break;
		}
		}
		}

		@@ -835,6 +811,36 @@ static int qrtr_sendmsg(struct socket sock, struct msghdr msg, size_t len)
		return rc;
		}

		static int qrtr_resume_tx(struct qrtr_cb *cb)
		{
		struct sockaddr_qrtr remote = { AF_QIPCRTR,
		cb->src_node, cb->src_port };
		struct sockaddr_qrtr local = { AF_QIPCRTR, cb->dst_node, cb->dst_port };
		struct qrtr_ctrl_pkt *pkt;
		struct qrtr_node *node;
		struct sk_buff *skb;
		int ret;

		node = qrtr_node_lookup(remote.sq_node);
		if (!node)
		return -EINVAL;

		skb = qrtr_alloc_ctrl_packet(&pkt);
		if (!skb)
		return -ENOMEM;

		pkt->cmd = cpu_to_le32(QRTR_TYPE_RESUME_TX);
		pkt->client.node = cpu_to_le32(cb->dst_node);
		pkt->client.port = cpu_to_le32(cb->dst_port);

		ret = qrtr_node_enqueue(node, skb, QRTR_TYPE_RESUME_TX,
		&local, &remote);

		qrtr_node_release(node);

		return ret;
		}

		static int qrtr_recvmsg(struct socket sock, struct msghdr msg,
		size_t size, int flags)
		{
		@@ -857,6 +863,7 @@ static int qrtr_recvmsg(struct socket sock, struct msghdr msg,
		release_sock(sk);
		return rc;
		}
		cb = (struct qrtr_cb *)skb->cb;

		copied = skb->len;
		if (copied > size) {
		@@ -870,7 +877,6 @@ static int qrtr_recvmsg(struct socket sock, struct msghdr msg,
		rc = copied;

		if (addr) {
		cb = (struct qrtr_cb *)skb->cb;
		addr->sq_family = AF_QIPCRTR;
		addr->sq_node = cb->src_node;
		addr->sq_port = cb->src_port;
		@@ -878,6 +884,9 @@ static int qrtr_recvmsg(struct socket sock, struct msghdr msg,
		}

		out:
		if (cb->confirm_rx)
		qrtr_resume_tx(cb);

		skb_free_datagram(sk, skb);
		release_sock(sk);