From patchwork Tue Nov 8 22:18:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 17234 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp9515wru; Tue, 8 Nov 2022 14:20:55 -0800 (PST) X-Google-Smtp-Source: AMsMyM5pjVmyzd5YtORLW/EGxBa0ktW6pQOXYkrNa926JDzbWpyO63SfdLvsDxa4Gm8J4pXqqb5u X-Received: by 2002:a17:90b:4c48:b0:214:25cd:96e3 with SMTP id np8-20020a17090b4c4800b0021425cd96e3mr38880620pjb.188.1667946055118; Tue, 08 Nov 2022 14:20:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1667946055; cv=none; d=google.com; s=arc-20160816; b=V8CrT3pcNhe60iBlD9+m9/ArC2hzQwUo8fYluS+OFAbZUEY6N8pOCKif45RDk+ACQ2 jgSAHaBed9RVZz5eQMtw1TTDbW9J84kqsAARGOhQVNeIJvAgX0PS1En5nEXybFxT9O9Q zq6a7HoGypyyhL6Trp6W8g8CYBHdQ/3f3cWjehAOXZ7B9/QwjKD4JBsoMsW4KKWze2Dj fORy9f50TPuwpw4crN1EJ2ORzso8TXA9n2q+34V0tBRa3KnqZaTBoNAGvF931GiNNnxr bv+DDwU/eXmU6hWNyCD2wiXmvYc54Hj5Wi6p9y4x/o0BIZD6Hz6KThLU6IPp89WPSSsI XyWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:cc:to:from :subject:organization:dkim-signature; bh=EKWpeoSLCt9caWg8myCdMi2gVDL57gtO1Zf69kLKx3w=; b=pwAVcdiXeJhkoFwE/rx/oq1TsWrWWqXlth1JObO4J0Y74MQu7NJ4CDYloOz+s4w/hr 1udUOQIAjcWOKr547O2uedkUq16qk2HgRkpw/qNnkmBfFp8HXMwKrwqncMK5kXCVCaWS VlFQ5TiVOlni+HQ6+Vxej5Y70r7HspCVTAKYT4d0ZOXyTYjIOrFOLtCVf0bsIJmVnL1w AhRcuq8d7fC3OCigOvwCN/x7Uaxo521hKOg7BP8nZ2P/0Fx7yDGkeT8q0CP352qnuwTI IRlv/9O58yXfa8MFp3mH3aXq1kCN7jf2KXhdn+VmTz8PQG1avvgOxMpyCcDDTrQ9lW4g hyYQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Vypqn7Fd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id nb17-20020a17090b35d100b0021306464b66si15196557pjb.28.2022.11.08.14.20.40; Tue, 08 Nov 2022 14:20:55 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Vypqn7Fd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229887AbiKHWTe (ORCPT + 99 others); Tue, 8 Nov 2022 17:19:34 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45180 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229639AbiKHWTO (ORCPT ); Tue, 8 Nov 2022 17:19:14 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9AAE631B for ; Tue, 8 Nov 2022 14:18:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1667945900; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=EKWpeoSLCt9caWg8myCdMi2gVDL57gtO1Zf69kLKx3w=; b=Vypqn7FdVCDBw3AbEvxdJ7h9U8Ecn5ZLuZQ3qc78B1+0Nkhfs0WrScww0vYNvAfdZBPvo0 PeM0YZh/T1EamUwqP1++ffnmsLu8u1BjEI7i0wd/eQXvmG1Zn8A3fSFazFsourZyq5YcMJ 1Y+p0RQ03WhHNkLXYyT/dyK56F2wOSc= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-137-9NxhZp0TNlmRlWKtEIyuQw-1; Tue, 08 Nov 2022 17:18:19 -0500 X-MC-Unique: 9NxhZp0TNlmRlWKtEIyuQw-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 0A48B1C0513B; Tue, 8 Nov 2022 22:18:19 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.33.37.22]) by smtp.corp.redhat.com (Postfix) with ESMTP id 80B3840C2140; Tue, 8 Nov 2022 22:18:18 +0000 (UTC) Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 3798903 Subject: [PATCH net-next 04/26] rxrpc: Track highest acked serial From: David Howells To: netdev@vger.kernel.org Cc: dhowells@redhat.com, linux-afs@lists.infradead.org, linux-kernel@vger.kernel.org Date: Tue, 08 Nov 2022 22:18:17 +0000 Message-ID: <166794589766.2389296.7622069710077746565.stgit@warthog.procyon.org.uk> In-Reply-To: <166794587113.2389296.16484814996876530222.stgit@warthog.procyon.org.uk> References: <166794587113.2389296.16484814996876530222.stgit@warthog.procyon.org.uk> User-Agent: StGit/1.5 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1748968202220799791?= X-GMAIL-MSGID: =?utf-8?q?1748968202220799791?= Keep track of the highest DATA serial number that has been acked by the peer for future purposes. Signed-off-by: David Howells cc: Marc Dionne cc: linux-afs@lists.infradead.org --- net/rxrpc/ar-internal.h | 1 + net/rxrpc/input.c | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/net/rxrpc/ar-internal.h b/net/rxrpc/ar-internal.h index 1ad0ec5afb50..6c93a2fa9628 100644 --- a/net/rxrpc/ar-internal.h +++ b/net/rxrpc/ar-internal.h @@ -690,6 +690,7 @@ struct rxrpc_call { rxrpc_seq_t acks_lowest_nak; /* Lowest NACK in the buffer (or ==tx_hard_ack) */ rxrpc_seq_t acks_lost_top; /* tx_top at the time lost-ack ping sent */ rxrpc_serial_t acks_lost_ping; /* Serial number of probe ACK */ + rxrpc_serial_t acks_highest_serial; /* Highest serial number ACK'd */ }; /* diff --git a/net/rxrpc/input.c b/net/rxrpc/input.c index 721d847ba92b..4ba678f0c384 100644 --- a/net/rxrpc/input.c +++ b/net/rxrpc/input.c @@ -967,6 +967,10 @@ static void rxrpc_input_ack(struct rxrpc_call *call, struct sk_buff *skb) call->acks_first_seq = first_soft_ack; call->acks_prev_seq = prev_pkt; + if (buf.ack.reason != RXRPC_ACK_PING && + after(acked_serial, call->acks_highest_serial)) + call->acks_highest_serial = acked_serial; + /* Parse rwind and mtu sizes if provided. */ if (buf.info.rxMTU) rxrpc_input_ackinfo(call, skb, &buf.info);