Received: by 2002:ab2:3141:0:b0:1ed:23cc:44d1 with SMTP id i1csp409107lqg; Fri, 1 Mar 2024 08:43:33 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCWtWZv9IyR7ald1w4n7PVT/DfamEkm6PTi1lWQhv1ioFPaMl73QG7p394yr+ROHsdWS3p+YmdV9YUsZOfwOokdbQCy7U1dn1fYCNb41Fw== X-Google-Smtp-Source: AGHT+IFMwa43+sJ6tSwRl5JMJPIWD7m/0SYeRXmaWdeybFY9b0ZXp5E2VTke+YaS1U8VTC1AzL/l X-Received: by 2002:a05:620a:60e2:b0:787:d917:8805 with SMTP id dy34-20020a05620a60e200b00787d9178805mr2173741qkb.15.1709311413426; Fri, 01 Mar 2024 08:43:33 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1709311413; cv=pass; d=google.com; s=arc-20160816; b=S1iytrckywBZ3aNneF28w4iRVXLeaWX0d6inYQQkhwuE7id8o3TEQpHeMJunkaEP+g JXXLF8SPHp2CkID7OAbmK74ECYYKykkJkiTmnNGJqXn/W1KeInxRotLGJSA3ToF3N57M qcJZnFoCncTiGsFp6cuqlkXNRfNc8CLD5+i7tgD8JLXO8NvYxwzGmn7n++r/aZkdVjj7 eg827eP5LdtTSZOdci2yKpwL6Sqwkly3AZBkbfxN6Ab8kogZvAMHmF0sp/2aZd5yyju2 25eEXpPLRnyZOAGigbNmLIZzapAV7rJFvrfyQJP3NiZhdlPFpTm6vdlC8tZLMyesMm5z JMdw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=dFZQL0DrD/luJDZ0nEKBrlgAEZrrkxfF6eLg9CJqo1A=; fh=icnuzcdbhXgwjK0pgvJXK7xplE+Och0jvyZv2PxZJ18=; b=HASePShJ/2woAiM8+Hm5JCTpBmW/wh89++ePWMThVeQs6/Y0GqApsTTJZosasCPZeX eP0abCYA1TU3UHG8foUz0hMLSJx9LQXmwOM4z8jSnZ97EZjwc2HkukzkOhmWnswHDtlG BbKcbjqt5ZoalUjwi+d7qpDsQE84CNE+nYdZJC4qtjTkhqfABj4NX7vcXLnu1gcDRoAL Xg8lqGjncSq7ZFrrGuvcLoXGXd9nLIIHZd03lJY5fkHH6/AcjT4MsydyKpvZnZSkHbtx LnzbTHxYzarHJmJ98Ol0p1vRO+ebWDjA9HO2ofjGtmGdEHXPOdJ8krfOe4mISixLw6Gk 7Obg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=LYWQO4Me; arc=pass (i=1 spf=pass spfdomain=redhat.com dkim=pass dkdomain=redhat.com dmarc=pass fromdomain=redhat.com); spf=pass (google.com: domain of linux-kernel+bounces-88731-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-88731-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id d13-20020a05620a166d00b0078802f0ba65si2768564qko.376.2024.03.01.08.43.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Mar 2024 08:43:33 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-88731-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=LYWQO4Me; arc=pass (i=1 spf=pass spfdomain=redhat.com dkim=pass dkdomain=redhat.com dmarc=pass fromdomain=redhat.com); spf=pass (google.com: domain of linux-kernel+bounces-88731-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-88731-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id AFABF1C22D2E for ; Fri, 1 Mar 2024 16:43:32 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 018553CF68; Fri, 1 Mar 2024 16:38:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="LYWQO4Me" Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5DBA03BB3F for ; Fri, 1 Mar 2024 16:38:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709311127; cv=none; b=IxmxhzEa8EllyBWJzB6uMKUCKNBSPyaL0ZcKJ+Zbtj4ed0x76wNi7BecaQ8VsqT2fnQCkn5dj5EkdPTi73EmZ4v8IwrFOgGOQUcVGyfwiB7yCcVRDj67XR3acq5HV4fLTMQgu/s44O4bcoI0cxLbJUF505iYTtH+qZUlk677lrc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709311127; c=relaxed/simple; bh=xqU7TdJ6uMoTB6NE2LCdz37Pqfl01I9/rlA/Td1pBIA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gSlhBziOw6R8Zip2VZWoRc+pvkfmCl0SItrlFpFXHmG2GPcQqjL25xtiDAKFkVJvcv3obJ3xT77LfZ6dDQdOx0/a0GbsWQFtM78VORXEZslvicYAG8M/aeJw+Ma2EtpOwXv6nK5t7BxlvbNBOg8K+wMjuaWo3XMLuEhcgGUblUU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=LYWQO4Me; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709311124; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=dFZQL0DrD/luJDZ0nEKBrlgAEZrrkxfF6eLg9CJqo1A=; b=LYWQO4MeSJ70CUWYGQqlfbh6RxAlbG8iRsjpj5vBmntClxpPZmR61BkK7BRU3B/NbSmSWm mWswP9YYz2x0cei4A5clCZ5dqhUhTKIU/Gs3rrB1Zygod5UIuIIWDFcqR7aWMXVq2f95Nh mHqUq/4yS5ENoDThUdG7HmpEPI4C8jk= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-508-SutcDLVMOKOwhF-oDdjF8Q-1; Fri, 01 Mar 2024 11:38:41 -0500 X-MC-Unique: SutcDLVMOKOwhF-oDdjF8Q-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C9AD73C2E0A5; Fri, 1 Mar 2024 16:38:40 +0000 (UTC) Received: from warthog.procyon.org.com (unknown [10.42.28.114]) by smtp.corp.redhat.com (Postfix) with ESMTP id AA063F96E8; Fri, 1 Mar 2024 16:38:39 +0000 (UTC) From: David Howells To: netdev@vger.kernel.org Cc: David Howells , Marc Dionne , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , linux-afs@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next 16/21] rxrpc: Don't permit resending after all Tx packets acked Date: Fri, 1 Mar 2024 16:37:48 +0000 Message-ID: <20240301163807.385573-17-dhowells@redhat.com> In-Reply-To: <20240301163807.385573-1-dhowells@redhat.com> References: <20240301163807.385573-1-dhowells@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.1 Once all the packets transmitted as part of a call have been acked, don't permit any resending. Signed-off-by: David Howells cc: Marc Dionne cc: "David S. Miller" cc: Eric Dumazet cc: Jakub Kicinski cc: Paolo Abeni cc: linux-afs@lists.infradead.org cc: netdev@vger.kernel.org --- net/rxrpc/call_event.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/net/rxrpc/call_event.c b/net/rxrpc/call_event.c index 58826710322d..ef28ebf37c7d 100644 --- a/net/rxrpc/call_event.c +++ b/net/rxrpc/call_event.c @@ -450,7 +450,9 @@ bool rxrpc_input_call_event(struct rxrpc_call *call, struct sk_buff *skb) rxrpc_send_ACK(call, RXRPC_ACK_PING, 0, rxrpc_propose_ack_ping_for_lost_ack); - if (resend && __rxrpc_call_state(call) != RXRPC_CALL_CLIENT_RECV_REPLY) + if (resend && + __rxrpc_call_state(call) != RXRPC_CALL_CLIENT_RECV_REPLY && + !test_bit(RXRPC_CALL_TX_ALL_ACKED, &call->flags)) rxrpc_resend(call, NULL); if (test_and_clear_bit(RXRPC_CALL_RX_IS_IDLE, &call->flags))