Commit 88fe4924 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'char-misc-5.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc 

Pull char/misc driver fixes from Greg KH:
 "Here are some small misc/char driver fixes to resolve some reported
  problems:

   - habanalabs driver fixes

   - Acrn build fixes (reported many times)

   - pvpanic module table export fix

  All of these have been in linux-next for a while with no reported
  issues"

* tag 'char-misc-5.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
  misc/pvpanic: Export module FDT device table
  misc: fastrpc: restrict user apps from sending kernel RPC messages
  virt: acrn: Correct type casting of argument of copy_from_user()
  virt: acrn: Use EPOLLIN instead of POLLIN
  virt: acrn: Use vfs_poll() instead of f_op->poll()
  virt: acrn: Make remove_cpu sysfs invisible with !CONFIG_HOTPLUG_CPU
  cpu/hotplug: Fix build error of using {add,remove}_cpu() with !CONFIG_SMP
  habanalabs: fix debugfs address translation
  habanalabs: Disable file operations after device is removed
  habanalabs: Call put_pid() when releasing control device
  drivers: habanalabs: remove unused dentry pointer for debugfs files
  habanalabs: mark hl_eq_inc_ptr() as static
parents be61af33 65527a51

drivers/misc/fastrpc.c

+5 −0
Original line number Diff line number Diff line
@@ -950,6 +950,11 @@ static int fastrpc_internal_invoke(struct fastrpc_user *fl, u32 kernel, 
	if (!fl->cctx->rpdev)

		return -EPIPE;



	if (handle == FASTRPC_INIT_HANDLE && !kernel) {

		dev_warn_ratelimited(fl->sctx->dev, "user app trying to send a kernel RPC message (%d)\n",  handle);

		return -EPERM;

	}



	ctx = fastrpc_context_alloc(fl, kernel, sc, args);

	if (IS_ERR(ctx))

		return PTR_ERR(ctx);

drivers/misc/habanalabs/common/debugfs.c

+1 −4
Original line number Diff line number Diff line
@@ -992,7 +992,6 @@ void hl_debugfs_add_device(struct hl_device *hdev) 
	struct hl_dbg_device_entry *dev_entry = &hdev->hl_debugfs;

	int count = ARRAY_SIZE(hl_debugfs_list);

	struct hl_debugfs_entry *entry;

	struct dentry *ent;

	int i;



	dev_entry->hdev = hdev;
@@ -1105,13 +1104,11 @@ void hl_debugfs_add_device(struct hl_device *hdev) 
				&hl_security_violations_fops);



	for (i = 0, entry = dev_entry->entry_arr ; i < count ; i++, entry++) {



		ent = debugfs_create_file(hl_debugfs_list[i].name,

		debugfs_create_file(hl_debugfs_list[i].name,

					0444,

					dev_entry->root,

					entry,

					&hl_debugfs_fops);

		entry->dent = ent;

		entry->info_ent = &hl_debugfs_list[i];

		entry->dev_entry = dev_entry;

	}

drivers/misc/habanalabs/common/device.c

+35 −5
Original line number Diff line number Diff line
@@ -93,12 +93,19 @@ void hl_hpriv_put(struct hl_fpriv *hpriv) 
static int hl_device_release(struct inode *inode, struct file *filp)

{

	struct hl_fpriv *hpriv = filp->private_data;

	struct hl_device *hdev = hpriv->hdev;



	filp->private_data = NULL;



	if (!hdev) {

		pr_crit("Closing FD after device was removed. Memory leak will occur and it is advised to reboot.\n");

		put_pid(hpriv->taskpid);

		return 0;

	}



	hl_cb_mgr_fini(hpriv->hdev, &hpriv->cb_mgr);

	hl_ctx_mgr_fini(hpriv->hdev, &hpriv->ctx_mgr);



	filp->private_data = NULL;



	hl_hpriv_put(hpriv);



	return 0;
@@ -107,15 +114,20 @@ static int hl_device_release(struct inode *inode, struct file *filp) 
static int hl_device_release_ctrl(struct inode *inode, struct file *filp)

{

	struct hl_fpriv *hpriv = filp->private_data;

	struct hl_device *hdev;

	struct hl_device *hdev = hpriv->hdev;



	filp->private_data = NULL;



	hdev = hpriv->hdev;

	if (!hdev) {

		pr_err("Closing FD after device was removed\n");

		goto out;

	}



	mutex_lock(&hdev->fpriv_list_lock);

	list_del(&hpriv->dev_node);

	mutex_unlock(&hdev->fpriv_list_lock);

out:

	put_pid(hpriv->taskpid);



	kfree(hpriv);
@@ -134,8 +146,14 @@ static int hl_device_release_ctrl(struct inode *inode, struct file *filp) 
static int hl_mmap(struct file *filp, struct vm_area_struct *vma)

{

	struct hl_fpriv *hpriv = filp->private_data;

	struct hl_device *hdev = hpriv->hdev;

	unsigned long vm_pgoff;



	if (!hdev) {

		pr_err_ratelimited("Trying to mmap after device was removed! Please close FD\n");

		return -ENODEV;

	}



	vm_pgoff = vma->vm_pgoff;

	vma->vm_pgoff = HL_MMAP_OFFSET_VALUE_GET(vm_pgoff);
@@ -883,6 +901,16 @@ static int device_kill_open_processes(struct hl_device *hdev, u32 timeout) 
	return -EBUSY;

}



static void device_disable_open_processes(struct hl_device *hdev)

{

	struct hl_fpriv *hpriv;



	mutex_lock(&hdev->fpriv_list_lock);

	list_for_each_entry(hpriv, &hdev->fpriv_list, dev_node)

		hpriv->hdev = NULL;

	mutex_unlock(&hdev->fpriv_list_lock);

}



/*

 * hl_device_reset - reset the device

 *
@@ -1556,8 +1584,10 @@ void hl_device_fini(struct hl_device *hdev) 
		HL_PENDING_RESET_LONG_SEC);



	rc = device_kill_open_processes(hdev, HL_PENDING_RESET_LONG_SEC);

	if (rc)

	if (rc) {

		dev_crit(hdev->dev, "Failed to kill all open processes\n");

		device_disable_open_processes(hdev);

	}



	hl_cb_pool_fini(hdev);

drivers/misc/habanalabs/common/habanalabs.h

+0 −2
Original line number Diff line number Diff line
@@ -1465,12 +1465,10 @@ struct hl_info_list { 


/**

 * struct hl_debugfs_entry - debugfs dentry wrapper.

 * @dent: base debugfs entry structure.

 * @info_ent: dentry realted ops.

 * @dev_entry: ASIC specific debugfs manager.

 */

struct hl_debugfs_entry {

	struct dentry			*dent;

	const struct hl_info_list	*info_ent;

	struct hl_dbg_device_entry	*dev_entry;

};

drivers/misc/habanalabs/common/habanalabs_ioctl.c

+12 −0
Original line number Diff line number Diff line
@@ -5,6 +5,8 @@ 
 * All Rights Reserved.

 */



#define pr_fmt(fmt)	"habanalabs: " fmt



#include <uapi/misc/habanalabs.h>

#include "habanalabs.h"
@@ -682,6 +684,11 @@ long hl_ioctl(struct file *filep, unsigned int cmd, unsigned long arg) 
	const struct hl_ioctl_desc *ioctl = NULL;

	unsigned int nr = _IOC_NR(cmd);



	if (!hdev) {

		pr_err_ratelimited("Sending ioctl after device was removed! Please close FD\n");

		return -ENODEV;

	}



	if ((nr >= HL_COMMAND_START) && (nr < HL_COMMAND_END)) {

		ioctl = &hl_ioctls[nr];

	} else {
@@ -700,6 +707,11 @@ long hl_ioctl_control(struct file *filep, unsigned int cmd, unsigned long arg) 
	const struct hl_ioctl_desc *ioctl = NULL;

	unsigned int nr = _IOC_NR(cmd);



	if (!hdev) {

		pr_err_ratelimited("Sending ioctl after device was removed! Please close FD\n");

		return -ENODEV;

	}



	if (nr == _IOC_NR(HL_IOCTL_INFO)) {

		ioctl = &hl_ioctls_control[nr];

	} else {