From: Vladislav Shpilevoy via Tarantool-patches <tarantool-patches@dev.tarantool.org> To: tarantool-patches@dev.tarantool.org, gorcunov@gmail.com, sergepetrenko@tarantool.org Subject: [Tarantool-patches] [PATCH 09/16] uuid: drop tt_uuid_str() from Lua Date: Sat, 20 Mar 2021 01:42:46 +0100 [thread overview] Message-ID: <41cbe040f3523f0aa3b7f484c0e3b4eca474b935.1616200860.git.v.shpilevoy@tarantool.org> (raw) In-Reply-To: <cover.1616200860.git.v.shpilevoy@tarantool.org> The function converts struct tt_uuid * to a string. The string is allocated on the static buffer, which can't be used in Lua due to unpredictable GC behaviour. It can start working any moment even if tt_uuid_str() has returned, but its result wasn't passed to ffi.string() yet. Then the buffer might be overwritten. Lua uuid now uses tt_uuid_to_string() which does the same but takes the buffer pointer. The buffer is stored in an ffi stash, because it is x4 times faster than ffi.new('char[37]') (where 37 is length of a UUID string + terminating 0) (2.4 ns vs 0.8 ns). After this patch UUID is supposed to be fully compatible with Lua GC handlers. Part of #5632 --- src/exports.h | 2 +- src/lua/uuid.lua | 13 ++++-- test/app-tap/gh-5632-gc-buf-reuse.test.lua | 49 ++++++++++++++++++++++ 3 files changed, 60 insertions(+), 4 deletions(-) create mode 100755 test/app-tap/gh-5632-gc-buf-reuse.test.lua diff --git a/src/exports.h b/src/exports.h index ddbe57230..a90b9406a 100644 --- a/src/exports.h +++ b/src/exports.h @@ -517,7 +517,7 @@ EXPORT(tt_uuid_create) EXPORT(tt_uuid_from_string) EXPORT(tt_uuid_is_equal) EXPORT(tt_uuid_is_nil) -EXPORT(tt_uuid_str) +EXPORT(tt_uuid_to_string) EXPORT(uri_format) EXPORT(uri_parse) EXPORT(uuid_nil) diff --git a/src/lua/uuid.lua b/src/lua/uuid.lua index 74f8c924c..3047b665c 100644 --- a/src/lua/uuid.lua +++ b/src/lua/uuid.lua @@ -17,8 +17,6 @@ bool tt_uuid_is_nil(const struct tt_uuid *uu); bool tt_uuid_is_equal(const struct tt_uuid *lhs, const struct tt_uuid *rhs); -char * -tt_uuid_str(const struct tt_uuid *uu); int tt_uuid_compare(const struct tt_uuid *a, const struct tt_uuid *b); extern const struct tt_uuid uuid_nil; @@ -31,6 +29,11 @@ local uuid_stash = buffer.ffi_stash_new(uuid_t) local uuid_stash_take = uuid_stash.take local uuid_stash_put = uuid_stash.put +local uuid_str_stash = + buffer.ffi_stash_new(string.format('char[%s]', UUID_STR_LEN + 1)) +local uuid_str_stash_take = uuid_str_stash.take +local uuid_str_stash_put = uuid_str_stash.put + local is_uuid = function(value) return ffi.istype(uuid_t, value) end @@ -39,7 +42,11 @@ local uuid_tostring = function(uu) if not is_uuid(uu) then return error('Usage: uuid:str()') end - return ffi.string(builtin.tt_uuid_str(uu), UUID_STR_LEN) + local strbuf = uuid_str_stash_take() + builtin.tt_uuid_to_string(uu, strbuf) + uu = ffi.string(strbuf, UUID_STR_LEN) + uuid_str_stash_put(strbuf) + return uu end local uuid_fromstr = function(str) diff --git a/test/app-tap/gh-5632-gc-buf-reuse.test.lua b/test/app-tap/gh-5632-gc-buf-reuse.test.lua new file mode 100755 index 000000000..8fe662d3f --- /dev/null +++ b/test/app-tap/gh-5632-gc-buf-reuse.test.lua @@ -0,0 +1,49 @@ +#!/usr/bin/env tarantool + +-- +-- gh-5632: Lua code should not use any global buffers or objects without +-- proper ownership protection. Otherwise these items might be suddenly reused +-- during Lua GC which happens almost at any moment. That might lead to data +-- corruption. +-- + +local tap = require('tap') +local ffi = require('ffi') +local uuid = require('uuid') + +local function test_uuid(test) + test:plan(1) + + local gc_count = 100 + local iter_count = 1000 + local is_success = true + + local function uuid_to_str() + local uu = uuid.new() + local str1 = uu:str() + local str2 = uu:str() + if str1 ~= str2 then + is_success = false + assert(false) + end + end + + local function create_gc() + for i = 1, gc_count do + ffi.gc(ffi.new('char[1]'), function() uuid_to_str() end) + end + end + + for i = 1, iter_count do + create_gc() + uuid_to_str() + end + + test:ok(is_success, 'uuid in gc') +end + +local test = tap.test('gh-5632-gc-buf-reuse') +test:plan(1) +test:test('uuid in __gc', test_uuid) + +os.exit(test:check() and 0 or 1) -- 2.24.3 (Apple Git-128)
next prev parent reply other threads:[~2021-03-20 0:50 UTC|newest] Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-03-20 0:42 [Tarantool-patches] [PATCH 00/16] Cord buffer, static alloc, and Lua GC bug Vladislav Shpilevoy via Tarantool-patches 2021-03-20 0:42 ` [Tarantool-patches] [PATCH 01/16] fio: don't use shared buffer in pread() Vladislav Shpilevoy via Tarantool-patches 2021-03-22 7:19 ` Cyrill Gorcunov via Tarantool-patches 2021-03-20 0:42 ` [Tarantool-patches] [PATCH 10/16] uri: replace static_alloc with ffi stash and ibuf Vladislav Shpilevoy via Tarantool-patches 2021-03-20 0:42 ` [Tarantool-patches] [PATCH 11/16] buffer: remove static_alloc() from Lua Vladislav Shpilevoy via Tarantool-patches 2021-03-20 0:42 ` [Tarantool-patches] [PATCH 12/16] lua: use lua_pushfstring() instead of tt_sprintf() Vladislav Shpilevoy via Tarantool-patches 2021-03-20 0:42 ` [Tarantool-patches] [PATCH 13/16] sio: rework sio_strfaddr() Vladislav Shpilevoy via Tarantool-patches 2021-03-20 0:42 ` [Tarantool-patches] [PATCH 14/16] sio: increase SERVICE_NAME_MAXLEN size Vladislav Shpilevoy via Tarantool-patches 2021-03-21 21:58 ` Cyrill Gorcunov via Tarantool-patches 2021-03-22 22:32 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 6:56 ` Cyrill Gorcunov via Tarantool-patches 2021-03-20 0:42 ` [Tarantool-patches] [PATCH 15/16] sio: introduce and use sio_snprintf() Vladislav Shpilevoy via Tarantool-patches 2021-03-20 0:42 ` [Tarantool-patches] [PATCH 16/16] buffer: remove Lua registers Vladislav Shpilevoy via Tarantool-patches 2021-03-20 0:42 ` [Tarantool-patches] [PATCH 02/16] test: don't use IBUF_SHARED in the tests Vladislav Shpilevoy via Tarantool-patches 2021-03-22 7:35 ` Cyrill Gorcunov via Tarantool-patches 2021-03-20 0:42 ` [Tarantool-patches] [PATCH 03/16] tuple: pass global ibuf explicitly where possible Vladislav Shpilevoy via Tarantool-patches 2021-03-20 0:42 ` [Tarantool-patches] [PATCH 04/16] iconv: take errno before reseting the context Vladislav Shpilevoy via Tarantool-patches 2021-03-20 0:42 ` [Tarantool-patches] [PATCH 05/16] cord_buf: introduce cord_buf API Vladislav Shpilevoy via Tarantool-patches 2021-03-20 0:42 ` [Tarantool-patches] [PATCH 06/16] cord_buf: introduce ownership management Vladislav Shpilevoy via Tarantool-patches 2021-03-22 16:48 ` Serge Petrenko via Tarantool-patches 2021-03-22 22:32 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 7:46 ` Serge Petrenko via Tarantool-patches 2021-03-20 0:42 ` [Tarantool-patches] [PATCH 07/16] buffer: implement ffi stash Vladislav Shpilevoy via Tarantool-patches 2021-03-23 0:29 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-20 0:42 ` [Tarantool-patches] [PATCH 08/16] uuid: replace static_alloc with " Vladislav Shpilevoy via Tarantool-patches 2021-03-20 0:42 ` Vladislav Shpilevoy via Tarantool-patches [this message] 2021-03-21 16:38 ` [Tarantool-patches] [PATCH 00/16] Cord buffer, static alloc, and Lua GC bug Vladislav Shpilevoy via Tarantool-patches 2021-03-22 7:52 ` Cyrill Gorcunov via Tarantool-patches 2021-03-22 7:56 ` Konstantin Osipov via Tarantool-patches 2021-03-22 17:17 ` Serge Petrenko via Tarantool-patches 2021-03-23 23:45 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-24 13:28 ` Kirill Yukhin via Tarantool-patches
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=41cbe040f3523f0aa3b7f484c0e3b4eca474b935.1616200860.git.v.shpilevoy@tarantool.org \ --to=tarantool-patches@dev.tarantool.org \ --cc=gorcunov@gmail.com \ --cc=sergepetrenko@tarantool.org \ --cc=v.shpilevoy@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH 09/16] uuid: drop tt_uuid_str() from Lua' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox