From patchwork Fri Feb 8 18:39:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 157868 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp2284090jaa; Fri, 8 Feb 2019 10:39:53 -0800 (PST) X-Google-Smtp-Source: AHgI3IYSQk5Nm21RwqDNqarvJRfeQCWBFceo4qfdjqyBDAfTYzunqZeacj/k9o1rqXTnzl9R3Z0A X-Received: by 2002:a62:6ec8:: with SMTP id j191mr23638828pfc.198.1549651193331; Fri, 08 Feb 2019 10:39:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1549651193; cv=none; d=google.com; s=arc-20160816; b=DcoQeCHB4MsxgQmpEaQVcQFn6XL0A+ZZaHwPcVYGbLLylDlpAI1dLSffLCydKdn/zV fu/1kiV/sFlBORMbhVL9AGGUx0GXl0yR+YDSbNQiwVn6mV+crgMADKibFQhglzOwdTsi qa/+go05wnCmU6Pwf3CtYntDmQrQ+H12RpXY2vb7MbGucvaaXEuIVgnSCmm8lG4gwAvQ 1uxYMeMP69HS15c4xZuv3dHhnVNBUhAq5MGGp20lAodCOpMXz7x6esgqW7i1oAr3Oxkk tVSCNrrs0ioD1K5LgU2zx2H5SFpbG7zCi4XqgjkP3b/ZCea0Br7ZjqlFECm68bbSVD85 hnCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:to:from :dkim-signature:delivered-to:sender:list-help:list-post:list-archive :list-subscribe:list-unsubscribe:list-id:precedence:mailing-list :dkim-signature:domainkey-signature; bh=q4tof0EMKKTpcCeqpPbYNcOGQ2cAOi2qxC5GC6Vbv8Y=; b=W9tHFySflcTP/r/gM8PL39gYbsN9Kesh4393aex6wfwrx3Wrn277k0zwE1T+GYw15C FoH5/9Lz30/XkCMpWhQ9mbkPo636DK5OD4k+xI4l2vudEm95Icz9GVQqVDHkEeRCl+/6 Xfr3NGLxs5SzJRhC72Kw7VJofedY6ryjVjQHSehhobPYb+HNkOIuVleSyC3T1K+2UBMK mweKOeaNeeOfj9hoYpzOrQMeey6cwfDguZO9EYCFE5aj7sYAYBKjPa0jcZD6n/7uyFb9 2QNKyNvHDN29xk7PXLwPH1RmQtFYlk6ga7xEvKQ8Fm+5d2FeDLfxSOiaBPKaTglpqJSW sROA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b="iZKL/LmG"; dkim=pass header.i=@linaro.org header.s=google header.b=fGKYQ2kg; spf=pass (google.com: domain of libc-alpha-return-99885-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="libc-alpha-return-99885-patch=linaro.org@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id b36si2704780pgl.596.2019.02.08.10.39.53 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Feb 2019 10:39:53 -0800 (PST) Received-SPF: pass (google.com: domain of libc-alpha-return-99885-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b="iZKL/LmG"; dkim=pass header.i=@linaro.org header.s=google header.b=fGKYQ2kg; spf=pass (google.com: domain of libc-alpha-return-99885-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="libc-alpha-return-99885-patch=linaro.org@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:in-reply-to :references; q=dns; s=default; b=aGFHzMrw6AwicLFjyqfHBhHDpsKLtiN /MO0kimIhg+/nLKTnwXAU1dSBCeXtR/XaNh6DOq4VAUHuTlSAZypYwRWhBdD7V/K WJq6q4hog293EyY6LNGTjswuXNugHH4BWwiLvLGVwzkC9/ENlTNOVMou4BsZMbag Venpw8lWm1H0= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:in-reply-to :references; s=default; bh=TM24xF4Cl9NaMSdCxb7MoCPxonw=; b=iZKL/ LmGUTfztB8kio+lYLEU8hYw6tTESzopEpoZvS/Q6ezIn3BJIDpeiJTRSISMQEeeS U17p4anKC7dtDyopANekiRHZe/NABgQR834cQf9GJPWMPV408SLqX6ufEQ+hZCo8 ono9AIcjvqJOh9GYv5IAs61+BZ7fafN88GmCLs= Received: (qmail 77052 invoked by alias); 8 Feb 2019 18:39:24 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 76968 invoked by uid 89); 8 Feb 2019 18:39:24 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy=rcode X-HELO: mail-qt1-f195.google.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references; bh=q4tof0EMKKTpcCeqpPbYNcOGQ2cAOi2qxC5GC6Vbv8Y=; b=fGKYQ2kgryJRxR1CUFXWhCceAkOMuFt7gGncdiP/yAKgHmVGM7bMFtcWgmNOYTSBUZ Hhqp4xdNqgxcMes48GcKOwb0YhPF9VuykqijA7pJz8d5g6yEbBvVkYOw6+WyrQwneSRl DxP8TF2BSP67fTAs7yv7YdG3hQ+AHuU5UzgA+qUAwjFgZk6KxwlUKxurynQ+7fdlPNZU lmBFX2RwDh20WMgquyHJWV7S/acHCSmojyOLZ51bZbjkDv11+5sv8KrD1vyanNt/cnRk H34SdN/gpNTNdL1VK/WNnQSrDo32+CZimba8otPrT6XnTf4uhY6GQeNRDpjPL21ncPbl Onhg== Return-Path: From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH 4/6] Do not use HP_TIMING_NOW for random bits Date: Fri, 8 Feb 2019 16:39:08 -0200 Message-Id: <20190208183910.30799-4-adhemerval.zanella@linaro.org> In-Reply-To: <20190208183910.30799-1-adhemerval.zanella@linaro.org> References: <20190208183910.30799-1-adhemerval.zanella@linaro.org> This patch removes the HP_TIMING_BITS usage for fast random bits and replace with clock_gettime (CLOCK_MONOTONIC). It has unspecified starting time and nano-second accuracy, so its randomness is significantly better than gettimeofday. Althoug it should incur in more overhead (specially for architecture that support hp-timing), the symbol is also common implemented as a vDSO. Checked on aarch64-linux-gnu, x86_64-linux-gnu, and i686-linux-gnu. I also checked on a i686-gnu build. * include/random-bits.h: New file. * resolv/res_mkquery.c [HP_TIMING_AVAIL] (RANDOM_BITS, (__res_context_mkquery): Remove usage hp-timing usage and replace with random_bits. * resolv/res_send.c [HP_TIMING_AVAIL] (nameserver_offset): Likewise. * sysdeps/posix/tempname.c [HP_TIMING_AVAIL] (__gen_tempname): Likewise. --- include/random-bits.h | 37 +++++++++++++++++++++++++++++++++++++ resolv/res_mkquery.c | 19 +++---------------- resolv/res_send.c | 12 ++---------- sysdeps/posix/tempname.c | 18 ++---------------- 4 files changed, 44 insertions(+), 42 deletions(-) create mode 100644 include/random-bits.h -- 2.17.1 diff --git a/include/random-bits.h b/include/random-bits.h new file mode 100644 index 0000000000..81e6a50b5e --- /dev/null +++ b/include/random-bits.h @@ -0,0 +1,37 @@ +/* Fast pseudo-random bits based on clock_gettime. + Copyright (C) 2019 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#ifndef _RANDOM_BITS_H +# define _RANDOM_BITS_H + +#include +#include + +/* Provides fast pseudo-random bits through clock_gettime. It has unspecified + starting time, nano-second accuracy, its randomness is significantly better + than gettimeofday, and for mostly architectures it is implemented through + vDSO instead of a syscall. */ +static inline uint64_t +random_bits (void) +{ + struct timespec tv; + __clock_gettime (CLOCK_MONOTONIC, &tv); + return tv.tv_nsec + UINT64_C(1000000000) * tv.tv_sec; +} + +#endif diff --git a/resolv/res_mkquery.c b/resolv/res_mkquery.c index 19b8b402c4..dd43d347af 100644 --- a/resolv/res_mkquery.c +++ b/resolv/res_mkquery.c @@ -82,6 +82,7 @@ * SOFTWARE. */ +#include #include #include #include @@ -92,12 +93,7 @@ #include #include #include - -#include -#include -#if HP_TIMING_AVAIL -# define RANDOM_BITS(Var) { uint64_t v64; HP_TIMING_NOW (v64); Var = v64; } -#endif +#include int __res_context_mkquery (struct resolv_context *ctx, int op, const char *dname, @@ -120,16 +116,7 @@ __res_context_mkquery (struct resolv_context *ctx, int op, const char *dname, /* We randomize the IDs every time. The old code just incremented by one after the initial randomization which still predictable if the application does multiple requests. */ - int randombits; -#ifdef RANDOM_BITS - RANDOM_BITS (randombits); -#else - struct timeval tv; - __gettimeofday (&tv, NULL); - randombits = (tv.tv_sec << 8) ^ tv.tv_usec; -#endif - - hp->id = randombits; + hp->id = random_bits (); hp->opcode = op; hp->rd = (ctx->resp->options & RES_RECURSE) != 0; hp->rcode = NOERROR; diff --git a/resolv/res_send.c b/resolv/res_send.c index fa040c1198..1b59b6080c 100644 --- a/resolv/res_send.c +++ b/resolv/res_send.c @@ -109,7 +109,7 @@ #include #include #include -#include +#include #if PACKETSZ > 65536 #define MAXPACKET PACKETSZ @@ -309,15 +309,7 @@ nameserver_offset (struct __res_state *statp) if ((offset & 1) == 0) { /* Initialization is required. */ -#if HP_TIMING_AVAIL - uint64_t ticks; - HP_TIMING_NOW (ticks); - offset = ticks; -#else - struct timeval tv; - __gettimeofday (&tv, NULL); - offset = ((tv.tv_sec << 8) ^ tv.tv_usec); -#endif + offset = random_bits (); /* The lowest bit is the most random. Preserve it. */ offset <<= 1; diff --git a/sysdeps/posix/tempname.c b/sysdeps/posix/tempname.c index 2ed39d1a42..62a20b3f30 100644 --- a/sysdeps/posix/tempname.c +++ b/sysdeps/posix/tempname.c @@ -71,22 +71,8 @@ #endif #ifdef _LIBC -# include -# if HP_TIMING_AVAIL -# define RANDOM_BITS(Var) \ - if (__glibc_unlikely (value == UINT64_C (0))) \ - { \ - /* If this is the first time this function is used initialize \ - the variable we accumulate the value in to some somewhat \ - random value. If we'd not do this programs at startup time \ - might have a reduced set of possible names, at least on slow \ - machines. */ \ - struct timeval tv; \ - __gettimeofday (&tv, NULL); \ - value = ((uint64_t) tv.tv_usec << 16) ^ tv.tv_sec; \ - } \ - HP_TIMING_NOW (Var) -# endif +# include +# define RANDOM_BITS(Var) ((Var) = random_bits ()) #endif /* Use the widest available unsigned type if uint64_t is not