Received: by 2002:a25:7ec1:0:0:0:0:0 with SMTP id z184csp7858674ybc; Fri, 29 Nov 2019 02:11:20 -0800 (PST) X-Google-Smtp-Source: APXvYqwGN0WG7N8UstG6lYYk7qo9LAR6KR+G9V5MkkbxLC84Lr6Q8hi+a/lRo/2HarLyqK1lyeJ/ X-Received: by 2002:a17:906:edc4:: with SMTP id sb4mr11708057ejb.113.1575022280769; Fri, 29 Nov 2019 02:11:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575022280; cv=none; d=google.com; s=arc-20160816; b=fvntUWKvOoZgFsIUsSpTmCkLafEKLEMzrIAwrIX86ByW7XVmUuOHcu59ibkFnFEqlM rtI637wPouPOl8UuDP5vbAAKZ02/FTmytWjxfBEzW2zHnnwKcRc4sb/4ojt/faxopAdv 2HT+F3Fo+NnEn+2nK6Z1Kbhj9EatBcDmCSzFidZ+jbaGINnxd/gaxB7J2aTJ9bunKjww vjqpHVBubZNpkoa2HMa+TK6mxkHhbb0Pc7iuB1rnf94GDoeoqfwMxHFxx+oklLKsSLQe lE1lTceQ2jU5uDXo0C4ejDp8moXWkyV2Who6tM6O11TW36eMUOSeR2/bnNSAio8CXArn /jNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding :content-language:in-reply-to:mime-version:user-agent:date :message-id:autocrypt:openpgp:from:references:to:subject; bh=Sxif87S/8qRRt5bgqDeUGgH12t6urnI8RWwJh1qCWRo=; b=dQ5tp+o01htzPKCrT5lS9MRpd8OIZwXFwCtmRSkPcQkhJ2/rLDYN6UvFnisjx19Old GOHCcbnG4v4+r7dDhUBVPmfy1R2xmXHCYf9fQWQzT7DGyFgOj7pxVdYhnK4Lf6vfVxAW ibcpYlwWQ2nQqgtYl/trxXGq1dwDtS7vNKv8XxESzqXC6MNrLfgqVS5EgJT27dRPJr8e 8/452/YVieJS6GDpojOYH/yp88m88aOC2Qgcay1/dQlusuiG+QXGG44kT4hKw4qNg5Ux Arv/uf9peiLB/DoU+YqgCwAhVUr8CnDEqIaG5glCcHfZfl5GsoNWRkHVM79QQg6o0lUN yg9Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id gj16si2829774ejb.18.2019.11.29.02.10.56; Fri, 29 Nov 2019 02:11:20 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726893AbfK2KHL (ORCPT + 99 others); Fri, 29 Nov 2019 05:07:11 -0500 Received: from mx2.suse.de ([195.135.220.15]:36022 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725892AbfK2KHL (ORCPT ); Fri, 29 Nov 2019 05:07:11 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id C1F82B430; Fri, 29 Nov 2019 10:07:08 +0000 (UTC) Subject: Re: [PATCH 1/3] blk-mq: optimise rq sort function To: Pavel Begunkov , Jens Axboe , linux-block@vger.kernel.org, linux-kernel@vger.kernel.org References: <0124910c-4dcf-2143-0ec6-32dad123067c@suse.com> <7b1a16db-287f-bba0-fca0-cc7f85f69ec6@gmail.com> From: Nikolay Borisov Openpgp: preference=signencrypt Autocrypt: addr=nborisov@suse.com; prefer-encrypt=mutual; keydata= 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 Message-ID: Date: Fri, 29 Nov 2019 12:07:07 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.9.0 MIME-Version: 1.0 In-Reply-To: <7b1a16db-287f-bba0-fca0-cc7f85f69ec6@gmail.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 29.11.19 г. 11:45 ч., Pavel Begunkov wrote: > On 11/29/2019 11:28 AM, Nikolay Borisov wrote: >> On 28.11.19 г. 23:11 ч., Pavel Begunkov wrote: >>> Check "!=" in multi-layer comparisons. The same memory usage, fewer >>> instructions, and 2 from 4 jumps are replaced with SETcc. >>> >>> Note, that list_sort() doesn't differ 0 and <0. >>> >>> Signed-off-by: Pavel Begunkov >> >> My first reaction was this is wrong since you no longer return negative >> values. But then I looked into list_sort/merge and this branch >> 'if (cmp(priv, a, b) <= 0) {' clearly shows this is correct. > > Yes, that's why there is a note in the patch description. The same is > told by list_sort() description. And of course I have missed your remark in the changelog :) > >> >> So : >> >> Reviewed-by: Nikolay Borisov > > Thanks for taking a look > >> >>> --- >>> block/blk-mq.c | 12 ++++-------- >>> 1 file changed, 4 insertions(+), 8 deletions(-) >>> >>> diff --git a/block/blk-mq.c b/block/blk-mq.c >>> index 323c9cb28066..f32a3cfdd34e 100644 >>> --- a/block/blk-mq.c >>> +++ b/block/blk-mq.c >>> @@ -1668,14 +1668,10 @@ static int plug_rq_cmp(void *priv, struct list_head *a, struct list_head *b) >>> struct request *rqa = container_of(a, struct request, queuelist); >>> struct request *rqb = container_of(b, struct request, queuelist); >>> >>> - if (rqa->mq_ctx < rqb->mq_ctx) >>> - return -1; >>> - else if (rqa->mq_ctx > rqb->mq_ctx) >>> - return 1; >>> - else if (rqa->mq_hctx < rqb->mq_hctx) >>> - return -1; >>> - else if (rqa->mq_hctx > rqb->mq_hctx) >>> - return 1; >>> + if (rqa->mq_ctx != rqb->mq_ctx) >>> + return rqa->mq_ctx > rqb->mq_ctx; >>> + if (rqa->mq_hctx != rqb->mq_hctx) >>> + return rqa->mq_hctx > rqb->mq_hctx; >>> >>> return blk_rq_pos(rqa) > blk_rq_pos(rqb); >>> } >>> >