From patchwork Tue Mar 7 02:26:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: mawupeng X-Patchwork-Id: 65205 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2202916wrd; Mon, 6 Mar 2023 18:48:32 -0800 (PST) X-Google-Smtp-Source: AK7set9HOVMDh6FlmBAKmTDqoAPhiBrbxHMWffqG7+w0BoqoKRDcwqKozf2veQcE/4McMLHf2bLB X-Received: by 2002:a17:906:fe08:b0:881:23a:aba5 with SMTP id wy8-20020a170906fe0800b00881023aaba5mr17460713ejb.11.1678157312198; Mon, 06 Mar 2023 18:48:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678157312; cv=none; d=google.com; s=arc-20160816; b=t/4Uqxgn78xSB4fracrHP6gNCuMXTPgIFuF6puIwCQJsDXzb/YJxdFjdk6c80GxBGM wJ9HzhdE0Fs2YLdX0RwtvIYnIJV/SBpDDZGWt9qpJM6wAvBNfIX3qiCO/m3TD54ZuHXc YCit+wyV/IFafiU7FPKx3tTQWfiIwGcHul8wm3FDAt2mbqphcD1cvmLBcQiEUhGf3N7d csW6yZgS93WmS2TZZWBR+MBHhUNQA/tgvEkcUkfU5HGYzNyg4d6PBB5o1M/EwWmaKAQ9 hpctThCe+Zgsyd9XaytvOT0hNbwRZzw0V1f8oe+Yxk9Dkp9MWxXm+yUGB7zt00owCWSM xnXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=OSHjpogGIgSp2Sh4MrhIUIR0Lz7PxX+seRacD9UGHaY=; b=hHfJdGfjMHXxeJxM4tNtJAfsVPow5DSn1CakjwoLeLA7oMLHf/yB50fx8c6y1XqKcH 44cCGk83du3p5CuAAFd+mFYQ67IMZ7Fd5kMI744fWR7MT3oSRRPiRouha/sIfCKNR642 iMUeiKHFq93GncOcm6UkH97BYeSxiX8Byb7kGiG+/bILPglSBPJFU9ombLXdrVnKfkHw /viSl4Ad/p4nkJd60EmmhSppIWIsmALZf23D6OsbG7ha9TODp79372Uk/kGjNv7HLLRx p9Q2fHc2jjHh3S/bLq3PGwkUKUvamYQ8b4rAEDz5BfdPHRHFb6UqKZW4vcvITWN/khAd Mbww== 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b15-20020a17090636cf00b008d92efb7984si933455ejc.999.2023.03.06.18.48.07; Mon, 06 Mar 2023 18:48:32 -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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229998AbjCGC0f (ORCPT + 99 others); Mon, 6 Mar 2023 21:26:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55726 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229976AbjCGC03 (ORCPT ); Mon, 6 Mar 2023 21:26:29 -0500 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B17466A428 for ; Mon, 6 Mar 2023 18:26:13 -0800 (PST) Received: from dggpemm500014.china.huawei.com (unknown [172.30.72.55]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4PVzl062xwznWTK; Tue, 7 Mar 2023 10:23:24 +0800 (CST) Received: from localhost.localdomain (10.175.112.125) by dggpemm500014.china.huawei.com (7.185.36.153) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.21; Tue, 7 Mar 2023 10:26:11 +0800 From: Wupeng Ma To: , , , CC: , , , Subject: [PATCH v2 -next 3/3] x86/mm/pat: Remove WARN_ON_ONCE if follow_phys fails Date: Tue, 7 Mar 2023 10:26:06 +0800 Message-ID: <20230307022606.2367399-4-mawupeng1@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230307022606.2367399-1-mawupeng1@huawei.com> References: <20230307022606.2367399-1-mawupeng1@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.112.125] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To dggpemm500014.china.huawei.com (7.185.36.153) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, 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?1759675481926390479?= X-GMAIL-MSGID: =?utf-8?q?1759675481926390479?= From: Ma Wupeng WARN_ON_ONCE here is not useful for solving problem since why this PA is not valid is still unknown if follow_phys fails in track_pfn_copy/untrack_pfn, Drop it. Signed-off-by: Ma Wupeng --- arch/x86/mm/pat/memtype.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/arch/x86/mm/pat/memtype.c b/arch/x86/mm/pat/memtype.c index 3ec025011c90..bda4b6b910c2 100644 --- a/arch/x86/mm/pat/memtype.c +++ b/arch/x86/mm/pat/memtype.c @@ -993,10 +993,9 @@ int track_pfn_copy(struct vm_area_struct *vma) * reserve the whole chunk covered by vma. We need the * starting address and protection from pte. */ - if (follow_phys(vma, vma->vm_start, &prot, &paddr)) { - WARN_ON_ONCE(1); + if (follow_phys(vma, vma->vm_start, &prot, &paddr)) return -EINVAL; - } + pgprot = __pgprot(prot); return reserve_pfn_range(paddr, vma_size, &pgprot, 1); } @@ -1080,10 +1079,8 @@ void untrack_pfn(struct vm_area_struct *vma, unsigned long pfn, /* free the chunk starting from pfn or the whole chunk */ paddr = (resource_size_t)pfn << PAGE_SHIFT; if (!paddr && !size) { - if (follow_phys(vma, vma->vm_start, &prot, &paddr)) { - WARN_ON_ONCE(1); + if (follow_phys(vma, vma->vm_start, &prot, &paddr)) return; - } size = vma->vm_end - vma->vm_start; }