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); } }