From patchwork Wed Aug 11 09:23:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dimitri John Ledkov X-Patchwork-Id: 1515719 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=RRMYvLD4; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Gl4BN0pfkz9sWd; Wed, 11 Aug 2021 19:23:40 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1mDkSW-0005CB-4k; Wed, 11 Aug 2021 09:23:36 +0000 Received: from smtp-relay-canonical-1.internal ([10.131.114.174] helo=smtp-relay-canonical-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1mDkSQ-0005C4-N6 for kernel-team@lists.ubuntu.com; Wed, 11 Aug 2021 09:23:30 +0000 Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-1.canonical.com (Postfix) with ESMTPS id 876C63F045 for ; Wed, 11 Aug 2021 09:23:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1628673810; bh=Lt+ybLU1ASc0IezpoBIjJfWh/X6IhTkQpltxiKgNO4Y=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=RRMYvLD4EMCJ/rMSzCcb6h+VxM67E4ICv9C/RxLJ+CVja31Jbns6p/HPjIXrLJVdo Wc+Qb3HdOPqTh0K/b0P0tZaB4VIt7GuZvwQVa7vM6rtD8SHkKwN6X9GHnP2CTEqeC/ yS9GYnqeP+mb/9jfwXo8U+kAMVKJRQBVvIYgrJivCntupYKke9VwbJ1DRf8CuXaoQD KhDVJ3gYMp+4LJHZiJmHZ1tGY1XpAXYDlstTWjD5ZW12Tabb1NV+TZ3TcrPtlUwwo0 ZR1yrA2L62l+kC0GYlV491HA5oAx2dPW8lObyXeeC9VWTzGQ8YRAOwWXndI6ADi/uy zKn2hIXH1wAWQ== Received: by mail-wr1-f69.google.com with SMTP id r17-20020adfda510000b02901526f76d738so531245wrl.0 for ; Wed, 11 Aug 2021 02:23:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=Lt+ybLU1ASc0IezpoBIjJfWh/X6IhTkQpltxiKgNO4Y=; b=CSfmCZu0oJxPuPl+li9OWEF0lleVdimyC0L4wG94um/TpbyqmkRJJcXzjy0MjSf8af rZ1YRCgP4UtcVknVSqSN6phsW1GKRR+MaelNgtwLEMnh/ZpPL4GmsLrinQBJTsc5i92d B85idDowLc05pGYTLRfBmJGvse6g9T4R1BNKPVqE+PWFeos7AeLYfq9EwZu8I6eM76Bn crU/AlbwVoVHAr7ObI+px17fItS0YC6ka9zSkRGa1KaDEFtmDM/b/p0PoAzYuCW9tuQr cseZb0yQ+jf9c7KIjQZDzPsc6AyIpUEMj8k3sXcjler652OWMxkjKwZbrlf+Nsge82bi LA0w== X-Gm-Message-State: AOAM531iro117Je+BHThYb2HeAesiKsMgv3XT/U23AOxw+YXjE6EYKcz yLgnA+0ziE75/13lnukTayieqdR0OZpOSqd7pKiOYlovN/fhY7094jNfbj1lyWosC1E6f5xSL5k 6dX/taJ7ZV5ARJOb/R1wVeSQaX2/cDCfkvqHCQPuRPw== X-Received: by 2002:a5d:45c1:: with SMTP id b1mr35593867wrs.264.1628673810028; Wed, 11 Aug 2021 02:23:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw3n6UUAJLNvosvOdVQGvVRmwJBInqtxOVt77FFG2HHqpda9qOslY5ZG6RpCojlXcW/dgKOkw== X-Received: by 2002:a5d:45c1:: with SMTP id b1mr35593843wrs.264.1628673809742; Wed, 11 Aug 2021 02:23:29 -0700 (PDT) Received: from localhost ([2a01:4b00:85fd:d700:af19:b72a:8970:43b5]) by smtp.gmail.com with ESMTPSA id c15sm26118441wrx.70.2021.08.11.02.23.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Aug 2021 02:23:29 -0700 (PDT) From: Dimitri John Ledkov To: kernel-team@lists.ubuntu.com Subject: [HIRSUTE][linux-riscv][PATCH v2] UBUNTU: SAUCE: RISC-V: prevent sbi_send_cpumask_ipi race with ftrace Date: Wed, 11 Aug 2021 10:23:27 +0100 Message-Id: <20210811092327.183695-1-dimitri.ledkov@canonical.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Thadeu Lima de Souza Cascardo ftrace will patch instructions in sbi_send_cpumask_ipi, which is going to be used by flush_icache_range, leading to potential races and crashes like this: [ 0.000000] ftrace: allocating 38893 entries in 152 pages [ 0.000000] Oops - illegal instruction [#1] [ 0.000000] Modules linked in: [ 0.000000] CPU: 0 PID: 0 Comm: swapper Not tainted 5.11.0-1014-generic #14-Ubuntu [ 0.000000] epc: ffffffe00000920e ra : ffffffe000009384 sp : ffffffe001803d30 [ 0.000000] gp : ffffffe001a14240 tp : ffffffe00180f440 t0 : ffffffe07fe38000 [ 0.000000] t1 : ffffffe0019cd338 t2 : 0000000000000000 s0 : ffffffe001803d70 [ 0.000000] s1 : 0000000000000000 a0 : ffffffe0000095aa a1 : 0000000000000001 [ 0.000000] a2 : 0000000000000002 a3 : 0000000000000000 a4 : 0000000000000000 [ 0.000000] a5 : 0000000000000000 a6 : 0000000000000004 a7 : 0000000052464e43 [ 0.000000] s2 : 0000000000000002 s3 : 0000000000000001 s4 : 0000000000000000 [ 0.000000] s5 : 0000000000000000 s6 : 0000000000000000 s7 : 0000000000000000 [ 0.000000] s8 : ffffffe001a170c0 s9 : 0000000000000001 s10: 0000000000000001 [ 0.000000] s11: 00000000fffcc5d0 t3 : 0000000000000068 t4 : 000000000000000b [ 0.000000] t5 : ffffffe0019cd3e0 t6 : ffffffe001803cd8 [ 0.000000] status: 0000000200000100 badaddr: 000000000513f187 cause: 0000000000000002 [ 0.000000] ---[ end trace f67eb9af4d8d492b ]--- [ 0.000000] Kernel panic - not syncing: Attempted to kill the idle task! [ 0.000000] ---[ end Kernel panic - not syncing: Attempted to kill the idle task! ]--- Where ffffffe00000920e lies in the middle of sbi_send_cpumask_ipi. BugLink: https://bugs.launchpad.net/bugs/1934548 Signed-off-by: Thadeu Lima de Souza Cascardo Tested-by: Dimitri John Ledkov Signed-off-by: Dimitri John Ledkov Acked-by: Tim Gardner Acked-by: Stefan Bader --- Patch can be applied to: - Unstable - Impish linux - Impish linux-riscv - Hirsute linux - Hirsute linux-riscv - Focal linux-riscv-5.11 Whichever are suitable for respins. Changes since v1: - Added BugLink, Tested-By, SOB arch/riscv/kernel/sbi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/riscv/kernel/sbi.c b/arch/riscv/kernel/sbi.c index b8f82c73de..9f85f0656f 100644 --- a/arch/riscv/kernel/sbi.c +++ b/arch/riscv/kernel/sbi.c @@ -562,7 +562,7 @@ long sbi_get_impid(void) return __sbi_base_ecall(SBI_EXT_BASE_GET_MIMPID); } -static void sbi_send_cpumask_ipi(const struct cpumask *target) +static void notrace sbi_send_cpumask_ipi(const struct cpumask *target) { struct cpumask hartid_mask;