From patchwork Thu Mar 2 22:47:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Catalin Marinas X-Patchwork-Id: 1751097 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=YJjYIKTT; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PSR8b3T58z1yWy for ; Fri, 3 Mar 2023 09:48:15 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Subject:Cc:To: From:Date:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=JCytobAtTFa06dT0/NoSu1W/Nh8kcViFtIulLcfMfj8=; b=YJjYIKTTkDVXD8 qY2jJS21ucWtpZhOQOEiBCU+alF6FaDe9i8Jw/TcvA+RX+iEEMhQQGUwsI+3P+qGUeBpPnRO0wBXT Brt3Ao/tsfHVtfJxDhVW8BJjIXMk6RFJTmKqG0US+Pa/AYgR1E/Aj0u54d8DZcPzcEXE/hAjKYMTq bcK9DoTyS0GHJNq23qhEGA4pTsUng6uQ/zMnoJzmLSRoRjlkkxCLpCMdCp+6/8/AswAF4EXTiZv/2 SY/vt6n1zG+AuVHJM01ahkVXM44UgkDbtm6CDaTMqGVSenLRcRHtAB45k7Tv6GJUlHdLvtuwVtPW5 mhQTf0aR8Z7BFFaA1Dow==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pXriR-003bhe-As; Thu, 02 Mar 2023 22:47:59 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pXriO-003bh2-4K for linux-arm-kernel@lists.infradead.org; Thu, 02 Mar 2023 22:47:57 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id E019D615C6; Thu, 2 Mar 2023 22:47:54 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 79CE4C433D2; Thu, 2 Mar 2023 22:47:53 +0000 (UTC) Date: Thu, 2 Mar 2023 22:47:50 +0000 From: Catalin Marinas To: Linus Torvalds Cc: Will Deacon , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [GIT PULL] arm64 fixes for 6.3-rc1 Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230302_144756_254046_6B4B8823 X-CRM114-Status: GOOD ( 17.49 ) X-Spam-Score: -2.1 (--) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hi Linus, Could you please pull the changes below? There are a few arm64 fixes that turned up during the merging window or just before it opened. They are based on top of the arm64-upstream tag I sent last week [...] Content analysis details: (-2.1 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [2604:1380:4641:c500:0:0:0:1 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.2 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org Hi Linus, Could you please pull the changes below? There are a few arm64 fixes that turned up during the merging window or just before it opened. They are based on top of the arm64-upstream tag I sent last week. There is a near conflict in arch/arm64/Kconfig but it seems that git is smart enough to figure it out. Thanks. The following changes since commit d54170812ef1c80e0fa3ed3e554a0bbfc2920d9d: arm64: fix .idmap.text assertion for large kernels (2023-02-20 18:23:35 +0000) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux tags/arm64-fixes for you to fetch changes up to 010338d729c1090036eb40d2a60b7b7bce2445b8: arm64: kaslr: don't pretend KASLR is enabled if offset < MIN_KIMG_ALIGN (2023-02-28 11:21:04 +0000) ---------------------------------------------------------------- arm64 fixes: - In copy_highpage(), only reset the tag of the destination pointer if KASAN_HW_TAGS is enabled so that user-space MTE does not interfere with KASAN_SW_TAGS (which relies on top-byte-ignore). - Remove warning if SME is detected without SVE, the kernel can cope with such configuration (though none in the field currently). - In cfi_handler(), pass the ESR_EL1 value to die() for consistency with other die() callers. - Disable HUGETLB_PAGE_OPTIMIZE_VMEMMAP on arm64 since the pte manipulation from the generic vmemmap_remap_pte() does not follow the required ARM break-before-make sequence (clear the pte, flush the TLBs, set the new pte). It may be re-enabled once this sequence is sorted. - Fix possible memory leak in the arm64 ACPI code if the SMCCC version and conduit checks fail. - Forbid CALL_OPS with CC_OPTIMIZE_FOR_SIZE since gcc ignores -falign-functions=N with -Os. - Don't pretend KASLR is enabled if offset < MIN_KIMG_ALIGN as no randomisation would actually take place. ---------------------------------------------------------------- Ard Biesheuvel (1): arm64: kaslr: don't pretend KASLR is enabled if offset < MIN_KIMG_ALIGN Catalin Marinas (1): arm64: mm: hugetlb: Disable HUGETLB_PAGE_OPTIMIZE_VMEMMAP Mark Brown (1): arm64/fpsimd: Remove warning for SME without SVE Mark Rutland (1): arm64: ftrace: forbid CALL_OPS with CC_OPTIMIZE_FOR_SIZE Peter Collingbourne (1): arm64: Reset KASAN tag in copy_highpage with HW tags only Sangmoon Kim (1): arm64: pass ESR_ELx to die() of cfi_handler Sudeep Holla (1): arm64: acpi: Fix possible memory leak of ffh_ctxt arch/arm64/Kconfig | 4 ++-- arch/arm64/include/asm/memory.h | 11 +++++++++++ arch/arm64/kernel/acpi.c | 8 ++++---- arch/arm64/kernel/cpufeature.c | 2 +- arch/arm64/kernel/fpsimd.c | 3 --- arch/arm64/kernel/kaslr.c | 2 +- arch/arm64/kernel/traps.c | 2 +- arch/arm64/mm/copypage.c | 3 ++- 8 files changed, 22 insertions(+), 13 deletions(-)