From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,NICE_REPLY_A,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 15078C433E7 for ; Thu, 15 Oct 2020 13:26:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A8F6E2222B for ; Thu, 15 Oct 2020 13:26:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="sxyRa8oi" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729587AbgJON0V (ORCPT ); Thu, 15 Oct 2020 09:26:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47396 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728216AbgJON0V (ORCPT ); Thu, 15 Oct 2020 09:26:21 -0400 Received: from mail-wr1-x444.google.com (mail-wr1-x444.google.com [IPv6:2a00:1450:4864:20::444]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EFE5CC061755; Thu, 15 Oct 2020 06:26:20 -0700 (PDT) Received: by mail-wr1-x444.google.com with SMTP id e18so3456867wrw.9; Thu, 15 Oct 2020 06:26:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=vbVg16QrGKyvlMckDNn7Gc3nciHNv5GDTwM3pbpTXY0=; b=sxyRa8oiLkOGh5khW9uyt4C/N1rfSh5E5GnzgOtuPTlJF9vh+poDXThSHdRMZgmNca M7Momf8eX1CN0ezKJ4p7KIMfevKqKcG5zw/bhPZqHGf62PrAqxDkzIuHBoL3EaUqmLZM 3ryp28PiXOe8ApVwwawYhM3pEa/K8s9hYdXjOd5BSIlWPL8gTTL9m8CZQyTjz0j61YbP Ac3oqCo0urF5XfrtJJqdhXLZat8966EmUzPp/oKQeI8C6XxOpeLO27+XDAGpfo751a29 cDMWcyzWFFqFV7a9jke1xUN3LT6FA6ZdX1Il8cqKkz1lvhrqSGQ9Nd/ZPQis73qBz5HH tIyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=vbVg16QrGKyvlMckDNn7Gc3nciHNv5GDTwM3pbpTXY0=; b=fPw5O3H8JQ/F8WU5aj3JlMBCJpgfKwzy84ibsuoSeVRLySs7/eFfPwCsNV4AOLEOKU JpdJsdZwhmXBMP1vJnM/855nwEFjTWWXj9QxMeatj3dtbbWzQWltv7PdkUIxVXjfhkoc VEeJ2kUP+EDbMC3v+lOkEuwkKsXkZ5/ZvWsiefPiLi6iT6Hx2PksA4FVIZ++qroc0ivL gGzc1dzDUtW01PGYOImRPbKeMGV/K2K5IfsmcOq+NvYSkfaXSWVQHr13y+OIA1zNUoA9 tfoA7gve7jNbEsxVyb1HQg0nucSrwUFYZsLydUt+IXhAs2lNCY9CI8pyPfOxP87iU1jh P2jw== X-Gm-Message-State: AOAM533X4pNi0O+Y3qWwHQH8j6a4FEAfWEmxuP6IA+T+92fXVj86rxY7 tuIl+cOZGlIwV/M85osA8MM= X-Google-Smtp-Source: ABdhPJzkVhQlHr4psjqGHvJgXaBFBjQpUe8HpzLEiIam3P0cz3ZzpqDT4ckaobCUecVdBb41Fj4W1w== X-Received: by 2002:adf:dd50:: with SMTP id u16mr4575900wrm.419.1602768379590; Thu, 15 Oct 2020 06:26:19 -0700 (PDT) Received: from ?IPv6:2a02:8084:e84:2480:228:f8ff:fe6f:83a8? ([2a02:8084:e84:2480:228:f8ff:fe6f:83a8]) by smtp.gmail.com with ESMTPSA id e25sm2431731wra.71.2020.10.15.06.26.18 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 15 Oct 2020 06:26:18 -0700 (PDT) Subject: Re: [PATCH 1/2] futex: adjust a futex timeout with a per-timens offset To: Andrei Vagin , Thomas Gleixner , linux-kernel@vger.kernel.org Cc: Ingo Molnar , Peter Zijlstra , Darren Hart , Shuah Khan , stable@vger.kernel.org References: <20201015072909.271426-1-avagin@gmail.com> From: Dmitry Safonov <0x7f454c46@gmail.com> Message-ID: Date: Thu, 15 Oct 2020 14:26:16 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.12.0 MIME-Version: 1.0 In-Reply-To: <20201015072909.271426-1-avagin@gmail.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 10/15/20 8:29 AM, Andrei Vagin wrote: > For all commands except FUTEX_WAIT, timeout is interpreted as an > absolute value. This absolute value is inside the task's time namespace > and has to be converted to the host's time. > > Cc: > Fixes: 5a590f35add9 ("posix-clocks: Wire up clock_gettime() with timens offsets") > Reported-by: Hans van der Laan > Signed-off-by: Andrei Vagin [..] > @@ -3797,6 +3798,8 @@ SYSCALL_DEFINE6(futex, u32 __user *, uaddr, int, op, u32, val, > t = timespec64_to_ktime(ts); > if (cmd == FUTEX_WAIT) > t = ktime_add_safe(ktime_get(), t); > + else if (!(cmd & FUTEX_CLOCK_REALTIME)) > + t = timens_ktime_to_host(CLOCK_MONOTONIC, t); Err, it probably should be : else if (!(op & FUTEX_CLOCK_REALTIME)) And there's also : SYSCALL_DEFINE6(futex_time32, ...) which wants to be patched. Thanks, Dmitry