From nobody Sun Feb 8 11:25:50 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 91211C77B7A for ; Fri, 26 May 2023 18:48:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243172AbjEZSsf (ORCPT ); Fri, 26 May 2023 14:48:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56374 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230104AbjEZSsb (ORCPT ); Fri, 26 May 2023 14:48:31 -0400 Received: from mail-yb1-xb49.google.com (mail-yb1-xb49.google.com [IPv6:2607:f8b0:4864:20::b49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 415ACAD for ; Fri, 26 May 2023 11:48:30 -0700 (PDT) Received: by mail-yb1-xb49.google.com with SMTP id 3f1490d57ef6-ba802c775caso2358564276.2 for ; Fri, 26 May 2023 11:48:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1685126909; x=1687718909; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=pr0CfxQy0sGUiXzLTyaj373l3U9KzezGvaWkoYzA3QE=; b=qgAB1W5NVq0jFTTBMjUg8Hw2q2NCZNUP+DbQz09KcF8PA6oV1ga9KYZU8oGCp5XDsc YuYYUi7x1xKpvEXZD59MCmcTwYmJgER8UKA56ZeiLEvH0lZVfq4r1Q9FJDx3hSqHFfVV cdF+xUutRZlK83XxrwxlR165AcmV3ycZH9lKCDkInV021tXS/6QItALaayAdaf0KPxGd kku0H6olSVdfFiUq01Lly+my+AaSOkIJJ51Xm6s1jzONF6tNwuNpUzyBwNDE1K/uj1qD knBzoTTVOEDEj3TfmEZ30cInDdSnw7Nue2SYcVHnEd6dIBDcEItqUUZc/FsuTXX1GKPk d8OA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685126909; x=1687718909; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=pr0CfxQy0sGUiXzLTyaj373l3U9KzezGvaWkoYzA3QE=; b=SB9/lFrqcSGOTjnFf+PS8fcMM/G9zVaJa/+wxCkEk0vwDCH9LBKig/ssFJoajcO8ne g6ZRUq0s7jYtlxfH/P8rt4JEwOEU2A3d/F8t6XBkpej/Y2Yg5z7PbV/LnsMv86Wtq5tR aZy0DxThpUFOUzlVG9hTG2mIKLseYgy8OLIX6IqRCvxF17mceIAwvI7rFpXSIFFMTiFV NkdakyOkhlqqMw76WlZEwPdrtdo+wWuW4THj3TfjRzFxodapBfYbu+dfUdFWkyNoD1oQ uFaBAUXPV0APxCMjcrAWZG2vNyOFOdQaDRFLocAQcoe4FMl0O4kTrgksncAdbk9TmyBB 7gGw== X-Gm-Message-State: AC+VfDwn4vU9ApHl/5nEJwAesIe5u+HvHyN3z4qoi3NkEwQjF6CTA25Z +IsgFAMRzRlWH//dTFgTZj/3aRWlupEeq3pz X-Google-Smtp-Source: ACHHUZ6077spJQTaPUlSVLjSqG56tK6rDRYM2ZgXdtOqglWP3smaalqlaryzjjW08qQlk4ow1hxNRPpHBCuDcQbo X-Received: from ericchancf.c.googlers.com ([fda3:e722:ac3:cc00:4f:4b78:c0a8:4139]) (user=ericchancf job=sendgmr) by 2002:a05:6902:1826:b0:bac:bae6:b363 with SMTP id cf38-20020a056902182600b00bacbae6b363mr1450617ybb.3.1685126909551; Fri, 26 May 2023 11:48:29 -0700 (PDT) Date: Fri, 26 May 2023 18:48:23 +0000 Mime-Version: 1.0 X-Mailer: git-send-email 2.41.0.rc0.172.g3f132b7071-goog Message-ID: <20230526184823.1230974-1-ericchancf@google.com> Subject: [PATCH] arm64: Fix 'lock held when returning to user space' lockdep warning From: Eric Chan To: Catalin Marinas , Will Deacon Cc: Mark Rutland , "Paul E . McKenney" , Mark Brown , Frederic Weisbecker , Mukesh Ojha , Josh Poimboeuf , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Eric Chan Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The arm64 architecture lacks support for CONFIG_GENERIC_ENTRY, resulting in the failure to report the lockdep warning "lock held when returning to user space" when lockdep is enabled. Rename the function to align with exit_to_user_mode_prepare in kernel/entry/common.c to improve readability. Signed-off-by: Eric Chan Acked-by: Mark Rutland --- arch/arm64/kernel/entry-common.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/arm64/kernel/entry-common.c b/arch/arm64/kernel/entry-com= mon.c index 3af3c01c93a6..9d6827201b6c 100644 --- a/arch/arm64/kernel/entry-common.c +++ b/arch/arm64/kernel/entry-common.c @@ -126,7 +126,7 @@ static __always_inline void __exit_to_user_mode(void) lockdep_hardirqs_on(CALLER_ADDR0); } =20 -static __always_inline void prepare_exit_to_user_mode(struct pt_regs *regs) +static __always_inline void exit_to_user_mode_prepare(struct pt_regs *regs) { unsigned long flags; =20 @@ -135,11 +135,13 @@ static __always_inline void prepare_exit_to_user_mode= (struct pt_regs *regs) flags =3D read_thread_flags(); if (unlikely(flags & _TIF_WORK_MASK)) do_notify_resume(regs, flags); + + lockdep_sys_exit(); } =20 static __always_inline void exit_to_user_mode(struct pt_regs *regs) { - prepare_exit_to_user_mode(regs); + exit_to_user_mode_prepare(regs); mte_check_tfsr_exit(); __exit_to_user_mode(); } --=20 2.41.0.rc0.172.g3f132b7071-goog