mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-08-27 11:19:37 +00:00
Code Issues Releases Wiki Activity

[PATCH] IB uverbs: add mthca user PD support

Browse source 
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:
Roland Dreier 2005-07-07 17:57:18 -07:00 committed by Linus Torvalds
parent 53b8b3ffd5
commit 99264c1ee2
5 changed files with 28 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/infiniband/hw/mthca/mthca_dev.h
View file

@ -1,6 +1,7 @@
/* /*
* Copyright (c) 2004, 2005 Topspin Communications. All rights reserved. * Copyright (c) 2004, 2005 Topspin Communications. All rights reserved.
* Copyright (c) 2005 Sun Microsystems, Inc. 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 * 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 * 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); int mthca_uar_alloc(struct mthca_dev *dev, struct mthca_uar *uar);
void mthca_uar_free(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); void mthca_pd_free(struct mthca_dev *dev, struct mthca_pd *pd);
struct mthca_mtt *mthca_alloc_mtt(struct mthca_dev *dev, int size); struct mthca_mtt *mthca_alloc_mtt(struct mthca_dev *dev, int size);

2
drivers/infiniband/hw/mthca/mthca_main.c
View file

@ -665,7 +665,7 @@ static int __devinit mthca_setup_hca(struct mthca_dev *dev)
goto err_pd_table_free; goto err_pd_table_free;
} }
err = mthca_pd_alloc(dev, &dev->driver_pd); err = mthca_pd_alloc(dev, 1, &dev->driver_pd);
if (err) { if (err) {
mthca_err(dev, "Failed to create driver PD, " mthca_err(dev, "Failed to create driver PD, "
"aborting.\n"); "aborting.\n");

24
drivers/infiniband/hw/mthca/mthca_pd.c
View file

@ -1,5 +1,6 @@
/* /*
* Copyright (c) 2004 Topspin Communications. All rights reserved. * 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 * 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 * licenses. You may choose to be licensed under the terms of the GNU
@ -37,23 +38,27 @@
#include "mthca_dev.h" #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(); might_sleep();
pd->privileged = privileged;
atomic_set(&pd->sqp_count, 0); atomic_set(&pd->sqp_count, 0);
pd->pd_num = mthca_alloc(&dev->pd_table.alloc); pd->pd_num = mthca_alloc(&dev->pd_table.alloc);
if (pd->pd_num == -1) if (pd->pd_num == -1)
return -ENOMEM; return -ENOMEM;
err = mthca_mr_alloc_notrans(dev, pd->pd_num, if (privileged) {
MTHCA_MPT_FLAG_LOCAL_READ | err = mthca_mr_alloc_notrans(dev, pd->pd_num,
MTHCA_MPT_FLAG_LOCAL_WRITE, MTHCA_MPT_FLAG_LOCAL_READ |
&pd->ntmr); MTHCA_MPT_FLAG_LOCAL_WRITE,
if (err) &pd->ntmr);
mthca_free(&dev->pd_table.alloc, pd->pd_num); if (err)
mthca_free(&dev->pd_table.alloc, pd->pd_num);
}
return err; return err;
} }
@ -61,7 +66,8 @@ int mthca_pd_alloc(struct mthca_dev *dev, struct mthca_pd *pd)
void mthca_pd_free(struct mthca_dev *dev, struct mthca_pd *pd) void mthca_pd_free(struct mthca_dev *dev, struct mthca_pd *pd)
{ {
might_sleep(); might_sleep();
mthca_free_mr(dev, &pd->ntmr); if (pd->privileged)
mthca_free_mr(dev, &pd->ntmr);
mthca_free(&dev->pd_table.alloc, pd->pd_num); mthca_free(&dev->pd_table.alloc, pd->pd_num);
} }

10
drivers/infiniband/hw/mthca/mthca_provider.c
View file

@ -368,12 +368,20 @@ static struct ib_pd *mthca_alloc_pd(struct ib_device *ibdev,
if (!pd) if (!pd)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
err = mthca_pd_alloc(to_mdev(ibdev), pd); err = mthca_pd_alloc(to_mdev(ibdev), !context, pd);
if (err) { if (err) {
kfree(pd); kfree(pd);
return ERR_PTR(err); 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; return &pd->ibpd;
} }

1
drivers/infiniband/hw/mthca/mthca_provider.h
View file

@ -92,6 +92,7 @@ struct mthca_pd {
u32 pd_num; u32 pd_num;
atomic_t sqp_count; atomic_t sqp_count;
struct mthca_mr ntmr; struct mthca_mr ntmr;
int privileged;
}; };
struct mthca_eq { struct mthca_eq {