From patchwork Thu Mar 27 00:30:03 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Pluzhnikov X-Patchwork-Id: 305 Return-Path: X-Original-To: siddhesh@wilcox.dreamhost.com Delivered-To: siddhesh@wilcox.dreamhost.com Received: from homiemail-mx21.g.dreamhost.com (caibbdcaaahb.dreamhost.com [208.113.200.71]) by wilcox.dreamhost.com (Postfix) with ESMTP id B94253602D4 for ; Wed, 26 Mar 2014 17:30:12 -0700 (PDT) Received: by homiemail-mx21.g.dreamhost.com (Postfix, from userid 14307373) id 6686FCB7D03; Wed, 26 Mar 2014 17:30:12 -0700 (PDT) X-Original-To: glibc@patchwork.siddhesh.in Delivered-To: x14307373@homiemail-mx21.g.dreamhost.com Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by homiemail-mx21.g.dreamhost.com (Postfix) with ESMTPS id 35AC7E3FE52 for ; Wed, 26 Mar 2014 17:30:12 -0700 (PDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id :mime-version:content-type; q=dns; s=default; b=KmgHFthPvANyBCT6 uiOe2kMqw+feWMjJrDFymK3xv6qQmzU7ydGdZ5nQBXZ0eaUv6V3Jhr1mn4MVvRCi K7vD/rnLGkc5wTEqxjYgYmFv26tzUjOMR4li5glwp1q/Iwft48+fQin+5vmBW4xy HuW1kgrR4f6Cxzstvs82XP8EfUQ= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id :mime-version:content-type; s=default; bh=8bngEs0WjQCNRbtqjKlGYz 3rITo=; b=TUZOXPSOwoU/ow9xmN97cqAzHf3gHdKYZal65BcEsPHdgLSk+UnHHg 9SDz1H8GVuh0dXks7dGiXXb0jHh3Fsk8x79BxydWCUknOtaRVTHuuxgN+7TutIM2 uUHRgCZFEkrpKl7KEMEglP9XfFb6ZRhk/0i/I/jLhuvLJuONKGB40= Received: (qmail 3279 invoked by alias); 27 Mar 2014 00:30:09 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 3266 invoked by uid 89); 27 Mar 2014 00:30:08 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.9 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_LOW, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mail-qa0-f74.google.com X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-type; bh=PkjSR3KmTHABx64m0xIgjj5m7rdKi0QqDTohGFAJAGY=; b=VdjmFs5Btzx/d2MI20n8BcXSXBAC0pqhBVpXRNs93CrxDMIRWc7iKSwTV0j5BRyMNM vlyRR/tvOMHXK2I3iAHIQ0fMZ57f+zGPC6keIi4Xp9UYlBnSd55tdcuqqnTUea8kkVmX s+Zqw7s5LmwA1xcm0aUreolrhqTn+fIGi8CIFcgsiWL0l8dhaQBzajVaztPLabNqI86+ 0oXCOg1nCoW6v7SM9fdWlwS7NtPatbPtLFwISEq2OmPghq51NgSTV/v/UK1pRb0RUzvt uqAUYAlThtoWw3xM/0QiHfO3XdmVDipllmxZ4hvqwnL29cWV1oSjJ4hmkKjQiLRbnpwk gxjw== X-Gm-Message-State: ALoCoQmPR8IXwiQmk3SXAPm+rg1w6Gimz1o1ZQUYc+sa+cwCUG2p+VIpjGfPr3xyrpDX+BnsiZlCoAe97qW7i7PWcqj1VSMwgDfflpGpzcW2JEqOQj7WIRdPCmmDT45aTrThtOA+B9+hO9ojkuIauvLabUWBIBNaeQnoYnUIKujdCYoEKJO5lE05EGo3J7vVSMYwdUeAX1xAHPeSn1QVPktakqLIysIK2w== X-Received: by 10.224.6.198 with SMTP id a6mr13252485qaa.6.1395880204463; Wed, 26 Mar 2014 17:30:04 -0700 (PDT) From: Paul Pluzhnikov To: libc-alpha@sourceware.org Cc: ppluzhnikov@google.com Subject: [patch] Finish __builtin_expect -> __glibc_{un}likely cleanup in elf/dl-load.c Date: Wed, 26 Mar 2014 17:30:03 -0700 Message-ID: MIME-Version: 1.0 X-DH-Original-To: glibc@patchwork.siddhesh.in Greetings, This patch cleans up remaining uses of __builtin_expect. It does change elf/dl-load.o in non-trivial ways, but - the tests still pass on Linux/x86_64 and - is much smaller, and easier to verify. Thanks, --- 2014-03-26 Paul Pluzhnikov * elf/dl-load.c: Finish __builtin_expect into __glibc_{un}likely conversion. diff --git a/elf/dl-load.c b/elf/dl-load.c index 2d15e41..0ae0ad1 100644 --- a/elf/dl-load.c +++ b/elf/dl-load.c @@ -1269,7 +1269,7 @@ cannot allocate TLS data structures for initial thread"); /* Length of the sections to be loaded. */ maplength = loadcmds[nloadcmds - 1].allocend - c->mapstart; - if (__builtin_expect (type, ET_DYN) == ET_DYN) + if (__glibc_likely (type == ET_DYN)) { /* This is a position-independent shared object. We can let the kernel map it anywhere it likes, but we must have space for all @@ -1767,14 +1767,13 @@ open_verify (const char *name, struct filebuf *fbp, struct link_map *loader, } /* See whether the ELF header is what we expect. */ - if (__builtin_expect (! VALID_ELF_HEADER (ehdr->e_ident, expected, + if (__glibc_unlikely (! VALID_ELF_HEADER (ehdr->e_ident, expected, EI_ABIVERSION) || !VALID_ELF_ABIVERSION (ehdr->e_ident[EI_OSABI], ehdr->e_ident[EI_ABIVERSION]) || memcmp (&ehdr->e_ident[EI_PAD], &expected[EI_PAD], - EI_NIDENT - EI_PAD) != 0, - 0)) + EI_NIDENT - EI_PAD) != 0)) { /* Something is wrong. */ const Elf32_Word *magp = (const void *) ehdr->e_ident; @@ -1832,10 +1831,10 @@ open_verify (const char *name, struct filebuf *fbp, struct link_map *loader, errstring = N_("ELF file version does not match current one"); goto call_lose; } - if (! __builtin_expect (elf_machine_matches_host (ehdr), 1)) + if (! __glibc_likely (elf_machine_matches_host (ehdr))) goto close_and_out; - else if (__builtin_expect (ehdr->e_type, ET_DYN) != ET_DYN - && __builtin_expect (ehdr->e_type, ET_EXEC) != ET_EXEC) + else if (__glibc_unlikely (ehdr->e_type != ET_DYN + && ehdr->e_type != ET_EXEC)) { errstring = N_("only ET_DYN and ET_EXEC can be loaded"); goto call_lose; @@ -2104,8 +2103,7 @@ _dl_map_object (struct link_map *loader, const char *name, /* If the requested name matches the soname of a loaded object, use that object. Elide this check for names that have not yet been opened. */ - if (__glibc_unlikely (l->l_faked != 0) - || __builtin_expect (l->l_removed, 0) != 0) + if (__glibc_unlikely (l->l_faked != 0 || l->l_removed != 0)) continue; if (!_dl_name_match_p (name, l)) { @@ -2230,7 +2228,7 @@ _dl_map_object (struct link_map *loader, const char *name, #ifdef USE_LDCONFIG if (fd == -1 - && (__builtin_expect (! (mode & __RTLD_SECURE), 1) + && (__glibc_likely ((mode & __RTLD_SECURE) == 0) || ! INTUSE(__libc_enable_secure)) && __glibc_likely (GLRO(dl_inhibit_cache) == 0)) {