pcmcia/pccard deadlock fix
PATCH 1/1 pcmcia/pccard deadlock fix
following patch prevents a mutex/semaphore deadlock within the pcmcia framework when ejecting devices multiple times using pccardctl eject.
For some more details see:
http://lkml.org/lkml/2007/2/19/58
Signature · 3 lines
Markus Rechberger Operating System Research Center AMD Saxony LLC & Co. KG
index ac00424..c02bf0d 100644
drivers/pcmcia/cs.c +2 -1
@@ -856,7 +856,8 @@ int pcmcia_eject_card(struct pcmcia_socket *skt)cs_dbg (skt,1 ,"user eject request\n" ); -mutex_lock (&skt->skt_mutex); +if (!mutex_trylock (&skt->skt_mutex)) +return -EAGAIN ; do { if (!(skt->state & SOCKET_PRESENT)) { ret = -ENODEV;
index 18e111e..b9d3440 100644
drivers/pcmcia/ds.c +3 -1
@@ -1100,7 +1100,9 @@ static ssize_t pcmcia_store_allow_func_id_match(struct device *dev,if (!count)return -EINVAL ; -mutex_lock (&p_dev->socket->skt_mutex); +if (!mutex_trylock (&p_dev->socket->skt_mutex)) +return -EAGAIN ; + p_dev->allow_func_id_match =1 ;mutex_unlock (&p_dev->socket->skt_mutex);
Quoted 23 lines · On Tue, 20 Feb 2007 16:08:11 +0100 "Markus Rechberger"…
following patch prevents a mutex/semaphore deadlock within the pcmcia framework when ejecting devices multiple times using pccardctl eject.
For some more details see:
http://lkml.org/lkml/2007/2/19/58drivers/pcmcia/cs.c +2
-1@@ -856,7 +856,8 @@ int pcmcia_eject_card(struct pcmcia_socket *skt)cs_dbg (skt,1 ,"user eject request\n" ); -mutex_lock (&skt->skt_mutex); +if (!mutex_trylock (&skt->skt_mutex)) +return -EAGAIN ; do { if (!(skt->state & SOCKET_PRESENT)) { ret = -ENODEV;index 18e111e..b9d3440 100644
drivers/pcmcia/ds.c static ssize_t pcmcia_store_allow_func_id_match(struct device *dev, · line 1107
Quoted 9 lines
drivers/pcmcia/ds.c +3
-1@@ -1100,7 +1100,9 @@ static ssize_t pcmcia_store_allow_func_id_match(struct device *dev,if (!count)return -EINVAL ; -mutex_lock (&p_dev->socket->skt_mutex); +if (!mutex_trylock (&p_dev->socket->skt_mutex)) +return -EAGAIN ; + p_dev->allow_func_id_match =1 ;mutex_unlock (&p_dev->socket->skt_mutex);
That looks rather hacky. I'll queue it up to bug Dominik with, but hopeully we'll come up with some fix which avoids the trylocks.
Quoted 1 line
On Tue, 20 Feb 2007 16:08:11 +0100
20 Feb was a long time ago, sorry. I was hoping to feed the pcmcia patches through Dominik but I think he's busy with exams or such. So I get to pretend to be pcmcia maintainer.
Quoted 33 lines · Markus Rechberger
following patch prevents a mutex/semaphore deadlock within the pcmcia framework when ejecting devices multiple times using pccardctl eject.
For some more details see:
http://lkml.org/lkml/2007/2/19/58Signed-off-by Markus Rechberger <[email protected]>Signature · 8 lines
Markus Rechberger Operating System Research Center AMD Saxony LLC & Co. KG [pcmcia-pccard-deadlock-fix.diff text/plain (757B)] index ac00424..c02bf0d 100644drivers/pcmcia/cs.c +2
-1@@ -856,7 +856,8 @@ int pcmcia_eject_card(struct pcmcia_socket *skt)cs_dbg (skt,1 ,"user eject request\n" ); -mutex_lock (&skt->skt_mutex); +if (!mutex_trylock (&skt->skt_mutex)) +return -EAGAIN ; do { if (!(skt->state & SOCKET_PRESENT)) { ret = -ENODEV;index 18e111e..b9d3440 100644
drivers/pcmcia/ds.c static ssize_t pcmcia_store_allow_func_id_match(struct device *dev, · line 1108
Quoted 10 lines
drivers/pcmcia/ds.c +3
-1@@ -1100,7 +1100,9 @@ static ssize_t pcmcia_store_allow_func_id_match(struct device *dev,if (!count)return -EINVAL ; -mutex_lock (&p_dev->socket->skt_mutex); +if (!mutex_trylock (&p_dev->socket->skt_mutex)) +return -EAGAIN ; + p_dev->allow_func_id_match =1 ;mutex_unlock (&p_dev->socket->skt_mutex);
This is a pretty sad-looking solution. Does it not mean that sometimes user-initiated actions will mysteriously fail?
Are you able to provide a more detailed description of why/how the deadlock actually occurs so that perhaps a more robust fix can be implemented?
Thanks.
Quoted 46 lines · Andrew Morton
Quoted 2 lines
On Tue, 20 Feb 2007 16:08:11 +0100
20 Feb was a long time ago, sorry. I was hoping to feed the pcmcia patches through Dominik but I think he's busy with exams or such. So I get to pretend to be pcmcia maintainer.
Quoted 36 lines · Markus Rechberger
following patch prevents a mutex/semaphore deadlock within the pcmcia framework when ejecting devices multiple times using pccardctl eject.
For some more details see:
http://lkml.org/lkml/2007/2/19/58Signed-off-by Markus Rechberger <[email protected]>Signature · 8 lines
Markus Rechberger Operating System Research Center AMD Saxony LLC & Co. KG [pcmcia-pccard-deadlock-fix.diff text/plain (757B)] index ac00424..c02bf0d 100644drivers/pcmcia/cs.c +2
-1@@ -856,7 +856,8 @@ int pcmcia_eject_card(struct pcmcia_socket *skt)cs_dbg (skt,1 ,"user eject request\n" ); -mutex_lock (&skt->skt_mutex); +if (!mutex_trylock (&skt->skt_mutex)) +return -EAGAIN ; do { if (!(skt->state & SOCKET_PRESENT)) { ret = -ENODEV;index 18e111e..b9d3440 100644
drivers/pcmcia/ds.c +0
-0@@ -1100,7 +1100,9 @@ static ssize_t pcmcia_store_allow_func_id_match(struct device *dev,if (!count)return -EINVAL ;
Quoted 12 lines
drivers/pcmcia/ds.c static ssize_t pcmcia_store_allow_func_id_match(struct device *dev, · line 1108
Quoted 8 lines
drivers/pcmcia/ds.c +3
-1-mutex_lock (&p_dev->socket->skt_mutex); +if (!mutex_trylock (&p_dev->socket->skt_mutex)) +return -EAGAIN ; + p_dev->allow_func_id_match =1 ;mutex_unlock (&p_dev->socket->skt_mutex);This is a pretty sad-looking solution. Does it not mean that sometimes user-initiated actions will mysteriously fail?
The userspace application should return the appropriate error then. It can really happen any time when someone tries to eject the pcmcia device (any time as within 1 minute - never in a normal scenario)
Quoted 4 lines
Are you able to provide a more detailed description of why/how the deadlock actually occurs so that perhaps a more robust fix can be implemented?
There's a description about it in following Email:
http://lkml.org/lkml/2007/2/19/58
Markus