From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id kNoXLb7g0GEcuQAAgWs5BA (envelope-from ) for ; Sun, 02 Jan 2022 00:16:14 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id 6EHKKb7g0GGiFgAAauVa8A (envelope-from ) for ; Sun, 02 Jan 2022 00:16:14 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id A5CB137A0 for ; Sun, 2 Jan 2022 00:16:13 +0100 (CET) Received: from localhost ([::1]:52054 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n3nbg-0008AV-3Q for larch@yhetil.org; Sat, 01 Jan 2022 18:16:12 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38678) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n3naZ-0007lS-Af for guix-patches@gnu.org; Sat, 01 Jan 2022 18:15:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:48006) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n3naY-00053B-8U for guix-patches@gnu.org; Sat, 01 Jan 2022 18:15:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n3naY-000232-2l for guix-patches@gnu.org; Sat, 01 Jan 2022 18:15:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52940] [PATCH] gremlin: Mimic ld.so NEEDED deduplication behavior. Resent-From: Chris Marusich Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 01 Jan 2022 23:15:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 52940 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52940@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16410788557773 (code B ref -1); Sat, 01 Jan 2022 23:15:01 +0000 Received: (at submit) by debbugs.gnu.org; 1 Jan 2022 23:14:15 +0000 Received: from localhost ([127.0.0.1]:59547 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n3nZm-00021J-6X for submit@debbugs.gnu.org; Sat, 01 Jan 2022 18:14:14 -0500 Received: from lists.gnu.org ([209.51.188.17]:53142) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n3nZW-00020U-6d for submit@debbugs.gnu.org; Sat, 01 Jan 2022 18:14:13 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38524) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n3nZW-0007gm-3J for guix-patches@gnu.org; Sat, 01 Jan 2022 18:13:58 -0500 Received: from [2607:f8b0:4864:20::434] (port=38872 helo=mail-pf1-x434.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n3nZR-0004yK-3o for guix-patches@gnu.org; Sat, 01 Jan 2022 18:13:56 -0500 Received: by mail-pf1-x434.google.com with SMTP id b22so26361869pfb.5 for ; Sat, 01 Jan 2022 15:13:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:user-agent:mime-version; bh=4V71Glf07hguPB/APnJtAywXNDnE+IBSH+JVsoeJ9FA=; b=mtCIXi9sK1cBP8hiIjOnOngzRkCO/na/zAvAP88m3ilXgEoIvoH+dN9Dzbv7rlzPKa ANWww2aTtQP7FpxdFPQemisyUfpDLZrKx0DcJx/Wl2cl+kDJzpi1cK87Z5yo45AAoT9I uK2zJ+adkf4Judt6xWaKEGHmooWQeJ2Poa07g3EDdJBe/Fj0YiHriMMTS9NU1WYjkZoU GU2zQ8KekNCFjc4nuYg28ovYZvgPLExzD6t/4TYSBTkB4LPvQS1cEAknbNQ51Z5KxD4P GpUXQeigLIW+BqezSaGLRgzFI4ZoL4ZTrlgdp05FARsXFMDBw91kRZGefI4322a2Ce47 MJzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:user-agent :mime-version; bh=4V71Glf07hguPB/APnJtAywXNDnE+IBSH+JVsoeJ9FA=; b=VD1/7eZKGxSr39RNv5NrqvmFqn8WbM6dZdsCpSaB94cYlSUkJlEnhR79j9Sx5byCK6 FoG4rk2VeqRtNNqL7yyGNuVhlhpzqePUqs2nb9KxEf2foxoK7EEBoTbUvORcF1qbkAqJ WQTtnmuI9QuDuMGpL8rjsCk5Mllt6aSFkt2cHtnld/0sH8LtAysEzDQW7Ww0poVcUOCm Mg+yCVOcWnAoSFaSensFEV49XqR2mz8jFhpqDlSMAEMuTMQYL/uwFzXHwggB4AyNub+I 5s8UnAcfleR97SaXvVgLgqS4jPCrtsgORTQBphBm7oKpNWUygGnpJi8GDqm0/kDnevUV pDeQ== X-Gm-Message-State: AOAM530kUZhmvcEbofAt8XyfdT2Z8sCVamZpik6Z2usyCbZr6zKGDTYh tPc0SAv1KEsxzbNo0uEP8xwlXNBOS2c= X-Google-Smtp-Source: ABdhPJzV9vpTvWu1Em1P93/BlX3cDX1E5TgGi9y1rg8HUKphHgYwOUb0ScH25E6ad5YslwaCSjTHKg== X-Received: by 2002:a05:6a00:847:b0:4ba:f004:e380 with SMTP id q7-20020a056a00084700b004baf004e380mr40510756pfk.42.1641078828914; Sat, 01 Jan 2022 15:13:48 -0800 (PST) Received: from garuda-lan (c-24-18-44-142.hsd1.wa.comcast.net. [24.18.44.142]) by smtp.gmail.com with ESMTPSA id s14sm33912403pfk.171.2022.01.01.15.13.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Jan 2022 15:13:48 -0800 (PST) From: Chris Marusich Date: Sat, 01 Jan 2022 15:13:43 -0800 Message-ID: <87zgofaw2g.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::434 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::434; envelope-from=cmmarusich@gmail.com; helo=mail-pf1-x434.google.com X-Spam_score_int: 6 X-Spam_score: 0.6 X-Spam_bar: / X-Spam_report: (0.6 / 5.0 requ) DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1641078974; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:list-id:list-help:list-unsubscribe:list-subscribe: list-post:dkim-signature; bh=4V71Glf07hguPB/APnJtAywXNDnE+IBSH+JVsoeJ9FA=; b=ffNDcQcDxOcOIRbcPdYBiJiAXGZnpxp+5QtwC5Wgs8F//j8e8OMTvgXrorPgRCp0HfB6tm LxS1bN5zmrybvxoeF+/tMJ4nC1gEFjeIPTpoaVrAEVnmX35zJuADoV8y5XCb/dueRArz5h RoEzpmeX7Weg9D0w2dqB2tlyHy8rkHbthu+4W369vmqbfQREOtlXYX6zIGzEW+Cruqj23l j5xoOPslCrQt0UazhWfbD081sMxNASoUTJvOhCwRxM9O66S9XzAdot6Y353DzGTiTxnSHt lPIYqL7A6+TklWiV2BZcJiGyWMNUG4qIiHhljv4tZlDu1/QK9w4JCL5wG37InQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1641078974; a=rsa-sha256; cv=none; b=QFmxhap08gMxxGL2COLJ0/2jkOV1hyT28Z+B0BcNySvvO2r/qOVA657ceOE8v8+mhYeBIj izeHpiEBAzg31+IPonPOBesKrMxM7lZbrk2sFTMMiyClHZEV7qSzCqnO6NysYX6bnpPGGG FOP10x+iCNOKuN+vaTjigEGJnN4wBVjS+EjHHdYs8L2rgo7DBADiXeMfxbJE65THikz6tx 2i+fuS0+w6MZjwSphc26CJs+gVLm21exlJO5QLDvEioTnbqzEq+itYMfIYmbV7Jc/cxict 995qUtFNjud0HaCbXNtAkQ7vLRNO9TmngOj9xyItjh3yUxwzadmOjYVo9eyfxg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=mtCIXi9s; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -4.28 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=mtCIXi9s; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: A5CB137A0 X-Spam-Score: -4.28 X-Migadu-Scanner: scn1.migadu.com X-TUID: fEyoZnB6F0UV --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain Hi Guix, I've noticed that test file-needed/recursive in tests/gremlin.scm fails on master branch on powerpc64le-linux. It does not fail on x86_64-linux. I've attached a patch that attempts to fix the issue. The primary issue is that it does not deduplicate entries in the same way as ld.so when there are multiple entries referring to the same shared object. The patch changes file-needed/recursive to behave more like ld.so. Here is the failing test output, including the test source: --8<---------------cut here---------------start------------->8--- ;;; (truth ("linux-vdso64.so.1" "/gnu/store/gahs2sx5snbfkr9vlcjj5c2kvnlhr0zs-guile-3.0.7/lib/libguile-3.0.so.1" "/gnu/store/7x2cjqbmpgwrgmnb234gsxkmsqs5pj09-libgc-8.0.4/lib/libgc.so.1" "/gnu/store/sipyfs2540b48b2sb9j8ypmybja1dvqb-glibc-2.31/lib/libpthread.so.0" "/gnu/store/521riv2sgv0b0s4j0kzz6i52rf9rarh8-libffi-3.3/lib/../lib/libffi.so.7" "/gnu/store/xj20v8lk2wal0z1rla0yx3bjkasbx6mq-libunistring-0.9.10/lib/libunistring.so.2" "/gnu/store/sipyfs2540b48b2sb9j8ypmybja1dvqb-glibc-2.31/lib/libcrypt.so.1" "/gnu/store/sipyfs2540b48b2sb9j8ypmybja1dvqb-glibc-2.31/lib/libdl.so.2" "/gnu/store/sipyfs2540b48b2sb9j8ypmybja1dvqb-glibc-2.31/lib/libm.so.6" "/gnu/store/ys7b4gr5nbq8sfnff9ry5blb4bhpx6mq-gcc-7.5.0-lib/lib/libgcc_s.so.1" "/gnu/store/sipyfs2540b48b2sb9j8ypmybja1dvqb-glibc-2.31/lib/libc.so.6" "/gnu/store/sipyfs2540b48b2sb9j8ypmybja1dvqb-glibc-2.31/lib/ld64.so.2")) ;;; (needed ("/gnu/store/sipyfs2540b48b2sb9j8ypmybja1dvqb-glibc-2.31/lib/libc.so.6" "/gnu/store/ys7b4gr5nbq8sfnff9ry5blb4bhpx6mq-gcc-7.5.0-lib/lib/libgcc_s.so.1" "/gnu/store/sipyfs2540b48b2sb9j8ypmybja1dvqb-glibc-2.31/lib/libm.so.6" "/gnu/store/sipyfs2540b48b2sb9j8ypmybja1dvqb-glibc-2.31/lib/libdl.so.2" "/gnu/store/sipyfs2540b48b2sb9j8ypmybja1dvqb-glibc-2.31/lib/libcrypt.so.1" "/gnu/store/xj20v8lk2wal0z1rla0yx3bjkasbx6mq-libunistring-0.9.10/lib/libunistring.so.2" "/gnu/store/521riv2sgv0b0s4j0kzz6i52rf9rarh8-libffi-3.3/lib/../lib/libffi.so.7" "/gnu/store/sipyfs2540b48b2sb9j8ypmybja1dvqb-glibc-2.31/lib/libpthread.so.0" "/gnu/store/7x2cjqbmpgwrgmnb234gsxkmsqs5pj09-libgc-8.0.4/lib/libgc.so.1" "/gnu/store/gahs2sx5snbfkr9vlcjj5c2kvnlhr0zs-guile-3.0.7/lib/libguile-3.0.so.1" "/gnu/store/sipyfs2540b48b2sb9j8ypmybja1dvqb-glibc-2.31/lib/ld64.so.2" "/gnu/store/sipyfs2540b48b2sb9j8ypmybja1dvqb-glibc-2.31/lib/../lib/libc.so.6")) test-name: file-needed/recursive location: /home/marusich/guix-master/tests/gremlin.scm:70 source: + (test-assert + "file-needed/recursive" + (let* ((needed + (file-needed/recursive %guile-executable)) + (pipe (dynamic-wind + (lambda () + (setenv "LD_TRACE_LOADED_OBJECTS" "yup")) + (lambda () + (open-pipe* OPEN_READ %guile-executable)) + (lambda () (unsetenv "LD_TRACE_LOADED_OBJECTS"))))) + (define ldd-rx + (make-regexp + "^[[:blank:]]+([[:graph:]]+ => )?([[:graph:]]+) .*$")) + (define (read-ldd-output port) + (let loop ((result '())) + (match (read-line port) + ((? eof-object?) (reverse result)) + ((= (cut regexp-exec ldd-rx <>) m) + (if m + (loop (cons (match:substring m 2) result)) + (loop result)))))) + (define ground-truth + (remove + (cut string-prefix? "linux-vdso.so" <>) + (read-ldd-output pipe))) + (and (zero? (close-pipe pipe)) + (lset= string=? + (pk 'truth ground-truth) + (pk 'needed needed))))) actual-value: #f result: FAIL --8<---------------cut here---------------end--------------->8--- For reference, here is the actual dynamic section of of %guile-executable on this system, as reported by readelf: --8<---------------cut here---------------start------------->8--- $ readelf -d /gnu/store/gahs2sx5snbfkr9vlcjj5c2kvnlhr0zs-guile-3.0.7/bin/guile Dynamic section at offset 0xfc60 contains 37 entries: Tag Type Name/Value 0x0000000000000001 (NEEDED) Shared library: [libguile-3.0.so.1] 0x0000000000000001 (NEEDED) Shared library: [libgc.so.1] 0x0000000000000001 (NEEDED) Shared library: [libpthread.so.0] 0x0000000000000001 (NEEDED) Shared library: [libffi.so.7] 0x0000000000000001 (NEEDED) Shared library: [libunistring.so.2] 0x0000000000000001 (NEEDED) Shared library: [libcrypt.so.1] 0x0000000000000001 (NEEDED) Shared library: [libdl.so.2] 0x0000000000000001 (NEEDED) Shared library: [libm.so.6] 0x0000000000000001 (NEEDED) Shared library: [libgcc_s.so.1] 0x0000000000000001 (NEEDED) Shared library: [libc.so.6] 0x000000000000001d (RUNPATH) Library runpath: [/gnu/store/gahs2sx5snbfkr9vlcjj5c2kvnlhr0zs-guile-3.0.7/lib:/gnu/store/7x2cjqbmpgwrgmnb234gsxkmsqs5pj09-libgc-8.0.4/lib:/gnu/store/521riv2sgv0b0s4j0kzz6i52rf9rarh8-libffi-3.3/lib/../lib:/gnu/store/xj20v8lk2wal0z1rla0yx3bjkasbx6mq-libunistring-0.9.10/lib:/gnu/store/sipyfs2540b48b2sb9j8ypmybja1dvqb-glibc-2.31/lib:/gnu/store/ys7b4gr5nbq8sfnff9ry5blb4bhpx6mq-gcc-7.5.0-lib/lib:/gnu/store/sipyfs2540b48b2sb9j8ypmybja1dvqb-glibc-2.31/lib/../lib:/gnu/store/ys7b4gr5nbq8sfnff9ry5blb4bhpx6mq-gcc-7.5.0-lib/lib/gcc/powerpc64le-unknown-linux-gnu/7.5.0/../../../../lib] 0x000000000000000c (INIT) 0x10000980 0x000000000000000d (FINI) 0x10000ef4 0x0000000000000019 (INIT_ARRAY) 0x1001fc50 0x000000000000001b (INIT_ARRAYSZ) 8 (bytes) 0x000000000000001a (FINI_ARRAY) 0x1001fc58 0x000000000000001c (FINI_ARRAYSZ) 8 (bytes) 0x0000000000000004 (HASH) 0x10000268 0x000000006ffffef5 (GNU_HASH) 0x100002c0 0x0000000000000005 (STRTAB) 0x10000470 0x0000000000000006 (SYMTAB) 0x100002f0 0x000000000000000a (STRSZ) 891 (bytes) 0x000000000000000b (SYMENT) 24 (bytes) 0x0000000000000015 (DEBUG) 0x0 0x0000000000000003 (PLTGOT) 0x10020000 0x0000000000000002 (PLTRELSZ) 216 (bytes) 0x0000000000000014 (PLTREL) RELA 0x0000000000000017 (JMPREL) 0x10000880 0x0000000070000000 (PPC64_GLINK) 0x10000eb0 0x0000000070000003 (PPC64_OPT) 0x0 0x0000000000000007 (RELA) 0x10000850 0x0000000000000008 (RELASZ) 48 (bytes) 0x0000000000000009 (RELAENT) 24 (bytes) 0x000000006ffffffe (VERNEED) 0x10000810 0x000000006fffffff (VERNEEDNUM) 2 0x000000006ffffff0 (VERSYM) 0x100007ec 0x0000000000000000 (NULL) 0x0 --8<---------------cut here---------------end--------------->8--- Note that the RUNPATH above contains an entry for "/gnu/store/sipyfs2540b48b2sb9j8ypmybja1dvqb-glibc-2.31/lib" followed later by "/gnu/store/sipyfs2540b48b2sb9j8ypmybja1dvqb-glibc-2.31/lib/../lib". It seems that ld.so's tracing mechanism is smart enough to avoid printing the second entry. So, the test fails because the "needed" list is not set-equivalent to the "truth" list. There are two reasons why they are not set-equivalent: A) "truth" contains "linux-vdso64.so.1", but "needed" does not. B) "needed" contains "/gnu/store/sipyfs2540b48b2sb9j8ypmybja1dvqb-glibc-2.31/lib/../lib/libc.so.6", but "truth" does not. However, both contain "/gnu/store/sipyfs2540b48b2sb9j8ypmybja1dvqb-glibc-2.31/lib/libc.so.6", which refers to the same file. Regarding (A), it seems to be an error in the test logic. The test code already filters out strings beginning with "linux-vdso.so" from the "truth" list.: (define ground-truth (remove (cut string-prefix? "linux-vdso.so" <>) (read-ldd-output pipe))) The intent seems to be to filter out the vdso shared object from the "truth" list. However, it fails to do so in this case, since the name of the vdso shared object is actually "linux-vdso64.so.1". My patch fixes this by filtering out strings that begin with "linux-vdso64.so", too. Regarding (B), it seems to occur because ld.so deduplicates entries. I checked the glibc source code, but I had a hard time figuring out exactly how exactly the deduplication works. In any case, based on ld.so's actual behavior, it seems that ld.so does in fact deduplicate entries, and file-needed/recursive does not. This explains the difference. What is a good solution for (B)? I can think of the following potential solutions: 1) Try to avoid introducing multiple entries referring to the same thing in the first place. Somehow, somewhere, something is adding the second entry to the dynamic section of Guile's ELF file. It happens on powerpc64le-linux but not on x86_64-linux. What code or tool is doing this? I don't know, but I guess I would start by looking at the gnu-build-system code. I'm not sure if it's a really problem, though, so I'm not eager to jump down this rabbit hole just yet. 2) Change the test so that it passes even if file-needed/recursive returns multiple entries referring to the same file. In other words, accept that the current behavior is OK, even if it means that the results returned by file-needed/recursive are not always exactly the same as the results returned by ld.so. 3) Try to change file-needed/recursive so that it does not return multiple entries referring to the same file. In other words, make it behave more like ld.so. I can't think of a reason why the current behavior of file-needed/recursive is bad, but it was simple enough to make it deduplicate entries similarly to ld.so. So, my patch implements solution (3). Hopefully it's good enough! -- Chris PGP: https://savannah.gnu.org/people/viewgpg.php?user_id=106836 --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: attachment; filename=0001-gremlin-Mimic-ld.so-NEEDED-deduplication-behavior.patch Content-Transfer-Encoding: quoted-printable From=2067365d79afc7182aefbacf360941f338aea712b6 Mon Sep 17 00:00:00 2001 From: Chris Marusich Date: Sat, 1 Jan 2022 14:17:38 -0800 Subject: [PATCH] gremlin: Mimic ld.so NEEDED deduplication behavior. Together, these two changes fix the file-needed/recursive test, which was failing on powerpc64le-linux. It was not failing on x86_64-linux. The test failure on powerpc64le-linux was caused by two issues. First, file-needed/recursive did not deduplicate entries in the same way as ld.so. The %guile-executable ELF file contains in its RUNPATH both "/gnu/store/sipyfs2540b48b2sb9j8ypmybja1dvqb-glibc-2.31/lib" and "/gnu/store/sipyfs2540b48b2sb9j8ypmybja1dvqb-glibc-2.31/lib/../lib". Altho= ugh ld.so deduplicates the second entry, file-needed/recursive did not. Second, the vdso shared library name is "linux-vdso64.so.1", but the test incorrect= ly assumed that the vdso shared library would always begin with "linux-vdso.so= ". * guix/build/gremlin.scm (file-needed/recursive)[contains-canonical-file?]: New procedure. Use it to deduplicate entries that refer to the same file. * tests/gremlin.scm (file-needed/recursive)[ground-truth]: In addition to strings that begin with "linux-vdso.so", remove strings that begin with "linux-vdso64.so". =2D-- guix/build/gremlin.scm | 12 +++++++++++- tests/gremlin.scm | 5 ++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/guix/build/gremlin.scm b/guix/build/gremlin.scm index 2a74d51dd9..e90e59679b 100644 =2D-- a/guix/build/gremlin.scm +++ b/guix/build/gremlin.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright =C2=A9 2015, 2018, 2020 Ludovic Court=C3=A8s +;;; Copyright =C2=A9 2022 Chris Marusich ;;; ;;; This file is part of GNU Guix. ;;; @@ -268,6 +269,10 @@ recursively, and the list of .so file names that could= not be found. File names are resolved by searching the RUNPATH of the file that NEEDs them. =20 This is similar to the info returned by the 'ldd' command." + (define (contains-canonical-file? file files) + (any (lambda (entry) + (string=3D? (canonicalize-path entry) (canonicalize-path file))) + files)) (let loop ((files (list file)) (result '()) (not-found '())) @@ -292,10 +297,15 @@ This is similar to the info returned by the 'ldd' com= mand." (not (libc-library? ne= eded)) needed)) needed resolved)) + ;; Deduplicate entries that refer to the same file. + ;; The actual ld.so tracing behavior is similar and + ;; will de-duplicate entries even if they have + ;; different names but refer to the same file. (needed (remove (lambda (value) (or (not value) ;; XXX: quadratic =2D (member value result))) + (contains-canonical-file? + value result))) resolved))) (loop (append rest needed) (append needed result) diff --git a/tests/gremlin.scm b/tests/gremlin.scm index 9af899c89a..86757e62b4 100644 =2D-- a/tests/gremlin.scm +++ b/tests/gremlin.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright =C2=A9 2015, 2018, 2020 Ludovic Court=C3=A8s +;;; Copyright =C2=A9 2022 Chris Marusich ;;; ;;; This file is part of GNU Guix. ;;; @@ -92,7 +93,9 @@ (loop result)))))) =20 (define ground-truth =2D (remove (cut string-prefix? "linux-vdso.so" <>) + (remove (lambda (entry) + (or (string-prefix? "linux-vdso.so" entry) + (string-prefix? "linux-vdso64.so" entry))) (read-ldd-output pipe))) =20 (and (zero? (close-pipe pipe)) =2D-=20 2.26.3 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQJJBAEBCAAzFiEEy/WXVcvn5+/vGD+x3UCaFdgiRp0FAmHQ4CgVHGNtbWFydXNp Y2hAZ21haWwuY29tAAoJEN1AmhXYIkad8gEQAMmprHCJ5TziVbRREZHTKfs3CUpz Vzl2cU6fNoXyMuU/pJr3DY1aRQGemyfS2DeHgjdbxA1z/qdqmj++iRJxfXiwmiEI YOdmEeHCbh/4Uv3bqAt+U0Ox7pomNqHlK+D1ZZdve+NqxHNz3pcOgD6fSv9OvZ9B OYTx+CbrLepAzyZIq7uAdvFyb4/Zs1rhOq5k4v8sOzSvkkl7zDjVLaWyk1bVn2X0 GY4v/URFkTho/RSVYVarXqmWo0tRgodYC2sCjz+RbmpdYDYtRZIxgU9HvXwAjqkO 9mGnkIuombYh2Ko+wlHyabkcpCKRudlsv+6NuQW9vTBV7mCYovrmpeQAoSJFEUpt yboxoHeo194jj/1JVLiYil38cpqt/yIwsoYmLFog/9eagoFINqxE+wjBoojl6/za YAzlwhP1aXtH5YrnZYhhUPTn/ERADp62+O2/WxjLRM0Al/T19IpV4RxkhHgc5h2q JHKXuq9lWsvQsacY5L/ScC7Uv7IwA39PcwSJCmx70LgGNQZiT8k6FR2ajHpGRoiZ RtCjZijllGnChzep+ThWubxGTGfgLx9jzeOFXh2/OgvsMtP77EMCUjZXWbc7lc9l Uqbtei3hOStCKWeOzChrOKpBelFWxGjGNOs2vpH2rzEQuSqi6C40CwBfOg5397DH XlVpLYhhiEYCtJzH =Xlle -----END PGP SIGNATURE----- --==-=-=--