From patchwork Tue Aug 3 14:15:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Andrzej Siewior X-Patchwork-Id: 491805 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_RED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 84D2FC4320A for ; Tue, 3 Aug 2021 14:17:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6A8A960F46 for ; Tue, 3 Aug 2021 14:17:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236555AbhHCORV (ORCPT ); Tue, 3 Aug 2021 10:17:21 -0400 Received: from Galois.linutronix.de ([193.142.43.55]:56910 "EHLO galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236525AbhHCORU (ORCPT ); Tue, 3 Aug 2021 10:17:20 -0400 From: Sebastian Andrzej Siewior DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1628000228; 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=0k6H0TlpQiIG8T0gkNhLFAoaG8dP3h1ysdzyIOTlzbg=; b=IdCNmtXWkWR04l93utaEbWisUqgSX+dBsCOfdXQoDAipMLnvjKsikYNCRqqU899fMoXuTg s8yxboNK+sIuCbRlmz/nNr65YmVO5Yzg3nUsZFk8xoNYyfig1BWc8zPY2DZ3jZ2bQNoapo Z9617OCaHPL4RkhCRUQFGz4nLnERe4gz9zt8oycKx6Ll1C2IkRt7U4EJ7BLHoPVxOVgu+K A2FzxUImK30aqumH9YfdkWZnAJtGIRre2wJOoIw4zbYHXNNkrPz2fg3xjPBjZAHRPQir2I xhiUOX87sMzRmwG1DpTDkxRGwlhphjLQXiuwqIFzjidNCR1D5dJNiYKbmdkwKQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1628000228; 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=0k6H0TlpQiIG8T0gkNhLFAoaG8dP3h1ysdzyIOTlzbg=; b=udVCVLJ2newdh0ZNz56+jM9pkapoG3FVJX45U+XcubImZJjAMfVV4GflHIaF7zx5LTUb9A oEOrO6NraEAp6sCA== To: linux-kernel@vger.kernel.org Cc: tglx@linutronix.de, Peter Zijlstra , Sebastian Andrzej Siewior , Gonglei , "Michael S. Tsirkin" , Jason Wang , Herbert Xu , "David S. Miller" , virtualization@lists.linux-foundation.org, linux-crypto@vger.kernel.org Subject: [PATCH 12/38] crypto: virtio: Replace deprecated CPU-hotplug functions. Date: Tue, 3 Aug 2021 16:15:55 +0200 Message-Id: <20210803141621.780504-13-bigeasy@linutronix.de> In-Reply-To: <20210803141621.780504-1-bigeasy@linutronix.de> References: <20210803141621.780504-1-bigeasy@linutronix.de> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org The functions get_online_cpus() and put_online_cpus() have been deprecated during the CPU hotplug rework. They map directly to cpus_read_lock() and cpus_read_unlock(). Replace deprecated CPU-hotplug functions with the official version. The behavior remains unchanged. Cc: Gonglei Cc: "Michael S. Tsirkin" Cc: Jason Wang Cc: Herbert Xu Cc: "David S. Miller" Cc: virtualization@lists.linux-foundation.org Cc: linux-crypto@vger.kernel.org Signed-off-by: Sebastian Andrzej Siewior --- drivers/crypto/virtio/virtio_crypto_core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/crypto/virtio/virtio_crypto_core.c b/drivers/crypto/virtio/virtio_crypto_core.c index 080955a1dd9c0..e2375d9923087 100644 --- a/drivers/crypto/virtio/virtio_crypto_core.c +++ b/drivers/crypto/virtio/virtio_crypto_core.c @@ -187,9 +187,9 @@ static int virtcrypto_init_vqs(struct virtio_crypto *vi) if (ret) goto err_free; - get_online_cpus(); + cpus_read_lock(); virtcrypto_set_affinity(vi); - put_online_cpus(); + cpus_read_unlock(); return 0; From patchwork Tue Aug 3 14:16:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Andrzej Siewior X-Patchwork-Id: 491066 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4C067C4320A for ; Tue, 3 Aug 2021 14:17:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 357F36054F for ; Tue, 3 Aug 2021 14:17:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236625AbhHCORl (ORCPT ); Tue, 3 Aug 2021 10:17:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55026 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236631AbhHCOR2 (ORCPT ); Tue, 3 Aug 2021 10:17:28 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7D31BC06179E; Tue, 3 Aug 2021 07:17:14 -0700 (PDT) From: Sebastian Andrzej Siewior DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1628000233; 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=BIWpi0J5GKgm++CC4pz/dS7QJOqOdYQfXdusIGoqZtU=; b=fbxorotkjX+w9iOuY5fTl6mXiRrH2STnzhtXgQvRtfYnyoTaLlVLRGNkIhx01UbFNg5/Xf EIJfblnVYXSN3VApYpI20NeBoKobofjuVNgZ9JiBWQMPZxFQXCmJzKdqwwtbopPEnAHktQ g6YZ33G+hRYMp/ew63Zy+b2umvD1ZoSqxLIFt2c5QufnDv4//zpx9piHkB5SquMoqxPSQ6 UZUWsbAiuNc3Bs4n9ENSIwmPn6GMdFHfi55EoIch+YddG6c38pBeJiaOT0rNcuRPl/+VgR iBM/RQWicizTZatysPB6Q2UGZRcJDPzGrqb50NIPk1XFNTjQp2NEQhZVhEKJgA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1628000233; 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=BIWpi0J5GKgm++CC4pz/dS7QJOqOdYQfXdusIGoqZtU=; b=C4y5/A858fS5TBmqcro9QQblLa4w8CPAL90ixhf1v288yA6l/ODjX87mip3hRWm7TciyXt 7vHG/P/k1pxIpODQ== To: linux-kernel@vger.kernel.org Cc: tglx@linutronix.de, Peter Zijlstra , Sebastian Andrzej Siewior , Steffen Klassert , Daniel Jordan , linux-crypto@vger.kernel.org Subject: [PATCH 27/38] padata: Replace deprecated CPU-hotplug functions. Date: Tue, 3 Aug 2021 16:16:10 +0200 Message-Id: <20210803141621.780504-28-bigeasy@linutronix.de> In-Reply-To: <20210803141621.780504-1-bigeasy@linutronix.de> References: <20210803141621.780504-1-bigeasy@linutronix.de> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org The functions get_online_cpus() and put_online_cpus() have been deprecated during the CPU hotplug rework. They map directly to cpus_read_lock() and cpus_read_unlock(). Replace deprecated CPU-hotplug functions with the official version. The behavior remains unchanged. Cc: Steffen Klassert Cc: Daniel Jordan Cc: linux-crypto@vger.kernel.org Signed-off-by: Sebastian Andrzej Siewior Acked-by: Daniel Jordan --- kernel/padata.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/kernel/padata.c b/kernel/padata.c index d4d3ba6e1728a..0b0b6e8917d10 100644 --- a/kernel/padata.c +++ b/kernel/padata.c @@ -733,7 +733,7 @@ int padata_set_cpumask(struct padata_instance *pinst, int cpumask_type, struct cpumask *serial_mask, *parallel_mask; int err = -EINVAL; - get_online_cpus(); + cpus_read_lock(); mutex_lock(&pinst->lock); switch (cpumask_type) { @@ -753,7 +753,7 @@ int padata_set_cpumask(struct padata_instance *pinst, int cpumask_type, out: mutex_unlock(&pinst->lock); - put_online_cpus(); + cpus_read_unlock(); return err; } @@ -992,7 +992,7 @@ struct padata_instance *padata_alloc(const char *name) if (!pinst->parallel_wq) goto err_free_inst; - get_online_cpus(); + cpus_read_lock(); pinst->serial_wq = alloc_workqueue("%s_serial", WQ_MEM_RECLAIM | WQ_CPU_INTENSIVE, 1, name); @@ -1026,7 +1026,7 @@ struct padata_instance *padata_alloc(const char *name) &pinst->cpu_dead_node); #endif - put_online_cpus(); + cpus_read_unlock(); return pinst; @@ -1036,7 +1036,7 @@ struct padata_instance *padata_alloc(const char *name) err_free_serial_wq: destroy_workqueue(pinst->serial_wq); err_put_cpus: - put_online_cpus(); + cpus_read_unlock(); destroy_workqueue(pinst->parallel_wq); err_free_inst: kfree(pinst); @@ -1074,9 +1074,9 @@ struct padata_shell *padata_alloc_shell(struct padata_instance *pinst) ps->pinst = pinst; - get_online_cpus(); + cpus_read_lock(); pd = padata_alloc_pd(ps); - put_online_cpus(); + cpus_read_unlock(); if (!pd) goto out_free_ps;