From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-qk1-x741.google.com (mail-qk1-x741.google.com [IPv6:2607:f8b0:4864:20::741]) by sourceware.org (Postfix) with ESMTPS id 309373985425 for ; Tue, 3 Nov 2020 13:02:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 309373985425 Received: by mail-qk1-x741.google.com with SMTP id 140so14496958qko.2 for ; Tue, 03 Nov 2020 05:02:06 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:references:from:autocrypt:subject:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=e6ePqPo9InAIugLWRXPICOGpy2aWZJgJ/h/5ffWRSjA=; b=Lfm6AiCMhBQE0Jh7YuiR+sbWUkjrrp07ouI8KHnrYjx0unFCgI5NuMZckgZB5C6u/g 3gkxMJ7x9N8AI/7S9NqrrPYk+yk8kvxZzjTj+UPIu+V067kTYyG3jGCX4jEgKpB412k4 GHIWqQ2VgpyaENimOgsc5fHqYtXcnhv1GQyX8FNUzNLDeAkRPlgdaObOlfj2Skbuzcc9 7Fuj2AEkL7ZikVvf97RTtfydgcaHAxtkDUgPvb1VRkfvylOvFQAhVW2mwR2aHlW7jH4B w0qDk4sGra3ogMrT0FRXaCGACo9f5ZsSnszoq/rA9mdLe2r+lMgRkmYMw4n5UZYXh8/Z wjFQ== X-Gm-Message-State: AOAM530JwM75DmsKKd0dfhG24+RZ8Z++v1B9sK8HF9d+EOCoFmszVXNh y/cbnZ5uy76fJ4ij5LSNUxb551iWRxms4Q== X-Google-Smtp-Source: ABdhPJz31JXu+W8Qjwski9my3j259+IuJClzZpAQCL4RP511o5b3qncrCTusCRSDQ6nnluoOmuCWnw== X-Received: by 2002:a37:9d4d:: with SMTP id g74mr18935629qke.176.1604408525441; Tue, 03 Nov 2020 05:02:05 -0800 (PST) Received: from [192.168.1.4] ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id 64sm9986849qtc.92.2020.11.03.05.02.04 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 03 Nov 2020 05:02:04 -0800 (PST) To: Florian Weimer , Adhemerval Zanella via Libc-alpha References: <286692c4-80ef-3115-0980-a5029fe8faa7@linaro.org> <87361vn915.fsf@oldenburg2.str.redhat.com> From: Adhemerval Zanella Autocrypt: addr=adhemerval.zanella@linaro.org; prefer-encrypt=mutual; keydata= mQINBFcVGkoBEADiQU2x/cBBmAVf5C2d1xgz6zCnlCefbqaflUBw4hB/bEME40QsrVzWZ5Nq 8kxkEczZzAOKkkvv4pRVLlLn/zDtFXhlcvQRJ3yFMGqzBjofucOrmdYkOGo0uCaoJKPT186L NWp53SACXguFJpnw4ODI64ziInzXQs/rUJqrFoVIlrPDmNv/LUv1OVPKz20ETjgfpg8MNwG6 iMizMefCl+RbtXbIEZ3TE/IaDT/jcOirjv96lBKrc/pAL0h/O71Kwbbp43fimW80GhjiaN2y WGByepnkAVP7FyNarhdDpJhoDmUk9yfwNuIuESaCQtfd3vgKKuo6grcKZ8bHy7IXX1XJj2X/ BgRVhVgMHAnDPFIkXtP+SiarkUaLjGzCz7XkUn4XAGDskBNfbizFqYUQCaL2FdbW3DeZqNIa nSzKAZK7Dm9+0VVSRZXP89w71Y7JUV56xL/PlOE+YKKFdEw+gQjQi0e+DZILAtFjJLoCrkEX w4LluMhYX/X8XP6/C3xW0yOZhvHYyn72sV4yJ1uyc/qz3OY32CRy+bwPzAMAkhdwcORA3JPb kPTlimhQqVgvca8m+MQ/JFZ6D+K7QPyvEv7bQ7M+IzFmTkOCwCJ3xqOD6GjX3aphk8Sr0dq3 4Awlf5xFDAG8dn8Uuutb7naGBd/fEv6t8dfkNyzj6yvc4jpVxwARAQABtElBZGhlbWVydmFs IFphbmVsbGEgTmV0dG8gKExpbmFybyBWUE4gS2V5KSA8YWRoZW1lcnZhbC56YW5lbGxhQGxp bmFyby5vcmc+iQI3BBMBCAAhBQJXFRpKAhsDBQsJCAcDBRUKCQgLBRYCAwEAAh4BAheAAAoJ EKqx7BSnlIjv0e8P/1YOYoNkvJ+AJcNUaM5a2SA9oAKjSJ/M/EN4Id5Ow41ZJS4lUA0apSXW NjQg3VeVc2RiHab2LIB4MxdJhaWTuzfLkYnBeoy4u6njYcaoSwf3g9dSsvsl3mhtuzm6aXFH /Qsauav77enJh99tI4T+58rp0EuLhDsQbnBic/ukYNv7sQV8dy9KxA54yLnYUFqH6pfH8Lly sTVAMyi5Fg5O5/hVV+Z0Kpr+ZocC1YFJkTsNLAW5EIYSP9ftniqaVsim7MNmodv/zqK0IyDB GLLH1kjhvb5+6ySGlWbMTomt/or/uvMgulz0bRS+LUyOmlfXDdT+t38VPKBBVwFMarNuREU2 69M3a3jdTfScboDd2ck1u7l+QbaGoHZQ8ZNUrzgObltjohiIsazqkgYDQzXIMrD9H19E+8fw kCNUlXxjEgH/Kg8DlpoYJXSJCX0fjMWfXywL6ZXc2xyG/hbl5hvsLNmqDpLpc1CfKcA0BkK+ k8R57fr91mTCppSwwKJYO9T+8J+o4ho/CJnK/jBy1pWKMYJPvvrpdBCWq3MfzVpXYdahRKHI ypk8m4QlRlbOXWJ3TDd/SKNfSSrWgwRSg7XCjSlR7PNzNFXTULLB34sZhjrN6Q8NQZsZnMNs TX8nlGOVrKolnQPjKCLwCyu8PhllU8OwbSMKskcD1PSkG6h3r0AquQINBFcVGkoBEACgAdbR Ck+fsfOVwT8zowMiL3l9a2DP3Eeak23ifdZG+8Avb/SImpv0UMSbRfnw/N81IWwlbjkjbGTu oT37iZHLRwYUFmA8fZX0wNDNKQUUTjN6XalJmvhdz9l71H3WnE0wneEM5ahu5V1L1utUWTyh VUwzX1lwJeV3vyrNgI1kYOaeuNVvq7npNR6t6XxEpqPsNc6O77I12XELic2+36YibyqlTJIQ V1SZEbIy26AbC2zH9WqaKyGyQnr/IPbTJ2Lv0dM3RaXoVf+CeK7gB2B+w1hZummD21c1Laua +VIMPCUQ+EM8W9EtX+0iJXxI+wsztLT6vltQcm+5Q7tY+HFUucizJkAOAz98YFucwKefbkTp eKvCfCwiM1bGatZEFFKIlvJ2QNMQNiUrqJBlW9nZp/k7pbG3oStOjvawD9ZbP9e0fnlWJIsj 6c7pX354Yi7kxIk/6gREidHLLqEb/otuwt1aoMPg97iUgDV5mlNef77lWE8vxmlY0FBWIXuZ yv0XYxf1WF6dRizwFFbxvUZzIJp3spAao7jLsQj1DbD2s5+S1BW09A0mI/1DjB6EhNN+4bDB SJCOv/ReK3tFJXuj/HbyDrOdoMt8aIFbe7YFLEExHpSk+HgN05Lg5TyTro8oW7TSMTk+8a5M kzaH4UGXTTBDP/g5cfL3RFPl79ubXwARAQABiQIfBBgBCAAJBQJXFRpKAhsMAAoJEKqx7BSn lIjvI/8P/jg0jl4Tbvg3B5kT6PxJOXHYu9OoyaHLcay6Cd+ZrOd1VQQCbOcgLFbf4Yr+rE9l mYsY67AUgq2QKmVVbn9pjvGsEaz8UmfDnz5epUhDxC6yRRvY4hreMXZhPZ1pbMa6A0a/WOSt AgFj5V6Z4dXGTM/lNManr0HjXxbUYv2WfbNt3/07Db9T+GZkpUotC6iknsTA4rJi6u2ls0W9 1UIvW4o01vb4nZRCj4rni0g6eWoQCGoVDk/xFfy7ZliR5B+3Z3EWRJcQskip/QAHjbLa3pml xAZ484fVxgeESOoaeC9TiBIp0NfH8akWOI0HpBCiBD5xaCTvR7ujUWMvhsX2n881r/hNlR9g fcE6q00qHSPAEgGr1bnFv74/1vbKtjeXLCcRKk3Ulw0bY1OoDxWQr86T2fZGJ/HIZuVVBf3+ gaYJF92GXFynHnea14nFFuFgOni0Mi1zDxYH/8yGGBXvo14KWd8JOW0NJPaCDFJkdS5hu0VY 7vJwKcyHJGxsCLU+Et0mryX8qZwqibJIzu7kUJQdQDljbRPDFd/xmGUFCQiQAncSilYOcxNU EMVCXPAQTteqkvA+gNqSaK1NM9tY0eQ4iJpo+aoX8HAcn4sZzt2pfUB9vQMTBJ2d4+m/qO6+ cFTAceXmIoFsN8+gFN3i8Is3u12u8xGudcBPvpoy4OoG Subject: Re: [PATCH 23/28] elf: Unify old and new format cache handling code in ld.so Message-ID: <6bf22ec9-484e-a6a0-5da5-d36879b7fe60@linaro.org> Date: Tue, 3 Nov 2020 10:02:02 -0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <87361vn915.fsf@oldenburg2.str.redhat.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-14.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, NICE_REPLY_A, RCVD_IN_DNSWL_NONE, 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: Tue, 03 Nov 2020 13:02:07 -0000 On 30/10/2020 10:22, Florian Weimer wrote: > * Adhemerval Zanella via Libc-alpha: > >>> +/* Compute the address of the element INDEX of the array at LIBS. >>> + Conceptually, this is &LIBS[INDEX], but use ENTRY_SIZE for the size >>> + of *LIBS. */ >>> +static inline const struct file_entry * >>> +_dl_cache_file_entry (const struct file_entry *libs, size_t entry_size, >>> + size_t index) >>> +{ >>> + return (const void *) libs + index * entry_size; >>> +} >>> + >> >> Although pointer arithmetic with void *is valid for gcc, I think we should >> use uintptr_t here. > > Do you mean char *? It will need another cast for the result. I don't > think it clarifies matters. I don't have a strong opinion in fact, it just is might not be straightforward for a reader not used with GNU C extensions. > >>> +{ >>> + /* Used by the HWCAP check in the struct file_entry_new case. */ >>> + uint64_t platform = _dl_string_platform (GLRO (dl_platform)); >>> + if (platform != (uint64_t) -1) >>> + platform = 1ULL << platform; >> >> Maybe UINT64_C(1) << platform? > > 1ULL needs to be at least 64 bits, so this should be fine. > >>> + >>> + best = string_table + lib->value; >>> + >>> + if (flags == GLRO (dl_correct_cache_id)) >>> + /* We've found an exact match for the shared >>> + object and no general `ELF' release. Stop >> >> Should we replace the grave accent with apostrophe in this case? > > I want to minimize the changes in this refactoring. But git shows this as new lines anyway, so I see no good reason to not replace it with an apostrophe. > >>> diff --git a/sysdeps/generic/dl-cache.h b/sysdeps/generic/dl-cache.h >>> index b154740da9..fec209509d 100644 >>> --- a/sysdeps/generic/dl-cache.h >>> +++ b/sysdeps/generic/dl-cache.h >>> @@ -66,8 +66,8 @@ >>> */ >>> struct file_entry >>> { >>> - int flags; /* This is 1 for an ELF library. */ >>> - unsigned int key, value; /* String table indices. */ >>> + int32_t flags; /* This is 1 for an ELF library. */ >>> + uint32_t key, value; /* String table indices. */ >>> }; >>> >> >> Ok, although not sure if our code guidelines allows multiple fields in the >> same line. > > Likewise. > > I'll assume your Reviewed-by: stands and push this separately. LGTM.