Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp3044420pxk; Mon, 7 Sep 2020 01:12:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxLX1SbhcEdQLWas9CB5reoBQ2LKq9Sf7gdNZwwA+nSEzrDNLqtPg6e/ULZIoo/7LEBebqs X-Received: by 2002:a17:906:4a19:: with SMTP id w25mr14324833eju.199.1599466350360; Mon, 07 Sep 2020 01:12:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1599466350; cv=none; d=google.com; s=arc-20160816; b=pv+zfL9uDjP4yY8u0NRwngjhPDA2vbcHVTV+9xeBo4gZS8fNa5/b9yGO1VT047xChk mqXVV4hoOmsH4i7Oc5D8muZgaW8qJJ78HlzTUPg/MO6vcDFr58+sog/FQVm6O0O1NY6M TgvDnaYGUhICKdOMUXOhcTQBCcitr3vP60NtLmgm1ZFE1x++0RIbvbzrTfosa8UzLMFk G7T+7rn1lNZYcsSbGkSV0CRFJIbTDRdlusrCRhRHfcYHjSOSaSgbCJ7PbZRvgGFg+6Ao DxusCuahGfKe/kRINVWdg7JT80eA/dZVEK6ksydISJ6D1cbSrIQ5UcvolQxJU2YO3LXZ lt/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:references :in-reply-to:message-id:date:subject:cc:to:from; bh=A4EqyBiuaRRFXzv6ydfeSodg1XIfYqSbZqe8vIz0hWI=; b=GEQGf2nsoPyGBlDUXOUimcObXL3MxcWMi2HrT5Hiecgp1oTTzbHHNpau7YHdbXZPau 0OX9ihZ/YuQMJHQxNA2cugr829SyFatrH/OV7Da0phWWF2Hxvwk37gigWu9QGpOU/1Hn zhWnKYSaIYVDVFgms+Jq4FH0UEQXMXxK5K8dYrJqTfRZGFlOgzziRCs7FxNiEG0U5eG7 HihDa147FUw0NESnkmd0XlWnTsMucx11yYovRLedWp0qZXTXhEd66Wr75NuwW6wNiTGf ePVios8DbNePlfQ+NyrJxOxk50Mapy1X6CLlMbYHMD4WA3AMGdSNlcibNGH5wgQEaQbk yPRQ== 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 ci4si9162189ejb.290.2020.09.07.01.12.08; Mon, 07 Sep 2020 01:12:30 -0700 (PDT) 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 S1727954AbgIGIK7 (ORCPT + 99 others); Mon, 7 Sep 2020 04:10:59 -0400 Received: from out30-44.freemail.mail.aliyun.com ([115.124.30.44]:41210 "EHLO out30-44.freemail.mail.aliyun.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727969AbgIGIKh (ORCPT ); Mon, 7 Sep 2020 04:10:37 -0400 X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R761e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=e01e04357;MF=baolin.wang@linux.alibaba.com;NM=1;PH=DS;RN=7;SR=0;TI=SMTPD_---0U87zzD4_1599466231; Received: from localhost(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0U87zzD4_1599466231) by smtp.aliyun-inc.com(127.0.0.1); Mon, 07 Sep 2020 16:10:31 +0800 From: Baolin Wang To: tj@kernel.org, axboe@kernel.dk Cc: baolin.wang@linux.alibaba.com, baolin.wang7@gmail.com, linux-block@vger.kernel.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 5/5] blk-throttle: Avoid checking bps/iops limitation if bps or iops is unlimited Date: Mon, 7 Sep 2020 16:10:17 +0800 Message-Id: X-Mailer: git-send-email 1.8.3.1 In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Do not need check the bps or iops limitation if bps or iops is unlimited. Signed-off-by: Baolin Wang --- block/blk-throttle.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/block/blk-throttle.c b/block/blk-throttle.c index 8719e37..36ba61c 100644 --- a/block/blk-throttle.c +++ b/block/blk-throttle.c @@ -901,6 +901,12 @@ static bool tg_with_in_iops_limit(struct throtl_grp *tg, struct bio *bio, unsigned long jiffy_elapsed, jiffy_wait, jiffy_elapsed_rnd; u64 tmp; + if (iops_limit == UINT_MAX) { + if (wait) + *wait = 0; + return true; + } + jiffy_elapsed = jiffies - tg->slice_start[rw]; /* Round up to the next throttle slice, wait time must be nonzero */ @@ -943,6 +949,12 @@ static bool tg_with_in_bps_limit(struct throtl_grp *tg, struct bio *bio, unsigned long jiffy_elapsed, jiffy_wait, jiffy_elapsed_rnd; unsigned int bio_size = throtl_bio_data_size(bio); + if (bps_limit == U64_MAX) { + if (wait) + *wait = 0; + return true; + } + jiffy_elapsed = jiffy_elapsed_rnd = jiffies - tg->slice_start[rw]; /* Slice has just started. Consider one slice interval */ -- 1.8.3.1