From patchwork Fri May 19 07:40:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 96225 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1058062vqo; Fri, 19 May 2023 00:52:48 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6VnyxWq+rNxhG1LNUXH48wbYwO6Aynw5UDPr3TpS0nhrjUEiMt2pL6ATnWA8Qyq27z6Xku X-Received: by 2002:a05:6a00:181d:b0:64d:2c58:f86f with SMTP id y29-20020a056a00181d00b0064d2c58f86fmr2246838pfa.0.1684482768407; Fri, 19 May 2023 00:52:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684482768; cv=none; d=google.com; s=arc-20160816; b=Ow6K+EXvyWVfUbKBuRrPf5y79qJ5OV8fCqW8FkxyZykhHSXm2xy4zaAzVF38foNK+Y 0BJxOqgFuTW/N7AbRWjLURhj1No0qBwuQEW9F3GWpCRUA0j7sxwOMWKUYBoYwYKArrBe 83bG6ZyFWNM5i8v2aMNdMTZydNxgD/n/mr/VwzCIAhuqvbQfqdvCsOdwztAVk0rT80pW uznZXBzfSsOLJgwIdGqB2Lc78uK8JUtYKKZhhLhFRuuHgAE7fxLwqNHHL/chvCwd62Fr r4BjYqSFcggaZDj+rTcgjsoNWW2vMdyQI/9gJ+P7VEUkiKCXRVptVdg9LNNWg72EPu5I D0jg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=edStQDA/gh3f03KMzWRlpjb2e/gxKf5/7u3ht9bl6/4=; b=BtMEwUKqzhKb2AOL4R1OVZCxx4Bz2zpovEc759MU5pMl5qQE8ESyOc1ppqOzIlgMg8 82RyrvxXwWUnOhjm6pWaJSuVkqmyY0H1H9jCGPwAewnrdT8eE5Q7k7Su0Nl9k/UZ2tKM Y5DGlX1VWWt75iPSACeNpIu2ibt9wzjxRrofwQM9E+TGFHx9KXbfYiTP3HsyTQRoILpw zh7HIKJ251fxzDaiPR9QIM/6VumN9RIxOyYtCdEi2qPzLG+1GQ2lB59qjzHyTmbGHi2M s/FpS5FC+ZaGdQMSPE8ge2Jhnm+vU6LEijZ3eaAEDq8QcY1C9GoAOgbCwdIzNlVm1BR/ d8uA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=ftUtJEE7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w69-20020a638248000000b0052d389c3ca7si3373673pgd.52.2023.05.19.00.52.22; Fri, 19 May 2023 00:52:48 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=ftUtJEE7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231580AbjESHrB (ORCPT + 99 others); Fri, 19 May 2023 03:47:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59470 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231371AbjESHqk (ORCPT ); Fri, 19 May 2023 03:46:40 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 79ACC270D for ; Fri, 19 May 2023 00:43:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684482161; 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=edStQDA/gh3f03KMzWRlpjb2e/gxKf5/7u3ht9bl6/4=; b=ftUtJEE7srthgAdLLhMoy8qotX/Poq+tN51QojqCScQyJZ3ijaUgB7vEQ6iBhFpL7r3Qrh jLBZvVh9gTJi+QUew2kbnCA6ewIzLM3wAp+3LzMa6veqmHQNtiy01OvYiM+/0/JNClzUTI 1J1UBGwPVtDBCZ8R6fS3k0zG2n6322A= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-558-Zn02uDUqNWychxCT98RFHQ-1; Fri, 19 May 2023 03:42:36 -0400 X-MC-Unique: Zn02uDUqNWychxCT98RFHQ-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 654BA101A531; Fri, 19 May 2023 07:42:35 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.42.28.221]) by smtp.corp.redhat.com (Postfix) with ESMTP id 468A240CFD46; Fri, 19 May 2023 07:42:33 +0000 (UTC) From: David Howells To: Jens Axboe , Al Viro , Christoph Hellwig Cc: David Howells , Matthew Wilcox , Jan Kara , Jeff Layton , David Hildenbrand , Jason Gunthorpe , Logan Gunthorpe , Hillf Danton , Christian Brauner , Linus Torvalds , linux-fsdevel@vger.kernel.org, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Christoph Hellwig , John Hubbard Subject: [PATCH v20 28/32] block: Fix bio_flagged() so that gcc can better optimise it Date: Fri, 19 May 2023 08:40:43 +0100 Message-Id: <20230519074047.1739879-29-dhowells@redhat.com> In-Reply-To: <20230519074047.1739879-1-dhowells@redhat.com> References: <20230519074047.1739879-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1766308203837649489?= X-GMAIL-MSGID: =?utf-8?q?1766308203837649489?= Fix bio_flagged() so that multiple instances of it, such as: if (bio_flagged(bio, BIO_PAGE_REFFED) || bio_flagged(bio, BIO_PAGE_PINNED)) can be combined by the gcc optimiser into a single test in assembly (arguably, this is a compiler optimisation issue[1]). The missed optimisation stems from bio_flagged() comparing the result of the bitwise-AND to zero. This results in an out-of-line bio_release_page() being compiled to something like: <+0>: mov 0x14(%rdi),%eax <+3>: test $0x1,%al <+5>: jne 0xffffffff816dac53 <+7>: test $0x2,%al <+9>: je 0xffffffff816dac5c <+11>: movzbl %sil,%esi <+15>: jmp 0xffffffff816daba1 <__bio_release_pages> <+20>: jmp 0xffffffff81d0b800 <__x86_return_thunk> However, the test is superfluous as the return type is bool. Removing it results in: <+0>: testb $0x3,0x14(%rdi) <+4>: je 0xffffffff816e4af4 <+6>: movzbl %sil,%esi <+10>: jmp 0xffffffff816dab7c <__bio_release_pages> <+15>: jmp 0xffffffff81d0b7c0 <__x86_return_thunk> instead. Also, the MOVZBL instruction looks unnecessary[2] - I think it's just 're-booling' the mark_dirty parameter. Signed-off-by: David Howells Reviewed-by: Christoph Hellwig Reviewed-by: John Hubbard cc: Jens Axboe cc: linux-block@vger.kernel.org Link: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=108370 [1] Link: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=108371 [2] Link: https://lore.kernel.org/r/167391056756.2311931.356007731815807265.stgit@warthog.procyon.org.uk/ # v6 --- include/linux/bio.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/bio.h b/include/linux/bio.h index b3e7529ff55e..7f53be035cf0 100644 --- a/include/linux/bio.h +++ b/include/linux/bio.h @@ -229,7 +229,7 @@ static inline void bio_cnt_set(struct bio *bio, unsigned int count) static inline bool bio_flagged(struct bio *bio, unsigned int bit) { - return (bio->bi_flags & (1U << bit)) != 0; + return bio->bi_flags & (1U << bit); } static inline void bio_set_flag(struct bio *bio, unsigned int bit)