From patchwork Tue Jul 4 02:23:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 115544 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp927489vqx; Mon, 3 Jul 2023 19:40:11 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6dgnvLVs3nN8QEhBPheuyY8YtpnXIrGbSmIe9j6NdFGeDzKAqTPF7OvDfYn9pWDBNRTEPr X-Received: by 2002:a05:622a:348:b0:3fd:eb53:3d8a with SMTP id r8-20020a05622a034800b003fdeb533d8amr15692776qtw.26.1688438411564; Mon, 03 Jul 2023 19:40:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688438411; cv=none; d=google.com; s=arc-20160816; b=B6TVDy5t+MDHkGZmEgbGO7kuoC5RwuyC2x1XpFaRMA05Aqs2wPuft/S+WsSZyihRWs qQXPCc6WPNkLqNj7QQ60/2gFZFcp3PdNmK5p/uX7MD0jrXBn1vfmIP3oim0OVjz/665b qIQJefH+GB2bSHukwE8mF84ZyZiQ7jmj2uGTgctxlncpzYuVb7gIWUm82CHhpIh8rbOt t/V8szFUrBbyrGq6iNAhFlMC2mdieydA1IevwX4jW3wS4a+HjERlMpxAkom0Z/1Y0r0m EFSN8NtZGuHF7iO1SzhhpX/zUN/K2E9H4idgmkEHlYKH2KETYmsilPREs9iNvTbYSc+e w+8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date :dkim-signature; bh=MjDf1HuKD5isgjMVPro7kfTdMThGf8HPmRufpQJgWIc=; fh=hZHuPt7oBWq92fA12dgcaWeUTkr+XhoK+c1PAoXZB6I=; b=AiTmftyRcA54nmNRJtWxHMiP6uqqu7WwmHpb0tbIt/4GsTcLkui7O3G9oInpcK0K0+ WOSg9kiei9xN4uRSMiuW/UVLsLlMhQ+a3GAg/qsy5WJ4b2PilSXn9ghq2bg94EH19VNz pfWNvIuNTnR6JMrV2rYhEI4R98Ds7JW2CbH6CFofIQimimPU5qdQRuA2AGNK+i+3DZLf cfFecy4EeRm6OlRCCG575aJALRal1QQuy6hGW9G4fYuNzdme0Syy6rAQona8Gtb8pFkj 2ssMfV7dEvPUoOI6txIDKxTc7bF70CgwFu1zKHGdH+t+tn1DVykZze4sOGDH/Zn0fxWv fItQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=vI8cr7ay; 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=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id n188-20020a6327c5000000b005536fc5187asi19413291pgn.47.2023.07.03.19.39.59; Mon, 03 Jul 2023 19:40:11 -0700 (PDT) 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; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=vI8cr7ay; 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=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230176AbjGDCXx (ORCPT + 99 others); Mon, 3 Jul 2023 22:23:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33202 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229546AbjGDCXw (ORCPT ); Mon, 3 Jul 2023 22:23:52 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1FC3613D; Mon, 3 Jul 2023 19:23:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1688437424; bh=MjDf1HuKD5isgjMVPro7kfTdMThGf8HPmRufpQJgWIc=; h=Date:From:To:Cc:Subject:From; b=vI8cr7ayU4erZZJYXTxlFlg6ciUfA1ZSENoSsikvgmlpJ/jvUiNdswEHb+uOE1pMP bR9M0748FqVSNDIDZfIqGuuaWto/t9h6vpXwKOf04JLvFNwvAVYgymy4DXpX/JkFdk 77c8ZubEZJjHe6p7T6u4KgXwkKwIR7dTrDneE/85+m88qWf4/+ceynADKhwiU3yDZ5 8JSi49ETOR1nrm/OfqSU1+JNKkHSLvu1KxOt0vTTtngg26tA5m1G4pWpucPfQzDU1w NGJNOwpkpZSQixLmRALj7wzsPxYPqwYRW7aBtJbe8Vbw9tOotLZmlZcl99/FWOZ5KW TETc+QFrV2frQ== Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4Qw66S4BWqz4wZw; Tue, 4 Jul 2023 12:23:44 +1000 (AEST) Date: Tue, 4 Jul 2023 12:23:42 +1000 From: Stephen Rothwell To: Linus Torvalds , Andrew Morton Cc: Suren Baghdasaryan , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: build failure after merge of the mm tree Message-ID: <20230704122342.4a1e2945@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_MED,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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?1770455996001613491?= X-GMAIL-MSGID: =?utf-8?q?1770455996001613491?= Hi all, After merging the origin tree, today's linux-next build (arm64 defconfig) failed like this: arch/arm64/mm/fault.c: In function 'do_page_fault': arch/arm64/mm/fault.c:624:9: error: 'vma' undeclared (first use in this function); did you mean 'vmap'? 624 | vma = lock_mm_and_find_vma(mm, addr, regs); | ^~~: | vmap Caused by commit ae870a68b5d1 ("arm64/mm: Convert to using lock_mm_and_find_vma()") interacting with commit 1e72a0774792 ("mm: disable CONFIG_PER_VMA_LOCK by default until its fixed") from the mm tree. I applied the following for today (but have no idea if it is correct). From: Stephen Rothwell Date: Tue, 4 Jul 2023 12:14:37 +1000 Subject: [PATCH] fix up for "arm64/mm: Convert to using lock_mm_and_find_vma()" Signed-off-by: Stephen Rothwell --- arch/arm64/mm/fault.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c index 9d78ff78b0e3..b8c80f7b8a5f 100644 --- a/arch/arm64/mm/fault.c +++ b/arch/arm64/mm/fault.c @@ -536,9 +536,7 @@ static int __kprobes do_page_fault(unsigned long far, unsigned long esr, unsigned long vm_flags; unsigned int mm_flags = FAULT_FLAG_DEFAULT; unsigned long addr = untagged_addr(far); -#ifdef CONFIG_PER_VMA_LOCK struct vm_area_struct *vma; -#endif if (kprobe_page_fault(regs, esr)) return 0;