From patchwork Mon Nov 8 10:11:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Borislav Petkov X-Patchwork-Id: 12608181 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 40A9AC433EF for ; Mon, 8 Nov 2021 10:13:09 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0AEBD611C4 for ; Mon, 8 Nov 2021 10:13:09 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 0AEBD611C4 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=alien8.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.223174.385755 (Exim 4.92) (envelope-from ) id 1mk1dp-0000wc-Dy; Mon, 08 Nov 2021 10:12:41 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 223174.385755; Mon, 08 Nov 2021 10:12:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mk1dp-0000wV-AR; Mon, 08 Nov 2021 10:12:41 +0000 Received: by outflank-mailman (input) for mailman id 223174; Mon, 08 Nov 2021 10:12:40 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mk1de-0000ta-EY for xen-devel@lists.xenproject.org; Mon, 08 Nov 2021 10:12:40 +0000 Received: from mail.skyhub.de (mail.skyhub.de [5.9.137.197]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 5cc4e9a2-407c-11ec-a9d2-d9f7a1cc8784; Mon, 08 Nov 2021 11:12:23 +0100 (CET) Received: from zn.tnic (p200300ec2f33110088892b77bd117736.dip0.t-ipconnect.de [IPv6:2003:ec:2f33:1100:8889:2b77:bd11:7736]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.skyhub.de (SuperMail on ZX Spectrum 128k) with ESMTPSA id 8A4191EC0503; Mon, 8 Nov 2021 11:12:22 +0100 (CET) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 5cc4e9a2-407c-11ec-a9d2-d9f7a1cc8784 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alien8.de; s=dkim; t=1636366342; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7P+1psRq8/HfQacGi22yCZu748tDOEEg0nO5q6foNi4=; b=cIuplv9KGmaQtphcAaDmcAC6xl2w0MeOIR4hIYs0MWfdHX/ARzmJwX7Xt95BiWbeP7Vaow /rT1rXqSh9J/jjp/apNMzA/3yRoAtxZawFAJ4KXO2c1kiVMYVwd5D7e8KJhBqrHyMaQLq5 1uAygH3VwNg7vzyFj/holnwvkHSBmBA= From: Borislav Petkov To: LKML Cc: xen-devel@lists.xenproject.org Subject: [PATCH v0 18/42] drivers/xen: Check notifier registration return value Date: Mon, 8 Nov 2021 11:11:33 +0100 Message-Id: <20211108101157.15189-19-bp@alien8.de> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20211108101157.15189-1-bp@alien8.de> References: <20211108101157.15189-1-bp@alien8.de> MIME-Version: 1.0 From: Borislav Petkov Avoid homegrown notifier registration checks. No functional changes. Signed-off-by: Borislav Petkov Cc: xen-devel@lists.xenproject.org --- drivers/xen/manage.c | 3 ++- drivers/xen/xenbus/xenbus_probe.c | 8 +++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/drivers/xen/manage.c b/drivers/xen/manage.c index 374d36de7f5a..f3c5cef0995f 100644 --- a/drivers/xen/manage.c +++ b/drivers/xen/manage.c @@ -48,7 +48,8 @@ static RAW_NOTIFIER_HEAD(xen_resume_notifier); void xen_resume_notifier_register(struct notifier_block *nb) { - raw_notifier_chain_register(&xen_resume_notifier, nb); + if (raw_notifier_chain_register(&xen_resume_notifier, nb)) + pr_warn("Xen resume notifier already registered\n"); } EXPORT_SYMBOL_GPL(xen_resume_notifier_register); diff --git a/drivers/xen/xenbus/xenbus_probe.c b/drivers/xen/xenbus/xenbus_probe.c index bd003ca8acbe..4e83ce95acd1 100644 --- a/drivers/xen/xenbus/xenbus_probe.c +++ b/drivers/xen/xenbus/xenbus_probe.c @@ -731,10 +731,12 @@ int register_xenstore_notifier(struct notifier_block *nb) { int ret = 0; - if (xenstored_ready > 0) + if (xenstored_ready > 0) { ret = nb->notifier_call(nb, 0, NULL); - else - blocking_notifier_chain_register(&xenstore_chain, nb); + } else { + if (blocking_notifier_chain_register(&xenstore_chain, nb)) + pr_warn("Xenstore notifier already registered\n"); + } return ret; }