From patchwork Tue Jan 31 17:12:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 50973 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp25015wrn; Tue, 31 Jan 2023 09:16:28 -0800 (PST) X-Google-Smtp-Source: AMrXdXujFZH590rTAdTKHxauj5YIscrGGkgpNA5BpY2hmlFesGh4HoAGs9WbBxWRlEnZGOy7dOJ4 X-Received: by 2002:a17:906:8d0f:b0:870:b950:18d4 with SMTP id rv15-20020a1709068d0f00b00870b95018d4mr62371777ejc.5.1675185388378; Tue, 31 Jan 2023 09:16:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675185388; cv=none; d=google.com; s=arc-20160816; b=0+Lrqltrljbna8yUNsWwXs2nJZmBgQNufcjsNWuTzVHuFhmv1BEWg/d2sJMXhiyNL/ 9llTVNyoIE0z5nUOyYLJHGmTadKiwQipA6elVj/F0/XSesXxpXGkgSIANlyMF7GGweUf Ys+fqn53smxDM9lq1gE6wjbnf/3oycebkCZcE3rM5i3urY5xGoO0Cm4wAg7NdsK53oRl PQZTScGV61gx41/6YGeMPyhjxD3N0tBQZdl5ZU82XEPk5kwJyaEMTPvt6HJM7ffPh1So KAkiHLee9G4+0Dz44QfQVPRRH2sgVar5BnyUKYLsyRzqaVgRLsSvkJzxNJeVZW0ekJ33 7pXg== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=j1lXQHsaAbWcsJQO5nY7N03i/YDSxEw0AXdAKk8e3hQ=; b=zpuSH1qk5/000j/CNTL9G3yTeBE8jGq19VJpxMOZ7YnRVJc4fAYE2jCPMGsZ+e1Iod b8R/EvMX4JXaxxoyd7IE1l+IRwSLcFrXQFAbpndgQhg/QId7OYneHCbgHsyY6SR7t5cy Y0Kqq/RhLdnDxNOCsrfFytFXxoYPyubxrCloD8EXXtTs61DbWCmfocsNFnlTlgxZ0usp brKOUNvBiIoSpcWsCEf4YSpJJD56KnNa+rWtIRkRh4ncoks6osunUDpx9MxzvpjcAMGi L2pdRqDkS5opsAgF6ivCTFlNW7uYQVMKTvNJZC4ouw9wwfB3bQTF5sfULN7MIOIk0dZp LsYQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=g8NaYVZ7; 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 c17-20020a50f611000000b004a08a5f9e49si19411607edn.48.2023.01.31.09.16.04; Tue, 31 Jan 2023 09:16:28 -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=g8NaYVZ7; 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 S231945AbjAaROA (ORCPT + 99 others); Tue, 31 Jan 2023 12:14:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46294 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231918AbjAaRNv (ORCPT ); Tue, 31 Jan 2023 12:13:51 -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 157A53CE1A for ; Tue, 31 Jan 2023 09:12:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675185165; 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=j1lXQHsaAbWcsJQO5nY7N03i/YDSxEw0AXdAKk8e3hQ=; b=g8NaYVZ7niBqOkclu/KwehbbPy2bClRV2eu+whsts4HobRSXtdJVcho0ksULM5pBF8ODyq eHDTpnAv+BZrTt43AhFNKHdYFbjeb6dr9/XuEaLDOipDO+7eCQ9coQxE7FZ+mPpxMghUPl vcTdwMteqfqkQlqcCixERWAzSlUVIMg= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-207-MYvx5GMcPImWdouy3JYrLA-1; Tue, 31 Jan 2023 12:12:40 -0500 X-MC-Unique: MYvx5GMcPImWdouy3JYrLA-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C3A6C18ABFA5; Tue, 31 Jan 2023 17:12:32 +0000 (UTC) Received: from warthog.procyon.org.uk.com (unknown [10.33.36.97]) by smtp.corp.redhat.com (Postfix) with ESMTP id AA87D1431C5B; Tue, 31 Jan 2023 17:12:31 +0000 (UTC) From: David Howells To: netdev@vger.kernel.org Cc: David Howells , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Marc Dionne , linux-afs@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next 01/13] rxrpc: Fix trace string Date: Tue, 31 Jan 2023 17:12:15 +0000 Message-Id: <20230131171227.3912130-2-dhowells@redhat.com> In-Reply-To: <20230131171227.3912130-1-dhowells@redhat.com> References: <20230131171227.3912130-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 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=unavailable 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?1756559193469467371?= X-GMAIL-MSGID: =?utf-8?q?1756559193469467371?= Fix a trace string to indicate that it's discarding the local endpoint for a preallocated peer, not a preallocated connection. Signed-off-by: David Howells cc: Marc Dionne cc: linux-afs@lists.infradead.org --- include/trace/events/rxrpc.h | 2 +- net/rxrpc/call_accept.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/trace/events/rxrpc.h b/include/trace/events/rxrpc.h index 283db0ea3db4..31524d605319 100644 --- a/include/trace/events/rxrpc.h +++ b/include/trace/events/rxrpc.h @@ -163,7 +163,7 @@ EM(rxrpc_local_put_for_use, "PUT for-use ") \ EM(rxrpc_local_put_kill_conn, "PUT conn-kil") \ EM(rxrpc_local_put_peer, "PUT peer ") \ - EM(rxrpc_local_put_prealloc_conn, "PUT conn-pre") \ + EM(rxrpc_local_put_prealloc_peer, "PUT peer-pre") \ EM(rxrpc_local_put_release_sock, "PUT rel-sock") \ EM(rxrpc_local_stop, "STOP ") \ EM(rxrpc_local_stopped, "STOPPED ") \ diff --git a/net/rxrpc/call_accept.c b/net/rxrpc/call_accept.c index 3e8689fdc437..0f5a1d77b890 100644 --- a/net/rxrpc/call_accept.c +++ b/net/rxrpc/call_accept.c @@ -195,7 +195,7 @@ void rxrpc_discard_prealloc(struct rxrpc_sock *rx) tail = b->peer_backlog_tail; while (CIRC_CNT(head, tail, size) > 0) { struct rxrpc_peer *peer = b->peer_backlog[tail]; - rxrpc_put_local(peer->local, rxrpc_local_put_prealloc_conn); + rxrpc_put_local(peer->local, rxrpc_local_put_prealloc_peer); kfree(peer); tail = (tail + 1) & (size - 1); }