From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS17314 8.43.84.0/22 X-Spam-Status: No, score=-4.2 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED,SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by dcvr.yhbt.net (Postfix) with ESMTPS id AA84F1F8C6 for ; Sat, 10 Jul 2021 18:11:32 +0000 (UTC) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 48247384B004 for ; Sat, 10 Jul 2021 18:11:31 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 48247384B004 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1625940691; bh=hXROl8mumKWe/tygT+Dkv92GFj+DMWvWD4bVGVjbY7k=; h=References:In-Reply-To:Date:Subject:To:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=YI4RRA6zpWu//mS/Jsdpk82VMJE1zkIZ3jfONVnKj+LnKbPLF/999x3gOIUKG4XF4 ibkaxBMl6Jx/EWOm0P2SJVgGizl/Ro8KXclJZTFsj5WPtef4AeYf7g80UAG2QRF6Eg 9eTk5JGcvJQmUQy08dVM5y8ZLbjTz9gxcYeYofj0= Received: from mail-pj1-x1031.google.com (mail-pj1-x1031.google.com [IPv6:2607:f8b0:4864:20::1031]) by sourceware.org (Postfix) with ESMTPS id 75E29385783D for ; Sat, 10 Jul 2021 18:11:09 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 75E29385783D Received: by mail-pj1-x1031.google.com with SMTP id p4-20020a17090a9304b029016f3020d867so7936778pjo.3 for ; Sat, 10 Jul 2021 11:11:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=hXROl8mumKWe/tygT+Dkv92GFj+DMWvWD4bVGVjbY7k=; b=tRUmOsOXhLvTYUtYKOtd8LWYnjNU7Z/JNeGLo2vOFWFJCbctzAKeaQXoWnZsV/QieQ v+Q3EHXnHKtUl6IwuYwhLKjYWARS5ItIioG2ccKsDCSNs0GvC/VBT9JfDSdlLBXjdKI7 Sc3LEPmmx6UhgY/RvLbIQYlF/V1bie6bndwyXLiGUPgAOsH8AX3XG3pbfLcGbA7jv+3s UMz89UBJwNLCSjzVb0ijJ4TUDIDZKT/DCJ9xKp3JRHfb6Uy/hfvw7vNQhAnsEBFNWNZu r/hUHyS1WHeJB7UXB75jc9rO8Z8k/BF1IVqs5qcCIWuDi/JMDS9D+1Ga4f3fNsNXcREK HkWA== X-Gm-Message-State: AOAM532ICzQGNbyxrJoSXaSXrK37YOeuhR2MjBh0qYR024HWaxVM3gX9 1JQCOksfnulEwCQZ3IgDQujZ/Res6t57Bqc7VZQ= X-Google-Smtp-Source: ABdhPJxHCXLSuBqs1/+xPJJk5R28sZfP1t4aHqbaXpwxuHAkAlJ4yfp12j9j3OMx+e4FZFXL6ci71bXTEpT/uXs0/Yc= X-Received: by 2002:a17:90b:3607:: with SMTP id ml7mr5409185pjb.153.1625940668551; Sat, 10 Jul 2021 11:11:08 -0700 (PDT) MIME-Version: 1.0 References: <20210709213831.1477694-1-hjl.tools@gmail.com> In-Reply-To: Date: Sat, 10 Jul 2021 11:10:32 -0700 Message-ID: Subject: [PATCH] support: Replace _SC_MINSIGSTKSZ with _SC_SIGSTKSZ To: "Carlos O'Donell" Content-Type: multipart/mixed; boundary="000000000000fa03c305c6c8cf0c" 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: , From: "H.J. Lu via Libc-alpha" Reply-To: "H.J. Lu" Cc: GNU C Library Errors-To: libc-alpha-bounces+e=80x24.org@sourceware.org Sender: "Libc-alpha" --000000000000fa03c305c6c8cf0c Content-Type: text/plain; charset="UTF-8" On Fri, Jul 9, 2021 at 3:10 PM Carlos O'Donell wrote: > > On 7/9/21 5:38 PM, H.J. Lu via Libc-alpha wrote: > > Replace MINSIGSTKSZ with sysconf (_SC_MINSIGSTKSZ) since the constant > > MINSIGSTKSZ used in glibc build may be too small. > > LGTM. It's good to explicitly convert to using sysconf in support/* code. I used the wrong _SC_XXX. _SC_MINSIGSTKSZ is for the empty signal handler. sysconf (_SC_SIGSTKSZ) returns the suggested minimum number of bytes of stack space required for a signal stack. OK for master? > Reviewed-by: Carlos O'Donell > > > --- > > support/support_stack_alloc.c | 9 +++++---- > > 1 file changed, 5 insertions(+), 4 deletions(-) > > > > diff --git a/support/support_stack_alloc.c b/support/support_stack_alloc.c > > index 03494dd185..b05ae08968 100644 > > --- a/support/support_stack_alloc.c > > +++ b/support/support_stack_alloc.c > > @@ -39,10 +39,11 @@ support_stack_alloc (size_t size) > > if (pagesize == -1) > > FAIL_EXIT1 ("sysconf (_SC_PAGESIZE): %m\n"); > > > > - /* Always supply at least MINSIGSTKSZ space; passing 0 as size means > > - only that much space. No matter what the number is, round it up > > - to a whole number of pages. */ > > - size_t stacksize = roundup (size + MINSIGSTKSZ, pagesize); > > + /* Always supply at least sysconf (_SC_MINSIGSTKSZ) space; passing 0 > > + as size means only that much space. No matter what the number is, > > + round it up to a whole number of pages. */ > > + size_t stacksize = roundup (size + sysconf (_SC_MINSIGSTKSZ), > > + pagesize); > > > > /* The guard bands need to be large enough to intercept offset > > accesses from a stack address that might otherwise hit another > > > > > -- > Cheers, > Carlos. > -- H.J. --000000000000fa03c305c6c8cf0c Content-Type: text/x-patch; charset="US-ASCII"; name="0001-support-Replace-_SC_MINSIGSTKSZ-with-_SC_SIGSTKSZ.patch" Content-Disposition: attachment; filename="0001-support-Replace-_SC_MINSIGSTKSZ-with-_SC_SIGSTKSZ.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_kqy31leh0 RnJvbSAxYjMwYTI3MDhmMmJjOGE3MTYxYzE5NzM3YWM1ZjU5Mjc4MDNmZmM5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiAiSC5KLiBMdSIgPGhqbC50b29sc0BnbWFpbC5jb20+CkRhdGU6 IFNhdCwgMTAgSnVsIDIwMjEgMTA6NTY6NTAgLTA3MDAKU3ViamVjdDogW1BBVENIXSBzdXBwb3J0 OiBSZXBsYWNlIF9TQ19NSU5TSUdTVEtTWiB3aXRoIF9TQ19TSUdTVEtTWgoKUmVwbGFjZSBfU0Nf TUlOU0lHU1RLU1ogd2l0aCBfU0NfU0lHU1RLU1ogc2luY2Ugc3lzY29uZiAoX1NDX01JTlNJR1NU S1NaKQpyZXR1cm5zIHRoZSBtaW5pbXVtIG51bWJlciBvZiBieXRlcyBvZiBmcmVlIHN0YWNrIHNw YWNlIHJlcXVpcmVkIGluIG9yZGVyCnRvIGd1YXJhbnRlZSBzdWNjZXNzZnVsLCBub24tbmVzdGVk IGhhbmRsaW5nIG9mIGEgc2luZ2xlIHNpZ25hbCB3aG9zZQpoYW5kbGVyIGlzIGFuIGVtcHR5IGZ1 bmN0aW9uIHdoaWxlIHN5c2NvbmYgKF9TQ19TSUdTVEtTWikgcmV0dXJucyB0aGUKc3VnZ2VzdGVk IG1pbmltdW0gbnVtYmVyIG9mIGJ5dGVzIG9mIHN0YWNrIHNwYWNlIHJlcXVpcmVkIGZvciBhIHNp Z25hbApzdGFjay4KLS0tCiBzdXBwb3J0L3N1cHBvcnRfc3RhY2tfYWxsb2MuYyB8IDQgKystLQog MSBmaWxlIGNoYW5nZWQsIDIgaW5zZXJ0aW9ucygrKSwgMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS9zdXBwb3J0L3N1cHBvcnRfc3RhY2tfYWxsb2MuYyBiL3N1cHBvcnQvc3VwcG9ydF9zdGFj a19hbGxvYy5jCmluZGV4IGIwNWFlMDg5NjguLjYyZWVlODQ1NzMgMTAwNjQ0Ci0tLSBhL3N1cHBv cnQvc3VwcG9ydF9zdGFja19hbGxvYy5jCisrKyBiL3N1cHBvcnQvc3VwcG9ydF9zdGFja19hbGxv Yy5jCkBAIC0zOSwxMCArMzksMTAgQEAgc3VwcG9ydF9zdGFja19hbGxvYyAoc2l6ZV90IHNpemUp CiAgIGlmIChwYWdlc2l6ZSA9PSAtMSkKICAgICBGQUlMX0VYSVQxICgic3lzY29uZiAoX1NDX1BB R0VTSVpFKTogJW1cbiIpOwogCi0gIC8qIEFsd2F5cyBzdXBwbHkgYXQgbGVhc3Qgc3lzY29uZiAo X1NDX01JTlNJR1NUS1NaKSBzcGFjZTsgcGFzc2luZyAwCisgIC8qIEFsd2F5cyBzdXBwbHkgYXQg bGVhc3Qgc3lzY29uZiAoX1NDX1NJR1NUS1NaKSBzcGFjZTsgcGFzc2luZyAwCiAgICAgIGFzIHNp emUgbWVhbnMgb25seSB0aGF0IG11Y2ggc3BhY2UuICBObyBtYXR0ZXIgd2hhdCB0aGUgbnVtYmVy IGlzLAogICAgICByb3VuZCBpdCB1cCB0byBhIHdob2xlIG51bWJlciBvZiBwYWdlcy4gICovCi0g IHNpemVfdCBzdGFja3NpemUgPSByb3VuZHVwIChzaXplICsgc3lzY29uZiAoX1NDX01JTlNJR1NU S1NaKSwKKyAgc2l6ZV90IHN0YWNrc2l6ZSA9IHJvdW5kdXAgKHNpemUgKyBzeXNjb25mIChfU0Nf U0lHU1RLU1opLAogCQkJICAgICAgcGFnZXNpemUpOwogCiAgIC8qIFRoZSBndWFyZCBiYW5kcyBu ZWVkIHRvIGJlIGxhcmdlIGVub3VnaCB0byBpbnRlcmNlcHQgb2Zmc2V0Ci0tIAoyLjMxLjEKCg== --000000000000fa03c305c6c8cf0c--