The ipmi module is shared between pb-config and pb-discover. During
system initilisation, we're likely to have a few invocations of
pb-config running, as well as pb-discover starting.
We may have multiple potential concurrent accesses to the ipmi device
node. To avoid problems, this change introduces a fcntl lock on the
device node.
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
{
struct timeval start, now, delta;
struct pollfd pollfds[1];
{
struct timeval start, now, delta;
struct pollfd pollfds[1];
+ memset(&lock, 0, sizeof(lock));
+ lock.l_type = F_WRLCK;
+ lock.l_whence = SEEK_SET;
+ rc = fcntl(ipmi->fd, F_SETLKW, &lock);
+ if (rc == -1) {
+ pb_log("IPMI: error locking IPMI device: %m\n");
+ return rc;
+ }
+
rc = ipmi_send(ipmi, netfn, cmd, req_buf, req_len);
if (rc)
rc = ipmi_send(ipmi, netfn, cmd, req_buf, req_len);
if (rc)
pollfds[0].fd = ipmi->fd;
pollfds[0].events = POLLIN;
pollfds[0].fd = ipmi->fd;
pollfds[0].events = POLLIN;
if (rc == 0) {
pb_log("IPMI: timeout waiting for response "
"(netfn %d, cmd %d)\n", netfn, cmd);
if (rc == 0) {
pb_log("IPMI: timeout waiting for response "
"(netfn %d, cmd %d)\n", netfn, cmd);
break;
}
if (!(pollfds[0].revents & POLLIN)) {
pb_log("IPMI: unexpected fd status from poll?\n");
break;
}
if (!(pollfds[0].revents & POLLIN)) {
pb_log("IPMI: unexpected fd status from poll?\n");
expired_ms = (delta.tv_sec * 1000) +
(delta.tv_usec / 1000);
expired_ms = (delta.tv_sec * 1000) +
(delta.tv_usec / 1000);
- if (expired_ms >= timeout_ms)
+ if (expired_ms >= timeout_ms) {
+ rc = -1;
}
} else {
pb_debug("IPMI: netfn(%x->%x), cmd(%x->%x)\n",
netfn, resp_netfn, cmd, resp_cmd);
}
} else {
pb_debug("IPMI: netfn(%x->%x), cmd(%x->%x)\n",
netfn, resp_netfn, cmd, resp_cmd);
+out:
+ lock.l_type = F_UNLCK;
+ fcntl(ipmi->fd, F_SETLKW, &lock);
+ return rc ? -1 : 0;
}
static int ipmi_destroy(void *p)
}
static int ipmi_destroy(void *p)