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: 63623 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp109196wrd; Thu, 2 Mar 2023 14:53:40 -0800 (PST) X-Google-Smtp-Source: AK7set8WSqQupeuueLHyhF/DHe48TvRMpESuGOadCAgeBCoPvFPQtfgEDrPSVrIGxmLqmpMNUm4L X-Received: by 2002:a05:6a20:a8a3:b0:cc:4a6f:ed8e with SMTP id ca35-20020a056a20a8a300b000cc4a6fed8emr61094pzb.40.1677797619818; Thu, 02 Mar 2023 14:53:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677797619; cv=none; d=google.com; s=arc-20160816; b=kEQ3yUc+n0gyJcr+KJzyDmhXaDuGN9gYwB2VXdeQsNKI4KE7Ua3p6Xf5u4zlIT0eLL jeoFZVUfb49TLPS42vlXa5ocw7ZP6aJatlNNIp0F8IFXDmCV7aKsmmlcMyWAP8vl1rm8 bDiBIth8OqRa2xGiU3i93J7umkv3lNemYf9DrLYwvfqrxYDjfnBVJrxj0vVTpq7dOJ9+ VMZkgx7DyVIMZEil/rPwPVpquXp9Ov5CNLuPpBbMMbitB9oRojH7czsniUuwFqr7ckon 9MIHiX4W5vEKP06dEHJ0Gt8i9WREDJt34glqIBe6NAKUd9PhibIHRTUeZqn5U5MhV5mD 7Cxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-disposition:mime-version:message-id :subject:cc:to:from:date; bh=lnRIHKwF/UmQpJ+qpAMuKTCdOTSnXYYvNtajjciJTQg=; b=E+qmYusCWPxQ6SxiGjYOxgyOTplIxokfKfI9Ia1Qg3r+4y+gD4D2WO0Mkr+3dUJ2Js 0VKSDnxE7TBd+XIeh9bMn6cWxk22VfM83pvTT3xm2G1OzBsEiG87wGeR8t82z4XBca9m 66tLxW3TTV2n989tiOYz7+ghnUmWywG2C+DCOiNBDADQoGsaWJgFkqwXrKTKxNkZduJ/ 1jP1FD7KUKACtmMfOffwW9TKvdbAu8t2LwIZu2f6Mvp2y9iPj8YNLtODWh6NIc5S3ogp r67rqOWLBxhOY5mjytoPnDJ2ViqsfptzQKIBD0Bue27Tue9adJjKqMmJTPjtEJuXLArf KNUA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w70-20020a638249000000b004fb7be617e9si450228pgd.672.2023.03.02.14.53.25; Thu, 02 Mar 2023 14:53:39 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230185AbjCBWr6 (ORCPT + 99 others); Thu, 2 Mar 2023 17:47:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34458 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229580AbjCBWr5 (ORCPT ); Thu, 2 Mar 2023 17:47:57 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8B8BD524D for ; Thu, 2 Mar 2023 14:47:55 -0800 (PST) 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 F1A2D615FE for ; 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-Spam-Status: No, score=-6.7 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759298317089671434?= X-GMAIL-MSGID: =?utf-8?q?1759298317089671434?= 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(-)