From patchwork Wed Apr 22 23:42:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Gora X-Patchwork-Id: 69161 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 8177BA00C2; Thu, 23 Apr 2020 01:44:24 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 793571D166; Thu, 23 Apr 2020 01:44:19 +0200 (CEST) Received: from mail-qk1-f196.google.com (mail-qk1-f196.google.com [209.85.222.196]) by dpdk.org (Postfix) with ESMTP id 385B81D159 for ; Thu, 23 Apr 2020 01:44:18 +0200 (CEST) Received: by mail-qk1-f196.google.com with SMTP id m67so4454391qke.12 for ; Wed, 22 Apr 2020 16:44:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Lo8+d918gZimIDGjN/gkv+6HIWmTeGcYnnMcht/KXPo=; b=HFruzfxmf66vHxZnjxTFnXlrseYbcFRXWZFgCVMRsC3HvlEQZ0kkMo3I8SNEKlmrVy gMTTeYR85YPVy+0p9bYlqO1fFu/1V378yTs7WMxJ0ORvy3RHRYY9mwZkpakTgA6M10Ft Gj83li5T3tsQmJ8j1dwfidYMWZdI5eTjq1Lg4KQipiQsf20DRt1Qq4NOkv1OGp+Yv/VL 1DWHGjXaU4epA4tdgoQdfUkKK+v6ceRhk9ux9nMglHBIEPV5LifAkwbJtc19/idbD/uL VSEuqxc6ThVJs1erWAQ9pk0WqnqriGWj5Wy9IkVYlONInbU+LIIxwNjkoLm3kX9RgAUQ QZYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Lo8+d918gZimIDGjN/gkv+6HIWmTeGcYnnMcht/KXPo=; b=e1KgWvh6Kog4jXjvvL0VED9YSVi7iDN3CuTP+M3elreryJJ9c2q/cakt5wGfIfzbun eYqQl0O5TlzbDe9FGq986DY45sx5Q+kHF8Nf7u6l5gOwOuSWYLdOX4eNSpuxqrVEP+PV B2sXhPZoBtiJjnXeyDihnhdypRwbOQA0CZpCMXkOXcFAHaQqlgl+Ay7EZPS+gcDszBkc yXfGtww3xEiG09XP1ybMxfLo0QhN+FgHUnfzCgN+ng2nqfOmepIPsBe39prR1Nl88B9M vn9s20sq1GDR7ihzXGZDOgxfdnU96nTippaupbNdd6yjwJTqr3aWXA6fwmAKmJSfjj0a t79A== X-Gm-Message-State: AGi0PubaAmrMPmkF9eC2G+81Z9oZhHnGraymWBPxngjoOiKkjA6iWxFz uRF3fUVOiaYMdqUDefl+dDde4DDNUbQ= X-Google-Smtp-Source: APiQypL+ilfjgTGQKbTvboOJraGU4YqJJPOGZtUnwuCqFDlyzpMIgcp5XOsjStKdPmxbOC/xkNTgxQ== X-Received: by 2002:a37:a6d4:: with SMTP id p203mr781548qke.201.1587599057170; Wed, 22 Apr 2020 16:44:17 -0700 (PDT) Received: from localhost.localdomain ([168.121.99.161]) by smtp.gmail.com with ESMTPSA id t15sm614263qtc.64.2020.04.22.16.44.15 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Apr 2020 16:44:16 -0700 (PDT) From: Dan Gora To: dev@dpdk.org, Thomas Monjalon , =?utf-8?q?Mattias_R?= =?utf-8?q?=C3=B6nnblom?= Cc: David Marchand , Jerin Jacob , Dan Gora Date: Wed, 22 Apr 2020 20:42:53 -0300 Message-Id: <20200422234255.7066-2-dg@adax.com> X-Mailer: git-send-email 2.24.1.425.g7034cd094b In-Reply-To: <20200422234255.7066-1-dg@adax.com> References: <20200421195446.1730-1-dg@adax.com> <20200422234255.7066-1-dg@adax.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v4 1/2] eal: check for rdseed at run time for random seed X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Instead of enabling the rdseed instruction for the random number generator entropy source at compilation time, determine if the instruction can be used at run time. The DPDK build is updated to check that the compiler can generate the rdseed instruction even if the compilation platform does not natively support it. If so, the -mrdseed flag is explicitly added. This allows binaries compiled on systems which do not support the rdseed instruction to use the instruction if the execution platform supports it. At run-time on x86, __rte_random_initial_seed() will check for the availability of the rdseed instruction on the execution platform using rte_cpu_get_flag_enabled(). This allows binaries which were compiled on systems which support the rdseed instruction to run on x86 CPUs which do not support the rdseed instruction. RTE_CPUFLAG_RDSEED is removed from the list of RTE_COMPILE_TIME_CPUFLAGS which are checked in rte_eal_init() at run time because it is no longer required to match the compilation system. Signed-off-by: Dan Gora --- config/x86/meson.build | 11 ++++++++--- lib/librte_eal/common/rte_random.c | 19 +++++++++++-------- mk/rte.cpuflags.mk | 9 +++++++-- 3 files changed, 26 insertions(+), 13 deletions(-) diff --git a/config/x86/meson.build b/config/x86/meson.build index adc857ba2..9491fad3a 100644 --- a/config/x86/meson.build +++ b/config/x86/meson.build @@ -20,15 +20,20 @@ if cc.get_define('__SSE4_2__', args: machine_args) == '' machine_args += '-msse4' endif +# set -mrdseed if necessary so _rdseed32_step compiles if the +# compilation host does not support the RDSEED instruction. +if cc.get_define('__RDSEED__', args: machine_args) == '' and cc.has_argument('-mrdseed') + machine_args += '-mrdseed' + message('RDSEED not enabled by default, explicitly setting -mrdseed') +endif + base_flags = ['SSE', 'SSE2', 'SSE3','SSSE3', 'SSE4_1', 'SSE4_2'] foreach f:base_flags dpdk_conf.set('RTE_MACHINE_CPUFLAG_' + f, 1) compile_time_cpuflags += ['RTE_CPUFLAG_' + f] endforeach -optional_flags = ['AES', 'PCLMUL', - 'AVX', 'AVX2', 'AVX512F', - 'RDRND', 'RDSEED'] +optional_flags = ['AES', 'PCLMUL', 'AVX', 'AVX2', 'AVX512F', 'RDRND'] foreach f:optional_flags if cc.get_define('__@0@__'.format(f), args: machine_args) == '1' if f == 'PCLMUL' # special case flags with different defines diff --git a/lib/librte_eal/common/rte_random.c b/lib/librte_eal/common/rte_random.c index b7a089ac4..2c84c8527 100644 --- a/lib/librte_eal/common/rte_random.c +++ b/lib/librte_eal/common/rte_random.c @@ -2,7 +2,7 @@ * Copyright(c) 2019 Ericsson AB */ -#ifdef RTE_MACHINE_CPUFLAG_RDSEED +#if defined(RTE_ARCH_X86) #include #endif #include @@ -188,14 +188,17 @@ __rte_random_initial_seed(void) if (ge_rc == 0) return ge_seed; #endif -#ifdef RTE_MACHINE_CPUFLAG_RDSEED - unsigned int rdseed_low; - unsigned int rdseed_high; - +#if defined(RTE_ARCH_X86) /* first fallback: rdseed instruction, if available */ - if (_rdseed32_step(&rdseed_low) == 1 && - _rdseed32_step(&rdseed_high) == 1) - return (uint64_t)rdseed_low | ((uint64_t)rdseed_high << 32); + if (rte_cpu_get_flag_enabled(RTE_CPUFLAG_RDSEED)) { + unsigned int rdseed_low; + unsigned int rdseed_high; + + if (_rdseed32_step(&rdseed_low) == 1 && + _rdseed32_step(&rdseed_high) == 1) + return (uint64_t)rdseed_low | + ((uint64_t)rdseed_high << 32); + } #endif /* second fallback: seed using rdtsc */ return rte_get_tsc_cycles(); diff --git a/mk/rte.cpuflags.mk b/mk/rte.cpuflags.mk index fa8753531..a114e9c02 100644 --- a/mk/rte.cpuflags.mk +++ b/mk/rte.cpuflags.mk @@ -51,8 +51,13 @@ ifneq ($(filter $(AUTO_CPUFLAGS),__RDRND__),) CPUFLAGS += RDRAND endif -ifneq ($(filter $(AUTO_CPUFLAGS),__RDSEED__),) -CPUFLAGS += RDSEED +ifeq ($(filter $(AUTO_CPUFLAGS),__RDSEED__),) +# If the native environment doesn't define __RDSEED__, see +# if the compiler supports -mrdseed. +RDSEED_CPUFLAGS := $(shell $(CC) $(MACHINE_CFLAGS) $(WERROR_FLAGS) $(EXTRA_CFLAGS) -mrdseed -dM -E - < /dev/null) +ifneq ($(filter $(RDSEED_CPUFLAGS),__RDSEED__),) +MACHINE_CFLAGS += -mrdseed +endif endif ifneq ($(filter $(AUTO_CPUFLAGS),__FSGSBASE__),) From patchwork Wed Apr 22 23:42:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Gora X-Patchwork-Id: 69162 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 5BC42A00C2; Thu, 23 Apr 2020 01:44:33 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E321A1D173; Thu, 23 Apr 2020 01:44:26 +0200 (CEST) Received: from mail-qk1-f193.google.com (mail-qk1-f193.google.com [209.85.222.193]) by dpdk.org (Postfix) with ESMTP id 6AD5E1D164 for ; Thu, 23 Apr 2020 01:44:25 +0200 (CEST) Received: by mail-qk1-f193.google.com with SMTP id o19so4515713qkk.5 for ; Wed, 22 Apr 2020 16:44:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xdQN6XP1bQ7p/HTW903byCKzoWIoVhknTniEKCN0GCA=; b=Nv4Mc9hHlFhmDIseXc+jjTZWbsh3W0NfmBdgR5inzJ1WZxfbtkluBzpw4esW77xHLp 948aVPfRqNjTE7QdhrPYS70ZcSBqshUZ+HZE4ehk2BlfyDEKw7zOYVuD1gEZYCefvdXl J2vBu8hNSds2VsPisRtGLrIO3Q7hqrAkPsqCTfFzs8XkK2y8R89d/fqKfZcAo6QgUE8m taWbKhbuVM2Vln39WAjcc9CN85Y8JLGoAPw58j1HKoLk2CSJHov89nNbzIHucgMhtzFN Js8FXqYu9TDkgnSOHRnAYtCVtujYvGvXNsIglV6Hz0DVcLqqpAVWfb7nA4Z2UTkhPIgu LzWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=xdQN6XP1bQ7p/HTW903byCKzoWIoVhknTniEKCN0GCA=; b=IIiCsXk9kuME3J7abNEuN97fxc76umptESRF88utT9a0M6s//PcKGbxSp7ZrEH5ci0 8YTQG7IjxCjkbFQYjK3nvoRseAsTqN7TXEP91vB9Gr/GGz8AFY83pgkI95F+3jKPhIAA yk8pil7LMYroWDBWv9Fd3N8Wlb0by+qJz0UNiul5HoVgTLqnchkzMNn/pob/RECF+pXH /PRODs02PpUGsH44ft3RKYcOOIAEKfN/lGR11iPAYqzlLOrRR84sCnMpKCmw6r7dAvEg 7SDICoj3LDwgDSHrekGpfJIlfZdkSxs6em9A7Mec0ZrqR/7Bn24z/nqY8DXlCFoUrbYX aNFw== X-Gm-Message-State: AGi0PubexI9gU2nS7FPXyrepI2MqOC6XaWu5GsHn5h0GrwKtQyxWq8xj vGNGN/4JUWROzl24hVtuJfxrINGC2FE= X-Google-Smtp-Source: APiQypJ5Udu2fM7WXIE9sjTvAR7IKJm2ICC/hY4HVKIppsHjR8Ijm431+if58IM3AxPxBZv2o50CiQ== X-Received: by 2002:a37:a348:: with SMTP id m69mr878999qke.31.1587599064556; Wed, 22 Apr 2020 16:44:24 -0700 (PDT) Received: from localhost.localdomain ([168.121.99.161]) by smtp.gmail.com with ESMTPSA id t15sm614263qtc.64.2020.04.22.16.44.22 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Apr 2020 16:44:24 -0700 (PDT) From: Dan Gora To: dev@dpdk.org, =?utf-8?q?Mattias_R=C3=B6nnblom?= Cc: David Marchand , Jerin Jacob , Dan Gora Date: Wed, 22 Apr 2020 20:42:54 -0300 Message-Id: <20200422234255.7066-3-dg@adax.com> X-Mailer: git-send-email 2.24.1.425.g7034cd094b In-Reply-To: <20200422234255.7066-1-dg@adax.com> References: <20200421195446.1730-1-dg@adax.com> <20200422234255.7066-1-dg@adax.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v4 2/2] eal: emulate glibc getentropy for initial random seed X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" The getentropy() function was introduced into glibc v2.25 and so is not available on all supported platforms. Previously, if DPDK was compiled (using meson) on a system which has getentropy(), it would introduce a dependency on glibc v2.25 which would prevent that binary from running on a system with an older glibc. Similarly if DPDK was compiled on a system which did not have getentropy(), getentropy() could not be used even if the execution system supported it. Introduce a new static function, __rte_getentropy() to emulate the glibc getentropy() function by reading from /dev/urandom to remove this dependency on the glibc version. Since __rte_genentropy() should never fail, the rdseed method is tried first. Signed-off-by: Dan Gora --- lib/librte_eal/common/rte_random.c | 62 ++++++++++++++++++++++++++---- lib/librte_eal/meson.build | 3 -- 2 files changed, 54 insertions(+), 11 deletions(-) diff --git a/lib/librte_eal/common/rte_random.c b/lib/librte_eal/common/rte_random.c index 2c84c8527..f043adf03 100644 --- a/lib/librte_eal/common/rte_random.c +++ b/lib/librte_eal/common/rte_random.c @@ -7,6 +7,7 @@ #endif #include #include +#include #include #include @@ -176,20 +177,61 @@ rte_rand_max(uint64_t upper_bound) return res; } +/* Emulate glibc getentropy() using /dev/urandom */ +static int +__rte_getentropy(void *buffer, size_t length) +{ + uint8_t *start = buffer; + uint8_t *end; + ssize_t bytes; + int fd; + int rc = -1; + + if (length > 256) { + errno = EIO; + return -1; + } + + fd = open("/dev/urandom", O_RDONLY); + if (fd < 0) { + errno = ENODEV; + return -1; + } + + end = start + length; + while (start < end) { + bytes = read(fd, start, end - start); + if (bytes < 0) { + if (errno == EINTR) + /* Supposedly cannot be interrupted by + * a signal, but just in case... + */ + continue; + else + goto out; + } + if (bytes == 0) { + /* no more bytes available, should not happen under + * normal circumstances. + */ + errno = EIO; + goto out; + } + start += bytes; + } + rc = 0; + errno = 0; +out: + close(fd); + return rc; +} + static uint64_t __rte_random_initial_seed(void) { -#ifdef RTE_LIBEAL_USE_GETENTROPY - int ge_rc; uint64_t ge_seed; - ge_rc = getentropy(&ge_seed, sizeof(ge_seed)); - - if (ge_rc == 0) - return ge_seed; -#endif #if defined(RTE_ARCH_X86) - /* first fallback: rdseed instruction, if available */ if (rte_cpu_get_flag_enabled(RTE_CPUFLAG_RDSEED)) { unsigned int rdseed_low; unsigned int rdseed_high; @@ -200,6 +242,10 @@ __rte_random_initial_seed(void) ((uint64_t)rdseed_high << 32); } #endif + /* first fallback: read from /dev/urandom.. */ + if (__rte_getentropy(&ge_seed, sizeof(ge_seed)) == 0) + return ge_seed; + /* second fallback: seed using rdtsc */ return rte_get_tsc_cycles(); } diff --git a/lib/librte_eal/meson.build b/lib/librte_eal/meson.build index 0267c3b9d..748359b8c 100644 --- a/lib/librte_eal/meson.build +++ b/lib/librte_eal/meson.build @@ -15,9 +15,6 @@ deps += 'kvargs' if dpdk_conf.has('RTE_USE_LIBBSD') ext_deps += libbsd endif -if cc.has_function('getentropy', prefix : '#include ') - cflags += '-DRTE_LIBEAL_USE_GETENTROPY' -endif if cc.has_header('getopt.h') cflags += ['-DHAVE_GETOPT_H', '-DHAVE_GETOPT', '-DHAVE_GETOPT_LONG'] endif