Received: by 2002:a17:90a:1609:0:0:0:0 with SMTP id n9csp851624pja; Wed, 1 Apr 2020 09:50:50 -0700 (PDT) X-Google-Smtp-Source: APiQypJA3VVFR7GCxtqYTuRsLavHd4XLZby7vzXpkb6eYTos3z+XHo2uaXjPNheFL5xzTPNTcuqg X-Received: by 2002:aca:5b04:: with SMTP id p4mr3733561oib.105.1585759850567; Wed, 01 Apr 2020 09:50:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585759850; cv=none; d=google.com; s=arc-20160816; b=hRGBoufUCY7G/wOiqfutKd13bbFlcJ00bmfRZvor2yb/qdohqi6/pIKTe3KArnm99m +i0oLNHgMjpMEOqtm8n+ZZrpeQbQDl/+9vSeAvwfUMfRGFu34rcyCPhuz02Cj62mrwTG DLibi9e1HoEiAgvxcBarFBziDv2IhHEm8qgU1BsIq8UBz+KxBDBCd4ma9YEC+O7SwXkW QN6eKNXrzs6qrwui1quWsWbigjZpwn4McfuYal9BxwuY/YwxBwS5LqsebsWzt3FRL5zg Y+3Sj8vhs8GDRzchCxruBh8JbEykAbOajyeGpX+xq0AQIICf2kqmh1JBgsv6QGvizF9C oGHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=s4QO0mCQrnAT8k4/IQ8/C+PG387JZDt/G46M86whEfw=; b=oydJL/A/7mzbBdYqhkK5SDD6K65/9mrlz5APp2em5R9DgufkrfXKQB+qeEtO2IsS/V v8SJT8Zm2jVsyj/6eb+9l3QVEDbqbCvnhst3ahRSNaJLnhCkI70+hlF/Q/RQ+2Q5sCPD 9Rc9XbY2F6CKpVTPS9pV4QX831kLAlM0gzvNRdgV1KQNxDv4afaqNgfnPEoArY9uUi7O nmaQ6As5fi2VyxaaR6JzVo6tXY0BipwBZAx42Ud7XTJiacr6y1TYxVuR2kw7nfFBlmCi HXX9JoM6sAizlcdZV3RzugNBHIEOGN7+QTvkxh2vrO7++UdP5f1dL1ZbEFkO1bALxCHf 7+6g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=TRY6ceQO; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u16si1121615oth.230.2020.04.01.09.50.38; Wed, 01 Apr 2020 09:50:50 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=TRY6ceQO; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389561AbgDAQoW (ORCPT + 99 others); Wed, 1 Apr 2020 12:44:22 -0400 Received: from mail.kernel.org ([198.145.29.99]:45306 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389691AbgDAQoU (ORCPT ); Wed, 1 Apr 2020 12:44:20 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1994D20705; Wed, 1 Apr 2020 16:44:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585759459; bh=3wk1i2l/6xed/usOGEbaHUqXGca5O6Lue6HwF1TsETk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TRY6ceQOyYBf7Lo4/6oEgtADwpq0+kVmv9gIqu70pTz3nIJ1o+rbin6fhXytzfmYc l2hFk43GK+OcdTWnar76gHcMpKwj2421bi6HxdxKJh1Ipo7TJV4cjDsKK1gRqQyuy9 tjZsSPsL0xTubx6tdHQff7N0YqXtR4q43d1sQc0o= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jiri Kosina , "Steven Rostedt (VMware)" , Guenter Roeck Subject: [PATCH 4.14 087/148] ftrace/x86: Anotate text_mutex split between ftrace_arch_code_modify_post_process() and ftrace_arch_code_modify_prepare() Date: Wed, 1 Apr 2020 18:17:59 +0200 Message-Id: <20200401161601.402505957@linuxfoundation.org> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200401161552.245876366@linuxfoundation.org> References: <20200401161552.245876366@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jiri Kosina commit 074376ac0e1d1fcd4fafebca86ee6158e7c20680 upstream. ftrace_arch_code_modify_prepare() is acquiring text_mutex, while the corresponding release is happening in ftrace_arch_code_modify_post_process(). This has already been documented in the code, but let's also make the fact that this is intentional clear to the semantic analysis tools such as sparse. Link: http://lkml.kernel.org/r/nycvar.YFH.7.76.1906292321170.27227@cbobk.fhfr.pm Fixes: 39611265edc1a ("ftrace/x86: Add a comment to why we take text_mutex in ftrace_arch_code_modify_prepare()") Fixes: d5b844a2cf507 ("ftrace/x86: Remove possible deadlock between register_kprobe() and ftrace_run_update_code()") Signed-off-by: Jiri Kosina Signed-off-by: Steven Rostedt (VMware) Cc: Guenter Roeck Signed-off-by: Greg Kroah-Hartman --- arch/x86/kernel/ftrace.c | 2 ++ 1 file changed, 2 insertions(+) --- a/arch/x86/kernel/ftrace.c +++ b/arch/x86/kernel/ftrace.c @@ -36,6 +36,7 @@ #ifdef CONFIG_DYNAMIC_FTRACE int ftrace_arch_code_modify_prepare(void) + __acquires(&text_mutex) { mutex_lock(&text_mutex); set_kernel_text_rw(); @@ -44,6 +45,7 @@ int ftrace_arch_code_modify_prepare(void } int ftrace_arch_code_modify_post_process(void) + __releases(&text_mutex) { set_all_modules_text_ro(); set_kernel_text_ro();