From patchwork Wed Mar 15 16:35:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 70309 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp2156wrt; Wed, 15 Mar 2023 09:41:09 -0700 (PDT) X-Google-Smtp-Source: AK7set+dTouzv3Y9298JF0t272W7n0NDu9+EBwdwubqn6gcd+QLAvpTQhvjeZkL3ISRCANY3QOWn X-Received: by 2002:aa7:9826:0:b0:5cd:229e:f1d8 with SMTP id q6-20020aa79826000000b005cd229ef1d8mr185987pfl.4.1678898469229; Wed, 15 Mar 2023 09:41:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678898469; cv=none; d=google.com; s=arc-20160816; b=BIlxgfaZ1b3yi9o8SNFkvcjfEQX9zd7WFiyHKN8QksnWDTFU4INBuBrGMOFXqh95QX XRK87lJcL2cFCM4uNrIL/IBaLc35UIAI6SQZovxGD70PoT+/saWH8cwDhjj2kbHG+df3 R7nUc5jaahf7GTukKThRcC+dqhiTFI7yOyrQsgU2zjldL4Gis+i77fgTippBP2eL6mQ5 yuhODfdEpbDXEf5AOl660jP8ZEHDYlNyWIVXECxqvm+2Mus2rT2yt+fEnkRYXlcERn0p Uutw/9JJDiBKUMDTo3lsBpcmnNSBpUa9nGbLVlIYSH0D4fB7rHWuzGdiWqhUfW2SgtXp iP7Q== 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=Turi6MH/eZrHYcdzIAmZk++xA072ajN+FGqrlnee27C17lBCUwlxt4lH/MuVxUfKoP vNXeRz58JpwQPROfLW3Bxn3fz0vVHeGpQuH7dUwV+V/lhhx+7/gDe9K6iZ1kLBzb+yfC jfmAgd+YBK9+IZQV1FhLTWhYRV6UVo0V0eGA73WUvnwlr2UoDWymPVfepuvLMRdMb2Es ijnx8fYVjcWq/xH15t+96732U0yIw5Q4NGl69ukHbfMiNPJRmShp8KxF3m/f+QOdTtk0 2QqGaMn+yp8fGwlcXTSfBIv69EWYjKYo/yq+h2ts+6rAA0+k0ozCrhFlRV27rdzX3SwJ jRCQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=NAl65g0X; 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 y128-20020a636486000000b004fc26d41be6si5174617pgb.72.2023.03.15.09.40.54; Wed, 15 Mar 2023 09:41:09 -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=NAl65g0X; 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 S232345AbjCOQi3 (ORCPT + 99 others); Wed, 15 Mar 2023 12:38:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38194 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232160AbjCOQhq (ORCPT ); Wed, 15 Mar 2023 12:37:46 -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 CBE33769F1 for ; Wed, 15 Mar 2023 09:36:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678898194; 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=NAl65g0XRxxRMByGwfkB6b2XFF1k6l4LoHxnoxY/0emKTJKeHUD6ENCPtcMRREi6oxXZhv HW/HegjFqpdAIO/1VFOSA2m9dnogfvDsEkMHXQAs2zIECQMKBSydIwUvhKqVDMdiZJ+HYm ls2xd94lDC4z/pf87Nmh2rTGkL+/o2E= 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-132-0_two9ifOYW8-fQttFHzIw-1; Wed, 15 Mar 2023 12:36:28 -0400 X-MC-Unique: 0_two9ifOYW8-fQttFHzIw-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id DCA38858297; Wed, 15 Mar 2023 16:36:26 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.33.36.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id C161AC164E7; Wed, 15 Mar 2023 16:36:24 +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 v19 11/15] block: Fix bio_flagged() so that gcc can better optimise it Date: Wed, 15 Mar 2023 16:35:45 +0000 Message-Id: <20230315163549.295454-12-dhowells@redhat.com> In-Reply-To: <20230315163549.295454-1-dhowells@redhat.com> References: <20230315163549.295454-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 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?1760452641184284791?= X-GMAIL-MSGID: =?utf-8?q?1760452641184284791?= 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)