From patchwork Wed Mar 8 14:37:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 66279 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp384159wrd; Wed, 8 Mar 2023 07:02:31 -0800 (PST) X-Google-Smtp-Source: AK7set9T/v86EpEQdewidCPyI1f5NYGs3oK6kKKz4WdJdfKoKuK+Wa/+6pYB9WlE4klb/CH+Hv8M X-Received: by 2002:a17:90b:1d08:b0:238:e9:8994 with SMTP id on8-20020a17090b1d0800b0023800e98994mr20511970pjb.0.1678287751498; Wed, 08 Mar 2023 07:02:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678287751; cv=none; d=google.com; s=arc-20160816; b=NpOyHTh4wdHQH9H3HWEN6eNk13/PT/uXWCPWx+exL2ZIEAil+Z8d9B+FdZsEzcgBJH L4yyTMDr37FrOQ5jiJJq7tjCQyZKu0IraL149Jpp/zbLx59UBpEBOZbbdoI4Z4G23+Ul YEW2ByPICyd8UbewIfuJh3pgY1dx/s/hXP99UnIdBw6EdrubzUbMIztApQ9mIXHJ0ZIG BIdtk6qPI00iH6rAWBUNsTZKW6NCQTXcHEADVxD8PadDRbxxNwnq1nkTKLQzinpeZRa3 PlcnUnH/23XtEBcRwAzGa3UnflZLFGC8cm19dcxwuon9zL8G2eaCeaavtkmXO4HrdcMh 9dZw== 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=yeXifQZRm2psN61HdEdlXlupFGTTNwxjPMr5BdUD24KPC6XVZAe+gfck9W8OSpRVvN dcwjU1yu0RBB/uDWpbMlPiTpD5hdKmpui4Cgc073+SRIuJ8uXAuynuoGMl0jRwgIstjq xtnGUyG+BtpgPyHeWxQxMyX1qbv2X1TOjTfed6ZQdGhPGgbtCa0CsP9RZHJEtTu8J9nj s5elX/CwVFNZ8MwYOZV1umFmPJaKwrPDPzHFWkVJsxxtpRjabj1BPy3W2h4ZtP7jz31x tzMsvGPXnSuT5rfHIHLYIYjYdoDmr+UOSFABfPFaLb5wn7DMmXRLhNQB2LV1ok3d+6n0 7o9A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=fpYV4ASo; 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 j2-20020a17090ae60200b00233ca49c5a7si17147675pjy.17.2023.03.08.07.02.12; Wed, 08 Mar 2023 07:02:31 -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=fpYV4ASo; 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 S232072AbjCHOkc (ORCPT + 99 others); Wed, 8 Mar 2023 09:40:32 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48734 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232249AbjCHOje (ORCPT ); Wed, 8 Mar 2023 09:39:34 -0500 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 E6F3899D70 for ; Wed, 8 Mar 2023 06:38:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678286318; 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=fpYV4ASousFxT/6DXiYFBQ7NYgiUX/7Bj70ULl1KHI+/LXJ8qhdVgtxP4bGy04THZcvBwn x6cpfm8NmDoubZLXSZTcqaQ8sD7sVUIPby7ej7nltywuNJsiDRCuKdv83kMmPb7eSrpLtv 5thC6MxWrylh7SGujNeNF1t35dMn9Ow= 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-522-MQY17EnwNZGepEkwDtQ80A-1; Wed, 08 Mar 2023 09:38:34 -0500 X-MC-Unique: MQY17EnwNZGepEkwDtQ80A-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E96C0803D62; Wed, 8 Mar 2023 14:38:24 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.33.36.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id EA7C22166B2A; Wed, 8 Mar 2023 14:38:22 +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 v16 09/13] block: Fix bio_flagged() so that gcc can better optimise it Date: Wed, 8 Mar 2023 14:37:50 +0000 Message-Id: <20230308143754.1976726-10-dhowells@redhat.com> In-Reply-To: <20230308143754.1976726-1-dhowells@redhat.com> References: <20230308143754.1976726-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 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?1759812257132069513?= X-GMAIL-MSGID: =?utf-8?q?1759812257132069513?= 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)