From patchwork Wed Feb 8 10:27:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 54345 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp3376038wrn; Wed, 8 Feb 2023 02:31:52 -0800 (PST) X-Google-Smtp-Source: AK7set8WL+je9de1iMTXLwsgbSISec/c2T4nO3yDDXnc9cOKA8gz8ruNZ6eg6lSigSfE8ziVTVt8 X-Received: by 2002:a17:906:2098:b0:889:3d10:ae93 with SMTP id 24-20020a170906209800b008893d10ae93mr6440216ejq.6.1675852312093; Wed, 08 Feb 2023 02:31:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675852312; cv=none; d=google.com; s=arc-20160816; b=SMHFveIGRCvzh/87dULgV0JpjPtp8f+gz6o1IpuINDQ8MPcI+m4eyWkTl5CdQjjtkC my7WyBcQr9lgmcQN5I/LfzmOFwVszKCAZTIT/weeCd9Uz/9mskIi+o7FdDV4kXW9evWT Zl2N7Kz6GHL73DxKufJVTrSdcW7oU6Pq/G7AIJx8QGFoa6H5upCaYizSFG0E9Sn3iPQc lrzJCgwWlU+t5R7qfqCmtpzGD6NTAhiiZu+Eo1PvDy/nCGT0sWk0S/BblmwlpApxtsmG kzeLtLYoC/f+c64rUcpbl7hYxGJn57q3N1KZi5d/l38g5eTGbzHu4xbD+mDZPVdPiews FsAw== 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=+0bdW2lu7gvPActE9FfmWhTe4s3T0qdSQp6cZIX9NGg=; b=dgucr6BhtsFl6YEGlwtXEYaTmXOvLBzAh74CT+TMmBi7yILnFoVzlwTUrZMoqys9HQ 8kEX7QK9j3eKUh6VOn3lWpBoL1xbpqTbVjS+sYThm+5dR5v4ug8KW2++twJZi5Ht8l2h YiFSEQFoQiqu97gAkd5Ouhg663iBsYHMnKL9KqzM+7CiRAWr/ARJHYEdUYXrv6ribA77 s0IHR31M+yfrr6TzUPpMX6Nbb920seF+WRmvz8suEBhhPlVguPB5gXDqjchEeRFek9uf aQpnA7bFb6qnCWAPRtOjIy4DmrbJUiOCPS2ExgTICCPxIkkYc9jnxdVb5AeHmXInrQFd dp3Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=VuLI0VxC; 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 mi10-20020a1709071a8a00b0089f801f7702si2399843ejc.682.2023.02.08.02.31.28; Wed, 08 Feb 2023 02:31:52 -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=VuLI0VxC; 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 S231436AbjBHK3G (ORCPT + 99 others); Wed, 8 Feb 2023 05:29:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37578 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231322AbjBHK2r (ORCPT ); Wed, 8 Feb 2023 05:28:47 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 093C246726 for ; Wed, 8 Feb 2023 02:27:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675852079; 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=+0bdW2lu7gvPActE9FfmWhTe4s3T0qdSQp6cZIX9NGg=; b=VuLI0VxCQNd1W6zSY9dbE6CGiF4CgHcisgFdNToUNPKFwImM70jixfAkNdYNSwu1sSFStT H88EBPcdqT1dNPUJYpXj83Z4d6K4fPshH5iZ4eduejASLOWK2ure3Rtn8eWe57wUVFODIQ uXkmRucJ9GPe0hZZ0XKmfTUxkeoriY4= 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-184-gxQTpNX-MGWQGk9aSn4jHg-1; Wed, 08 Feb 2023 05:27:56 -0500 X-MC-Unique: gxQTpNX-MGWQGk9aSn4jHg-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 90659800B23; Wed, 8 Feb 2023 10:27:55 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.33.36.24]) by smtp.corp.redhat.com (Postfix) with ESMTP id 769EB492C3F; Wed, 8 Feb 2023 10:27:54 +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 1/4] rxrpc: Use consume_skb() rather than kfree_skb_reason() Date: Wed, 8 Feb 2023 10:27:47 +0000 Message-Id: <20230208102750.18107-2-dhowells@redhat.com> In-Reply-To: <20230208102750.18107-1-dhowells@redhat.com> References: <20230208102750.18107-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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?1757258513990930213?= X-GMAIL-MSGID: =?utf-8?q?1757258513990930213?= Use consume_skb() rather than kfree_skb_reason(). Reported-by: Paolo Abeni Signed-off-by: David Howells cc: Marc Dionne cc: linux-afs@lists.infradead.org --- net/rxrpc/skbuff.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/rxrpc/skbuff.c b/net/rxrpc/skbuff.c index 944320e65ea8..3bcd6ee80396 100644 --- a/net/rxrpc/skbuff.c +++ b/net/rxrpc/skbuff.c @@ -63,7 +63,7 @@ void rxrpc_free_skb(struct sk_buff *skb, enum rxrpc_skb_trace why) if (skb) { int n = atomic_dec_return(select_skb_count(skb)); trace_rxrpc_skb(skb, refcount_read(&skb->users), n, why); - kfree_skb_reason(skb, SKB_CONSUMED); + consume_skb(skb); } } @@ -78,6 +78,6 @@ void rxrpc_purge_queue(struct sk_buff_head *list) int n = atomic_dec_return(select_skb_count(skb)); trace_rxrpc_skb(skb, refcount_read(&skb->users), n, rxrpc_skb_put_purge); - kfree_skb_reason(skb, SKB_CONSUMED); + consume_skb(skb); } } From patchwork Wed Feb 8 10:27:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 54347 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp3376248wrn; Wed, 8 Feb 2023 02:32:34 -0800 (PST) X-Google-Smtp-Source: AK7set8appdd0f2GZC+/yy4RB2ohkBO6n3GK9v8ui0v135ytYafdo+C/HnFWvaeJooueAM5esnq5 X-Received: by 2002:a17:906:1da:b0:8ae:e5e2:2418 with SMTP id 26-20020a17090601da00b008aee5e22418mr732112ejj.6.1675852354247; Wed, 08 Feb 2023 02:32:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675852354; cv=none; d=google.com; s=arc-20160816; b=pCOuVZcN5Wa4SEDwhV0JoneGwpN3VV8+i0teAu8HfCHqSS8gmnPSYvVXmouHrzM9U3 W0pTo7GSbn9UKwuFq3VY9Hq8XaoK77J2Ky0snJKOfeyHcCr8Ti73oWEkENGz5jYS2eH5 dXqC/onznJkYZ92Qbavey8y6i3cotxMkszjGhoJhkT/2d1ubkBANfLLZbEBSusTLJt7p ZKT5gsV1wzNI2/fo35X89PANZLMffVMvZwrvu5IAvjm0iabH3W6KW8Jekh0ndgQwAT4Z frsONUz5wQj+YtgNVy+O97M5mXgx1+TbKyHOtL6g6p3CL+jrFaomKhxMLVNI2qsyLr5X F+Zw== 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=8H/UOjisVXBilIHmQJZBTMReWmL632uxgSQLNraANrg=; b=dKDSJsFxlvNTXQitJCELNnTpiCR9q433T6rjyMqI9cVhvfrjFp8Os4B+0ChOUzs4h4 5J/LqYu/S3/Akm4SCTzUA4JAO4SRgppsFnjOJ0L4yEu6Dl4iaYOKldgfz0CzlQlFmlt2 9aoJCcXEOSFWOLg+4ODns2L4TyL78QEY8X5+Ls+omP7/+pzLfDxk7eeunAc4nwnbmvx5 DJX+GMkoBSIgKuXKQ2WmP7YF7Wu45eUAZaNhZG6UJSkD/N6y/JbrIXlJxe+DrK6cGhdG fxk/l69FLQPYmxbiWIVmbj8NBr8EgGXoC+iixUzbzKLkbaHm63asJXg3dBH3lXmBI+6W J/dw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=NrZCAawd; 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 u27-20020a170906109b00b0087d0121def7si25694276eju.248.2023.02.08.02.32.11; Wed, 08 Feb 2023 02:32:34 -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=NrZCAawd; 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 S230207AbjBHK3L (ORCPT + 99 others); Wed, 8 Feb 2023 05:29:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37594 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231341AbjBHK2v (ORCPT ); Wed, 8 Feb 2023 05:28: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 329454671F for ; Wed, 8 Feb 2023 02:28:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675852081; 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=8H/UOjisVXBilIHmQJZBTMReWmL632uxgSQLNraANrg=; b=NrZCAawdgBxoweLqgfjjsWg5tWodAX8dzt06uVrswMEi4mt2ZIChyqLEaP+9bD3EGJwpnz Ql7712Fu5vsgNTDjcqIkM42+UgC+meNP94aXENnA7lXTM/SDWtgPFV+6GtRGIy6dV86mZg lRUO/ZmY9MRgu5GORwPQA1BIsDtjqC8= 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-331-89VE2ZaEMQWKDxwI5X3Y8Q-1; Wed, 08 Feb 2023 05:27:57 -0500 X-MC-Unique: 89VE2ZaEMQWKDxwI5X3Y8Q-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4D97085A588; Wed, 8 Feb 2023 10:27:57 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.33.36.24]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2D21B2026D4B; Wed, 8 Feb 2023 10:27:56 +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 2/4] rxrpc: Fix overwaking on call poking Date: Wed, 8 Feb 2023 10:27:48 +0000 Message-Id: <20230208102750.18107-3-dhowells@redhat.com> In-Reply-To: <20230208102750.18107-1-dhowells@redhat.com> References: <20230208102750.18107-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 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?1757258558277934296?= X-GMAIL-MSGID: =?utf-8?q?1757258558277934296?= If an rxrpc call is given a poke, it will get woken up unconditionally, even if there's already a poke pending (for which there will have been a wake) or if the call refcount has gone to 0. Fix this by only waking the call if it is still referenced and if it doesn't already have a poke pending. Fixes: 15f661dc95da ("rxrpc: Implement a mechanism to send an event notification to a call") Signed-off-by: David Howells cc: Marc Dionne cc: linux-afs@lists.infradead.org --- net/rxrpc/call_object.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/net/rxrpc/call_object.c b/net/rxrpc/call_object.c index 6eaffb0d8fdc..e9f1f49d18c2 100644 --- a/net/rxrpc/call_object.c +++ b/net/rxrpc/call_object.c @@ -54,12 +54,14 @@ void rxrpc_poke_call(struct rxrpc_call *call, enum rxrpc_call_poke_trace what) spin_lock_bh(&local->lock); busy = !list_empty(&call->attend_link); trace_rxrpc_poke_call(call, busy, what); + if (!busy && !rxrpc_try_get_call(call, rxrpc_call_get_poke)) + busy = true; if (!busy) { - rxrpc_get_call(call, rxrpc_call_get_poke); list_add_tail(&call->attend_link, &local->call_attend_q); } spin_unlock_bh(&local->lock); - rxrpc_wake_up_io_thread(local); + if (!busy) + rxrpc_wake_up_io_thread(local); } } From patchwork Wed Feb 8 10:27:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 54346 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp3376185wrn; Wed, 8 Feb 2023 02:32:22 -0800 (PST) X-Google-Smtp-Source: AK7set8bfmx1gFvxyDlksYjZcK9JCzF6MjwprX6ViM83vqb/3Bn9DMNhzP2sPPITXHWW9nvaiA4A X-Received: by 2002:a17:906:283:b0:878:5946:c0ac with SMTP id 3-20020a170906028300b008785946c0acmr6369744ejf.3.1675852342497; Wed, 08 Feb 2023 02:32:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675852342; cv=none; d=google.com; s=arc-20160816; b=zkMQTymsm5JwE2ndhWuiUhvcUPHrWVavLpmerEp9z5i3dt5Wj/HgQecrzBQQGlIU7+ wQThFqaT44JjbbCy1COkArlaH5HGoUKCKXCowvcHnB2333Z64tE7mJVDDQurCYSdQxp3 /zoNElZeZfzTu9D0U1ZYdojLrqK+FMHTunCwQ/jTPfend5/t8h4fvuLAOOBNaH3PO8y6 +wSXcE9xkv5DdEMFBMXSN9pqrqBhSigldshc2fRNHPIWuGmXv90aSANWioE4ZH8M4BbH tbFJlWBWhAPzsr5y2bstRQaQdSPSoy7lUgIH1VLoYMaDQA3PNGubk+2jMn61599wcdqC s8YQ== 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=5w/Gjj7DW5ecxl8zA3551kkbDeon6m1PThZoUo8b6x8=; b=d9UlphNBhAem2fIP3op36U0V3T+/RrljceekINDDpjDZbpV2Oti/f4djniJK1+Xt+i pbGPUmEYjxwtycNXhF6ZtAN1IzTy/qxHyC+iQQTOtERwmlhHiCjo6NR6Dy2peCJ8K2cs ApnJzIi5uGbX2NxQYkRwC9gOp4uVQyJm5W9iXg6ORBrGOxA25dGa90zRXxFPgqv7Js1O N0a0fP1ZiPs0RaAt7I6n3GVXt7HJbGhMjXzlN8RxvSYRdLjq8QxrotTkHdD4yFW99Y9k kO1HqXgkIOA/X6Wa3WL1SnK/0CK8zgWNy4V+rDBV4M/v3W8SoNH6lnQCUBbb3rckAFwd J01w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=VBBkpO3D; 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 jr21-20020a170906515500b008879a229030si17222203ejc.292.2023.02.08.02.31.59; Wed, 08 Feb 2023 02:32:22 -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=VBBkpO3D; 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 S231490AbjBHK3j (ORCPT + 99 others); Wed, 8 Feb 2023 05:29:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37646 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231190AbjBHK2z (ORCPT ); Wed, 8 Feb 2023 05:28:55 -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 271DB46738 for ; Wed, 8 Feb 2023 02:28:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675852083; 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=5w/Gjj7DW5ecxl8zA3551kkbDeon6m1PThZoUo8b6x8=; b=VBBkpO3Dq5kcMp9/0BOZ8OnCAgO17m3CNknXhz0XrFC/kNn+2HLD+9xjQdvPPgQRj+0jnJ /IbnoPaVW30pWokmu4EkogWux4R4nUMkay/dOsUHU93x510xZz8EO+k0yQGSn4/zJWuZwV 7POxWZAYNvVHHV+Uc5c7Zs7RFeeRJLM= 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-615-Ppae9fkXOSCdYx20j-_rMQ-1; Wed, 08 Feb 2023 05:27:59 -0500 X-MC-Unique: Ppae9fkXOSCdYx20j-_rMQ-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 23DB9101A521; Wed, 8 Feb 2023 10:27:59 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.33.36.24]) by smtp.corp.redhat.com (Postfix) with ESMTP id 08F4E140EBF4; Wed, 8 Feb 2023 10:27:57 +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 3/4] rxrpc: Trace ack.rwind Date: Wed, 8 Feb 2023 10:27:49 +0000 Message-Id: <20230208102750.18107-4-dhowells@redhat.com> In-Reply-To: <20230208102750.18107-1-dhowells@redhat.com> References: <20230208102750.18107-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=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?1757258545866789100?= X-GMAIL-MSGID: =?utf-8?q?1757258545866789100?= Log ack.rwind in the rxrpc_tx_ack tracepoint. This value is useful to see as it represents flow-control information to the peer. Signed-off-by: David Howells cc: Marc Dionne cc: linux-afs@lists.infradead.org --- include/trace/events/rxrpc.h | 11 +++++++---- net/rxrpc/conn_event.c | 2 +- net/rxrpc/output.c | 10 +++++++--- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/include/trace/events/rxrpc.h b/include/trace/events/rxrpc.h index d7bb4acf4580..c3c0b0aa8381 100644 --- a/include/trace/events/rxrpc.h +++ b/include/trace/events/rxrpc.h @@ -1118,9 +1118,9 @@ TRACE_EVENT(rxrpc_tx_data, TRACE_EVENT(rxrpc_tx_ack, TP_PROTO(unsigned int call, rxrpc_serial_t serial, rxrpc_seq_t ack_first, rxrpc_serial_t ack_serial, - u8 reason, u8 n_acks), + u8 reason, u8 n_acks, u16 rwind), - TP_ARGS(call, serial, ack_first, ack_serial, reason, n_acks), + TP_ARGS(call, serial, ack_first, ack_serial, reason, n_acks, rwind), TP_STRUCT__entry( __field(unsigned int, call) @@ -1129,6 +1129,7 @@ TRACE_EVENT(rxrpc_tx_ack, __field(rxrpc_serial_t, ack_serial) __field(u8, reason) __field(u8, n_acks) + __field(u16, rwind) ), TP_fast_assign( @@ -1138,15 +1139,17 @@ TRACE_EVENT(rxrpc_tx_ack, __entry->ack_serial = ack_serial; __entry->reason = reason; __entry->n_acks = n_acks; + __entry->rwind = rwind; ), - TP_printk(" c=%08x ACK %08x %s f=%08x r=%08x n=%u", + TP_printk(" c=%08x ACK %08x %s f=%08x r=%08x n=%u rw=%u", __entry->call, __entry->serial, __print_symbolic(__entry->reason, rxrpc_ack_names), __entry->ack_first, __entry->ack_serial, - __entry->n_acks) + __entry->n_acks, + __entry->rwind) ); TRACE_EVENT(rxrpc_receive, diff --git a/net/rxrpc/conn_event.c b/net/rxrpc/conn_event.c index 44414e724415..95f4bc206b3d 100644 --- a/net/rxrpc/conn_event.c +++ b/net/rxrpc/conn_event.c @@ -163,7 +163,7 @@ void rxrpc_conn_retransmit_call(struct rxrpc_connection *conn, trace_rxrpc_tx_ack(chan->call_debug_id, serial, ntohl(pkt.ack.firstPacket), ntohl(pkt.ack.serial), - pkt.ack.reason, 0); + pkt.ack.reason, 0, rxrpc_rx_window_size); break; default: diff --git a/net/rxrpc/output.c b/net/rxrpc/output.c index 6b2022240076..5e53429c6922 100644 --- a/net/rxrpc/output.c +++ b/net/rxrpc/output.c @@ -80,7 +80,8 @@ static void rxrpc_set_keepalive(struct rxrpc_call *call) */ static size_t rxrpc_fill_out_ack(struct rxrpc_connection *conn, struct rxrpc_call *call, - struct rxrpc_txbuf *txb) + struct rxrpc_txbuf *txb, + u16 *_rwind) { struct rxrpc_ackinfo ackinfo; unsigned int qsize, sack, wrap, to; @@ -124,6 +125,7 @@ static size_t rxrpc_fill_out_ack(struct rxrpc_connection *conn, jmax = rxrpc_rx_jumbo_max; qsize = (window - 1) - call->rx_consumed; rsize = max_t(int, call->rx_winsize - qsize, 0); + *_rwind = rsize; ackinfo.rxMTU = htonl(rxrpc_rx_mtu); ackinfo.maxMTU = htonl(mtu); ackinfo.rwind = htonl(rsize); @@ -190,6 +192,7 @@ int rxrpc_send_ack_packet(struct rxrpc_call *call, struct rxrpc_txbuf *txb) rxrpc_serial_t serial; size_t len, n; int ret, rtt_slot = -1; + u16 rwind; if (test_bit(RXRPC_CALL_DISCONNECTED, &call->flags)) return -ECONNRESET; @@ -205,7 +208,7 @@ int rxrpc_send_ack_packet(struct rxrpc_call *call, struct rxrpc_txbuf *txb) if (txb->ack.reason == RXRPC_ACK_PING) txb->wire.flags |= RXRPC_REQUEST_ACK; - n = rxrpc_fill_out_ack(conn, call, txb); + n = rxrpc_fill_out_ack(conn, call, txb, &rwind); if (n == 0) return 0; @@ -217,7 +220,8 @@ int rxrpc_send_ack_packet(struct rxrpc_call *call, struct rxrpc_txbuf *txb) txb->wire.serial = htonl(serial); trace_rxrpc_tx_ack(call->debug_id, serial, ntohl(txb->ack.firstPacket), - ntohl(txb->ack.serial), txb->ack.reason, txb->ack.nAcks); + ntohl(txb->ack.serial), txb->ack.reason, txb->ack.nAcks, + rwind); if (txb->ack.reason == RXRPC_ACK_PING) rtt_slot = rxrpc_begin_rtt_probe(call, serial, rxrpc_rtt_tx_ping); From patchwork Wed Feb 8 10:27:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 54353 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp3376800wrn; Wed, 8 Feb 2023 02:34:15 -0800 (PST) X-Google-Smtp-Source: AK7set+srYxNtLkbOESDxa5RQUJyifXTpBIcLmVaiHfNYpgHNnD6ZYSy8prriQjknoVHtS0eE8Rd X-Received: by 2002:a17:90a:f018:b0:230:904a:998e with SMTP id bt24-20020a17090af01800b00230904a998emr6667461pjb.3.1675852454870; Wed, 08 Feb 2023 02:34:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675852454; cv=none; d=google.com; s=arc-20160816; b=b25kyOF7nA7a43idsLw6yhC0XvYccanQ2u1jjO6/Zt2/nDbh7zZIhPprjxeZkRoP5b 9vG6JCjzpP+tJxFqlsN9XsrLiTHcfAYblrxJOi2wQTawZVTmEtIZWODcKPY4yK71etIc WG6DufD14p14d1CVrPqe09LaDTuWutcSu+LDcdcy3jpoNRHZJCJ+6JN3RmsKeIDAJOFX 38JMCMLibdRkPOcg3tqFcdCopewQWHmo3eNh17gwXRsoYmZYs1PZ3UlT2TuLURn988JY K6U7DxW5Suw/Kixpn2tSh2k2whNeqKg+Wt7eVsdqN0RtV4zM+0hlu8ASCX3mPUjIxKiy oXng== 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=AIbGFXSEGrcouEuIniWxwMqD+I+3i7zmAP6fRARvEuo=; b=GMQg0YL27NXKPaRd2XbTLUNbyPYQOwYlFTNdbShBoRsHez26IbQxH41jkJzvYTcUMc L0sIczEm2hg2Q6BtTgo3EioyU+pUi+XGy2Lvz+y+XqGM0bJxkViuH0xYhWyWeOmrRs6P bXrLjkSklluTBI5aHcU4Yb5aCILW3QEjuOeecwXg74ogGmCPtahIDdqdcRg1aEEoWqcu DzgykXgrPsC/d0MU+h7w0uBubydIeM+kHM2Zb2PnEUKXiJ3xNZ7FLyKZi80Y+fsyMyXP U2hMyT5Bb/wJBWXuTL1nIkZK4l3pSWAM5djs3yJz/5rt4fZmpQT52Qr09Sb7gg4yfECi 9PEA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=eZ89A7DB; 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 v29-20020a63b95d000000b004fabdc5c7c3si12441608pgo.495.2023.02.08.02.34.01; Wed, 08 Feb 2023 02:34:14 -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=eZ89A7DB; 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 S230388AbjBHK3P (ORCPT + 99 others); Wed, 8 Feb 2023 05:29:15 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37638 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230203AbjBHK2w (ORCPT ); Wed, 8 Feb 2023 05:28:52 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 67A0B4672A for ; Wed, 8 Feb 2023 02:28:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675852082; 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=AIbGFXSEGrcouEuIniWxwMqD+I+3i7zmAP6fRARvEuo=; b=eZ89A7DBEH3V/4ue2J/8UWZfrBsfAX5tAEkVdpTxpUfxim6AHPS8dOwvgGU93kxXFjcVKQ fitwXOX7TFKr+njnXy5gTG0KDkJ4Sfxvbh+Vz1+oP5cvEbaJgBrQdEEPuSoaQQIfbFmkJI MAT4EuaxJ2aknCOEpRhJ1Qt0p4Ltrj8= 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-670-_iwab9PJNXWBQVklYDQKwA-1; Wed, 08 Feb 2023 05:28:01 -0500 X-MC-Unique: _iwab9PJNXWBQVklYDQKwA-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D773D8030D0; Wed, 8 Feb 2023 10:28:00 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.33.36.24]) by smtp.corp.redhat.com (Postfix) with ESMTP id B71542166B2B; Wed, 8 Feb 2023 10:27:59 +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 4/4] rxrpc: Reduce unnecessary ack transmission Date: Wed, 8 Feb 2023 10:27:50 +0000 Message-Id: <20230208102750.18107-5-dhowells@redhat.com> In-Reply-To: <20230208102750.18107-1-dhowells@redhat.com> References: <20230208102750.18107-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 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?1757258663750268113?= X-GMAIL-MSGID: =?utf-8?q?1757258663750268113?= rxrpc_recvmsg_data() schedules an ACK to be transmitted every time at least two packets have been consumed and any time it runs out of data and would return -EAGAIN to the caller. Both events may occur within a single loop, however, and if the I/O thread is quick enough it may send duplicate ACKs. The ACKs are sent to inform the peer that more space has been made in the local Rx window, but the I/O thread is going to send an ACK every couple of DATA packets anyway, so we end up sending a lot more ACKs than we really need to. So reduce the rate at which recvmsg() schedules ACKs, such that if the I/O thread sends ACKs at its normal faster rate, recvmsg() won't actually schedule ACKs until the Rx flow stops (call->rx_consumed is cleared any time we transmit an ACK for that call, resetting the counter used by recvmsg). Signed-off-by: David Howells cc: Marc Dionne cc: linux-afs@lists.infradead.org --- net/rxrpc/recvmsg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/rxrpc/recvmsg.c b/net/rxrpc/recvmsg.c index 50d263a6359d..76eb2b9cd936 100644 --- a/net/rxrpc/recvmsg.c +++ b/net/rxrpc/recvmsg.c @@ -137,7 +137,7 @@ static void rxrpc_rotate_rx_window(struct rxrpc_call *call) /* Check to see if there's an ACK that needs sending. */ acked = atomic_add_return(call->rx_consumed - old_consumed, &call->ackr_nr_consumed); - if (acked > 2 && + if (acked > 8 && !test_and_set_bit(RXRPC_CALL_RX_IS_IDLE, &call->flags)) rxrpc_poke_call(call, rxrpc_call_poke_idle); }