IB/qib: Remove mmap from qib (cd18201f) · Commits · 戴 / test

drivers/infiniband/hw/qib/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -2,7 +2,7 @@ obj-$(CONFIG_INFINIBAND_QIB) += ib_qib.o

		ib_qib-y := qib_cq.o qib_diag.o qib_driver.o qib_eeprom.o \
		qib_file_ops.o qib_fs.o qib_init.o qib_intr.o \
		qib_mad.o qib_mmap.o qib_pcie.o qib_pio_copy.o \
		qib_mad.o qib_pcie.o qib_pio_copy.o \
		qib_qp.o qib_qsfp.o qib_rc.o qib_ruc.o qib_sdma.o qib_srq.o \
		qib_sysfs.o qib_twsi.o qib_tx.o qib_uc.o qib_ud.o \
		qib_user_pages.o qib_user_sdma.o qib_verbs_mcast.o qib_iba7220.o \

drivers/infiniband/hw/qib/qib_cq.c

+9 −9

Original line number	Diff line number	Diff line
		@@ -264,7 +264,7 @@ struct ib_cq qib_create_cq(struct ib_device ibdev,
		if (udata && udata->outlen >= sizeof(__u64)) {
		int err;

		cq->ip = qib_create_mmap_info(dev, sz, context, wc);
		cq->ip = rvt_create_mmap_info(&dev->rdi, sz, context, wc);
		if (!cq->ip) {
		ret = ERR_PTR(-ENOMEM);
		goto bail_wc;
		@@ -290,9 +290,9 @@ struct ib_cq qib_create_cq(struct ib_device ibdev,
		spin_unlock(&dev->n_cqs_lock);

		if (cq->ip) {
		spin_lock_irq(&dev->pending_lock);
		list_add(&cq->ip->pending_mmaps, &dev->pending_mmaps);
		spin_unlock_irq(&dev->pending_lock);
		spin_lock_irq(&dev->rdi.pending_lock);
		list_add(&cq->ip->pending_mmaps, &dev->rdi.pending_mmaps);
		spin_unlock_irq(&dev->rdi.pending_lock);
		}

		/*
		@@ -342,7 +342,7 @@ int qib_destroy_cq(struct ib_cq *ibcq)
		dev->n_cqs_allocated--;
		spin_unlock(&dev->n_cqs_lock);
		if (cq->ip)
		kref_put(&cq->ip->ref, qib_release_mmap_info);
		kref_put(&cq->ip->ref, rvt_release_mmap_info);
		else
		vfree(cq->queue);
		kfree(cq);
		@@ -468,7 +468,7 @@ int qib_resize_cq(struct ib_cq ibcq, int cqe, struct ib_udata udata)
		struct qib_ibdev *dev = to_idev(ibcq->device);
		struct rvt_mmap_info *ip = cq->ip;

		qib_update_mmap_info(dev, ip, sz, wc);
		rvt_update_mmap_info(&dev->rdi, ip, sz, wc);

		/*
		* Return the offset to mmap.
		@@ -481,10 +481,10 @@ int qib_resize_cq(struct ib_cq ibcq, int cqe, struct ib_udata udata)
		goto bail;
		}

		spin_lock_irq(&dev->pending_lock);
		spin_lock_irq(&dev->rdi.pending_lock);
		if (list_empty(&ip->pending_mmaps))
		list_add(&ip->pending_mmaps, &dev->pending_mmaps);
		spin_unlock_irq(&dev->pending_lock);
		list_add(&ip->pending_mmaps, &dev->rdi.pending_mmaps);
		spin_unlock_irq(&dev->rdi.pending_lock);
		}

		ret = 0;

drivers/infiniband/hw/qib/qib_mmap.c

deleted100644 → 0

+0 −174

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2006, 2007, 2008, 2009 QLogic Corporation. All rights reserved.
		*
		* This software is available to you under a choice of one of two
		* licenses. You may choose to be licensed under the terms of the GNU
		* General Public License (GPL) Version 2, available from the file
		* COPYING in the main directory of this source tree, or the
		* OpenIB.org BSD license below:
		*
		* Redistribution and use in source and binary forms, with or
		* without modification, are permitted provided that the following
		* conditions are met:
		*
		* - Redistributions of source code must retain the above
		* copyright notice, this list of conditions and the following
		* disclaimer.
		*
		* - Redistributions in binary form must reproduce the above
		* copyright notice, this list of conditions and the following
		* disclaimer in the documentation and/or other materials
		* provided with the distribution.
		*
		* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
		* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
		* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
		* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
		* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
		* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
		* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
		* SOFTWARE.
		*/

		#include <linux/module.h>
		#include <linux/slab.h>
		#include <linux/vmalloc.h>
		#include <linux/mm.h>
		#include <linux/errno.h>
		#include <asm/pgtable.h>

		#include "qib_verbs.h"

		/**
		* qib_release_mmap_info - free mmap info structure
		* @ref: a pointer to the kref within struct rvt_mmap_info
		*/
		void qib_release_mmap_info(struct kref *ref)
		{
		struct rvt_mmap_info *ip =
		container_of(ref, struct rvt_mmap_info, ref);
		struct qib_ibdev *dev = to_idev(ip->context->device);

		spin_lock_irq(&dev->pending_lock);
		list_del(&ip->pending_mmaps);
		spin_unlock_irq(&dev->pending_lock);

		vfree(ip->obj);
		kfree(ip);
		}

		/*
		* open and close keep track of how many times the CQ is mapped,
		* to avoid releasing it.
		*/
		static void qib_vma_open(struct vm_area_struct *vma)
		{
		struct rvt_mmap_info *ip = vma->vm_private_data;

		kref_get(&ip->ref);
		}

		static void qib_vma_close(struct vm_area_struct *vma)
		{
		struct rvt_mmap_info *ip = vma->vm_private_data;

		kref_put(&ip->ref, qib_release_mmap_info);
		}

		static const struct vm_operations_struct qib_vm_ops = {
		.open = qib_vma_open,
		.close = qib_vma_close,
		};

		/**
		* qib_mmap - create a new mmap region
		* @context: the IB user context of the process making the mmap() call
		* @vma: the VMA to be initialized
		* Return zero if the mmap is OK. Otherwise, return an errno.
		*/
		int qib_mmap(struct ib_ucontext context, struct vm_area_struct vma)
		{
		struct qib_ibdev *dev = to_idev(context->device);
		unsigned long offset = vma->vm_pgoff << PAGE_SHIFT;
		unsigned long size = vma->vm_end - vma->vm_start;
		struct rvt_mmap_info ip, pp;
		int ret = -EINVAL;

		/*
		* Search the device's list of objects waiting for a mmap call.
		* Normally, this list is very short since a call to create a
		* CQ, QP, or SRQ is soon followed by a call to mmap().
		*/
		spin_lock_irq(&dev->pending_lock);
		list_for_each_entry_safe(ip, pp, &dev->pending_mmaps,
		pending_mmaps) {
		/* Only the creator is allowed to mmap the object */
		if (context != ip->context \|\| (__u64) offset != ip->offset)
		continue;
		/* Don't allow a mmap larger than the object. */
		if (size > ip->size)
		break;

		list_del_init(&ip->pending_mmaps);
		spin_unlock_irq(&dev->pending_lock);

		ret = remap_vmalloc_range(vma, ip->obj, 0);
		if (ret)
		goto done;
		vma->vm_ops = &qib_vm_ops;
		vma->vm_private_data = ip;
		qib_vma_open(vma);
		goto done;
		}
		spin_unlock_irq(&dev->pending_lock);
		done:
		return ret;
		}

		/*
		* Allocate information for qib_mmap
		*/
		struct rvt_mmap_info qib_create_mmap_info(struct qib_ibdev dev,
		u32 size,
		struct ib_ucontext *context,
		void *obj) {
		struct rvt_mmap_info *ip;

		ip = kmalloc(sizeof(*ip), GFP_KERNEL);
		if (!ip)
		goto bail;

		size = PAGE_ALIGN(size);

		spin_lock_irq(&dev->mmap_offset_lock);
		if (dev->mmap_offset == 0)
		dev->mmap_offset = PAGE_SIZE;
		ip->offset = dev->mmap_offset;
		dev->mmap_offset += size;
		spin_unlock_irq(&dev->mmap_offset_lock);

		INIT_LIST_HEAD(&ip->pending_mmaps);
		ip->size = size;
		ip->context = context;
		ip->obj = obj;
		kref_init(&ip->ref);

		bail:
		return ip;
		}

		void qib_update_mmap_info(struct qib_ibdev dev, struct rvt_mmap_info ip,
		u32 size, void *obj)
		{
		size = PAGE_ALIGN(size);

		spin_lock_irq(&dev->mmap_offset_lock);
		if (dev->mmap_offset == 0)
		dev->mmap_offset = PAGE_SIZE;
		ip->offset = dev->mmap_offset;
		dev->mmap_offset += size;
		spin_unlock_irq(&dev->mmap_offset_lock);

		ip->size = size;
		ip->obj = obj;
		}

drivers/infiniband/hw/qib/qib_qp.c

+12 −12

Original line number	Diff line number	Diff line
		@@ -494,12 +494,12 @@ int qib_error_qp(struct rvt_qp *qp, enum ib_wc_status err)
		if (qp->s_flags & QIB_S_ANY_WAIT_SEND)
		qp->s_flags &= ~QIB_S_ANY_WAIT_SEND;

		spin_lock(&dev->pending_lock);
		spin_lock(&dev->rdi.pending_lock);
		if (!list_empty(&priv->iowait) && !(qp->s_flags & QIB_S_BUSY)) {
		qp->s_flags &= ~QIB_S_ANY_WAIT_IO;
		list_del_init(&priv->iowait);
		}
		spin_unlock(&dev->pending_lock);
		spin_unlock(&dev->rdi.pending_lock);

		if (!(qp->s_flags & QIB_S_BUSY)) {
		qp->s_hdrwords = 0;
		@@ -702,10 +702,10 @@ int qib_modify_qp(struct ib_qp ibqp, struct ib_qp_attr attr,
		case IB_QPS_RESET:
		if (qp->state != IB_QPS_RESET) {
		qp->state = IB_QPS_RESET;
		spin_lock(&dev->pending_lock);
		spin_lock(&dev->rdi.pending_lock);
		if (!list_empty(&priv->iowait))
		list_del_init(&priv->iowait);
		spin_unlock(&dev->pending_lock);
		spin_unlock(&dev->rdi.pending_lock);
		qp->s_flags &= ~(QIB_S_TIMER \| QIB_S_ANY_WAIT);
		spin_unlock(&qp->s_lock);
		spin_unlock_irq(&qp->r_lock);
		@@ -1158,7 +1158,7 @@ struct ib_qp qib_create_qp(struct ib_pd ibpd,
		} else {
		u32 s = sizeof(struct rvt_rwq) + qp->r_rq.size * sz;

		qp->ip = qib_create_mmap_info(dev, s,
		qp->ip = rvt_create_mmap_info(&dev->rdi, s,
		ibpd->uobject->context,
		qp->r_rq.wq);
		if (!qp->ip) {
		@@ -1186,9 +1186,9 @@ struct ib_qp qib_create_qp(struct ib_pd ibpd,
		spin_unlock(&dev->n_qps_lock);

		if (qp->ip) {
		spin_lock_irq(&dev->pending_lock);
		list_add(&qp->ip->pending_mmaps, &dev->pending_mmaps);
		spin_unlock_irq(&dev->pending_lock);
		spin_lock_irq(&dev->rdi.pending_lock);
		list_add(&qp->ip->pending_mmaps, &dev->rdi.pending_mmaps);
		spin_unlock_irq(&dev->rdi.pending_lock);
		}

		ret = &qp->ibqp;
		@@ -1196,7 +1196,7 @@ struct ib_qp qib_create_qp(struct ib_pd ibpd,

		bail_ip:
		if (qp->ip)
		kref_put(&qp->ip->ref, qib_release_mmap_info);
		kref_put(&qp->ip->ref, rvt_release_mmap_info);
		else
		vfree(qp->r_rq.wq);
		free_qpn(&dev->qpn_table, qp->ibqp.qp_num);
		@@ -1230,10 +1230,10 @@ int qib_destroy_qp(struct ib_qp *ibqp)
		spin_lock_irq(&qp->s_lock);
		if (qp->state != IB_QPS_RESET) {
		qp->state = IB_QPS_RESET;
		spin_lock(&dev->pending_lock);
		spin_lock(&dev->rdi.pending_lock);
		if (!list_empty(&priv->iowait))
		list_del_init(&priv->iowait);
		spin_unlock(&dev->pending_lock);
		spin_unlock(&dev->rdi.pending_lock);
		qp->s_flags &= ~(QIB_S_TIMER \| QIB_S_ANY_WAIT);
		spin_unlock_irq(&qp->s_lock);
		cancel_work_sync(&priv->s_work);
		@@ -1256,7 +1256,7 @@ int qib_destroy_qp(struct ib_qp *ibqp)
		spin_unlock(&dev->n_qps_lock);

		if (qp->ip)
		kref_put(&qp->ip->ref, qib_release_mmap_info);
		kref_put(&qp->ip->ref, rvt_release_mmap_info);
		else
		vfree(qp->r_rq.wq);
		vfree(qp->s_wq);

drivers/infiniband/hw/qib/qib_sdma.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -697,7 +697,7 @@ busy:
		tx->dwords = dwords;
		priv->s_tx = tx;
		dev = &ppd->dd->verbs_dev;
		spin_lock(&dev->pending_lock);
		spin_lock(&dev->rdi.pending_lock);
		if (list_empty(&priv->iowait)) {
		struct qib_ibport *ibp;

		@@ -706,7 +706,7 @@ busy:
		qp->s_flags \|= QIB_S_WAIT_DMA_DESC;
		list_add_tail(&priv->iowait, &dev->dmawait);
		}
		spin_unlock(&dev->pending_lock);
		spin_unlock(&dev->rdi.pending_lock);
		qp->s_flags &= ~QIB_S_BUSY;
		spin_unlock(&qp->s_lock);
		ret = -EBUSY;

Admin message