[PATCH] IB uverbs: add mthca user PD support
Add support for userspace protection domains (PDs) to mthca. Signed-off-by: Roland Dreier <rolandd@cisco.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
53b8b3ffd5
commit
99264c1ee2
|
@ -1,6 +1,7 @@
|
|||
/*
|
||||
* Copyright (c) 2004, 2005 Topspin Communications. All rights reserved.
|
||||
* Copyright (c) 2005 Sun Microsystems, Inc. All rights reserved.
|
||||
* Copyright (c) 2005 Cisco Systems. 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
|
||||
|
@ -378,7 +379,7 @@ void mthca_unregister_device(struct mthca_dev *dev);
|
|||
int mthca_uar_alloc(struct mthca_dev *dev, struct mthca_uar *uar);
|
||||
void mthca_uar_free(struct mthca_dev *dev, struct mthca_uar *uar);
|
||||
|
||||
int mthca_pd_alloc(struct mthca_dev *dev, struct mthca_pd *pd);
|
||||
int mthca_pd_alloc(struct mthca_dev *dev, int privileged, struct mthca_pd *pd);
|
||||
void mthca_pd_free(struct mthca_dev *dev, struct mthca_pd *pd);
|
||||
|
||||
struct mthca_mtt *mthca_alloc_mtt(struct mthca_dev *dev, int size);
|
||||
|
|
|
@ -665,7 +665,7 @@ static int __devinit mthca_setup_hca(struct mthca_dev *dev)
|
|||
goto err_pd_table_free;
|
||||
}
|
||||
|
||||
err = mthca_pd_alloc(dev, &dev->driver_pd);
|
||||
err = mthca_pd_alloc(dev, 1, &dev->driver_pd);
|
||||
if (err) {
|
||||
mthca_err(dev, "Failed to create driver PD, "
|
||||
"aborting.\n");
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
/*
|
||||
* Copyright (c) 2004 Topspin Communications. All rights reserved.
|
||||
* Copyright (c) 2005 Cisco Systems. 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
|
||||
|
@ -37,23 +38,27 @@
|
|||
|
||||
#include "mthca_dev.h"
|
||||
|
||||
int mthca_pd_alloc(struct mthca_dev *dev, struct mthca_pd *pd)
|
||||
int mthca_pd_alloc(struct mthca_dev *dev, int privileged, struct mthca_pd *pd)
|
||||
{
|
||||
int err;
|
||||
int err = 0;
|
||||
|
||||
might_sleep();
|
||||
|
||||
pd->privileged = privileged;
|
||||
|
||||
atomic_set(&pd->sqp_count, 0);
|
||||
pd->pd_num = mthca_alloc(&dev->pd_table.alloc);
|
||||
if (pd->pd_num == -1)
|
||||
return -ENOMEM;
|
||||
|
||||
if (privileged) {
|
||||
err = mthca_mr_alloc_notrans(dev, pd->pd_num,
|
||||
MTHCA_MPT_FLAG_LOCAL_READ |
|
||||
MTHCA_MPT_FLAG_LOCAL_WRITE,
|
||||
&pd->ntmr);
|
||||
if (err)
|
||||
mthca_free(&dev->pd_table.alloc, pd->pd_num);
|
||||
}
|
||||
|
||||
return err;
|
||||
}
|
||||
|
@ -61,6 +66,7 @@ int mthca_pd_alloc(struct mthca_dev *dev, struct mthca_pd *pd)
|
|||
void mthca_pd_free(struct mthca_dev *dev, struct mthca_pd *pd)
|
||||
{
|
||||
might_sleep();
|
||||
if (pd->privileged)
|
||||
mthca_free_mr(dev, &pd->ntmr);
|
||||
mthca_free(&dev->pd_table.alloc, pd->pd_num);
|
||||
}
|
||||
|
|
|
@ -368,12 +368,20 @@ static struct ib_pd *mthca_alloc_pd(struct ib_device *ibdev,
|
|||
if (!pd)
|
||||
return ERR_PTR(-ENOMEM);
|
||||
|
||||
err = mthca_pd_alloc(to_mdev(ibdev), pd);
|
||||
err = mthca_pd_alloc(to_mdev(ibdev), !context, pd);
|
||||
if (err) {
|
||||
kfree(pd);
|
||||
return ERR_PTR(err);
|
||||
}
|
||||
|
||||
if (context) {
|
||||
if (ib_copy_to_udata(udata, &pd->pd_num, sizeof (__u32))) {
|
||||
mthca_pd_free(to_mdev(ibdev), pd);
|
||||
kfree(pd);
|
||||
return ERR_PTR(-EFAULT);
|
||||
}
|
||||
}
|
||||
|
||||
return &pd->ibpd;
|
||||
}
|
||||
|
||||
|
|
|
@ -92,6 +92,7 @@ struct mthca_pd {
|
|||
u32 pd_num;
|
||||
atomic_t sqp_count;
|
||||
struct mthca_mr ntmr;
|
||||
int privileged;
|
||||
};
|
||||
|
||||
struct mthca_eq {
|
||||
|
|
Loading…
Reference in New Issue