From patchwork Mon Mar 6 08:43:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: mawupeng X-Patchwork-Id: 64515 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1731313wrd; Mon, 6 Mar 2023 01:00:26 -0800 (PST) X-Google-Smtp-Source: AK7set+4TTw/Yw+ukEYXVsBMmfzGfAImbmDbp4lueoEPSIwGCTU1vHySn6TMIDuAt3lAz3y1urNQ X-Received: by 2002:a17:907:1c1f:b0:884:930:b014 with SMTP id nc31-20020a1709071c1f00b008840930b014mr12640920ejc.6.1678093226584; Mon, 06 Mar 2023 01:00:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678093226; cv=none; d=google.com; s=arc-20160816; b=qmtkl+c84OsEUotoxHemdRjX3k4/8lXmbXnaTq4X9B7nC8vsxQy50gd+6Ws0Jqvfvt RcKsTOcGeS5AMZsub9Xd8LJV8ruLGC3batysmMc6LofLLnWVLrAhY4950mNZnT4UBcXM +RkX2lIEtP8yKzIomwI0buM3Pc5LFpKjOxyCSuORIi421uokZVXPoa1c1JLxAgVrOnqE wYuq+KPYQ3ijGfITyb1y1cXZgwd8ae+6/9Xt8q/yPTwvzpOUwpoaB/7tuPEvLbsLJAJg LmOLC/5jvCGGCQpbipxO915klQplHYDeG/3hygk/75k2ds0Hp8t+Vp7ILkgmxJl4qTZW LimQ== 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=Ne6uvzXO3HOlV7GKQTXIOk3XuKLRJDS6eYir0XxkMnU=; b=nq7qE0dTVaYPepGMvesJ3Qy+ccnGWSBjWA2WWSqvc/c36FGZsyRr67TR7cC3fhCY9Y ZouzqpVkH+vwD3Krnuwsa2kDwcC/CNDUQ8T88jDFmP8Eho7CLsKx1AhnC5xZfjRWDpiV PgoUx2QJbQrcUz+LOg7e7SnFLSYUHFX0C8kwsojJ4GNMTbTYyJGbavx8n2ABu+F1PXqS zsxMu8jHhJeEaZ9Pr5bQxJLrhHuA7iQWxo+SC51D+d2o+Qo+k5B4HxDp14oQwOc5nNia gRYGM1GmcT2G/nV3KUZ0D7cbEmJMZaSZeKoUArF/3+U2VNwtaRxXPIx0up34RRNxqZWd jOCA== 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 sh43-20020a1709076eab00b008d3be841cdfsi9160411ejc.38.2023.03.06.01.00.03; Mon, 06 Mar 2023 01:00:26 -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 S229876AbjCFInx (ORCPT + 99 others); Mon, 6 Mar 2023 03:43:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46302 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230052AbjCFIn1 (ORCPT ); Mon, 6 Mar 2023 03:43:27 -0500 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 580591730 for ; Mon, 6 Mar 2023 00:43:24 -0800 (PST) Received: from dggpemm500014.china.huawei.com (unknown [172.30.72.53]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4PVXC26JL3zrSHg; Mon, 6 Mar 2023 16:42:38 +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; Mon, 6 Mar 2023 16:43:22 +0800 From: Wupeng Ma To: , , , CC: , , Subject: [PATCH -next 2/2] x86/mm/pat: Drop the unnecessary WARN_ON_ONCE if follow_phys fails Date: Mon, 6 Mar 2023 16:43:16 +0800 Message-ID: <20230306084316.2275757-3-mawupeng1@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230306084316.2275757-1-mawupeng1@huawei.com> References: <20230306084316.2275757-1-mawupeng1@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.112.125] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) 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?1759608283482628718?= X-GMAIL-MSGID: =?utf-8?q?1759608283482628718?= From: Ma Wupeng Since there is no obvious reason to keep this WARN_ON_ONCE 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 c138ea0b0e6e..8c7f9e6b76e6 100644 --- a/arch/x86/mm/pat/memtype.c +++ b/arch/x86/mm/pat/memtype.c @@ -992,10 +992,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); } @@ -1079,10 +1078,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; }