From patchwork Wed Sep 26 00:55:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guenter Roeck X-Patchwork-Id: 147522 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp98561lji; Tue, 25 Sep 2018 17:56:00 -0700 (PDT) X-Google-Smtp-Source: ACcGV60Dj9kqMZdsc1ZZqdktzaGnHPbyBqJXz6+g0TPg5Yn9bE6MQNaWumlnsgfaJ7aoQzqgkssa X-Received: by 2002:a17:902:a40a:: with SMTP id p10-v6mr3575802plq.118.1537923359904; Tue, 25 Sep 2018 17:55:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537923359; cv=none; d=google.com; s=arc-20160816; b=0S0tgMpRxikrEedFFI5VJ5lJGVTbKaDVr3yw0XRNnnyYAoBm770ZbV47v/YZa1sOJo GUk7m504lgLZE5yBKc+DDXXWOovKA8OlWdZxAC0rI5Ye4LNCAopqwku93KsKmAFrK0W7 k2I5Bwh+poS1izriXYmyL4rqZUD4MeWdeRhdbOANo3zWU9dMxRhmY5VaMJY9CfgWXeb9 U04NIDtCKaqhgb5e29w3HaFHT/IeAUnI+WbSsK91sdPYlMl3hjwxQGx80r8FrkiSdwow KWw4PP7pV59XI/OIaqwpVBLztKsvJ4uUmtmnAugokh55CnuLuUz6ycA8o+4ANL17LOEk 7uqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature; bh=FxXIDnFIMrzEcR023Ma7k2KUAPzH6ciUXztic+rQiI0=; b=bknuEoJeEDMNKPQP3etAR/sY05rNaexufJDCV7NjHnMRunF7am/+VXluYiK8eyfi22 IyMMcGm0HpLcFQ3+xjE8uxN4liPCgN4d53Yo0nVxmLYUIZi2/K7ytg73Lfby87EQNLFH usvkRM/SUcJ/etEK2jzqYAk7Werr3AsPrjXMM+BQx1DkftTupqbxb/O1FlKCEO4hygS4 1TecpyecNUuKtODDrQP7kU0jEvEKxAM2QhYYen7YqSsAJKtfozK+c27wmzBLTnHXnQJo 9EU5to/KE7uCZL39U8qNtls2DJNql6kU7YeoLyyqLO3o24dYhRbb9eazb7jM4Jd79BI/ doXA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=RwN1SNuO; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-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 91-v6si4016951ple.169.2018.09.25.17.55.59; Tue, 25 Sep 2018 17:55:59 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=RwN1SNuO; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727037AbeIZHGJ (ORCPT + 13 others); Wed, 26 Sep 2018 03:06:09 -0400 Received: from mail-pf1-f193.google.com ([209.85.210.193]:34347 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726460AbeIZHGI (ORCPT ); Wed, 26 Sep 2018 03:06:08 -0400 Received: by mail-pf1-f193.google.com with SMTP id k19-v6so12401732pfi.1 for ; Tue, 25 Sep 2018 17:55:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id; bh=FxXIDnFIMrzEcR023Ma7k2KUAPzH6ciUXztic+rQiI0=; b=RwN1SNuO5gqxXtmQH8NZPXmT4nV7Leh6AbgUwZcOR4IYCpH/74quaKm4DTwlP2p/xR 1Jr43GFu3aD8wfOQ7Ys7qRvztmdShhm6RA42ArUBHtwwP4/c/9jXZnqJOAlXz2zGzUZY dCbdQXVslGvuCH+/J74O4FIGBBDLZUZA24my91SrCTLITxo6S350tSmDsx/iCnyGX3T1 txKlBomqWmTu9KvwTiWM8rOnAlkIXFSy3Wi1/kd1wzYnFRY8k6zowPClLPgXsyF5aTsX jFSPhxE1DCWuV/0iK2BJKb4dLU7TESrSU2DbsTgHHt95jsFw6rZZihCdq1v/T5U5tQ0k dpjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=FxXIDnFIMrzEcR023Ma7k2KUAPzH6ciUXztic+rQiI0=; b=S8hqmpRaYLv0A2du1L7nwfVp80FASXBrLW0Bm7+tgEEL/yzxt/feZwHf3Lu92ll25f QNRoJbmFW5WcxduKRfI60oNpStIkITdxwkQcukgsuY69Wlc9IP2NAShhvrlVTD2Je/FF tqmlS39qFnCUzvriCdLjpMP2kWNEJgosX/Zzh89bpaLDN+kUch98KScB+2JMLoxMslRO Sv975H5UmPWaI3W5Un3etTxfSdoay09G2b/n6Wh3VIB40njOeC6APP6PqgP5+3+C6eDw XcnZg60BRixm2w/279tplVrTfqJnL+pAr1ya2TVzO+CYSWTW9fkMiJ2cU/mbhB9ezjcT H5cA== X-Gm-Message-State: ABuFfoilUlfMNSz5iJbJvsB00cLePDWLIYY0qF7LJbdQyFgsVvfJoBvb AINuO2rH1QzHx9SKAFWytZa8Pf82 X-Received: by 2002:a17:902:7402:: with SMTP id g2-v6mr3398393pll.321.1537923356463; Tue, 25 Sep 2018 17:55:56 -0700 (PDT) Received: from localhost (108-223-40-66.lightspeed.sntcca.sbcglobal.net. [108.223.40.66]) by smtp.gmail.com with ESMTPSA id v8-v6sm4355830pfl.6.2018.09.25.17.55.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 25 Sep 2018 17:55:55 -0700 (PDT) From: Guenter Roeck To: Greg Kroah-Hartman Cc: stable@vger.kernel.org, Catalin Marinas , Will Deacon Subject: [PATCH v3.18 v4.4] arm64: Add trace_hardirqs_off annotation in ret_to_user Date: Tue, 25 Sep 2018 17:55:47 -0700 Message-Id: <1537923347-24107-1-git-send-email-linux@roeck-us.net> X-Mailer: git-send-email 2.7.4 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Catalin Marinas commit db3899a6477a4dccd26cbfb7f408b6be2cc068e0 upstream. When a kernel is built with CONFIG_TRACE_IRQFLAGS the following warning is produced when entering userspace for the first time: WARNING: at /work/Linux/linux-2.6-aarch64/kernel/locking/lockdep.c:3519 Modules linked in: CPU: 1 PID: 1 Comm: systemd Not tainted 4.4.0-rc3+ #639 Hardware name: Juno (DT) task: ffffffc9768a0000 ti: ffffffc9768a8000 task.ti: ffffffc9768a8000 PC is at check_flags.part.22+0x19c/0x1a8 LR is at check_flags.part.22+0x19c/0x1a8 pc : [] lr : [] pstate: 600001c5 sp : ffffffc9768abe10 x29: ffffffc9768abe10 x28: ffffffc9768a8000 x27: 0000000000000000 x26: 0000000000000001 x25: 00000000000000a6 x24: ffffffc00064be6c x23: ffffffc0009f249e x22: ffffffc9768a0000 x21: ffffffc97fea5480 x20: 00000000000001c0 x19: ffffffc00169a000 x18: 0000005558cc7b58 x17: 0000007fb78e3180 x16: 0000005558d2e238 x15: ffffffffffffffff x14: 0ffffffffffffffd x13: 0000000000000008 x12: 0101010101010101 x11: 7f7f7f7f7f7f7f7f x10: fefefefefefeff63 x9 : 7f7f7f7f7f7f7f7f x8 : 6e655f7371726964 x7 : 0000000000000001 x6 : ffffffc0001079c4 x5 : 0000000000000000 x4 : 0000000000000001 x3 : ffffffc001698438 x2 : 0000000000000000 x1 : ffffffc9768a0000 x0 : 000000000000002e Call trace: [] check_flags.part.22+0x19c/0x1a8 [] lock_is_held+0x80/0x98 [] __schedule+0x404/0x730 [] schedule+0x44/0xb8 [] ret_to_user+0x0/0x24 possible reason: unannotated irqs-off. irq event stamp: 502169 hardirqs last enabled at (502169): [] el0_irq_naked+0x1c/0x24 hardirqs last disabled at (502167): [] __do_softirq+0x17c/0x298 softirqs last enabled at (502168): [] __do_softirq+0x1fc/0x298 softirqs last disabled at (502143): [] irq_exit+0xa0/0xf0 This happens because we disable interrupts in ret_to_user before calling schedule() in work_resched. This patch adds the necessary trace_hardirqs_off annotation. Signed-off-by: Catalin Marinas Reported-by: Mark Rutland Cc: Will Deacon Signed-off-by: Will Deacon --- Without this patch and CONFIG_TRACE_IRQFLAGS enabled, the mentioned warning is seen in v3.18.y and v4.4.y. The patch applies cleanly to both releases. I confirmed that the problem is gone after applying it. arch/arm64/kernel/entry.S | 3 +++ 1 file changed, 3 insertions(+) -- 2.7.4 diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S index 7ed3d75f6304..e5b25389c48f 100644 --- a/arch/arm64/kernel/entry.S +++ b/arch/arm64/kernel/entry.S @@ -634,6 +634,9 @@ work_pending: bl do_notify_resume b ret_to_user work_resched: +#ifdef CONFIG_TRACE_IRQFLAGS + bl trace_hardirqs_off // the IRQs are off here, inform the tracing code +#endif bl schedule /*