diff options
| -rw-r--r-- | include/my_valgrind.h | 18 | ||||
| m--------- | libmariadb | 0 | ||||
| -rw-r--r-- | libmysqld/libmysql.c | 2 | ||||
| -rw-r--r-- | sql/my_json_writer.cc | 5 | ||||
| -rw-r--r-- | sql/mysqld.cc | 2 | ||||
| -rw-r--r-- | storage/innobase/include/dict0stats.ic | 14 | ||||
| -rw-r--r-- | storage/innobase/include/univ.i | 7 | ||||
| -rw-r--r-- | storage/innobase/ut/ut0crc32.cc | 4 | ||||
| -rw-r--r-- | strings/dtoa.c | 5 |
9 files changed, 45 insertions, 12 deletions
diff --git a/include/my_valgrind.h b/include/my_valgrind.h index 08ad3f46b96..3f172831e51 100644 --- a/include/my_valgrind.h +++ b/include/my_valgrind.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2010, 2019, MariaDB Corporation. +/* Copyright (C) 2010, 2020, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -33,6 +33,7 @@ #if defined(HAVE_VALGRIND_MEMCHECK_H) && defined(HAVE_valgrind) # include <valgrind/memcheck.h> # define MEM_UNDEFINED(a,len) VALGRIND_MAKE_MEM_UNDEFINED(a,len) +# define MEM_MAKE_DEFINED(a,len) VALGRIND_MAKE_MEM_DEFINED(a,len) # define MEM_NOACCESS(a,len) VALGRIND_MAKE_MEM_NOACCESS(a,len) # define MEM_CHECK_ADDRESSABLE(a,len) VALGRIND_CHECK_MEM_IS_ADDRESSABLE(a,len) # define MEM_CHECK_DEFINED(a,len) VALGRIND_CHECK_MEM_IS_DEFINED(a,len) @@ -42,12 +43,27 @@ /* How to do manual poisoning: https://github.com/google/sanitizers/wiki/AddressSanitizerManualPoisoning */ # define MEM_UNDEFINED(a,len) ASAN_UNPOISON_MEMORY_REGION(a,len) +# define MEM_MAKE_DEFINED(a,len) ((void) 0) # define MEM_NOACCESS(a,len) ASAN_POISON_MEMORY_REGION(a,len) # define MEM_CHECK_ADDRESSABLE(a,len) ((void) 0) # define MEM_CHECK_DEFINED(a,len) ((void) 0) # define REDZONE_SIZE 8 +#elif __has_feature(memory_sanitizer) +# include <sanitizer/msan_interface.h> +# if 0 /* FIXME: these reveal lots of failures */ +# define MEM_UNDEFINED(a,len) __msan_allocated_memory(a,len) +# define MEM_MAKE_DEFINED(a,len) __msan_unpoison(a,len) +# else +# define MEM_UNDEFINED(a,len) ((void) 0) +# define MEM_MAKE_DEFINED(a,len) ((void) 0) +# endif +# define MEM_NOACCESS(a,len) ((void) 0) +# define MEM_CHECK_ADDRESSABLE(a,len) ((void) 0) +# define MEM_CHECK_DEFINED(a,len) __msan_check_mem_is_initialized(a,len) +# define REDZONE_SIZE 8 #else # define MEM_UNDEFINED(a,len) ((void) (a), (void) (len)) +# define MEM_MAKE_DEFINED(a,len) ((void) 0) # define MEM_NOACCESS(a,len) ((void) 0) # define MEM_CHECK_ADDRESSABLE(a,len) ((void) 0) # define MEM_CHECK_DEFINED(a,len) ((void) 0) diff --git a/libmariadb b/libmariadb -Subproject 1768cb6c322d403c1e372b368cc3c23b660b793 +Subproject 7a2c052ffc8b93acaa1e4de502c83cbae548148 diff --git a/libmysqld/libmysql.c b/libmysqld/libmysql.c index bc39ea9e569..8b48d6d4bcb 100644 --- a/libmysqld/libmysql.c +++ b/libmysqld/libmysql.c @@ -155,8 +155,10 @@ int STDCALL mysql_server_init(int argc __attribute__((unused)), */ #if MYSQL_PORT_DEFAULT == 0 +# if !__has_feature(memory_sanitizer) // Work around MSAN deficiency if ((serv_ptr= getservbyname("mysql", "tcp"))) mysql_port= (uint) ntohs((ushort) serv_ptr->s_port); +# endif #endif if ((env= getenv("MYSQL_TCP_PORT"))) mysql_port=(uint) atoi(env); diff --git a/sql/my_json_writer.cc b/sql/my_json_writer.cc index f4cf8204d61..0097eb6b658 100644 --- a/sql/my_json_writer.cc +++ b/sql/my_json_writer.cc @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 SkySQL Ab, MariaDB Corporation Ab +/* Copyright (C) 2014, 2020, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -180,6 +180,9 @@ void Json_writer::add_size(longlong val) void Json_writer::add_double(double val) { char buf[64]; +#if __has_feature(memory_sanitizer) // FIXME: remove this workaround for + __msan_unpoison(&val, sizeof val); // main.range_mrr_icp & many other tests +#endif size_t len= my_snprintf(buf, sizeof(buf), "%lg", val); add_unquoted_str(buf, len); } diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 7cf85b72d71..9033103cef5 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -2174,9 +2174,11 @@ static void set_ports() */ #if MYSQL_PORT_DEFAULT == 0 +# if !__has_feature(memory_sanitizer) // Work around MSAN deficiency struct servent *serv_ptr; if ((serv_ptr= getservbyname("mysql", "tcp"))) SYSVAR_AUTOSIZE(mysqld_port, ntohs((u_short) serv_ptr->s_port)); +# endif #endif if ((env = getenv("MYSQL_TCP_PORT"))) { diff --git a/storage/innobase/include/dict0stats.ic b/storage/innobase/include/dict0stats.ic index 446d91f4c04..3c24e7a8fc3 100644 --- a/storage/innobase/include/dict0stats.ic +++ b/storage/innobase/include/dict0stats.ic @@ -1,7 +1,7 @@ /***************************************************************************** Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. -Copyright (c) 2017, MariaDB Corporation. +Copyright (c) 2017, 2020, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -202,18 +202,18 @@ dict_stats_deinit( for (index = dict_table_get_first_index(table); index != NULL; index = dict_table_get_next_index(index)) { - - ulint n_uniq = dict_index_get_n_unique(index); - UNIV_MEM_INVALID( index->stat_n_diff_key_vals, - n_uniq * sizeof(index->stat_n_diff_key_vals[0])); + index->n_uniq + * sizeof(index->stat_n_diff_key_vals[0])); UNIV_MEM_INVALID( index->stat_n_sample_sizes, - n_uniq * sizeof(index->stat_n_sample_sizes[0])); + index->n_uniq + * sizeof(index->stat_n_sample_sizes[0])); UNIV_MEM_INVALID( index->stat_n_non_null_key_vals, - n_uniq * sizeof(index->stat_n_non_null_key_vals[0])); + index->n_uniq + * sizeof(index->stat_n_non_null_key_vals[0])); UNIV_MEM_INVALID( &index->stat_index_size, sizeof(index->stat_index_size)); diff --git a/storage/innobase/include/univ.i b/storage/innobase/include/univ.i index c2f471aeec6..4749ebfbb1c 100644 --- a/storage/innobase/include/univ.i +++ b/storage/innobase/include/univ.i @@ -170,8 +170,12 @@ using the call command. */ #define UNIV_ENABLE_UNIT_TEST_ROW_RAW_FORMAT_INT */ +#include <my_valgrind.h> + #if defined HAVE_valgrind && defined HAVE_VALGRIND_MEMCHECK_H # define UNIV_DEBUG_VALGRIND +#elif __has_feature(memory_sanitizer) +# define UNIV_DEBUG_VALGRIND #endif #ifdef DBUG_OFF @@ -573,14 +577,13 @@ typedef void* os_thread_ret_t; #include "ut0ut.h" #include "sync0types.h" -#include <my_valgrind.h> /* define UNIV macros in terms of my_valgrind.h */ #define UNIV_MEM_INVALID(addr, size) MEM_UNDEFINED(addr, size) #define UNIV_MEM_FREE(addr, size) MEM_NOACCESS(addr, size) #define UNIV_MEM_ALLOC(addr, size) UNIV_MEM_INVALID(addr, size) #ifdef UNIV_DEBUG_VALGRIND # include <valgrind/memcheck.h> -# define UNIV_MEM_VALID(addr, size) VALGRIND_MAKE_MEM_DEFINED(addr, size) +# define UNIV_MEM_VALID(addr, size) MEM_MAKE_DEFINED(addr, size) # define UNIV_MEM_DESC(addr, size) VALGRIND_CREATE_BLOCK(addr, size, #addr) # define UNIV_MEM_UNDESC(b) VALGRIND_DISCARD(b) # define UNIV_MEM_ASSERT_RW_LOW(addr, size, should_abort) do { \ diff --git a/storage/innobase/ut/ut0crc32.cc b/storage/innobase/ut/ut0crc32.cc index efe6dc0a729..52b69e899b0 100644 --- a/storage/innobase/ut/ut0crc32.cc +++ b/storage/innobase/ut/ut0crc32.cc @@ -172,6 +172,8 @@ ut_crc32_8_hw( { # ifdef _MSC_VER *crc = _mm_crc32_u8(*crc, (*data)[0]); +# elif __has_feature(memory_sanitizer) + *crc = __builtin_ia32_crc32qi(*crc, (*data)[0]); # else asm("crc32b %1, %0" /* output operands */ @@ -204,6 +206,8 @@ ut_crc32_64_low_hw( # else # error Not Supported processors type. # endif +# elif __has_feature(memory_sanitizer) + crc_64bit = __builtin_ia32_crc32di(crc_64bit, data); # else asm("crc32q %1, %0" /* output operands */ diff --git a/strings/dtoa.c b/strings/dtoa.c index e31b7e92d7c..63c99c6b2a9 100644 --- a/strings/dtoa.c +++ b/strings/dtoa.c @@ -1,5 +1,5 @@ /* Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved. - Copyright (c) 2017, MariaDB Corporation. + Copyright (c) 2017, 2020, MariaDB Corporation. This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public @@ -2168,6 +2168,9 @@ static int quorem(Bigint *b, Bigint *S) static char *dtoa(double dd, int mode, int ndigits, int *decpt, int *sign, char **rve, char *buf, size_t buf_size) +#if __has_feature(memory_sanitizer) + __attribute__((no_sanitize("memory"))) // FIXME: dd is claimed uninitialized +#endif { /* Arguments ndigits, decpt, sign are similar to those |