public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-11-16 11:44:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

drm/amdkfd: Use PASID manager from KGD

Browse source 
Signed-off-by: Felix Kuehling <Felix.Kuehling@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Oded Gabbay <oded.gabbay@gmail.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Felix Kuehling 2017-08-26 02:10:12 -04:00 • committed by Alex Deucher
parent a91e70e30c
commit d2791c4563
2 changed files with 34 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/gpu/drm/amd/amdkfd/kfd_module.c
View file

@ -103,10 +103,6 @@ static int __init kfd_module_init(void)
return -1; return -1;
} }
err = kfd_pasid_init();
if (err < 0)
return err;
err = kfd_chardev_init(); err = kfd_chardev_init();
if (err < 0) if (err < 0)
goto err_ioctl; goto err_ioctl;
@ -126,7 +122,6 @@ static int __init kfd_module_init(void)
err_topology: err_topology:
kfd_chardev_exit(); kfd_chardev_exit();
err_ioctl: err_ioctl:
kfd_pasid_exit();
return err; return err;
} }
@ -137,7 +132,6 @@ static void __exit kfd_module_exit(void)
kfd_process_destroy_wq(); kfd_process_destroy_wq();
kfd_topology_shutdown(); kfd_topology_shutdown();
kfd_chardev_exit(); kfd_chardev_exit();
kfd_pasid_exit();
dev_info(kfd_device, "Removed module\n"); dev_info(kfd_device, "Removed module\n");
} }

82
drivers/gpu/drm/amd/amdkfd/kfd_pasid.c
View file

@ -20,78 +20,64 @@
* OTHER DEALINGS IN THE SOFTWARE. * OTHER DEALINGS IN THE SOFTWARE.
*/ */
#include <linux/slab.h>
#include <linux/types.h> #include <linux/types.h>
#include "kfd_priv.h" #include "kfd_priv.h"
static unsigned long *pasid_bitmap; static unsigned int pasid_bits = 16;
static unsigned int pasid_limit; static const struct kfd2kgd_calls *kfd2kgd;
static DEFINE_MUTEX(pasid_mutex);
int kfd_pasid_init(void)
{
pasid_limit = KFD_MAX_NUM_OF_PROCESSES;
pasid_bitmap = kcalloc(BITS_TO_LONGS(pasid_limit), sizeof(long),
GFP_KERNEL);
if (!pasid_bitmap)
return -ENOMEM;
set_bit(0, pasid_bitmap); /* PASID 0 is reserved. */
return 0;
}
void kfd_pasid_exit(void)
{
kfree(pasid_bitmap);
}
bool kfd_set_pasid_limit(unsigned int new_limit) bool kfd_set_pasid_limit(unsigned int new_limit)
{ {
if (new_limit < pasid_limit) { if (new_limit < 2)
bool ok; return false;
mutex_lock(&pasid_mutex); if (new_limit < (1U << pasid_bits)) {
if (kfd2kgd)
/* We've already allocated user PASIDs, too late to
* change the limit
*/
return false;
/* ensure that no pasids >= new_limit are in-use */ while (new_limit < (1U << pasid_bits))
ok = (find_next_bit(pasid_bitmap, pasid_limit, new_limit) == pasid_bits--;
pasid_limit);
if (ok)
pasid_limit = new_limit;
mutex_unlock(&pasid_mutex);
return ok;
} }
return true; return true;
} }
inline unsigned int kfd_get_pasid_limit(void) unsigned int kfd_get_pasid_limit(void)
{ {
return pasid_limit; return 1U << pasid_bits;
} }
unsigned int kfd_pasid_alloc(void) unsigned int kfd_pasid_alloc(void)
{ {
unsigned int found; int r;
mutex_lock(&pasid_mutex); /* Find the first best KFD device for calling KGD */
if (!kfd2kgd) {
struct kfd_dev *dev = NULL;
unsigned int i = 0;
found = find_first_zero_bit(pasid_bitmap, pasid_limit); while ((dev = kfd_topology_enum_kfd_devices(i)) != NULL) {
if (found == pasid_limit) if (dev && dev->kfd2kgd) {
found = 0; kfd2kgd = dev->kfd2kgd;
else break;
set_bit(found, pasid_bitmap); }
i++;
}
mutex_unlock(&pasid_mutex); if (!kfd2kgd)
return false;
}
return found; r = kfd2kgd->alloc_pasid(pasid_bits);
return r > 0 ? r : 0;
} }
void kfd_pasid_free(unsigned int pasid) void kfd_pasid_free(unsigned int pasid)
{ {
if (!WARN_ON(pasid == 0 || pasid >= pasid_limit)) if (kfd2kgd)
clear_bit(pasid, pasid_bitmap); kfd2kgd->free_pasid(pasid);
} }