Return-Path: Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=linux.vnet.ibm.com (client-ip=148.163.156.1; helo=mx0a-001b2d01.pphosted.com; envelope-from=eajames@linux.vnet.ibm.com; receiver=) Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3y7N5N56t0zDrJ7 for ; Fri, 6 Oct 2017 06:25:12 +1100 (AEDT) Received: from pps.filterd (m0098393.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id v95JOiKN051550 for ; Thu, 5 Oct 2017 15:25:10 -0400 Received: from e33.co.us.ibm.com (e33.co.us.ibm.com [32.97.110.151]) by mx0a-001b2d01.pphosted.com with ESMTP id 2ddqq2b1ke-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Thu, 05 Oct 2017 15:25:09 -0400 Received: from localhost by e33.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 5 Oct 2017 13:25:06 -0600 Received: from b03cxnp08027.gho.boulder.ibm.com (9.17.130.19) by e33.co.us.ibm.com (192.168.1.133) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 5 Oct 2017 13:25:04 -0600 Received: from b03ledav002.gho.boulder.ibm.com (b03ledav002.gho.boulder.ibm.com [9.17.130.233]) by b03cxnp08027.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id v95JP40a60293246; Thu, 5 Oct 2017 12:25:04 -0700 Received: from b03ledav002.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 0858E13603A; Thu, 5 Oct 2017 13:25:04 -0600 (MDT) Received: from oc3016140333.ibm.com (unknown [9.41.174.252]) by b03ledav002.gho.boulder.ibm.com (Postfix) with ESMTP id BD0D8136043; Thu, 5 Oct 2017 13:25:03 -0600 (MDT) From: Eddie James To: openbmc@lists.ozlabs.org Cc: joel@jms.id.au, andrew@aj.id.au, "Edward A. James" Subject: [PATCH linux dev-4.10 v3 28/31] drivers: fsi: occ: Add cancel to remove() and fix probe() Date: Thu, 5 Oct 2017 14:24:21 -0500 X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1507231464-13635-1-git-send-email-eajames@linux.vnet.ibm.com> References: <1507231464-13635-1-git-send-email-eajames@linux.vnet.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 17100519-0008-0000-0000-000008AB72FA X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00007847; HX=3.00000241; KW=3.00000007; PH=3.00000004; SC=3.00000235; SDB=6.00926924; UDB=6.00466363; IPR=6.00707180; BA=6.00005623; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009; ZB=6.00000000; ZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00017410; XFM=3.00000015; UTC=2017-10-05 19:25:05 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17100519-0009-0000-0000-0000443E9361 Message-Id: <1507231464-13635-29-git-send-email-eajames@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2017-10-05_08:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=1 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1707230000 definitions=main-1710050269 X-BeenThere: openbmc@lists.ozlabs.org X-Mailman-Version: 2.1.24 Precedence: list List-Id: Development list for OpenBMC List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Oct 2017 19:25:13 -0000 From: "Edward A. James" Need some data to indicate to clients and the rest of the driver when the device is being removed, so add a cancel boolean. Fix up both the probe and remove functions to properly handle failures and prevent deadlocks. Signed-off-by: Edward A. James --- drivers/fsi/occ.c | 86 +++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 62 insertions(+), 24 deletions(-) diff --git a/drivers/fsi/occ.c b/drivers/fsi/occ.c index 8555e99..1770823 100644 --- a/drivers/fsi/occ.c +++ b/drivers/fsi/occ.c @@ -46,6 +46,7 @@ struct occ { spinlock_t list_lock; /* lock access to the xfrs list */ struct mutex occ_lock; /* lock access to the hardware */ struct work_struct work; + bool cancel; }; #define to_occ(x) container_of((x), struct occ, mdev) @@ -117,12 +118,15 @@ struct occ_client { static DEFINE_IDA(occ_ida); -static void occ_enqueue_xfr(struct occ_xfr *xfr) +static int occ_enqueue_xfr(struct occ_xfr *xfr) { int empty; struct occ_client *client = to_client(xfr); struct occ *occ = client->occ; + if (occ->cancel) + return -ECANCELED; + spin_lock_irq(&occ->list_lock); empty = list_empty(&occ->xfrs); @@ -132,14 +136,20 @@ static void occ_enqueue_xfr(struct occ_xfr *xfr) if (empty) queue_work(occ_wq, &occ->work); + + return 0; } static struct occ_client *occ_open_common(struct occ *occ, unsigned long flags) { - struct occ_client *client = kzalloc(sizeof(*client), GFP_KERNEL); + struct occ_client *client; + + if (occ->cancel) + return ERR_PTR(-ECANCELED); + client = kzalloc(sizeof(*client), GFP_KERNEL); if (!client) - return NULL; + return ERR_PTR(-ENOMEM); client->occ = occ; spin_lock_init(&client->lock); @@ -158,8 +168,8 @@ static int occ_open(struct inode *inode, struct file *file) struct occ *occ = to_occ(mdev); client = occ_open_common(occ, file->f_flags); - if (!client) - return -ENOMEM; + if (IS_ERR(client)) + return PTR_ERR(client); file->private_data = client; @@ -172,6 +182,7 @@ static ssize_t occ_read_common(struct occ_client *client, char __user *ubuf, int rc; size_t bytes; struct occ_xfr *xfr = &client->xfr; + struct occ *occ = client->occ; if (len > OCC_SRAM_BYTES) return -EINVAL; @@ -204,7 +215,8 @@ static ssize_t occ_read_common(struct occ_client *client, char __user *ubuf, test_bit(XFR_COMPLETE, &xfr->flags) || test_bit(XFR_CANCELED, - &xfr->flags)); + &xfr->flags) || + occ->cancel); spin_lock_irq(&client->lock); @@ -272,7 +284,7 @@ static ssize_t occ_write_common(struct occ_client *client, spin_lock_irq(&client->lock); - if (test_and_set_bit(CLIENT_XFR_PENDING, &client->flags)) { + if (test_bit(CLIENT_XFR_PENDING, &client->flags)) { rc = -EBUSY; goto done; } @@ -310,8 +322,11 @@ static ssize_t occ_write_common(struct occ_client *client, xfr->cmd_data_length = data_length + 6; client->read_offset = 0; - occ_enqueue_xfr(xfr); + rc = occ_enqueue_xfr(xfr); + if (rc) + goto done; + set_bit(CLIENT_XFR_PENDING, &client->flags); rc = len; done: @@ -583,6 +598,9 @@ static void occ_worker(struct work_struct *work) struct device *sbefifo = occ->sbefifo; again: + if (occ->cancel) + return; + spin_lock_irq(&occ->list_lock); xfr = list_first_entry_or_null(&occ->xfrs, struct occ_xfr, link); @@ -676,12 +694,17 @@ static void occ_worker(struct work_struct *work) struct occ_client *occ_drv_open(struct device *dev, unsigned long flags) { + struct occ_client *client; struct occ *occ = dev_get_drvdata(dev); if (!occ) return NULL; - return occ_open_common(occ, flags); + client = occ_open_common(occ, flags); + if (IS_ERR(client)) + return NULL; + + return client; } EXPORT_SYMBOL_GPL(occ_drv_open); @@ -752,23 +775,13 @@ static int occ_probe(struct platform_device *pdev) if (occ->idx < 0) occ->idx = ida_simple_get(&occ_ida, 1, INT_MAX, GFP_KERNEL); - } else + } else { occ->idx = ida_simple_get(&occ_ida, 1, INT_MAX, GFP_KERNEL); - - /* create platform devs for dts child nodes (hwmon, etc) */ - for_each_child_of_node(dev->of_node, np) { - snprintf(child_name, sizeof(child_name), "occ%d-dev%d", - occ->idx, child_idx++); - child = of_platform_device_create(np, child_name, dev); - if (!child) - dev_warn(dev, - "failed to create child node dev\n"); } - } else + } else { occ->idx = ida_simple_get(&occ_ida, 1, INT_MAX, GFP_KERNEL); - - platform_set_drvdata(pdev, occ); + } snprintf(occ->name, sizeof(occ->name), "occ%d", occ->idx); occ->mdev.fops = &occ_fops; @@ -778,20 +791,45 @@ static int occ_probe(struct platform_device *pdev) rc = misc_register(&occ->mdev); if (rc) { - dev_err(dev, "failed to register miscdevice\n"); + dev_err(dev, "failed to register miscdevice: %d\n", rc); + ida_simple_remove(&occ_ida, occ->idx); return rc; } + /* create platform devs for dts child nodes (hwmon, etc) */ + for_each_available_child_of_node(dev->of_node, np) { + snprintf(child_name, sizeof(child_name), "occ%d-dev%d", + occ->idx, child_idx++); + child = of_platform_device_create(np, child_name, dev); + if (!child) + dev_warn(dev, "failed to create child node dev\n"); + } + + platform_set_drvdata(pdev, occ); + return 0; } static int occ_remove(struct platform_device *pdev) { struct occ *occ = platform_get_drvdata(pdev); + struct occ_xfr *xfr; + struct occ_client *client; + + occ->cancel = true; + + spin_lock_irq(&occ->list_lock); + list_for_each_entry(xfr, &occ->xfrs, link) { + client = to_client(xfr); + wake_up_all(&client->wait); + } + spin_unlock_irq(&occ->list_lock); - flush_work(&occ->work); misc_deregister(&occ->mdev); device_for_each_child(&pdev->dev, NULL, occ_unregister_child); + + cancel_work_sync(&occ->work); + ida_simple_remove(&occ_ida, occ->idx); return 0; -- 1.8.3.1