From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTP id 2B63926D80 for ; Wed, 18 Jul 2018 07:43:44 -0400 (EDT) Received: from turing.freelists.org ([127.0.0.1]) by localhost (turing.freelists.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ccgdocDP99AS for ; Wed, 18 Jul 2018 07:43:44 -0400 (EDT) Received: from smtp36.i.mail.ru (smtp36.i.mail.ru [94.100.177.96]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTPS id D5DE420FE5 for ; Wed, 18 Jul 2018 07:43:43 -0400 (EDT) From: Georgy Kirichenko Subject: [tarantool-patches] [PATCH] Protect lua socket io against a spurious wakeup Date: Wed, 18 Jul 2018 14:43:39 +0300 Message-Id: <661cb14302af460fb3779040fb9258ae37c1075e.1531914062.git.georgy@tarantool.org> Sender: tarantool-patches-bounce@freelists.org Errors-to: tarantool-patches-bounce@freelists.org Reply-To: tarantool-patches@freelists.org List-help: List-unsubscribe: List-software: Ecartis version 1.0.0 List-Id: tarantool-patches List-subscribe: List-owner: List-post: List-archive: To: tarantool-patches@freelists.org Cc: Georgy Kirichenko socket_readable/socket_writable might return until socket become a requested state in case of a spurious wakeup. Socket functions are refactored with considering that fact. Old behavior leads to test failures. --- Issue: https://github.com/tarantool/tarantool/issues/3344 Branch: https://github.com/tarantool/tarantool/tree/g.kirichenko/gh-3344-socket-io-spurios-wakeup src/lua/socket.lua | 54 ++++++++++++++++++++++----------------- test/box/net.box.result | 3 +++ test/box/net.box.test.lua | 2 ++ 3 files changed, 35 insertions(+), 24 deletions(-) diff --git a/src/lua/socket.lua b/src/lua/socket.lua index 06306eae2..0b22bb91c 100644 --- a/src/lua/socket.lua +++ b/src/lua/socket.lua @@ -689,12 +689,8 @@ local function read(self, limit, timeout, check, ...) return nil end - if not socket_readable(self, timeout) then - return nil - end - if timeout <= 0 then - break - end + socket_readable(self, timeout) + fiber.testcancel() timeout = timeout - ( fiber.clock() - started ) end self._errno = boxerrno.ETIMEDOUT @@ -736,7 +732,7 @@ local function socket_write(self, octets, timeout) end local started = fiber.clock() - while true do + while timeout > 0 do local written = syswrite(self, p, e - p) if written == 0 then return p - s -- eof @@ -750,10 +746,9 @@ local function socket_write(self, octets, timeout) return nil end + socket_writable(self, timeout) + fiber.testcancel() timeout = timeout - (fiber.clock() - started) - if timeout <= 0 or not socket_writable(self, timeout) then - break - end end end @@ -935,16 +930,21 @@ local function socket_tcp_connect(s, address, port, timeout) -- Wait until the connection is established or ultimately fails. -- In either condition the socket becomes writable. To tell these -- conditions appart SO_ERROR must be consulted (man connect). - if socket_writable(s, timeout) then - s._errno = socket_getsockopt(s, 'SOL_SOCKET', 'SO_ERROR') - else - s._errno = boxerrno.ETIMEDOUT - end - if s._errno ~= 0 then - return nil + local deadline = timeout + fiber.clock() + while deadline - fiber.clock() > 0 do + if socket_writable(s, deadline - fiber.clock()) then + s._errno = socket_getsockopt(s, 'SOL_SOCKET', 'SO_ERROR') + if s._errno == 0 then + return true + else + return nil + end + end + -- timeout, spurious wakeup or cancel + fiber.testcancel() end - -- Connected - return true + s._errno = boxerrno.ETIMEDOUT + return nil end local function tcp_connect(host, port, timeout) @@ -1005,7 +1005,9 @@ end local function tcp_server_loop(server, s, addr) fiber.name(format("%s/%s:%s", server.name, addr.host, addr.port), {truncate = true}) log.info("started") - while socket_readable(s) do + while true do + fiber.testcancel() + socket_readable(s) local sc, from = socket_accept(s) if sc == nil then local errno = s._errno @@ -1325,7 +1327,9 @@ end local function lsocket_tcp_accept(self) check_socket(self) local deadline = fiber.clock() + (self.timeout or TIMEOUT_INFINITY) - repeat + while deadline - fiber.clock() > 0 do + socket_readable(self, deadline - fiber.clock()) + fiber.testcancel() local client = socket_accept(self) if client then setmetatable(client, lsocket_tcp_client_mt) @@ -1335,7 +1339,7 @@ local function lsocket_tcp_accept(self) if not errno_is_transient[errno] then break end - until not socket_readable(self, deadline - fiber.clock()) + end return nil, socket_error(self) end @@ -1390,7 +1394,9 @@ local function lsocket_tcp_receive(self, pattern, prefix) elseif pattern == "*a" then local result = { prefix } local deadline = fiber.clock() + (self.timeout or TIMEOUT_INFINITY) - repeat + while deadline - fiber.clock() > 0 do + socket_readable(self, deadline - fiber.clock()) + fiber.testcancel() local data = socket_sysread(self) if data == nil then if not errno_is_transient[self._errno] then @@ -1401,7 +1407,7 @@ local function lsocket_tcp_receive(self, pattern, prefix) else table.insert(result, data) end - until not socket_readable(self, deadline - fiber.clock()) + end if #result == 1 then return nil, 'closed', table.concat(result) end diff --git a/test/box/net.box.result b/test/box/net.box.result index 21cff4a11..4bafabdcb 100644 --- a/test/box/net.box.result +++ b/test/box/net.box.result @@ -20,6 +20,9 @@ test_run:cmd("push filter ".."'\\.lua.*:[0-9]+: ' to '.lua...\"]:: '") --- - true ... +fiber.wakeup(fiber.self()) +--- +... test_run:cmd("setopt delimiter ';'") --- - true diff --git a/test/box/net.box.test.lua b/test/box/net.box.test.lua index 14fb6ebbd..76d3a5837 100644 --- a/test/box/net.box.test.lua +++ b/test/box/net.box.test.lua @@ -6,6 +6,8 @@ env = require('test_run') test_run = env.new() test_run:cmd("push filter ".."'\\.lua.*:[0-9]+: ' to '.lua...\"]:: '") +fiber.wakeup(fiber.self()) + test_run:cmd("setopt delimiter ';'") function x_select(cn, space_id, index_id, iterator, offset, limit, key, opts) return cn:_request('select', opts, space_id, index_id, iterator, -- 2.18.0