5 files changed, 53 insertions, 3 deletions

diff --git a/fs/afs/rotate.c b/fs/afs/rotate.c
index e065bc0768e6..1faef56b12bd 100644
--- a/fs/afs/rotate.c
+++ b/fs/afs/rotate.c
@@ -310,6 +310,10 @@ bool afs_select_fileserver(struct afs_fs_cursor *fc)
         case -ETIME:
                 _debug("no conn");
                 goto iterate_address;
+
+        case -ECONNRESET:
+                _debug("call reset");
+                goto failed;
         }
 
 restart_from_beginning:
diff --git a/include/trace/events/rxrpc.h b/include/trace/events/rxrpc.h
index 077e664ac9a2..4fff00e9da8a 100644
--- a/include/trace/events/rxrpc.h
+++ b/include/trace/events/rxrpc.h
@@ -1459,6 +1459,38 @@ TRACE_EVENT(rxrpc_tx_fail,
                       __print_symbolic(__entry->what, rxrpc_tx_fail_traces))
             );
 
+TRACE_EVENT(rxrpc_call_reset,
+            TP_PROTO(struct rxrpc_call *call),
+
+            TP_ARGS(call),
+
+            TP_STRUCT__entry(
+                    __field(unsigned int,               debug_id        )
+                    __field(u32,                        cid             )
+                    __field(u32,                        call_id         )
+                    __field(rxrpc_serial_t,             call_serial     )
+                    __field(rxrpc_serial_t,             conn_serial     )
+                    __field(rxrpc_seq_t,                tx_seq          )
+                    __field(rxrpc_seq_t,                rx_seq          )
+                             ),
+
+            TP_fast_assign(
+                    __entry->debug_id = call->debug_id;
+                    __entry->cid = call->cid;
+                    __entry->call_id = call->call_id;
+                    __entry->call_serial = call->rx_serial;
+                    __entry->conn_serial = call->conn->hi_serial;
+                    __entry->tx_seq = call->tx_hard_ack;
+                    __entry->rx_seq = call->ackr_seen;
+                           ),
+
+            TP_printk("c=%08x %08x:%08x r=%08x/%08x tx=%08x rx=%08x",
+                      __entry->debug_id,
+                      __entry->cid, __entry->call_id,
+                      __entry->call_serial, __entry->conn_serial,
+                      __entry->tx_seq, __entry->rx_seq)
+            );
+
 #endif /* _TRACE_RXRPC_H */
 
 /* This part must be outside protection */
diff --git a/net/rxrpc/ar-internal.h b/net/rxrpc/ar-internal.h
index 19975d2ca9a2..b2393113a251 100644
--- a/net/rxrpc/ar-internal.h
+++ b/net/rxrpc/ar-internal.h
@@ -477,6 +477,7 @@ enum rxrpc_call_flag {
         RXRPC_CALL_PINGING,             /* Ping in process */
         RXRPC_CALL_RETRANS_TIMEOUT,     /* Retransmission due to timeout occurred */
         RXRPC_CALL_BEGAN_RX_TIMER,      /* We began the expect_rx_by timer */
+        RXRPC_CALL_RX_HEARD,            /* The peer responded at least once to this call */
 };
 
 /*
@@ -624,6 +625,7 @@ struct rxrpc_call {
                                                  */
         rxrpc_seq_t             rx_top;         /* Highest Rx slot allocated. */
         rxrpc_seq_t             rx_expect_next; /* Expected next packet sequence number */
+        rxrpc_serial_t          rx_serial;      /* Highest serial received for this call */
         u8                      rx_winsize;     /* Size of Rx window */
         u8                      tx_winsize;     /* Maximum size of Tx window */
         bool                    tx_phase;       /* T if transmission phase, F if receive phase */
diff --git a/net/rxrpc/call_event.c b/net/rxrpc/call_event.c
index 6e0d788b4dc4..20210418904b 100644
--- a/net/rxrpc/call_event.c
+++ b/net/rxrpc/call_event.c
@@ -392,7 +392,13 @@ recheck_state:
 
         /* Process events */
         if (test_and_clear_bit(RXRPC_CALL_EV_EXPIRED, &call->events)) {
-                rxrpc_abort_call("EXP", call, 0, RX_USER_ABORT, -ETIME);
+                if (test_bit(RXRPC_CALL_RX_HEARD, &call->flags) &&
+                    (int)call->conn->hi_serial - (int)call->rx_serial > 0) {
+                        trace_rxrpc_call_reset(call);
+                        rxrpc_abort_call("EXP", call, 0, RX_USER_ABORT, -ECONNRESET);
+                } else {
+                        rxrpc_abort_call("EXP", call, 0, RX_USER_ABORT, -ETIME);
+                }
                 set_bit(RXRPC_CALL_EV_ABORT, &call->events);
                 goto recheck_state;
         }
diff --git a/net/rxrpc/input.c b/net/rxrpc/input.c
index b5fd6381313d..608d078a4981 100644
--- a/net/rxrpc/input.c
+++ b/net/rxrpc/input.c
@@ -1278,8 +1278,14 @@ void rxrpc_data_ready(struct sock *udp_sk)
                         call = NULL;
                 }
 
-                if (call && sp->hdr.serviceId != call->service_id)
-                        call->service_id = sp->hdr.serviceId;
+                if (call) {
+                        if (sp->hdr.serviceId != call->service_id)
+                                call->service_id = sp->hdr.serviceId;
+                        if ((int)sp->hdr.serial - (int)call->rx_serial > 0)
+                                call->rx_serial = sp->hdr.serial;
+                        if (!test_bit(RXRPC_CALL_RX_HEARD, &call->flags))
+                                set_bit(RXRPC_CALL_RX_HEARD, &call->flags);
+                }
         } else {
                 skew = 0;
                 call = NULL;