Unverified Commit 8ad2c84e authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'ffa-fixes-6.8' of... 

Merge tag 'ffa-fixes-6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into arm/fixes

Arm FF-A fixes for v6.8

Quite a few fixes addressing issues around missing RW lock initialisation
in ffa_setup_partitions(), missing check for xa_load() return value,
use of xa_insert instead of xa_store to flag case of duplicate insertion.
It also simplifies ffa_partitions_cleanup() with xa_for_each() and xa_erase()
instead of xa_extract() and kfree(). Finally it includes fixes around
handling of partitions setup failures during initialisation.

* tag 'ffa-fixes-6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux:
  firmware: arm_ffa: Handle partitions setup failures
  firmware: arm_ffa: Use xa_insert() and check for result
  firmware: arm_ffa: Simplify ffa_partitions_cleanup()
  firmware: arm_ffa: Check xa_load() return value
  firmware: arm_ffa: Add missing rwlock_init() for the driver partition
  firmware: arm_ffa: Add missing rwlock_init() in ffa_setup_partitions()

Link: https://lore.kernel.org/r/20240122161652.3551159-1-sudeep.holla@arm.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents d77b016b 0c565d16

drivers/firmware/arm_ffa/driver.c

+57 −28
Original line number Diff line number Diff line
@@ -107,12 +107,12 @@ struct ffa_drv_info { 
	struct work_struct notif_pcpu_work;

	struct work_struct irq_work;

	struct xarray partition_info;

	unsigned int partition_count;

	DECLARE_HASHTABLE(notifier_hash, ilog2(FFA_MAX_NOTIFICATIONS));

	struct mutex notify_lock; /* lock to protect notifier hashtable  */

};



static struct ffa_drv_info *drv_info;

static void ffa_partitions_cleanup(void);



/*

 * The driver must be able to support all the versions from the earliest
@@ -733,6 +733,11 @@ static void __do_sched_recv_cb(u16 part_id, u16 vcpu, bool is_per_vcpu) 
	void *cb_data;



	partition = xa_load(&drv_info->partition_info, part_id);

	if (!partition) {

		pr_err("%s: Invalid partition ID 0x%x\n", __func__, part_id);

		return;

	}



	read_lock(&partition->rw_lock);

	callback = partition->callback;

	cb_data = partition->cb_data;
@@ -915,6 +920,11 @@ static int ffa_sched_recv_cb_update(u16 part_id, ffa_sched_recv_cb callback, 
		return -EOPNOTSUPP;



	partition = xa_load(&drv_info->partition_info, part_id);

	if (!partition) {

		pr_err("%s: Invalid partition ID 0x%x\n", __func__, part_id);

		return -EINVAL;

	}



	write_lock(&partition->rw_lock);



	cb_valid = !!partition->callback;
@@ -1186,9 +1196,9 @@ void ffa_device_match_uuid(struct ffa_device *ffa_dev, const uuid_t *uuid) 
	kfree(pbuf);

}



static void ffa_setup_partitions(void)

static int ffa_setup_partitions(void)

{

	int count, idx;

	int count, idx, ret;

	uuid_t uuid;

	struct ffa_device *ffa_dev;

	struct ffa_dev_part_info *info;
@@ -1197,7 +1207,7 @@ static void ffa_setup_partitions(void) 
	count = ffa_partition_probe(&uuid_null, &pbuf);

	if (count <= 0) {

		pr_info("%s: No partitions found, error %d\n", __func__, count);

		return;

		return -EINVAL;

	}



	xa_init(&drv_info->partition_info);
@@ -1226,40 +1236,53 @@ static void ffa_setup_partitions(void) 
			ffa_device_unregister(ffa_dev);

			continue;

		}

		xa_store(&drv_info->partition_info, tpbuf->id, info, GFP_KERNEL);

		rwlock_init(&info->rw_lock);

		ret = xa_insert(&drv_info->partition_info, tpbuf->id,

				info, GFP_KERNEL);

		if (ret) {

			pr_err("%s: failed to save partition ID 0x%x - ret:%d\n",

			       __func__, tpbuf->id, ret);

			ffa_device_unregister(ffa_dev);

			kfree(info);

		}

	}

	drv_info->partition_count = count;



	kfree(pbuf);



	/* Allocate for the host */

	info = kzalloc(sizeof(*info), GFP_KERNEL);

	if (!info)

		return;

	xa_store(&drv_info->partition_info, drv_info->vm_id, info, GFP_KERNEL);

	drv_info->partition_count++;

	if (!info) {

		pr_err("%s: failed to alloc Host partition ID 0x%x. Abort.\n",

		       __func__, drv_info->vm_id);

		/* Already registered devices are freed on bus_exit */

		ffa_partitions_cleanup();

		return -ENOMEM;

	}



static void ffa_partitions_cleanup(void)

{

	struct ffa_dev_part_info **info;

	int idx, count = drv_info->partition_count;



	if (!count)

		return;

	rwlock_init(&info->rw_lock);

	ret = xa_insert(&drv_info->partition_info, drv_info->vm_id,

			info, GFP_KERNEL);

	if (ret) {

		pr_err("%s: failed to save Host partition ID 0x%x - ret:%d. Abort.\n",

		       __func__, drv_info->vm_id, ret);

		kfree(info);

		/* Already registered devices are freed on bus_exit */

		ffa_partitions_cleanup();

	}



	info = kcalloc(count, sizeof(*info), GFP_KERNEL);

	if (!info)

		return;

	return ret;

}



	xa_extract(&drv_info->partition_info, (void **)info, 0, VM_ID_MASK,

		   count, XA_PRESENT);

static void ffa_partitions_cleanup(void)

{

	struct ffa_dev_part_info *info;

	unsigned long idx;



	for (idx = 0; idx < count; idx++)

		kfree(info[idx]);

	xa_for_each(&drv_info->partition_info, idx, info) {

		xa_erase(&drv_info->partition_info, idx);

		kfree(info);

	}



	drv_info->partition_count = 0;

	xa_destroy(&drv_info->partition_info);

}
@@ -1508,7 +1531,11 @@ static int __init ffa_init(void) 


	ffa_notifications_setup();



	ffa_setup_partitions();

	ret = ffa_setup_partitions();

	if (ret) {

		pr_err("failed to setup partitions\n");

		goto cleanup_notifs;

	}



	ret = ffa_sched_recv_cb_update(drv_info->vm_id, ffa_self_notif_handle,

				       drv_info, true);
@@ -1516,6 +1543,9 @@ static int __init ffa_init(void) 
		pr_info("Failed to register driver sched callback %d\n", ret);



	return 0;



cleanup_notifs:

	ffa_notifications_cleanup();

free_pages:

	if (drv_info->tx_buffer)

		free_pages_exact(drv_info->tx_buffer, RXTX_BUFFER_SIZE);
@@ -1535,7 +1565,6 @@ static void __exit ffa_exit(void) 
	ffa_rxtx_unmap(drv_info->vm_id);

	free_pages_exact(drv_info->tx_buffer, RXTX_BUFFER_SIZE);

	free_pages_exact(drv_info->rx_buffer, RXTX_BUFFER_SIZE);

	xa_destroy(&drv_info->partition_info);

	kfree(drv_info);

	arm_ffa_bus_exit();

}