Re: Linux 2.6.0-test9
From: <hidden>
Date: 2003-10-27 19:55:05
Also in:
lkml
Hello!
But I am starting to see that URG is different. It is not like other socket errors that halt the socket and make no new data arrive after it happens. Rather, URG can happen just about anywhere and more data can continue to flow into the socket buffers. In fact, this means that our change can result in an application can never see the error if data continues to arrive faster than the application can pull it out, see? Alexey, I think we did not understand this case fully when making this change.
No doubts taking into account that the things are so badly broken. :-) But I was aware about this problem and even "proved" to you that the patch will not change anything. :-) Remember this?
I found only one more or less essential difference: when we have one oob octet in the stream with data following it, read() can return -EINTR/RESTART due to pending SIGURG and normal data will be read at the second read(), or, alternatively, it can return data following oob octet immediately. In practice there is no real difference: SIGURG is processed before read() returns in any case and even more, with restartable signals it is just exactly no difference.
Actually, I considered the same thing:
quoted hunk
--- 1.49/net/ipv4/tcp.c Mon Oct 20 22:27:42 2003 +++ edited/net/ipv4/tcp.c Sun Oct 26 17:59:14 2003@@ -1536,9 +1536,15 @@struct sk_buff *skb; u32 offset; - /* Are we at urgent data? Stop if we have read anything. */ - if (copied && tp->urg_data && tp->urg_seq == *seq) - break; + /* Are we at urgent data? Stop if we have read anything or have SIGURG pending. */ + if (tp->urg_data && tp->urg_seq == *seq) { + if (copied) + break; + if (signal_pending(current)) { + copied = timeo ? sock_intr_errno(timeo) : -EAGAIN; + break; + } + } /* Next get a buffer. */
as a reliable workaround for SIGURG situation, but then "figured out" that this is not necessary (which was mistake). Though at the moment I still do not understand what exactly is so wrong with that my argument, the signal should be processed before read() returns, should not it? Maybe, rlogin longjmp()s or something like this... Alexey