On Wed, Sep 27, 2023 at 07:05:33PM +0200, Stefano Brivio wrote:On Mon, 25 Sep 2023 13:07:24 +1000 David Gibson <david(a)gibson.dropbear.id.au> wrote:Sure, if we could think of one. Except, on second thoughts, I'm not sure my characterization is correct. If the tap side window is full then, indeed, we can't accept data from the socket. However if everything we have is in flight that doesn't mean we couldn't put more data into flight if it arrived. That consideration, together with the way we use MSG_PEEK possibly means that we fundamentally need to use edge-triggered interrupts - with the additional trickiness that entails - to avoid busy polling. Although even that only works if we get a new edge interrupt when data is added to a buffer that's been PEEKed but not TRUNCed. If that's not true the MSG_PEEK approach might be doomed :(.I think the change itself here is sound, but I have some nits to pick with the description and reasoning. On Sat, Sep 23, 2023 at 12:06:07AM +0200, Stefano Brivio wrote:Right. I mean, we can also call them differently... or maybe pick a name that reflects the outcome/handling instead of what happened.In tcp_tap_handler(), we shouldn't reset the STALLED flag (indicating that we ran out of tap-side window space, or that all available socket data is already in flight -- better names welcome!Hmm.. when you put it like that it makes me wonder if those two quite different conditions really need the same handling. Hrm.. I guess both conditions mean that we can't accept data from the socket, even if it's availble.Uh.. I don't think that actually helps. Remember pools aren't queues. The point here is that is that the packet we're considering is not the first of the batch/pool/whatever, but the first of what's left.Well, it depends on what we call "batch" -- here I meant the pool of packets (that are passed as a batch to tcp_tap_handler()). Yes, "pool" would be more accurate.) on any event: do that only if the first packet in a batch has the ACK flag set."First packet in a batch" may not be accurate here - we're looking at whichever packet we were up to before calling data_from_tap(). There could have been earlier packets in the receive batch that were already processed.Ok.This also raises the question of why the first data packet should be particularly privileged here.No reason other than convenience, and yes, it can be subtly wrong.I'm wondering if what we really want to check is whether data_from_tap() advanced the ack pointer at all.Right, we probably should do that instead.Ah, ok, I wasn't aware of that case.I'm not clear on when the th->ack check would ever fail in practice: aren't the only normal packets in a TCP connection without ACK the initial SYN or an RST? We've handled the SYN case earlier, so should we just have a blanket case above this that if we get a packet with !ACK, we reset the connection?One thing that's legitimate (rarely seen, but I've seen it, I don't remember if the Linux kernel ever does that) is a segment without ACK, and without data, that just updates the window (for example after a zero window). If the sequence received/processed so far doesn't correspond to the latest sequence sent, omitting the ACK flag is useful so that the window update is not taken as duplicate ACK (that would trigger retransmission).So specifically to mask EPOLLRDHUP as well? On the grounds that if we're still chewing on what we got already we don't yet care that we've reached the end, yes? So yes, explicitly masking both those makes more sense to me.. except that as above, I suspect we can't have level-triggered + MSG_PEEK + no busy polling all at once.Hmm, yes, and by doing a quick isolated test actually this seems to work as intended in the kernel. I should drop this and try again.Make sure we check for pending socket data when we reset it: reverting back to level-triggered epoll events, as tcp_epoll_ctl() does, isn't guaranteed to actually trigger a socket event.Which sure seems like a kernel bug. Some weird edge conditions for edge-triggered seems expected, but this doesn't seem like valid level-triggered semantics.Hmmm... is toggling EPOLLET even what we want. IIUC, the heart of what's going on here is that we can't take more data from the socket until something happens on the tap side (either the window expands, or it acks some data). In which case should we be toggling EPOLLIN on the socket instead? That seems more explicitly to be saying to the socket side "we don't currently care if you have data available".The reason was to act on EPOLLRDHUP at the same time. But well, we could just mask EPOLLIN and EPOLLRDHUP, then -- I guess that would make more sense.For the moment being, we should probably try to see what happens if this patch simply moves conn_flag(c, conn, ~STALLED); to where 3/5 needs it (or directly incorporate that into 3/5).Ok. -- David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson