From patchwork Mon Jun 5 15:08:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 103344 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2763063vqr; Mon, 5 Jun 2023 08:23:51 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6bE3slqxaGGcuRsA0L0KODwIVpKBxm5HQP7oEku9O0sqHMyk7w43OqmSQFCcM8R+Xt5uJt X-Received: by 2002:a05:6a20:914c:b0:10e:f369:2809 with SMTP id x12-20020a056a20914c00b0010ef3692809mr2972534pzc.21.1685978630889; Mon, 05 Jun 2023 08:23:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685978630; cv=none; d=google.com; s=arc-20160816; b=yc3GHfhOsf0JZC/xiBjm6xZkJxaPByf1qCpGEvdN3SrxAoxtzFu6HvybOuFH/MAyUi nCagvWCY2wGcfqvbHXnkSrbKqkmaIvSEnVsDbhaOm7aihba8xo5+WmwPHGc38Y9Yoet8 JM5YjwPd5EZ/oBp1JVXW4pszaXsvSzK6uOEL84G75XBSOnkdu8hRv5gIJ7ESPjGq2g3C AxgX4/tk91oD0fR3kc3bBo0LOCJc/S/ZVoA4P/GEnelNogNUu5/kquVAqoRDLzYgQwPZ lj7eqATJOBKfR2Z+NCsf7tNPKOwfKbg45oXXmnUpqgA68lcW0Sa7/qRVspv8TjyP/FEc vJIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=gYWfKdbZQ3j9N07sb0OGHBVpTwEqk9DubNlrO7xIl8g=; b=ykixF7B1NfyJejPTwSgD5K7UGBcKeeKjFv/wu+srkMDNhHgFyZCi6y4QhD0zdSf4Kq ViqAc3CmVFhlevYUyU+5EofKR04GkbBZ/aeejiibQCrthb0ZIZRACFCyzL3pL/JPzVD5 CSAyXut+6hA+G/okBgJCAsBVGgQ6MNeNsAkfRZie5cIEeVFoc/U3LD5cVLY/yrs+YKfa ybdtCDCon5pfTQKzkbqHkFDEcNP+QcETNfDurTLA9IZN9gey7ZMvgDy3WaoObM5TQrj9 n9hhhUTQJApm0x3ryCSdgqbCc6K4/sBFivaLeqUcMjoJ623ZYjmLnUGZjr96v8vva0Ra KwXA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=B5M6Xhrm; dkim=neutral (no key) header.i=@linutronix.de header.b="dCJnDuB/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w15-20020a63af0f000000b00543c1b205a5si957944pge.149.2023.06.05.08.23.37; Mon, 05 Jun 2023 08:23:50 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=B5M6Xhrm; dkim=neutral (no key) header.i=@linutronix.de header.b="dCJnDuB/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234488AbjFEPJ3 (ORCPT + 99 others); Mon, 5 Jun 2023 11:09:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48012 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234202AbjFEPIe (ORCPT ); Mon, 5 Jun 2023 11:08:34 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E4782F9; Mon, 5 Jun 2023 08:08:32 -0700 (PDT) Date: Mon, 05 Jun 2023 15:08:30 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1685977711; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gYWfKdbZQ3j9N07sb0OGHBVpTwEqk9DubNlrO7xIl8g=; b=B5M6XhrmNX4qBgzO2zorbnEYC2WWxgw2fHR+GlQGoqdT0064OArXx/NwNLGPW+0VWGpBFW 8UVMgyJoXUeMcI+IG331HjoiYOd9RljcjlUnNyomqcpFSFyZmkDRQlQ7xAZ95I6PVR24gF 4qoTpd7Tfr2oFNOVgyC8CPU22ro6wrTtNR3Rpb+KgN/6jezTzDZ2W1dpEqaCH5LrCSm9ns ktqbgQh+Kj7EAJBINT5jFw0HabiLdki1xJ1SbQXIOmUHCMfY6g9Jp+4eygl3jGQKeCqoeq cnA6o0Qo2IV5vsnyt7tB33Jq+ZzyUzH7veD5xtDnh/mimIGroVGM+uzCgw8pvw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1685977711; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gYWfKdbZQ3j9N07sb0OGHBVpTwEqk9DubNlrO7xIl8g=; b=dCJnDuB/4GnRDvwDM57VrzjmCv00R45OrfJaN/hmFVY1reApv70fybtZPsBqFLH+5sID6C xJmSZP1VGeGj1QAg== From: "tip-bot2 for Thomas Gleixner" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: timers/core] posix-timers: Add comments about timer lookup Cc: Thomas Gleixner , Frederic Weisbecker , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20230425183313.091081515@linutronix.de> References: <20230425183313.091081515@linutronix.de> MIME-Version: 1.0 Message-ID: <168597771092.404.9646873933731226661.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1764175265642152195?= X-GMAIL-MSGID: =?utf-8?q?1767876729110624472?= The following commit has been merged into the timers/core branch of tip: Commit-ID: 46c7863e061f64c96745003f699912667c2a1bd6 Gitweb: https://git.kernel.org/tip/46c7863e061f64c96745003f699912667c2a1bd6 Author: Thomas Gleixner AuthorDate: Tue, 25 Apr 2023 20:49:03 +02:00 Committer: Thomas Gleixner CommitterDate: Mon, 05 Jun 2023 17:03:37 +02:00 posix-timers: Add comments about timer lookup Document how the timer ID validation in the hash table works. Signed-off-by: Thomas Gleixner Reviewed-by: Frederic Weisbecker Link: https://lore.kernel.org/r/20230425183313.091081515@linutronix.de --- kernel/time/posix-timers.c | 39 ++++++++++++++++++++++++++++++------- 1 file changed, 32 insertions(+), 7 deletions(-) diff --git a/kernel/time/posix-timers.c b/kernel/time/posix-timers.c index 355c6f4..f6650c1 100644 --- a/kernel/time/posix-timers.c +++ b/kernel/time/posix-timers.c @@ -506,6 +506,12 @@ static int do_timer_create(clockid_t which_clock, struct sigevent *event, return -EAGAIN; spin_lock_init(&new_timer->it_lock); + + /* + * Add the timer to the hash table. The timer is not yet valid + * because new_timer::it_signal is still NULL. The timer id is also + * not yet visible to user space. + */ new_timer_id = posix_timer_add(new_timer); if (new_timer_id < 0) { error = new_timer_id; @@ -551,6 +557,7 @@ static int do_timer_create(clockid_t which_clock, struct sigevent *event, goto out; spin_lock_irq(¤t->sighand->siglock); + /* This makes the timer valid in the hash table */ new_timer->it_signal = current->signal; list_add(&new_timer->list, ¤t->signal->posix_timers); spin_unlock_irq(¤t->sighand->siglock); @@ -597,13 +604,6 @@ COMPAT_SYSCALL_DEFINE3(timer_create, clockid_t, which_clock, } #endif -/* - * Locking issues: We need to protect the result of the id look up until - * we get the timer locked down so it is not deleted under us. The - * removal is done under the idr spinlock so we use that here to bridge - * the find to the timer lock. To avoid a dead lock, the timer id MUST - * be release with out holding the timer lock. - */ static struct k_itimer *__lock_timer(timer_t timer_id, unsigned long *flags) { struct k_itimer *timr; @@ -615,10 +615,35 @@ static struct k_itimer *__lock_timer(timer_t timer_id, unsigned long *flags) if ((unsigned long long)timer_id > INT_MAX) return NULL; + /* + * The hash lookup and the timers are RCU protected. + * + * Timers are added to the hash in invalid state where + * timr::it_signal == NULL. timer::it_signal is only set after the + * rest of the initialization succeeded. + * + * Timer destruction happens in steps: + * 1) Set timr::it_signal to NULL with timr::it_lock held + * 2) Release timr::it_lock + * 3) Remove from the hash under hash_lock + * 4) Call RCU for removal after the grace period + * + * Holding rcu_read_lock() accross the lookup ensures that + * the timer cannot be freed. + * + * The lookup validates locklessly that timr::it_signal == + * current::it_signal and timr::it_id == @timer_id. timr::it_id + * can't change, but timr::it_signal becomes NULL during + * destruction. + */ rcu_read_lock(); timr = posix_timer_by_id(timer_id); if (timr) { spin_lock_irqsave(&timr->it_lock, *flags); + /* + * Validate under timr::it_lock that timr::it_signal is + * still valid. Pairs with #1 above. + */ if (timr->it_signal == current->signal) { rcu_read_unlock(); return timr;