bkinnightskytw
/
ethercat
mirror of https://gitlab.com/bkinnightskytw/ethercat.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Applied 0017-Master-locks-to-avoid-corrupted-datagram-queue.patch

This commit is contained in:
Florian Pose 2022-06-23 11:26:20 +02:00
parent d1e3d2e0a3
commit cef602586c
1 changed files with 39 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
master/ioctl.c
View File

@ -57,6 +57,16 @@
#define ATTRIBUTES #define ATTRIBUTES
#endif #endif
/** Ioctl locking is disabled for RTDM as the RT app needs to use RTAI locks.
*/
#ifdef EC_IOCTL_RTDM
#define ec_ioctl_lock_down_interruptible(p) 0
#define ec_ioctl_lock_up(p) do {} while (0)
#else
#define ec_ioctl_lock_down_interruptible(p) ec_lock_down_interruptible(p)
#define ec_ioctl_lock_up(p) ec_lock_up(p)
#endif
/*****************************************************************************/ /*****************************************************************************/
/** Copies a string to an ioctl structure. /** Copies a string to an ioctl structure.
@ -2100,8 +2110,15 @@ static ATTRIBUTES int ec_ioctl_send(
return -EPERM; return -EPERM;
} }
/* Locking added as send is likely to be used by more than
one application tasks */
if (ec_ioctl_lock_down_interruptible(&master->master_sem))
return -EINTR;
sent_bytes = ecrt_master_send(master); sent_bytes = ecrt_master_send(master);
ec_ioctl_lock_up(&master->master_sem);
if (copy_to_user((void __user *) arg, &sent_bytes, sizeof(sent_bytes))) { if (copy_to_user((void __user *) arg, &sent_bytes, sizeof(sent_bytes))) {
return -EFAULT; return -EFAULT;
} }
@ -2125,7 +2142,14 @@ static ATTRIBUTES int ec_ioctl_receive(
return -EPERM; return -EPERM;
} }
/* Locking added as receive is likely to be used by more than
one application tasks */
if (ec_ioctl_lock_down_interruptible(&master->master_sem))
return -EINTR;
ecrt_master_receive(master); ecrt_master_receive(master);
ec_ioctl_lock_up(&master->master_sem);
return 0; return 0;
} }
@ -3441,14 +3465,19 @@ static ATTRIBUTES int ec_ioctl_domain_process(
if (unlikely(!ctx->requested)) if (unlikely(!ctx->requested))
return -EPERM; return -EPERM;
/* no locking of master_sem needed, because domain will not be deleted in /* Locking added as domain processing is likely to be used by more than
* the meantime. */ one application tasks */
if (ec_ioctl_lock_down_interruptible(&master->master_sem)) {
return -EINTR;
}
if (!(domain = ec_master_find_domain(master, (unsigned long) arg))) { if (!(domain = ec_master_find_domain(master, (unsigned long) arg))) {
ec_ioctl_lock_up(&master->master_sem);
return -ENOENT; return -ENOENT;
} }
ecrt_domain_process(domain); ecrt_domain_process(domain);
ec_ioctl_lock_up(&master->master_sem);
return 0; return 0;
} }
@ -3469,14 +3498,20 @@ static ATTRIBUTES int ec_ioctl_domain_queue(
if (unlikely(!ctx->requested)) if (unlikely(!ctx->requested))
return -EPERM; return -EPERM;
/* no locking of master_sem needed, because domain will not be deleted in /* Locking added as domain queing is likely to be used by more than
* the meantime. */ one application tasks */
if (ec_ioctl_lock_down_interruptible(&master->master_sem))
return -EINTR;
if (!(domain = ec_master_find_domain(master, (unsigned long) arg))) { if (!(domain = ec_master_find_domain(master, (unsigned long) arg))) {
ec_ioctl_lock_up(&master->master_sem);
return -ENOENT; return -ENOENT;
} }
ecrt_domain_queue(domain); ecrt_domain_queue(domain);
ec_ioctl_lock_up(&master->master_sem);
return 0; return 0;
} }