Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp4829161pxu; Thu, 10 Dec 2020 06:32:25 -0800 (PST) X-Google-Smtp-Source: ABdhPJzSJ/QnXkiRIJN2A2mRK/S5VkO5Ccqa81O78wqTKtljBfrrGBrwjk3lUDIj8Mukv415ShRR X-Received: by 2002:aa7:d494:: with SMTP id b20mr7312170edr.330.1607610745166; Thu, 10 Dec 2020 06:32:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1607610745; cv=none; d=google.com; s=arc-20160816; b=zw1QYXHm9aK61toW7jh+2lgV4LywA6GG83oQH3DafRbI5jj2aObndu1HS1JISz6fWe gmFzErr5HUSfZJUKt4gtCBwpNmZIietgCSIp0AUpKnjiJP7yiWL7BN8eShuW7yYp6RLE PDxn17Ft/qgz19X5NUJfPNcAMkNSQZ5tZdukcHzwMhaZegnnhnJVoClLsXaecXk61NcT B4rpdpyQiFatksvNdl04LievR5Gsvsj0XeXqjiE70v6YROcKw2PjjBW/Bv1oTt9932Hi OO/dYTB1NF5EeLxMuRpYpPLkD8oOw8KqkTimutHikm2vsP0VDlTwimG0iZ9pV6yY8tDM eZcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:references:in-reply-to :message-id:date:subject:cc:to:from; bh=z1Q6WpP0VoYp8JfPeZtTUim/0KiM/fMlFr2kSQBct3w=; b=kz0OySkEAQb/Vk+8MHWy+yZfIg17xZGRArY1Y/L8zVOA4XBGsxHNYcqputayER8C3v +Ui7Wcbx+8T6fsoLUKu2tIPTwIgdfzBsMNTcr3WBNPC6Q/yklFtqhfDj1NCXi5YiXA7S QH/lEcZq+1zZ0aWGW2/QtYK9Q5E8a4Nx0QW50T6pxlddWEcEQOVW2mBIfGytyPpDZ07r 6+GYrCVX4w0w7MUhQdtFH3vQHMsoGwda3nZZytQgmMuhAiop5ex2N1Z9nykeq3pPnqQ+ DiwgMB6G7KF/TisM0ZhR+qUS1gxBEDHtH+BTsyjvDcToGBbCpculZRoO2Td/hjsu/rPs LVcw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id np6si2573508ejb.609.2020.12.10.06.32.01; Thu, 10 Dec 2020 06:32:25 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389310AbgLJK7C (ORCPT + 99 others); Thu, 10 Dec 2020 05:59:02 -0500 Received: from out30-131.freemail.mail.aliyun.com ([115.124.30.131]:49964 "EHLO out30-131.freemail.mail.aliyun.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389254AbgLJK5h (ORCPT ); Thu, 10 Dec 2020 05:57:37 -0500 X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R101e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=e01e04394;MF=baolin.wang@linux.alibaba.com;NM=1;PH=DS;RN=5;SR=0;TI=SMTPD_---0UI8pCt1_1607597813; Received: from localhost(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0UI8pCt1_1607597813) by smtp.aliyun-inc.com(127.0.0.1); Thu, 10 Dec 2020 18:56:53 +0800 From: Baolin Wang To: axboe@kernel.dk, tj@kernel.org Cc: baolin.wang@linux.alibaba.com, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] blk-iocost: Use alloc_percpu_gfp() to simplify the code Date: Thu, 10 Dec 2020 18:56:45 +0800 Message-Id: X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1ba7a38d5a6186b1e71432ef424c23ba1904a365.1607591591.git.baolin.wang@linux.alibaba.com> References: <1ba7a38d5a6186b1e71432ef424c23ba1904a365.1607591591.git.baolin.wang@linux.alibaba.com> In-Reply-To: <1ba7a38d5a6186b1e71432ef424c23ba1904a365.1607591591.git.baolin.wang@linux.alibaba.com> References: <1ba7a38d5a6186b1e71432ef424c23ba1904a365.1607591591.git.baolin.wang@linux.alibaba.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use alloc_percpu_gfp() with __GFP_ZERO flag, which can remove some explicit initialization code. Signed-off-by: Baolin Wang --- block/blk-iocost.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/block/blk-iocost.c b/block/blk-iocost.c index ac6078a..52ce2e3 100644 --- a/block/blk-iocost.c +++ b/block/blk-iocost.c @@ -2819,28 +2819,19 @@ static int blk_iocost_init(struct request_queue *q) { struct ioc *ioc; struct rq_qos *rqos; - int i, cpu, ret; + int ret; + gfp_t gfp = GFP_KERNEL | __GFP_ZERO; ioc = kzalloc(sizeof(*ioc), GFP_KERNEL); if (!ioc) return -ENOMEM; - ioc->pcpu_stat = alloc_percpu(struct ioc_pcpu_stat); + ioc->pcpu_stat = alloc_percpu_gfp(struct ioc_pcpu_stat, gfp); if (!ioc->pcpu_stat) { kfree(ioc); return -ENOMEM; } - for_each_possible_cpu(cpu) { - struct ioc_pcpu_stat *ccs = per_cpu_ptr(ioc->pcpu_stat, cpu); - - for (i = 0; i < ARRAY_SIZE(ccs->missed); i++) { - local_set(&ccs->missed[i].nr_met, 0); - local_set(&ccs->missed[i].nr_missed, 0); - } - local64_set(&ccs->rq_wait_ns, 0); - } - rqos = &ioc->rqos; rqos->id = RQ_QOS_COST; rqos->ops = &ioc_rqos_ops; -- 1.8.3.1