From patchwork Wed Mar 8 16:52:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 66368 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp447680wrd; Wed, 8 Mar 2023 08:58:47 -0800 (PST) X-Google-Smtp-Source: AK7set+aF+5CuJwzzz+HYJ091SHDYTEA1k8k6mwJm2yOTrrrsQYijwzZyGb0NToMRn4Sm7COeM1/ X-Received: by 2002:a05:6a20:8403:b0:cc:76ec:70dc with SMTP id c3-20020a056a20840300b000cc76ec70dcmr23868517pzd.26.1678294727333; Wed, 08 Mar 2023 08:58:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678294727; cv=none; d=google.com; s=arc-20160816; b=tBgCCrQPPq/C9F3sObx+gpCU+j3Yq9mGFWC7DtCjeNADpR+ud6Hj2JWqs437ebuXXT DkSj1Da43m2s64z4BW33adp+rFP5tZdpfpz23PihFR7wo2BuHpvGv5Oa0h8ephO5IOK+ 8feRbQW1lbOpGDt5Ht8SaHE5PwbdGPKG4LRExc1FOLpRJRvvBzRZp1YpiRSwxn+mZ5O5 w55kg6UDhzLzV1EdBJWP+Y16FipPs5+AyK+O8meXmoTOnb9dKHsGWMD3sTyBp0lWuDp7 4fOyFLRoeQPGoXWOBtCjv/WDfbE25fsMu1eJ0hpyWuFsYdk40+ECP4FcI3ayw9i+qtc2 UCGA== 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=0+QymJ+GCZW28tJ8JK9HTXv9GxubpscA9882LeMgv9w=; b=y+stSqeMSW3KxmkZNAlIr87i/ZcIoSXGd2JVfqpnbzOAnxHRPoqFIQ3WZXXNf4PBet YqM+EAzuuhYeaqPU+Q+c8VZQ8zRMznvdha6ZGamqMrlh5g0wU2N6QbtyPtfN1+ySfgR0 bEeI2KS6kbGXckJrwNVzldkbL0LCRI0A/X3XwiV92aEjXJqYcbz8ZJArNzDpqSDJDF2F wispVcS/QvT0arCWobGvhOL4JbDjdycKzfqMyA4TbLUaV+aa34Lea4XX/HJNjUXPkF5q p0NAvRRQ6swjD9aBoE1XdMtN/FCTNy0zL4dH90cpasNqjqN+rXvC20TyP8k4j36+VCU7 w6jA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=cgaoeWDA; 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 e9-20020a636909000000b004d82885a5b4si14939429pgc.32.2023.03.08.08.58.34; Wed, 08 Mar 2023 08:58:47 -0800 (PST) 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=cgaoeWDA; 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 S230146AbjCHQzK (ORCPT + 99 others); Wed, 8 Mar 2023 11:55:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50890 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230116AbjCHQyp (ORCPT ); Wed, 8 Mar 2023 11:54:45 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4C1F59661A for ; Wed, 8 Mar 2023 08:53:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678294411; 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=0+QymJ+GCZW28tJ8JK9HTXv9GxubpscA9882LeMgv9w=; b=cgaoeWDA4GLtYnWKdXmE89cDwJGZvbmzo2xBJLx+bLIoqJvxpSum8duznH7Io5cyC5FGZO MEGDEGdkvuA6NFqFiY9wZyyEgoRNrhJjs5RRV15o5Gb5qfI7ypTXn5lEN3Gaq5k9t1o2gc 9zkiri3K1tzue68Koxg0Lyns0RmioMU= 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-581-t3_NrMduOtmhP4jO257PkQ-1; Wed, 08 Mar 2023 11:53:28 -0500 X-MC-Unique: t3_NrMduOtmhP4jO257PkQ-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 32CB7811E9C; Wed, 8 Mar 2023 16:53:27 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.33.36.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2B99618EC7; Wed, 8 Mar 2023 16:53:25 +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 , 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 v17 10/14] block: Fix bio_flagged() so that gcc can better optimise it Date: Wed, 8 Mar 2023 16:52:47 +0000 Message-Id: <20230308165251.2078898-11-dhowells@redhat.com> In-Reply-To: <20230308165251.2078898-1-dhowells@redhat.com> References: <20230308165251.2078898-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 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,URIBL_BLOCKED autolearn=unavailable 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?1759819572130555571?= X-GMAIL-MSGID: =?utf-8?q?1759819572130555571?= 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 d766be7152e1..d9d6df62ea57 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)