From patchwork Mon Feb 26 09:49:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rui Qi X-Patchwork-Id: 206543 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:a81b:b0:108:e6aa:91d0 with SMTP id bq27csp1979870dyb; Mon, 26 Feb 2024 02:22:49 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCUruns5mz+vc6fGZNUOdQDA8/Pp5gVzcqgFHJ0hjE/uu4MFKm+w/DYFNd9DzmomJc3KUZshXGNe6TwqdqiFYk9zI5kSmg== X-Google-Smtp-Source: AGHT+IH3mKFBaYk0Qm9oY3QAvhg8WhmhRwb6hmvHWQxvgjW34bWZSPzylkWG13Sr9jCCJmEhdvq2 X-Received: by 2002:a05:6358:4428:b0:17a:def8:5687 with SMTP id z40-20020a056358442800b0017adef85687mr4924371rwc.27.1708942968983; Mon, 26 Feb 2024 02:22:48 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708942968; cv=pass; d=google.com; s=arc-20160816; b=NK+Amy2C4WRz0LVaNfxrCbMxz9tcRyosDEi9GeBQ4uxkMyJttIsx96EF3gS8ZExk2M 0iEPa71fSqMMl9fRdh4fBFjPcliXjt23tJN7CcID9jYNlgtRFfS/qlF945oLz5YP66u0 1KFkvc8exL+hUh5WSD4YLQ/SJOhZjHUySRQHR9CCvXXKH2p03ZPJZ5wn5kZchxrynkRC fH8e6vGECIihxScoyjSuqiMOPIE0n+kvnhCs+OgJ31AZdDhfq9p76/zTsb+JAUb+G0CK 744yeQFbX/2/P+yQW8ryXDWpR1N8ongYxraU9j4HiyTXW2BavuN/7Ytnz05dCLRRM4LL hkWA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=BoOMBp9MzLd3f62Ny862YOxP5jt6oFE+bwUjv1x9+1Q=; fh=nrYJ/xtn8+3pj0uBchL7pcMB7vEcBLqYmRBUnxi+53k=; b=DgW7PU+LDRtc9YsFzUWWI4km3VMsBzte20qENlX47SCWzS4v9XbOjBN4wbgB8/CLMA 8V45h0mhevw0lI0BBwInNT1QoM9ybgQdozMMwzFm0lnW20mR1goraUpxjg6BGAzrBXVl WfElHRfzsnhBlhHJNvVL8Rp3t840JWOwDRwg7FZWiQeFy/INxMgNRuCPmccmNwNTMwT+ isa0XqeVc//viPNewpHBu1OteuAiVAgFtpaxlZ0qICfdfXoQeJk4qkyorExv2VpISbnX oWzZJ2P6Xjp/3BI9eCI5Pk4mgkqn/EBaWaZHu5qX2WOT9kB4VTEsDDqdwImzzW5SxFri SnmA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@bytedance.com header.s=google header.b="XL/J4snT"; arc=pass (i=1 spf=pass spfdomain=bytedance.com dkim=pass dkdomain=bytedance.com dmarc=pass fromdomain=bytedance.com); spf=pass (google.com: domain of linux-kernel+bounces-81096-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-81096-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=bytedance.com Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id o25-20020a656159000000b005d8b8ca425esi3470541pgv.308.2024.02.26.02.22.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Feb 2024 02:22:48 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-81096-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@bytedance.com header.s=google header.b="XL/J4snT"; arc=pass (i=1 spf=pass spfdomain=bytedance.com dkim=pass dkdomain=bytedance.com dmarc=pass fromdomain=bytedance.com); spf=pass (google.com: domain of linux-kernel+bounces-81096-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-81096-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=bytedance.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id E982228B019 for ; Mon, 26 Feb 2024 10:11:22 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id B5CC263518; Mon, 26 Feb 2024 09:49:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bytedance.com header.i=@bytedance.com header.b="XL/J4snT" Received: from mail-pg1-f172.google.com (mail-pg1-f172.google.com [209.85.215.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9130563405 for ; Mon, 26 Feb 2024 09:49:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708940995; cv=none; b=mBkH/tvGddRlo/5CBlkjL1eUONrfRypERb9uODJNQ5n5yKCqDlFI8a0tXcxhwhQcN8/o51c5244/NLKhaUys6LDvNxfYlORrRvVnK0k2Bj9zJLXzMI/Fbw6zMxdW1hXRNU3RT04QCAjk3Q5neUDBcrA5aToUr0e9j2v/qIIZk9E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708940995; c=relaxed/simple; bh=M/UuqL9yNB3YF1HtldRq/T2nYA0slbNy46LBdPsUNaQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=TUH6zXeLIlZQZyJ3lPWZ7/7FE+eRq7AUR2Xr08JfDt+/BnmpjfpYsj4Y+rcMNbqW1z4ceu9aCdlMRsMCjD4IYMFOCZC+URrphFoHX/2uBhEscsYRhajHkBn4Oe2aOX/1CzKsuuOtXI1z+CFkPxFmpfngMyW3194F3l3imD0KzNU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=bytedance.com; spf=pass smtp.mailfrom=bytedance.com; dkim=pass (2048-bit key) header.d=bytedance.com header.i=@bytedance.com header.b=XL/J4snT; arc=none smtp.client-ip=209.85.215.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=bytedance.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bytedance.com Received: by mail-pg1-f172.google.com with SMTP id 41be03b00d2f7-5bdbe2de25fso2542536a12.3 for ; Mon, 26 Feb 2024 01:49:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1708940993; x=1709545793; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=BoOMBp9MzLd3f62Ny862YOxP5jt6oFE+bwUjv1x9+1Q=; b=XL/J4snT3B/RN17t+c08z5978ntp2Z62yUxUAjk4+UC260iIs22/n0n3Bc69G81MZ5 FZKqVdAIn1n1OuHGMxDyAratZ/QyhQG0+eiA+gbZoWeneV+Q6Fgchmebvw+3+CWL/G/R e68ks+B2f0t8SVtwjOSDPlsLcmzYdG80twE4uwlm336w2HRe+KCG2icDkTMBi8pDeFiK 1D9fn4a2fl6U7b9IM6AyP+ZCt9Z+2mYEC1VjZwIVxuaZ4Y1M5roEh01/2FOHfetdSnCF gT3Ni96X2spWDycAlWi9C4K8HJ+VsFnb29Q16Y1y6bmKMAeKm3hYYQhAF/c8tt3QMIUx PFnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708940993; x=1709545793; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=BoOMBp9MzLd3f62Ny862YOxP5jt6oFE+bwUjv1x9+1Q=; b=pIKsULHU1UD1WJUGbW1YCWemJKKTtTyKT+nuQGWq4dGEjCXV2fNoYD0MmzCgaFF1Q0 di7CGiSkYlcnZcEeN9s2rcD98vyWcVG05ELYJmbs7SeTVM9CNj4VfzYHE0QR/pJXo0Z7 z7Ulw7cfx8nofUC6hp0gzDF4FZUkQP/tzmNUP/CuHva4BSgpqnNB24NCZT2onwQY3wNs 4Y4RGJ0orDmUdysxqfx2ewX27bIaTO7TkEKDbU/sanvsoNCB/8ocySpTT5ef8jN+ueQ/ jM/e9Ec7uOUAtlCgh0SkngNNlj8PVWBEWA5dedsq2KBRgAtGPZZOE3MUEuEwh7wJmkLZ 9Y8g== X-Forwarded-Encrypted: i=1; AJvYcCXZYagqj1K1B0S/HJJ6Py1gvhpUZc0Cjcn//3WMg1BLy65djDA3/ugC4p+hPIUXeiSd8qpzQFd6zAIvaj8x3ePc5l2+/MuQDNOXYadt X-Gm-Message-State: AOJu0YwkyQfEnawehuFKOlro2hEVwGjMiD2VaHBFzwsfnfQEhY6OPUs8 1TgL5OkVsNNzXqD3VCwIHhafeMJzZ+mvOkgIcZLvx3s6y+0Tuq6bKfOS7bkh9Ok= X-Received: by 2002:a05:6a21:2d0b:b0:1a0:e59d:1dc4 with SMTP id tw11-20020a056a212d0b00b001a0e59d1dc4mr11855842pzb.11.1708940993010; Mon, 26 Feb 2024 01:49:53 -0800 (PST) Received: from C02CV19DML87.bytedance.net ([203.208.189.12]) by smtp.gmail.com with ESMTPSA id x19-20020a17090ab01300b002990d91d31dsm5934779pjq.15.2024.02.26.01.49.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Feb 2024 01:49:52 -0800 (PST) From: Rui Qi To: bp@alien8.de, mingo@redhat.com, tglx@linutronix.de, hpa@zytor.com, jpoimboe@redhat.com, peterz@infradead.org, mbenes@suse.cz, gregkh@linuxfoundation.org, stable@vger.kernel.org, alexandre.chartre@oracle.com Cc: x86@kernel.org, linux-kernel@vger.kernel.org, Rui Qi Subject: [PATCH 3/3] x86/speculation: Support intra-function call validation Date: Mon, 26 Feb 2024 17:49:25 +0800 Message-Id: <20240226094925.95835-4-qirui.001@bytedance.com> X-Mailer: git-send-email 2.39.2 (Apple Git-143) In-Reply-To: <20240226094925.95835-1-qirui.001@bytedance.com> References: <20240226094925.95835-1-qirui.001@bytedance.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791956582689447319 X-GMAIL-MSGID: 1791956582689447319 commit 8afd1c7da2b0 ("x86/speculation: Change FILL_RETURN_BUFFER to work with objtool") does not support intra-function call stack validation, which causes kernel live patching to fail. This commit adds support for this, and after testing, the kernel live patching feature is restored to normal. Fixes: 8afd1c7da2b0 ("x86/speculation: Change FILL_RETURN_BUFFER to work with objtool") Signed-off-by: Rui Qi --- arch/x86/include/asm/nospec-branch.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/arch/x86/include/asm/nospec-branch.h b/arch/x86/include/asm/nospec-branch.h index c8819358a332..a88135c358c0 100644 --- a/arch/x86/include/asm/nospec-branch.h +++ b/arch/x86/include/asm/nospec-branch.h @@ -13,6 +13,8 @@ #include #include +#include +#include /* * This should be used immediately before a retpoline alternative. It tells * objtool where the retpolines are so that it can make sense of the control @@ -51,14 +53,18 @@ #define __FILL_RETURN_BUFFER(reg, nr, sp) \ mov $(nr/2), reg; \ 771: \ + ANNOTATE_INTRA_FUNCTION_CALL; \ call 772f; \ 773: /* speculation trap */ \ + UNWIND_HINT_EMPTY; \ pause; \ lfence; \ jmp 773b; \ 772: \ + ANNOTATE_INTRA_FUNCTION_CALL; \ call 774f; \ 775: /* speculation trap */ \ + UNWIND_HINT_EMPTY; \ pause; \ lfence; \ jmp 775b; \ @@ -152,6 +158,7 @@ .endm .macro ISSUE_UNBALANCED_RET_GUARD + ANNOTATE_INTRA_FUNCTION_CALL; call .Lunbalanced_ret_guard_\@ int3 .Lunbalanced_ret_guard_\@: