From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by sourceware.org (Postfix) with ESMTP id BE524398242A for ; Mon, 28 Jun 2021 12:31:07 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org BE524398242A Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-135-HLPRYXxXNUCKQxuplx0Ryg-1; Mon, 28 Jun 2021 08:31:05 -0400 X-MC-Unique: HLPRYXxXNUCKQxuplx0Ryg-1 Received: by mail-qv1-f71.google.com with SMTP id k12-20020a0cfd6c0000b029020df9543019so17398949qvs.14 for ; Mon, 28 Jun 2021 05:31:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:from:organization :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=hI/SbsppN3TU//gSN+dbtkDHqC4eOuAAvXyfVrg897w=; b=gREMhcUBCGK7RUKYGoKvVZCn7YnJ+DdG8UhtAiHxqjdL9ZEpvRDs4MLO5jrJTHO2Lw 6OJoo7XSVjtOLDmTUX8VPt5unQ0VGkTzINARzOogAzEshuAlT2dFEkTi4T3YD3Rhr8JB HrMjlTV0qcZ6xWNGbZnbUc2xn4xmDCGvaRK+vlI6w+IaLuItqGPAihYasBlETEt2xZ+G qvj8vf3iemzY/82gRuWTTEOXV6g3eAc2LX6VAmxvJ9gIk/aLSEjkt2AbpMr9BxJw4Lvh g2VVRzFRJEsAn/MTsxLBj69qAgTc2+IfVOQnikyFrm4eoDIzl4HFIl9ViPgAMBJ2jyev 8Wsg== X-Gm-Message-State: AOAM532qbatokIB0Xvvs+dQkA4alWdVf9UQNTiu2VVQT53S+w8FnEkr2 NYFm5fgh//jNW2qrrPKp8snrRG1fRl11iGr2WnzK/2LnlUbN48njDCSzK17XgD9SlgpA1yx4evF IFpUpgx0G3l4wty7uCF/U97O3O1R2yaK7t237m5J9qM8Je0/MliLVBKA8OTxj6W4A3OVr3Q== X-Received: by 2002:a37:a7ce:: with SMTP id q197mr24747651qke.278.1624883465248; Mon, 28 Jun 2021 05:31:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxvJCk8g7ABl/518CsMpzy8gdn78YXhYnFrz+raZ8Z8ZYzOPi1SGqgZydzB6Mhqt3DYBtCLdw== X-Received: by 2002:a37:a7ce:: with SMTP id q197mr24747629qke.278.1624883465030; Mon, 28 Jun 2021 05:31:05 -0700 (PDT) Received: from [192.168.1.16] (198-84-214-74.cpe.teksavvy.com. [198.84.214.74]) by smtp.gmail.com with ESMTPSA id a62sm10670256qke.108.2021.06.28.05.31.04 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 28 Jun 2021 05:31:04 -0700 (PDT) Subject: Re: [PATCH 1/3] nptl_db: Clean up main/rtld variable handling To: Florian Weimer , libc-alpha@sourceware.org References: From: Carlos O'Donell Organization: Red Hat Message-ID: Date: Mon, 28 Jun 2021 08:31:03 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.10.1 MIME-Version: 1.0 In-Reply-To: X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-11.9 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, NICE_REPLY_A, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jun 2021 12:31:10 -0000 On 6/28/21 5:09 AM, Florian Weimer via Libc-alpha wrote: > Most symbols are now in libc.so.6. The "main" (exempted from > coverage checks) status is therefore not necessary. Use > DB_MAIN_VARIABLE for the remaining separate symbol, > __nptl_initial_report_events. DB_RTLD_VARIABLE is now unused, so > remove it. This looks good to me. Tested on x86_64 without regression. Reviewed-by: Carlos O'Donell Tested-by: Carlos O'Donell > --- > nptl_db/db-symbols.awk | 1 - > nptl_db/structs.def | 14 +++++--------- > 2 files changed, 5 insertions(+), 10 deletions(-) > > diff --git a/nptl_db/db-symbols.awk b/nptl_db/db-symbols.awk > index 6f326cf379..ef1d91b167 100644 > --- a/nptl_db/db-symbols.awk > +++ b/nptl_db/db-symbols.awk > @@ -2,7 +2,6 @@ > # we've just built. It checks for all the symbols used in td_symbol_list. > > BEGIN { > -%define DB_RTLD_VARIABLE(name) /* Nothing. */ OK. Remove. > %define DB_MAIN_VARIABLE(name) /* Nothing. */ > %define DB_MAIN_SYMBOL(name) /* Nothing. */ > %define DB_MAIN_ARRAY_VARIABLE(name) /* Nothing. */ > diff --git a/nptl_db/structs.def b/nptl_db/structs.def > index 6a726f207e..fb7bb9367d 100644 > --- a/nptl_db/structs.def > +++ b/nptl_db/structs.def > @@ -22,10 +22,6 @@ > # define STRUCTS_DEF_DEFAULTS 1 > #endif > > -#ifndef DB_RTLD_VARIABLE > -# define DB_RTLD_VARIABLE(name) DB_VARIABLE (name) > -#endif > - OK. Remove. > /* DB_MAIN_VARIABLE, DB_MAIN_SYMBOL, DB_MAIN_ARRAY_VARIABLE are not > covered by the libc symbol check in db-symbols.awk. */ > #ifndef DB_MAIN_VARIABLE > @@ -78,14 +74,14 @@ DB_STRUCT_FIELD (td_eventbuf_t, eventnum) > DB_STRUCT_FIELD (td_eventbuf_t, eventdata) > > DB_SYMBOL (nptl_version) > -DB_MAIN_SYMBOL (__nptl_create_event) > -DB_MAIN_SYMBOL (__nptl_death_event) > +DB_SYMBOL (__nptl_create_event) > +DB_SYMBOL (__nptl_death_event) OK. > DB_SYMBOL (__nptl_threads_events) > -DB_MAIN_VARIABLE (__nptl_nthreads) > +DB_VARIABLE (__nptl_nthreads) OK. Adds __nptl_nthreads to checking. > DB_VARIABLE (__nptl_last_event) > -DB_RTLD_VARIABLE (__nptl_initial_report_events) > +DB_MAIN_VARIABLE (__nptl_initial_report_events) OK. Becomes DB_MAIN_VARIABLE, defined in ld.so. > > -DB_MAIN_ARRAY_VARIABLE (__pthread_keys) > +DB_ARRAY_VARIABLE (__pthread_keys) OK. Add __pthread_keys to checking. > DB_STRUCT (pthread_key_struct) > DB_STRUCT_FIELD (pthread_key_struct, seq) > DB_STRUCT_FIELD (pthread_key_struct, destr) > -- Cheers, Carlos.