From patchwork Wed Mar 16 16:30:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Giuliano Procida X-Patchwork-Id: 52011 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 70E9C3888829 for ; Wed, 16 Mar 2022 16:31:31 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 70E9C3888829 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1647448291; bh=4L3iFLbdg4PxKVb3T4104U8MKDvT04USGvgKjAoy+Ew=; h=Date:In-Reply-To:References:Subject:To:List-Id:List-Unsubscribe: List-Archive:List-Help:List-Subscribe:From:Reply-To:Cc:From; b=vZFGHZ8Nqhi/JMgfECrnB9hrqpcOE/GKMcR7/+qO81w5Qaq50dUtmqcoMLQUIvopF XigMB5Yjsugjktt7Uy0MhhYsbDRQfQbXlFA/tHlNwy1JDQfE30rjr9B8u/Qc4Jg9DV 9/aLJyTgt9ZyzsOoxT1Zjl2XRVXIUfu3Pv/HIvrU= X-Original-To: libabigail@sourceware.org Delivered-To: libabigail@sourceware.org Received: from mail-ed1-x549.google.com (mail-ed1-x549.google.com [IPv6:2a00:1450:4864:20::549]) by sourceware.org (Postfix) with ESMTPS id ADB6F3881873 for ; Wed, 16 Mar 2022 16:31:25 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org ADB6F3881873 Received: by mail-ed1-x549.google.com with SMTP id b24-20020a50e798000000b0041631767675so1604163edn.23 for ; Wed, 16 Mar 2022 09:31:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=4L3iFLbdg4PxKVb3T4104U8MKDvT04USGvgKjAoy+Ew=; b=x6PZGXytWeMd7BRlbBGPguzn9CA3gIY3CMD6c6hgc3w5kKpCP/LhoZySXWZDoRlt6z FVPNQFmY8UeNAQan08FIP0sYs6VqWhm/eAej2Yy+STviWeJT7evKJQC9E5q1+Jxlgoty +pkOgAZqACas6V+ZsW7i2PAkGaFjR1ZSXdH/Ooey2aY/DGDoc36hUNKtmZ65GuRe4ZZv Ff+7bh1Yupkpul8V7QmtsStQh8QBLSsbp36b+7LVZy01S4mAlrxyiqaXvduN/EjHqLc2 +PhNdCwSDb39FtmlMGmwKkNBh7jz6rQKS/B1CGBYDFTDhCbdp6EucS27BxXkJ7pPKjJY +FKw== X-Gm-Message-State: AOAM531SIvBrfK0/x8RZ9q6KRwKf9q5+agZRLvV7L4HNACWDHLqS0wda R1BlIiOsVQdzEjHJ9PHaNXBKQvEffXs+JmLwECnwd6heyiLYLjanO90V3OR5vux6gS82H16DUGS fkPczSMcpJgNBgpN6oNF1SArQJVqb0rPG+bLcmvvDuJuQ1h4MgAlGwimbTUGRjALU6OXqEHU= X-Google-Smtp-Source: ABdhPJyvbyqclHV4r2iIopV5loMQKljQAv3SG4jqmxdTyzoGkZONVGvjD4p0a7XlC2lgh/jqlvM9fQQQcNW41Q== X-Received: from tef.lon.corp.google.com ([2a00:79e0:d:210:5871:c940:7381:f8f4]) (user=gprocida job=sendgmr) by 2002:a17:907:a41f:b0:6d6:f925:1696 with SMTP id sg31-20020a170907a41f00b006d6f9251696mr726731ejc.62.1647448284207; Wed, 16 Mar 2022 09:31:24 -0700 (PDT) Date: Wed, 16 Mar 2022 16:30:52 +0000 In-Reply-To: <20220316163055.4127796-1-gprocida@google.com> Message-Id: <20220316163055.4127796-2-gprocida@google.com> Mime-Version: 1.0 References: <20220314181312.3436802-1-gprocida@google.com> <20220316163055.4127796-1-gprocida@google.com> X-Mailer: git-send-email 2.35.1.894.gb6a874cedc-goog Subject: [PATCH v2 1/4] optional: minor improvements To: libabigail@sourceware.org X-Spam-Status: No, score=-21.5 required=5.0 tests=BAYES_00, DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE, USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libabigail@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Mailing list of the Libabigail project List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-Patchwork-Original-From: Giuliano Procida via Libabigail From: Giuliano Procida Reply-To: Giuliano Procida Cc: maennich@google.com, kernel-team@android.com Errors-To: libabigail-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libabigail" This change makes minor improvements to the optional class used with pre-C++17 compilers. - adds operator== and operator!= - adds various missing noexcept (but not constexpr) decorations - defines operator bool in terms of has_value Note that some constexpr decorations would require C++17 anyway. * include/abg-cxx-compat.h (optional): Add operator== and operator!=. Add noexcept decorations. Tweak operator bool. Signed-off-by: Giuliano Procida Reviewed-by: Matthias Maennich --- include/abg-cxx-compat.h | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/include/abg-cxx-compat.h b/include/abg-cxx-compat.h index 443905c7..5c5943d0 100644 --- a/include/abg-cxx-compat.h +++ b/include/abg-cxx-compat.h @@ -45,7 +45,7 @@ public: optional(const T& value) : has_value_(true), value_(value) {} bool - has_value() const + has_value() const noexcept { return has_value_; } @@ -67,19 +67,19 @@ public: } const T& - operator*() const + operator*() const& noexcept { return value_; } T& - operator*() + operator*() & noexcept { return value_; } const T* - operator->() const + operator->() const noexcept { return &value_; } T* - operator->() + operator->() noexcept { return &value_; } optional& @@ -90,9 +90,27 @@ public: return *this; } - explicit operator bool() const { return has_value_; } + explicit operator bool() const noexcept { return has_value(); } }; +template +bool +operator==(const optional& lhs, const optional& rhs) +{ + if (!lhs.has_value() && !rhs.has_value()) + return true; + if (!lhs.has_value() || !rhs.has_value()) + return false; + return lhs.value() == rhs.value(); +} + +template +bool +operator!=(const optional& lhs, const optional& rhs) +{ + return !(lhs == rhs); +} + #endif } From patchwork Wed Mar 16 16:30:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Giuliano Procida X-Patchwork-Id: 52012 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 7D4C03888821 for ; Wed, 16 Mar 2022 16:31:34 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7D4C03888821 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1647448294; bh=ZmtlayKLLf1Ev4AkINXNqsacXFAWi4pV7HgUVAwE3yU=; h=Date:In-Reply-To:References:Subject:To:List-Id:List-Unsubscribe: List-Archive:List-Help:List-Subscribe:From:Reply-To:Cc:From; b=GBam0nv2MgOEmKUAMz/daFTdeHc8/PNhT/IkWpQTvsmoLgv2rUubs6JCHXJw4TD4b 4WSeWupd0EBNvM7ebHiYXkz2rzwHZUcGJ61lfNLmXVyRBCcORiLYBQKUSfVblLBCjq hng5RhiPokr520tx/sglO29Q82P2w5ly599eb3tk= X-Original-To: libabigail@sourceware.org Delivered-To: libabigail@sourceware.org Received: from mail-ed1-x54a.google.com (mail-ed1-x54a.google.com [IPv6:2a00:1450:4864:20::54a]) by sourceware.org (Postfix) with ESMTPS id 20E81388883D for ; Wed, 16 Mar 2022 16:31:28 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 20E81388883D Received: by mail-ed1-x54a.google.com with SMTP id x25-20020a50d619000000b00418e70d8528so1604890edi.21 for ; Wed, 16 Mar 2022 09:31:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=ZmtlayKLLf1Ev4AkINXNqsacXFAWi4pV7HgUVAwE3yU=; b=pPJiPxmPOXZAziJPlOZgvv37USOHC+OClwm5ulEghpVEZsklMVpM5y7N8iq+KLoaif WHUeSmqt8Adc7UOUYDenunfd0hmDA2aYnqmhkDom8OC//bzhDTU2+qcKMmzuZ9VUQt2d XpcIeLuA0rf6ALtl/DPel/0ZEjZatR9uAIwtfsk4h45aRpOxl1LjSLgQtSl7LLflGZ9G HdTiroD7t378F58XfWCMiedwraMIppomu/QT2bOE5kalNCHdC/P90qHZh40D79uZSXGr rFpy5Qufei8FBoD7QRZKMwJveVpd5Uj2apDz9MyyxRpu6aivbHIq9Hn02+RRxtwATt4u 00sw== X-Gm-Message-State: AOAM531NWQmKuUNUwhSxF5V7mZpj012LgYhMAwtihdWfj3dXdubCh5au CW33Z8YSjHAz1AscG0nh4TB/maAeXCyJMZ94Fl+ni6nSsYuHEenRaW0BEq+d06qfwMix+v7Q+R1 lVvIDy2DdwtOCn3QyY4JOYTBs/mpAe3KFJ3Xb0dRV+oGE/VON/45REJKWthlOGsVxEdivjoM= X-Google-Smtp-Source: ABdhPJxRCmRhv77u+cl5qQ4rm/1NjLscJEN6m/wjg32+M9cpeqQUzZ7knMj+bS2gRPgOsJ1khh/DC+aorQadIw== X-Received: from tef.lon.corp.google.com ([2a00:79e0:d:210:5871:c940:7381:f8f4]) (user=gprocida job=sendgmr) by 2002:aa7:ca01:0:b0:415:ece6:b0d9 with SMTP id y1-20020aa7ca01000000b00415ece6b0d9mr266197eds.303.1647448286808; Wed, 16 Mar 2022 09:31:26 -0700 (PDT) Date: Wed, 16 Mar 2022 16:30:53 +0000 In-Reply-To: <20220316163055.4127796-1-gprocida@google.com> Message-Id: <20220316163055.4127796-3-gprocida@google.com> Mime-Version: 1.0 References: <20220314181312.3436802-1-gprocida@google.com> <20220316163055.4127796-1-gprocida@google.com> X-Mailer: git-send-email 2.35.1.894.gb6a874cedc-goog Subject: [PATCH v2 2/4] crc_changed: eliminate copying of shared_ptr values To: libabigail@sourceware.org X-Spam-Status: No, score=-21.4 required=5.0 tests=BAYES_00, DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE, USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libabigail@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Mailing list of the Libabigail project List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-Patchwork-Original-From: Giuliano Procida via Libabigail From: Giuliano Procida Reply-To: Giuliano Procida Cc: maennich@google.com, kernel-team@android.com Errors-To: libabigail-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libabigail" As pointed out in a review of similar code, it is possible to avoid copying a couple of shared pointers in this function, by taking references instead. This commit also splits declarations to one per line and removes the unnecessary parentheses around the return expression. * src/abg-comp-filter.cc (crc_changed): Take references to avoid std::shared_ptr copying. Split declarations into one per line. Remove unnecessary return expression parentheses. Signed-off-by: Giuliano Procida Reviewed-by: Matthias Maennich --- src/abg-comp-filter.cc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/abg-comp-filter.cc b/src/abg-comp-filter.cc index 56251274..f90fdc78 100644 --- a/src/abg-comp-filter.cc +++ b/src/abg-comp-filter.cc @@ -230,11 +230,13 @@ static bool crc_changed(const function_or_var_decl_sptr& f, const function_or_var_decl_sptr& s) { - const auto symbol_f = f->get_symbol(), symbol_s = s->get_symbol(); + const auto& symbol_f = f->get_symbol(); + const auto& symbol_s = s->get_symbol(); if (!symbol_f || !symbol_s) return false; - const auto crc_f = symbol_f->get_crc(), crc_s = symbol_s->get_crc(); - return (crc_f != 0 && crc_s != 0 && crc_f != crc_s); + const auto crc_f = symbol_f->get_crc(); + const auto crc_s = symbol_s->get_crc(); + return crc_f != 0 && crc_s != 0 && crc_f != crc_s; } /// Test if the current diff tree node carries a CRC change in either a From patchwork Wed Mar 16 16:30:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Giuliano Procida X-Patchwork-Id: 52014 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id B208E3888821 for ; Wed, 16 Mar 2022 16:31:42 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B208E3888821 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1647448302; bh=y7F6/MTiuLEk6fc0wkKs98YwycUWSY2cN2e7bLYYu5M=; h=Date:In-Reply-To:References:Subject:To:List-Id:List-Unsubscribe: List-Archive:List-Help:List-Subscribe:From:Reply-To:Cc:From; b=TvgRaKSV0dhb0HUVTzJAZiiEJDHK7XOFr+3/c+lSuMwThm7mkppeaSK2xvpAK/zko 8uh7SCBRBkFU8aLx9QMLNNNn3TzlFRnLmBIuzT9MHOw/LbMDMc3KgZwkBBAe1KAHB+ r3w2S9XTWItpLRKYu01uqPaJpUuyQLt7C/r3DLMw= X-Original-To: libabigail@sourceware.org Delivered-To: libabigail@sourceware.org Received: from mail-ej1-x649.google.com (mail-ej1-x649.google.com [IPv6:2a00:1450:4864:20::649]) by sourceware.org (Postfix) with ESMTPS id A8410388883E for ; Wed, 16 Mar 2022 16:31:30 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org A8410388883E Received: by mail-ej1-x649.google.com with SMTP id hq34-20020a1709073f2200b006d677c94909so1457658ejc.8 for ; Wed, 16 Mar 2022 09:31:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=y7F6/MTiuLEk6fc0wkKs98YwycUWSY2cN2e7bLYYu5M=; b=NWfVgUOAloowI7ygVnhRWRBLLEKeE8olhyDHv/SxErL5+H0vr61DjmCWTnqg78ZVNj UD/LXpIEksaXLZxuL10sWg56l0bIDnnybtGLBhLyNvKOKfKGqYdoMbExIUOAuDlT0N3I nICk5QvCSy2XXUjAO0lDpwCXrZ+TTkGS8FEmBjRREJSm8ofTjkIztu/TEV1umSQoYOK6 qbHWmrVhvOkUpd58lIZW927RcWaStgrQTfSoY5P75KyxjFGERpTetAli30AivZmxdVbB /hp4qVj0KEA81XVsYtpCnqyHNMZevgbB3dxTK2F/DgLqFMjXJh7w/quZRbnOAjwqooCY 2rcQ== X-Gm-Message-State: AOAM5312QSuFfyig7c3u7M9Fwg8R93VevzLegHDAVq8eVcsXqMouC/Me LxL2sUrfQ4HAnpvizFLaydFj4Z5To1cAiuSz1J/DR0GrR+4SCK08obCei4AxY3xfk+2ZCEkLISb ZUs0w1nfVj8Pmb4PicjMN05PxSKwwwYMik4R+dD9oUGuzXkdlOTS1t/23GEHSnrhjjtuqVN0= X-Google-Smtp-Source: ABdhPJyiEKG17ztkVDQYuRM8lV5lOdEGUzBujphWoxhtp65tzJpjIY6LIKP/wMUGNe7cCHg4RPmRTD4d9SO8MQ== X-Received: from tef.lon.corp.google.com ([2a00:79e0:d:210:5871:c940:7381:f8f4]) (user=gprocida job=sendgmr) by 2002:a05:6402:51ce:b0:418:5745:f869 with SMTP id r14-20020a05640251ce00b004185745f869mr299012edd.39.1647448289360; Wed, 16 Mar 2022 09:31:29 -0700 (PDT) Date: Wed, 16 Mar 2022 16:30:54 +0000 In-Reply-To: <20220316163055.4127796-1-gprocida@google.com> Message-Id: <20220316163055.4127796-4-gprocida@google.com> Mime-Version: 1.0 References: <20220314181312.3436802-1-gprocida@google.com> <20220316163055.4127796-1-gprocida@google.com> X-Mailer: git-send-email 2.35.1.894.gb6a874cedc-goog Subject: [PATCH v2 3/4] add Linux kernel symbol namespace support To: libabigail@sourceware.org X-Spam-Status: No, score=-21.6 required=5.0 tests=BAYES_00, DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE, USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libabigail@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Mailing list of the Libabigail project List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-Patchwork-Original-From: Giuliano Procida via Libabigail From: Giuliano Procida Reply-To: Giuliano Procida Cc: maennich@google.com, kernel-team@android.com Errors-To: libabigail-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libabigail" Bug 28954 - add Linux Kernel symbol namespace support Each Linux kernel symbol can be exported to a specified named namespace or left in the global (nameless) namespace. One complexity is that the offset symbol values require slightly different interpretation for vmlinux and .ko loadable modules as the former has a fixed load address but the latter are relocatable. The global namespace is explicitly represented as the empty string, at least when it comes to the value of __kstrtabns_FOO symbols, but the common interpretation is that such symbols lack an export namespace. I would rather not have to make use of "empty implies missing" in many places, so the code here represents namespace as optional and only the symtab reader cares about empty strings in __ksymtab_strings. * include/abg-ir.h (elf_symbol::elf_symbol): Add ns argument. (elf_symbol::create): Add ns argument. (elf_symbol::get_namespace): Declare new function. (elf_symbol::set_namespace): Declare new function. and set_namespace. * src/abg-comp-filter.cc (namespace_changed): Define new helper functions. (categorize_harmful_diff_node): Also call namespace_changed(). * src/abg-ir.cc (elf_symbol::priv): Add namespace_ member. (elf_symbol::priv::priv): Add namespace_ to initialisers. (elf_symbol::elf_symbol): Take new ns argument and pass it to priv constructor. (elf_symbol::create): Take new ns argument and pass it to elf_symbol constructor. (elf_symbol::get_namespace): Define new function. (elf_symbol::set_namespace): Define new function. * src/abg-reader.cc (build_elf_symbol): If namespace attribute is present, set symbol namespace. * src/abg-reporter-priv.cc (maybe_report_diff_for_symbol): If symbol namespaces differ, report this. * src/abg-symtab-reader.cc (symtab::load): Try to get __ksymtab_strings metadata and data. Use these to look up __kstrtabns_FOO namespace entries. Set symbol namespace where found. * src/abg-writer.cc (write_elf_symbol): Emit namespace attribute, if symbol has a namespace. * tests/data/Makefile.am: Add new test files. * tests/data/test-abidiff/test-namespace-0.xml: New test file. * tests/data/test-abidiff/test-namespace-1.xml: Likewise * tests/data/test-abidiff/test-namespace-report.txt: Likewise. * tests/test-abidiff.cc: Add new test case. Signed-off-by: Giuliano Procida --- include/abg-ir.h | 9 +++ src/abg-comp-filter.cc | 40 +++++++++++- src/abg-ir.cc | 30 ++++++++- src/abg-reader.cc | 7 +++ src/abg-reporter-priv.cc | 18 ++++++ src/abg-symtab-reader.cc | 61 +++++++++++++++++++ src/abg-writer.cc | 3 + tests/data/Makefile.am | 3 + tests/data/test-abidiff/test-namespace-0.xml | 15 +++++ tests/data/test-abidiff/test-namespace-1.xml | 15 +++++ .../test-abidiff/test-namespace-report.txt | 17 ++++++ tests/test-abidiff.cc | 6 ++ 12 files changed, 221 insertions(+), 3 deletions(-) create mode 100644 tests/data/test-abidiff/test-namespace-0.xml create mode 100644 tests/data/test-abidiff/test-namespace-1.xml create mode 100644 tests/data/test-abidiff/test-namespace-report.txt diff --git a/include/abg-ir.h b/include/abg-ir.h index a2f4e1a7..7c42bea7 100644 --- a/include/abg-ir.h +++ b/include/abg-ir.h @@ -21,6 +21,7 @@ #include #include #include +#include "abg-cxx-compat.h" #include "abg-fwd.h" #include "abg-hash.h" #include "abg-traverse.h" @@ -921,6 +922,7 @@ private: visibility vi, bool is_in_ksymtab = false, uint64_t crc = 0, + const abg_compat::optional& ns = {}, bool is_suppressed = false); elf_symbol(const elf_symbol&); @@ -946,6 +948,7 @@ public: visibility vi, bool is_in_ksymtab = false, uint64_t crc = 0, + const abg_compat::optional& ns = {}, bool is_suppressed = false); const environment* @@ -1023,6 +1026,12 @@ public: void set_crc(uint64_t crc); + const abg_compat::optional& + get_namespace() const; + + void + set_namespace(const abg_compat::optional& ns); + bool is_suppressed() const; diff --git a/src/abg-comp-filter.cc b/src/abg-comp-filter.cc index f90fdc78..c179b6bd 100644 --- a/src/abg-comp-filter.cc +++ b/src/abg-comp-filter.cc @@ -256,6 +256,43 @@ crc_changed(const diff* diff) return false; } +/// Test if there was a function or variable namespace change. +/// +/// @param f the first function or variable to consider. +/// +/// @param s the second function or variable to consider. +/// +/// @return true if the test is positive, false otherwise. +template +static bool +namespace_changed(const function_or_var_decl_sptr& f, + const function_or_var_decl_sptr& s) +{ + const auto& symbol_f = f->get_symbol(); + const auto& symbol_s = s->get_symbol(); + if (!symbol_f || !symbol_s) + return false; + return symbol_f->get_namespace() != symbol_s->get_namespace(); +} + +/// Test if the current diff tree node carries a namespace change in +/// either a function or a variable. +/// +/// @param diff the diff tree node to consider. +/// +/// @return true if the test is positive, false otherwise. +static bool +namespace_changed(const diff* diff) +{ + if (const function_decl_diff* d = + dynamic_cast(diff)) + return namespace_changed(d->first_function_decl(), + d->second_function_decl()); + if (const var_diff* d = dynamic_cast(diff)) + return namespace_changed(d->first_var(), d->second_var()); + return false; +} + /// Test if there was a function name change, but there there was no /// change in name of the underlying symbol. IOW, if the name of a /// function changed, but the symbol of the new function is equal to @@ -1783,7 +1820,8 @@ categorize_harmful_diff_node(diff *d, bool pre) || non_static_data_member_added_or_removed(d) || base_classes_added_or_removed(d) || has_harmful_enum_change(d) - || crc_changed(d))) + || crc_changed(d) + || namespace_changed(d))) category |= SIZE_OR_OFFSET_CHANGE_CATEGORY; if (has_virtual_mem_fn_change(d)) diff --git a/src/abg-ir.cc b/src/abg-ir.cc index 0ef5e8b2..78154622 100644 --- a/src/abg-ir.cc +++ b/src/abg-ir.cc @@ -1728,6 +1728,7 @@ struct elf_symbol::priv bool is_common_; bool is_in_ksymtab_; uint64_t crc_; + abg_compat::optional namespace_; bool is_suppressed_; elf_symbol_wptr main_symbol_; elf_symbol_wptr next_alias_; @@ -1745,6 +1746,7 @@ struct elf_symbol::priv is_common_(false), is_in_ksymtab_(false), crc_(0), + namespace_(), is_suppressed_(false) {} @@ -1760,6 +1762,7 @@ struct elf_symbol::priv elf_symbol::visibility vi, bool is_in_ksymtab, uint64_t crc, + const abg_compat::optional& ns, bool is_suppressed) : env_(e), index_(i), @@ -1773,6 +1776,7 @@ struct elf_symbol::priv is_common_(c), is_in_ksymtab_(is_in_ksymtab), crc_(crc), + namespace_(ns), is_suppressed_(is_suppressed) { if (!is_common_) @@ -1818,6 +1822,8 @@ elf_symbol::elf_symbol() /// @param vi the visibility of the symbol. /// /// @param crc the CRC (modversions) value of Linux Kernel symbols +/// +/// @param ns the namespace of Linux Kernel symbols, if any elf_symbol::elf_symbol(const environment* e, size_t i, size_t s, @@ -1830,6 +1836,7 @@ elf_symbol::elf_symbol(const environment* e, visibility vi, bool is_in_ksymtab, uint64_t crc, + const abg_compat::optional& ns, bool is_suppressed) : priv_(new priv(e, i, @@ -1843,6 +1850,7 @@ elf_symbol::elf_symbol(const environment* e, vi, is_in_ksymtab, crc, + ns, is_suppressed)) {} @@ -1886,6 +1894,8 @@ elf_symbol::create() /// /// @param crc the CRC (modversions) value of Linux Kernel symbols /// +/// @param ns the namespace of Linux Kernel symbols, if any +/// /// @return a (smart) pointer to a newly created instance of @ref /// elf_symbol. elf_symbol_sptr @@ -1901,10 +1911,11 @@ elf_symbol::create(const environment* e, visibility vi, bool is_in_ksymtab, uint64_t crc, + const abg_compat::optional& ns, bool is_suppressed) { elf_symbol_sptr sym(new elf_symbol(e, i, s, n, t, b, d, c, ve, vi, - is_in_ksymtab, crc, is_suppressed)); + is_in_ksymtab, crc, ns, is_suppressed)); sym->priv_->main_symbol_ = sym; return sym; } @@ -1927,7 +1938,8 @@ textually_equals(const elf_symbol&l, && l.is_common_symbol() == r.is_common_symbol() && l.get_version() == r.get_version() && (l.get_crc() == 0 || r.get_crc() == 0 - || l.get_crc() == r.get_crc())); + || l.get_crc() == r.get_crc()) + && l.get_namespace() == r.get_namespace()); if (equals && l.is_variable()) // These are variable symbols. Let's compare their symbol size. @@ -2147,6 +2159,20 @@ void elf_symbol::set_crc(uint64_t crc) {priv_->crc_ = crc;} +/// Getter of the 'namespace' property. +/// +/// @return the namespace for Linux Kernel symbols, if any +const abg_compat::optional& +elf_symbol::get_namespace() const +{return priv_->namespace_;} + +/// Setter of the 'namespace' property. +/// +/// @param ns the new namespace for Linux Kernel symbols, if any +void +elf_symbol::set_namespace(const abg_compat::optional& ns) +{priv_->namespace_ = ns;} + /// Getter for the 'is-suppressed' property. /// /// @return true iff the current symbol has been suppressed by a diff --git a/src/abg-reader.cc b/src/abg-reader.cc index 31885692..0a8ecd70 100644 --- a/src/abg-reader.cc +++ b/src/abg-reader.cc @@ -3269,6 +3269,13 @@ build_elf_symbol(read_context& ctxt, const xmlNodePtr node, if (crc != 0) e->set_crc(crc); + if (xml_char_sptr s = XML_NODE_GET_ATTRIBUTE(node, "namespace")) + { + std::string ns; + xml::xml_char_sptr_to_string(s, ns); + e->set_namespace(ns); + } + return e; } diff --git a/src/abg-reporter-priv.cc b/src/abg-reporter-priv.cc index 7012f5dc..9ebcdf00 100644 --- a/src/abg-reporter-priv.cc +++ b/src/abg-reporter-priv.cc @@ -1158,6 +1158,24 @@ maybe_report_diff_for_symbol(const elf_symbol_sptr& symbol1, << std::noshowbase << std::dec << "\n"; } + + const abg_compat::optional& ns1 = symbol1->get_namespace(); + const abg_compat::optional& ns2 = symbol2->get_namespace(); + if (ns1 != ns2) + { + const std::string none = "(none)"; + out << indent << "namespace changed from "; + if (ns1.has_value()) + out << "'" << ns1.value() << "'"; + else + out << none; + out << " to "; + if (ns2.has_value()) + out << "'" << ns2.value() << "'"; + else + out << none; + out << "\n"; + } } /// For a given symbol, emit a string made of its name and version. diff --git a/src/abg-symtab-reader.cc b/src/abg-symtab-reader.cc index b42ce87d..e59bd62c 100644 --- a/src/abg-symtab-reader.cc +++ b/src/abg-symtab-reader.cc @@ -232,9 +232,33 @@ symtab::load_(Elf* elf_handle, return false; } + // The __kstrtab_strings sections is basically an ELF strtab but does not + // support elf_strptr lookups. A single call to elf_getdata gives a handle to + // section data. + // + // The value of a __kstrtabns_FOO (or other similar) symbol is an address + // within the __kstrtab_strings section. To look up the string value, we need + // to translate from load address to section offset by subtracting the base + // address of the section. + Elf_Scn* strings_section = elf_helpers::find_ksymtab_strings_section(elf_handle); + size_t strings_offset = 0; + const char* strings_data = nullptr; + size_t strings_size = 0; + if (strings_section) + { + GElf_Shdr strings_sheader; + gelf_getshdr(strings_section, &strings_sheader); + strings_offset = strings_sheader.sh_addr; + Elf_Data* data = elf_getdata(strings_section, nullptr); + ABG_ASSERT(data->d_off == 0); + strings_data = reinterpret_cast(data->d_buf); + strings_size = data->d_size; + } + const bool is_kernel = elf_helpers::is_linux_kernel(elf_handle); std::unordered_set exported_kernel_symbols; std::unordered_map crc_values; + std::unordered_map namespaces; const bool is_arm32 = elf_helpers::architecture_is_arm32(elf_handle); const bool is_ppc64 = elf_helpers::architecture_is_ppc64(elf_handle); @@ -288,6 +312,32 @@ symtab::load_(Elf* elf_handle, ABG_ASSERT(crc_values.emplace(name.substr(6), sym->st_value).second); continue; } + if (strings_section && is_kernel && name.rfind("__kstrtabns_", 0) == 0) + { + // This symbol lives in the __ksymtab_strings section but st_value is + // a load address so, for vmlinux only, we need to subtract an offset + // before looking it up in that section. Kernel module offsets must + // not be adjusted. The simple way to distinguish the cases is to see + // if the adjustment would overflow. + const size_t value = sym->st_value; + const size_t offset = + value < strings_offset ? value : value - strings_offset; + // check offset + ABG_ASSERT(offset < strings_size); + // find the terminating NULL + const char* first = strings_data + offset; + const char* last = strings_data + strings_size; + const char* limit = std::find(first, last, 0); + // check NULL found + ABG_ASSERT(limit < last); + // interpret the empty namespace name as no namespace name + if (first < limit) + { + const std::string ns(first, limit - first); + ABG_ASSERT(namespaces.emplace(name.substr(12), ns).second); + } + continue; + } // filter out uninteresting entries and only keep functions/variables for // now. The rest might be interesting in the future though. @@ -402,6 +452,17 @@ symtab::load_(Elf* elf_handle, symbol->set_crc(crc_entry.second); } + // Now add the namespaces + for (const auto& namespace_entry : namespaces) + { + const auto r = name_symbol_map_.find(namespace_entry.first); + if (r == name_symbol_map_.end()) + continue; + + for (const auto& symbol : r->second) + symbol->set_namespace(namespace_entry.second); + } + // sort the symbols for deterministic output std::sort(symbols_.begin(), symbols_.end(), symbol_sort); diff --git a/src/abg-writer.cc b/src/abg-writer.cc index 7802128d..692abc75 100644 --- a/src/abg-writer.cc +++ b/src/abg-writer.cc @@ -3136,6 +3136,9 @@ write_elf_symbol(const elf_symbol_sptr& sym, << std::hex << std::showbase << sym->get_crc() << "'" << std::dec << std::noshowbase; + if (sym->get_namespace().has_value()) + o << " namespace='" << sym->get_namespace().value() << "'"; + o << "/>\n"; return true; diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am index a7eb7ff0..7ea24d58 100644 --- a/tests/data/Makefile.am +++ b/tests/data/Makefile.am @@ -91,6 +91,9 @@ test-abidiff/test-crc-0.xml \ test-abidiff/test-crc-1.xml \ test-abidiff/test-crc-2.xml \ test-abidiff/test-crc-report.txt \ +test-abidiff/test-namespace-0.xml \ +test-abidiff/test-namespace-1.xml \ +test-abidiff/test-namespace-report.txt \ test-abidiff/test-PR27985-report.txt \ test-abidiff/test-PR27985-v0.c \ test-abidiff/test-PR27985-v0.o \ diff --git a/tests/data/test-abidiff/test-namespace-0.xml b/tests/data/test-abidiff/test-namespace-0.xml new file mode 100644 index 00000000..5a9f5cd2 --- /dev/null +++ b/tests/data/test-abidiff/test-namespace-0.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/tests/data/test-abidiff/test-namespace-1.xml b/tests/data/test-abidiff/test-namespace-1.xml new file mode 100644 index 00000000..9814844b --- /dev/null +++ b/tests/data/test-abidiff/test-namespace-1.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/tests/data/test-abidiff/test-namespace-report.txt b/tests/data/test-abidiff/test-namespace-report.txt new file mode 100644 index 00000000..d2c421ed --- /dev/null +++ b/tests/data/test-abidiff/test-namespace-report.txt @@ -0,0 +1,17 @@ +Functions changes summary: 0 Removed, 0 Changed, 0 Added function +Variables changes summary: 0 Removed, 4 Changed, 0 Added variables + +4 Changed variables: + + [C] 'int v1' was changed: + namespace changed from (none) to 'this' + + [C] 'int v2' was changed: + namespace changed from 'this' to 'that' + + [C] 'int v3' was changed: + namespace changed from 'that' to '' + + [C] 'int v4' was changed: + namespace changed from '' to (none) + diff --git a/tests/test-abidiff.cc b/tests/test-abidiff.cc index 32858ece..009f7de5 100644 --- a/tests/test-abidiff.cc +++ b/tests/test-abidiff.cc @@ -128,6 +128,12 @@ static InOutSpec specs[] = "data/test-abidiff/test-crc-report.txt", "output/test-abidiff/test-crc-report-1-2.txt" }, + { + "data/test-abidiff/test-namespace-0.xml", + "data/test-abidiff/test-namespace-1.xml", + "data/test-abidiff/test-namespace-report.txt", + "output/test-abidiff/test-namespace-report-0-1.txt" + }, { "data/test-abidiff/test-PR27616-v0.xml", "data/test-abidiff/test-PR27616-v1.xml", From patchwork Wed Mar 16 16:30:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Giuliano Procida X-Patchwork-Id: 52013 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 894883888C41 for ; Wed, 16 Mar 2022 16:31:39 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 894883888C41 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1647448299; bh=S0Qf+6do/qEGhIRUxMR7fkpudQCRDldRNie4Qrhex4c=; h=Date:In-Reply-To:References:Subject:To:List-Id:List-Unsubscribe: List-Archive:List-Help:List-Subscribe:From:Reply-To:Cc:From; b=SzOV13nDwcnjnUODiqoyTArH/PlfQ4gaV69qHiKJDl0Gu7X5yWJH4lMNW2MQLCivq c8eo5+psy6Am3xgbHFw3ojosQBzHER5xpnu0RPWlN/ZQnr73McO3Tbk7n4tHzWAMLQ 2S5gqIGQbn9ao56ybnJu+QQ43mq0dRXaxAsDj/pY= X-Original-To: libabigail@sourceware.org Delivered-To: libabigail@sourceware.org Received: from mail-wm1-x34a.google.com (mail-wm1-x34a.google.com [IPv6:2a00:1450:4864:20::34a]) by sourceware.org (Postfix) with ESMTPS id 2755F3888837 for ; Wed, 16 Mar 2022 16:31:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 2755F3888837 Received: by mail-wm1-x34a.google.com with SMTP id f19-20020a7bcd13000000b0038c01defd5aso1236241wmj.7 for ; Wed, 16 Mar 2022 09:31:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=S0Qf+6do/qEGhIRUxMR7fkpudQCRDldRNie4Qrhex4c=; b=lLX7vFr8KpBVaaj6JDeemARTuYQ5bl/sOxU/2UIb9W5l3s9RxDVMjvfIBfN7vReb8/ Blg6N0hATbeOt8KW9q7/AHjWOZTrP8X4DdQXAuQbwBodCihbigzTFIyWdMPZ1bnoRHl1 E4ICFjEhcJ7rUP1yBclNur1Ayo7AXiDe8aGEPLtUV38vr4HqKrtM8zWO45PuT51w7gwN IMEE8ObrbxQ/tGuBrJq3kkkUnEgcorlDpm4Bik3TDDqGH343mhtZYrRipmwjX2yevuuL ufbJcxrGJBj4wcJf8TGRKXhMVRcBS+rYcDHv9Tdkl1ZwBHkl1JHzIOzmUxCvwaqnm7Ew dYRA== X-Gm-Message-State: AOAM5314wgtTEsuGxtGHrb+YOmyapK0KfjSACY2WSFVoW+U5O+SCnBX1 radgKdqM5jp5c7/Xn4JZbitz9Tk2G7YXhXUj7knalpf7JsaixBRzipUNkfF9zql1IFxo2mmuCXl 1e3TrebX7VoZVqjYopWrLKEYWMAv+o8/EgGrQCNLMTRt1kzfPkPKvO83XW31uHDvMZuDQHKc= X-Google-Smtp-Source: ABdhPJy5zJm48mzNROp4FeOspTHA9SW1MhBj4gtdV3g3XY5SMGFJtu1WH/a4e8Nmma3FyQSjjFBtxFsmCmbe7A== X-Received: from tef.lon.corp.google.com ([2a00:79e0:d:210:5871:c940:7381:f8f4]) (user=gprocida job=sendgmr) by 2002:a5d:68d2:0:b0:1f0:653f:108d with SMTP id p18-20020a5d68d2000000b001f0653f108dmr556943wrw.283.1647448291945; Wed, 16 Mar 2022 09:31:31 -0700 (PDT) Date: Wed, 16 Mar 2022 16:30:55 +0000 In-Reply-To: <20220316163055.4127796-1-gprocida@google.com> Message-Id: <20220316163055.4127796-5-gprocida@google.com> Mime-Version: 1.0 References: <20220314181312.3436802-1-gprocida@google.com> <20220316163055.4127796-1-gprocida@google.com> X-Mailer: git-send-email 2.35.1.894.gb6a874cedc-goog Subject: [PATCH v2 4/4] Linux symbol CRCs: support 0 and report presence changes To: libabigail@sourceware.org X-Spam-Status: No, score=-22.6 required=5.0 tests=BAYES_00, DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE, USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libabigail@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Mailing list of the Libabigail project List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-Patchwork-Original-From: Giuliano Procida via Libabigail From: Giuliano Procida Reply-To: Giuliano Procida Cc: maennich@google.com, kernel-team@android.com Errors-To: libabigail-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libabigail" The CRC with value zero was used to mean "absent". This can be better modelled using optional. This commit makes this change and also tweaks reporting so that disappearing / appearing CRCs are noted. This should be essentially impossible unless CRCs are enabled / disabled altogether but would be very noteworthy otherwise. * include/abg-ir.h (elf_symbol::elf_symbol): Argument crc is now an optional defaulted to absent. (elf_symbol::create): Likewise. (elf_symbol::get_crc): Now returns an optional uint64_t. (elf_symbol::set_src): Now takes an optional uint64_t. * src/abg-comp-filter.cc (crc_changed): Simplify comparison. * src/abg-ir.cc (elf_symbol::priv): Member crc_ is now an optional uint64_t. (elf_symbol::priv::priv): Argument crc is now an optional uint64_t. (elf_symbol::elf_symbol): Likewise. (elf_symbol::create): Argument crc is now an optional uint64_t and defaults to absent. (textually_equals): Simplify comparison. (elf_symbol::get_crc): Now returns an optional uint64_t. (elf_symbol::set_crc): Now takes an optional uint64_t. * src/abg-reader.cc (build_elf_symbol): Treat CRC 0 the same as other CRC values. * src/abg-reporter-priv.cc (maybe_report_diff_for_symbol): Treat CRC 0 the same as other CRC values and also report changes to CRC presence. * src/abg-writer.cc (write_elf_symbol): Treat CRC 0 the same as other CRC values. * tests/data/Makefile: Remove test-abidiff/test-crc-report.txt and add test-abidiff/test-crc-report-{0-1,1-0,1-2}.txt. * tests/data/test-abidiff/test-crc-report-0-1.txt: Report showing additional of CRCs. * tests/data/test-abidiff/test-crc-report-1-0.txt: Report showing removal of CRCs. * tests/data/test-abidiff/test-crc-report-1-2.txt: Renamed from tests/data/test-abidiff/test-crc-report.txt. * tests/test-abidiff.cc: Update test cases that no longer generate empty reports. * tests/test-symtab.cc: Update KernelSymtabsWithCRC test. Signed-off-by: Giuliano Procida Reviewed-by: Matthias Maennich --- include/abg-ir.h | 8 ++++---- src/abg-comp-filter.cc | 4 +--- src/abg-ir.cc | 19 +++++++++--------- src/abg-reader.cc | 8 ++------ src/abg-reporter-priv.cc | 20 ++++++++++++++----- src/abg-writer.cc | 6 +++--- tests/data/Makefile.am | 4 +++- .../data/test-abidiff/test-crc-report-0-1.txt | 16 +++++++++++++++ .../data/test-abidiff/test-crc-report-1-0.txt | 16 +++++++++++++++ ...crc-report.txt => test-crc-report-1-2.txt} | 0 tests/test-abidiff.cc | 6 +++--- tests/test-symtab.cc | 8 ++++---- 12 files changed, 76 insertions(+), 39 deletions(-) create mode 100644 tests/data/test-abidiff/test-crc-report-0-1.txt create mode 100644 tests/data/test-abidiff/test-crc-report-1-0.txt rename tests/data/test-abidiff/{test-crc-report.txt => test-crc-report-1-2.txt} (100%) diff --git a/include/abg-ir.h b/include/abg-ir.h index 7c42bea7..7c558828 100644 --- a/include/abg-ir.h +++ b/include/abg-ir.h @@ -921,7 +921,7 @@ private: const version& ve, visibility vi, bool is_in_ksymtab = false, - uint64_t crc = 0, + const abg_compat::optional& crc = {}, const abg_compat::optional& ns = {}, bool is_suppressed = false); @@ -947,7 +947,7 @@ public: const version& ve, visibility vi, bool is_in_ksymtab = false, - uint64_t crc = 0, + const abg_compat::optional& crc = {}, const abg_compat::optional& ns = {}, bool is_suppressed = false); @@ -1020,11 +1020,11 @@ public: void set_is_in_ksymtab(bool is_in_ksymtab); - uint64_t + const abg_compat::optional& get_crc() const; void - set_crc(uint64_t crc); + set_crc(const abg_compat::optional& crc); const abg_compat::optional& get_namespace() const; diff --git a/src/abg-comp-filter.cc b/src/abg-comp-filter.cc index c179b6bd..22da5244 100644 --- a/src/abg-comp-filter.cc +++ b/src/abg-comp-filter.cc @@ -234,9 +234,7 @@ crc_changed(const function_or_var_decl_sptr& f, const auto& symbol_s = s->get_symbol(); if (!symbol_f || !symbol_s) return false; - const auto crc_f = symbol_f->get_crc(); - const auto crc_s = symbol_s->get_crc(); - return crc_f != 0 && crc_s != 0 && crc_f != crc_s; + return symbol_f->get_crc() != symbol_s->get_crc(); } /// Test if the current diff tree node carries a CRC change in either a diff --git a/src/abg-ir.cc b/src/abg-ir.cc index 78154622..f90be2e4 100644 --- a/src/abg-ir.cc +++ b/src/abg-ir.cc @@ -1727,7 +1727,7 @@ struct elf_symbol::priv // STT_COMMON definition of that name that has the largest size. bool is_common_; bool is_in_ksymtab_; - uint64_t crc_; + abg_compat::optional crc_; abg_compat::optional namespace_; bool is_suppressed_; elf_symbol_wptr main_symbol_; @@ -1745,7 +1745,7 @@ struct elf_symbol::priv is_defined_(false), is_common_(false), is_in_ksymtab_(false), - crc_(0), + crc_(), namespace_(), is_suppressed_(false) {} @@ -1761,7 +1761,7 @@ struct elf_symbol::priv const elf_symbol::version& ve, elf_symbol::visibility vi, bool is_in_ksymtab, - uint64_t crc, + const abg_compat::optional& crc, const abg_compat::optional& ns, bool is_suppressed) : env_(e), @@ -1835,7 +1835,7 @@ elf_symbol::elf_symbol(const environment* e, const version& ve, visibility vi, bool is_in_ksymtab, - uint64_t crc, + const abg_compat::optional& crc, const abg_compat::optional& ns, bool is_suppressed) : priv_(new priv(e, @@ -1910,7 +1910,7 @@ elf_symbol::create(const environment* e, const version& ve, visibility vi, bool is_in_ksymtab, - uint64_t crc, + const abg_compat::optional& crc, const abg_compat::optional& ns, bool is_suppressed) { @@ -1937,8 +1937,7 @@ textually_equals(const elf_symbol&l, && l.is_defined() == r.is_defined() && l.is_common_symbol() == r.is_common_symbol() && l.get_version() == r.get_version() - && (l.get_crc() == 0 || r.get_crc() == 0 - || l.get_crc() == r.get_crc()) + && l.get_crc() == r.get_crc() && l.get_namespace() == r.get_namespace()); if (equals && l.is_variable()) @@ -2147,8 +2146,8 @@ elf_symbol::set_is_in_ksymtab(bool is_in_ksymtab) /// Getter of the 'crc' property. /// -/// @return the CRC (modversions) value for Linux Kernel symbols (if present) -uint64_t +/// @return the CRC (modversions) value for Linux Kernel symbols, if any +const abg_compat::optional& elf_symbol::get_crc() const {return priv_->crc_;} @@ -2156,7 +2155,7 @@ elf_symbol::get_crc() const /// /// @param crc the new CRC (modversions) value for Linux Kernel symbols void -elf_symbol::set_crc(uint64_t crc) +elf_symbol::set_crc(const abg_compat::optional& crc) {priv_->crc_ = crc;} /// Getter of the 'namespace' property. diff --git a/src/abg-reader.cc b/src/abg-reader.cc index 0a8ecd70..f9e420f1 100644 --- a/src/abg-reader.cc +++ b/src/abg-reader.cc @@ -3239,10 +3239,6 @@ build_elf_symbol(read_context& ctxt, const xmlNodePtr node, is_default_version = true; } - uint64_t crc = 0; - if (xml_char_sptr s = XML_NODE_GET_ATTRIBUTE(node, "crc")) - crc = strtoull(CHAR_STR(s), NULL, 0); - elf_symbol::type type = elf_symbol::NOTYPE_TYPE; read_elf_symbol_type(node, type); @@ -3266,8 +3262,8 @@ build_elf_symbol(read_context& ctxt, const xmlNodePtr node, e->set_is_suppressed(is_suppressed); - if (crc != 0) - e->set_crc(crc); + if (xml_char_sptr s = XML_NODE_GET_ATTRIBUTE(node, "crc")) + e->set_crc(strtoull(CHAR_STR(s), NULL, 0)); if (xml_char_sptr s = XML_NODE_GET_ATTRIBUTE(node, "namespace")) { diff --git a/src/abg-reporter-priv.cc b/src/abg-reporter-priv.cc index 9ebcdf00..9ad733f4 100644 --- a/src/abg-reporter-priv.cc +++ b/src/abg-reporter-priv.cc @@ -1149,13 +1149,23 @@ maybe_report_diff_for_symbol(const elf_symbol_sptr& symbol1, << "\n"; } - if (symbol1->get_crc() != 0 && symbol2->get_crc() != 0 - && symbol1->get_crc() != symbol2->get_crc()) + const abg_compat::optional& crc1 = symbol1->get_crc(); + const abg_compat::optional& crc2 = symbol2->get_crc(); + if (crc1 != crc2) { + const std::string none = "(none)"; out << indent << "CRC (modversions) changed from " - << std::showbase << std::hex - << symbol1->get_crc() << " to " << symbol2->get_crc() - << std::noshowbase << std::dec + << std::showbase << std::hex; + if (crc1.has_value()) + out << crc1.value(); + else + out << none; + out << " to "; + if (crc2.has_value()) + out << crc2.value(); + else + out << none; + out << std::noshowbase << std::dec << "\n"; } diff --git a/src/abg-writer.cc b/src/abg-writer.cc index 692abc75..03fb658b 100644 --- a/src/abg-writer.cc +++ b/src/abg-writer.cc @@ -3131,10 +3131,10 @@ write_elf_symbol(const elf_symbol_sptr& sym, if (sym->is_common_symbol()) o << " is-common='yes'"; - if (sym->get_crc() != 0) + if (sym->get_crc().has_value()) o << " crc='" - << std::hex << std::showbase << sym->get_crc() << "'" - << std::dec << std::noshowbase; + << std::hex << std::showbase << sym->get_crc().value() + << std::dec << std::noshowbase << "'"; if (sym->get_namespace().has_value()) o << " namespace='" << sym->get_namespace().value() << "'"; diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am index 7ea24d58..7388697b 100644 --- a/tests/data/Makefile.am +++ b/tests/data/Makefile.am @@ -90,7 +90,9 @@ test-abidiff/test-empty-corpus-2.xml \ test-abidiff/test-crc-0.xml \ test-abidiff/test-crc-1.xml \ test-abidiff/test-crc-2.xml \ -test-abidiff/test-crc-report.txt \ +test-abidiff/test-crc-report-0-1.txt \ +test-abidiff/test-crc-report-1-0.txt \ +test-abidiff/test-crc-report-1-2.txt \ test-abidiff/test-namespace-0.xml \ test-abidiff/test-namespace-1.xml \ test-abidiff/test-namespace-report.txt \ diff --git a/tests/data/test-abidiff/test-crc-report-0-1.txt b/tests/data/test-abidiff/test-crc-report-0-1.txt new file mode 100644 index 00000000..0db42f68 --- /dev/null +++ b/tests/data/test-abidiff/test-crc-report-0-1.txt @@ -0,0 +1,16 @@ +Functions changes summary: 0 Removed, 1 Changed, 0 Added function +Variables changes summary: 0 Removed, 2 Changed, 0 Added variables + +1 function with some indirect sub-type change: + + [C] 'function void exported_function()' has some indirect sub-type changes: + CRC (modversions) changed from (none) to 0xe52d5bcf + +2 Changed variables: + + [C] 'int exported_variable' was changed: + CRC (modversions) changed from (none) to 0xee94d699 + + [C] 'int exported_variable_gpl' was changed: + CRC (modversions) changed from (none) to 0x41336c46 + diff --git a/tests/data/test-abidiff/test-crc-report-1-0.txt b/tests/data/test-abidiff/test-crc-report-1-0.txt new file mode 100644 index 00000000..e11f29c1 --- /dev/null +++ b/tests/data/test-abidiff/test-crc-report-1-0.txt @@ -0,0 +1,16 @@ +Functions changes summary: 0 Removed, 1 Changed, 0 Added function +Variables changes summary: 0 Removed, 2 Changed, 0 Added variables + +1 function with some indirect sub-type change: + + [C] 'function void exported_function()' has some indirect sub-type changes: + CRC (modversions) changed from 0xe52d5bcf to (none) + +2 Changed variables: + + [C] 'int exported_variable' was changed: + CRC (modversions) changed from 0xee94d699 to (none) + + [C] 'int exported_variable_gpl' was changed: + CRC (modversions) changed from 0x41336c46 to (none) + diff --git a/tests/data/test-abidiff/test-crc-report.txt b/tests/data/test-abidiff/test-crc-report-1-2.txt similarity index 100% rename from tests/data/test-abidiff/test-crc-report.txt rename to tests/data/test-abidiff/test-crc-report-1-2.txt diff --git a/tests/test-abidiff.cc b/tests/test-abidiff.cc index 009f7de5..93e44d6a 100644 --- a/tests/test-abidiff.cc +++ b/tests/test-abidiff.cc @@ -113,19 +113,19 @@ static InOutSpec specs[] = { "data/test-abidiff/test-crc-0.xml", "data/test-abidiff/test-crc-1.xml", - "data/test-abidiff/empty-report.txt", + "data/test-abidiff/test-crc-report-0-1.txt", "output/test-abidiff/test-crc-report-0-1.txt" }, { "data/test-abidiff/test-crc-1.xml", "data/test-abidiff/test-crc-0.xml", - "data/test-abidiff/empty-report.txt", + "data/test-abidiff/test-crc-report-1-0.txt", "output/test-abidiff/test-crc-report-1-0.txt" }, { "data/test-abidiff/test-crc-1.xml", "data/test-abidiff/test-crc-2.xml", - "data/test-abidiff/test-crc-report.txt", + "data/test-abidiff/test-crc-report-1-2.txt", "output/test-abidiff/test-crc-report-1-2.txt" }, { diff --git a/tests/test-symtab.cc b/tests/test-symtab.cc index 7d7a2df0..85303563 100644 --- a/tests/test-symtab.cc +++ b/tests/test-symtab.cc @@ -420,9 +420,9 @@ TEST_CASE("Symtab::KernelSymtabsWithCRC", "[symtab, crc, kernel, ksymtab]") { const std::string binary = base_path + "one_of_each.ko"; const corpus_sptr& corpus = assert_symbol_count(binary, 2, 2); - CHECK(corpus->lookup_function_symbol("exported_function")->get_crc() != 0); - CHECK(corpus->lookup_function_symbol("exported_function_gpl")->get_crc() != 0); - CHECK(corpus->lookup_variable_symbol("exported_variable")->get_crc() != 0); - CHECK(corpus->lookup_variable_symbol("exported_variable_gpl")->get_crc() != 0); + CHECK(corpus->lookup_function_symbol("exported_function")->get_crc()); + CHECK(corpus->lookup_function_symbol("exported_function_gpl")->get_crc()); + CHECK(corpus->lookup_variable_symbol("exported_variable")->get_crc()); + CHECK(corpus->lookup_variable_symbol("exported_variable_gpl")->get_crc()); } }