Unverified Commit dc1c3c04 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!10604 IB/core: Implement a limit on UMAD receive List 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zhang Changzhong <zhangchangzhong@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/3JNSJBRAFV523ZUY7AXL66X4AFVHDKO6/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAGSPA 
 
Link:https://gitee.com/openeuler/kernel/pulls/10604

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents 91413220 5e5e9746

drivers/infiniband/core/user_mad.c

+15 −6
Original line number Diff line number Diff line
@@ -63,6 +63,8 @@ MODULE_AUTHOR("Roland Dreier"); 
MODULE_DESCRIPTION("InfiniBand userspace MAD packet access");

MODULE_LICENSE("Dual BSD/GPL");



#define MAX_UMAD_RECV_LIST_SIZE 200000



enum {

	IB_UMAD_MAX_PORTS  = RDMA_MAX_PORTS,

	IB_UMAD_MAX_AGENTS = 32,
@@ -113,6 +115,7 @@ struct ib_umad_file { 
	struct mutex		mutex;

	struct ib_umad_port    *port;

	struct list_head	recv_list;

	atomic_t		recv_list_size;

	struct list_head	send_list;

	struct list_head	port_list;

	spinlock_t		send_lock;
@@ -175,24 +178,28 @@ static struct ib_mad_agent *__get_agent(struct ib_umad_file *file, int id) 
	return file->agents_dead ? NULL : file->agent[id];

}



static int queue_packet(struct ib_umad_file *file,

			struct ib_mad_agent *agent,

			struct ib_umad_packet *packet)

static int queue_packet(struct ib_umad_file *file, struct ib_mad_agent *agent,

			struct ib_umad_packet *packet, bool is_recv_mad)

{

	int ret = 1;



	mutex_lock(&file->mutex);



	if (is_recv_mad &&

	    atomic_read(&file->recv_list_size) > MAX_UMAD_RECV_LIST_SIZE)

		goto unlock;



	for (packet->mad.hdr.id = 0;

	     packet->mad.hdr.id < IB_UMAD_MAX_AGENTS;

	     packet->mad.hdr.id++)

		if (agent == __get_agent(file, packet->mad.hdr.id)) {

			list_add_tail(&packet->list, &file->recv_list);

			atomic_inc(&file->recv_list_size);

			wake_up_interruptible(&file->recv_wait);

			ret = 0;

			break;

		}



unlock:

	mutex_unlock(&file->mutex);



	return ret;
@@ -219,7 +226,7 @@ static void send_handler(struct ib_mad_agent *agent, 
	if (send_wc->status == IB_WC_RESP_TIMEOUT_ERR) {

		packet->length = IB_MGMT_MAD_HDR;

		packet->mad.hdr.status = ETIMEDOUT;

		if (!queue_packet(file, agent, packet))

		if (!queue_packet(file, agent, packet, false))

			return;

	}

	kfree(packet);
@@ -279,7 +286,7 @@ static void recv_handler(struct ib_mad_agent *agent, 
		rdma_destroy_ah_attr(&ah_attr);

	}



	if (queue_packet(file, agent, packet))

	if (queue_packet(file, agent, packet, true))

		goto err2;

	return;
@@ -404,6 +411,7 @@ static ssize_t ib_umad_read(struct file *filp, char __user *buf, 


	packet = list_entry(file->recv_list.next, struct ib_umad_packet, list);

	list_del(&packet->list);

	atomic_dec(&file->recv_list_size);



	mutex_unlock(&file->mutex);
@@ -416,6 +424,7 @@ static ssize_t ib_umad_read(struct file *filp, char __user *buf, 
		/* Requeue packet */

		mutex_lock(&file->mutex);

		list_add(&packet->list, &file->recv_list);

		atomic_inc(&file->recv_list_size);

		mutex_unlock(&file->mutex);

	} else {

		if (packet->recv_wc)