Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fb8593e8 authored by Sagi Grimberg's avatar Sagi Grimberg Committed by Greg Kroah-Hartman
Browse files

nvme-tcp: don't check blk_mq_tag_to_rq when receiving pdu data 



[ Upstream commit 3b01a9d0caa8276d9ce314e09610f7fb70f49a00 ]

We already validate it when receiving the c2hdata pdu header
and this is not changing so this is a redundant check.

Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Signed-off-by: default avatarSagi Grimberg <sagi@grimberg.me>
Reviewed-by: default avatarDaniel Wagner <dwagner@suse.de>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 072660f6

drivers/nvme/host/tcp.c

+3 −11
Original line number Diff line number Diff line
@@ -642,17 +642,9 @@ static int nvme_tcp_recv_data(struct nvme_tcp_queue *queue, struct sk_buff *skb, 
			      unsigned int *offset, size_t *len)

{

	struct nvme_tcp_data_pdu *pdu = (void *)queue->pdu;

	struct nvme_tcp_request *req;

	struct request *rq;



	rq = blk_mq_tag_to_rq(nvme_tcp_tagset(queue), pdu->command_id);

	if (!rq) {

		dev_err(queue->ctrl->ctrl.device,

			"queue %d tag %#x not found\n",

			nvme_tcp_queue_id(queue), pdu->command_id);

		return -ENOENT;

	}

	req = blk_mq_rq_to_pdu(rq);

	struct request *rq =

		blk_mq_tag_to_rq(nvme_tcp_tagset(queue), pdu->command_id);

	struct nvme_tcp_request *req = blk_mq_rq_to_pdu(rq);



	while (true) {

		int recv_len, ret;