From patchwork Mon Mar 6 08:43:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: mawupeng X-Patchwork-Id: 64513 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1730750wrd; Mon, 6 Mar 2023 00:58:36 -0800 (PST) X-Google-Smtp-Source: AK7set9tRkZsitTetBf0XzE6dSATu8oAclvU0MhndbKzTDgZI6NwmQam5PoL9fuXzk1lLan+etg8 X-Received: by 2002:a17:907:6092:b0:872:6bd0:d2b with SMTP id ht18-20020a170907609200b008726bd00d2bmr12266160ejc.45.1678093116606; Mon, 06 Mar 2023 00:58:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678093116; cv=none; d=google.com; s=arc-20160816; b=0kvG+YTVyLwa5wCxd06jA4i4BwYk6vgJzV0PZLnTDzucTBOMP8/UFX0tHVjG/QTzEV 5hcZ2TQXtwN2wEMZQmxvExymIn4nNRoxS+BrXTegVA3QhyemXmwiLQLJF16Fc3Uq+77z +PPRhmfycl85nLGyg045Fi+7n9EVxsi0TpzgU5Sh4cL3Eyl3M7o5+KeaAwjgomJD7J/j t+ukrpjxVm+bNZenymWHl6Q7OWGhbDX81Z9wkbw14CDWgDvn3RIyKPikR/L5PTtTqatA 47L3Jm1gN8XDtJyaI5Jx1AFgOkjRETB5XuvTh1rTbwwmjEo3poLpAFgyVie63HCE5Zbm KNMA== 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=bKkKOhCWgKOtkTH2Xskz/bzRs+PCE/0MoxTa1Ji7VKA=; b=UXiL6yTcWi9YbtmUNThaiGgMOtXo9Mr+Q88XlPt0zAcCuJlCJpRrOOOqxTbeEluCxq 1j5NEIXLdFe4ZMYMzDZ2sgrE+PHQumFp6GdIZhjtz2FeX8sRQ8fTUOhx7AQjAk2C6LCb 9GRDouLnP0hLjUUygk/55j23ZvL36GvEqXvIWk8oBND84H2qO4hb9K2rh6rSGd6XTTlV dQIlnI/GFCe9Md/EdpYU+WgS+mQNoLFDsfvpvydaZu9frA05h6lTkghy5Fa9lkBxr0Uz qvYwO7d79pvLrZ2DHGQ7Eq2Jxz4qo3CMDBJQ2OSGx6vCjWgK2iGsrOoVwpTeWxpAHBG1 5UrQ== 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 se3-20020a170906ce4300b008f1ce937174si6937179ejb.886.2023.03.06.00.58.11; Mon, 06 Mar 2023 00:58:36 -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 S229868AbjCFInu (ORCPT + 99 others); Mon, 6 Mar 2023 03:43:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46008 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230035AbjCFIn0 (ORCPT ); Mon, 6 Mar 2023 03:43:26 -0500 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4315822000 for ; Mon, 6 Mar 2023 00:43:24 -0800 (PST) Received: from dggpemm500014.china.huawei.com (unknown [172.30.72.56]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4PVX9W1WkvzKq7g; Mon, 6 Mar 2023 16:41:19 +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 1/2] x86/mm/pat: Move follow_phys to pat-related file Date: Mon, 6 Mar 2023 16:43:15 +0800 Message-ID: <20230306084316.2275757-2-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?1759608167763458565?= X-GMAIL-MSGID: =?utf-8?q?1759608167763458565?= From: Ma Wupeng Since only PAT in x86 use follow_phys(), move this to from memory.c to memtype.c and make it static. Argument flags is always zero in caller untrack_pfn() and track_pfn_copy(). let's drop it. Since config HAVE_IOREMAP_PROT is selected by x86, drop this config macro. Signed-off-by: Ma Wupeng --- arch/x86/mm/pat/memtype.c | 27 +++++++++++++++++++++++++-- include/linux/mm.h | 2 -- mm/memory.c | 28 ---------------------------- 3 files changed, 25 insertions(+), 32 deletions(-) diff --git a/arch/x86/mm/pat/memtype.c b/arch/x86/mm/pat/memtype.c index de10800cd4dd..c138ea0b0e6e 100644 --- a/arch/x86/mm/pat/memtype.c +++ b/arch/x86/mm/pat/memtype.c @@ -950,6 +950,29 @@ static void free_pfn_range(u64 paddr, unsigned long size) memtype_free(paddr, paddr + size); } +static int follow_phys(struct vm_area_struct *vma, unsigned long address, + unsigned long *prot, resource_size_t *phys) +{ + int ret = -EINVAL; + pte_t *ptep, pte; + spinlock_t *ptl; + + if (!(vma->vm_flags & (VM_IO | VM_PFNMAP))) + goto out; + + if (follow_pte(vma->vm_mm, address, &ptep, &ptl)) + goto out; + pte = *ptep; + + *prot = pgprot_val(pte_pgprot(pte)); + *phys = (resource_size_t)pte_pfn(pte) << PAGE_SHIFT; + + ret = 0; + pte_unmap_unlock(ptep, ptl); +out: + return ret; +} + /* * track_pfn_copy is called when vma that is covering the pfnmap gets * copied through copy_page_range(). @@ -969,7 +992,7 @@ 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, 0, &prot, &paddr)) { + if (follow_phys(vma, vma->vm_start, &prot, &paddr)) { WARN_ON_ONCE(1); return -EINVAL; } @@ -1056,7 +1079,7 @@ 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, 0, &prot, &paddr)) { + if (follow_phys(vma, vma->vm_start, &prot, &paddr)) { WARN_ON_ONCE(1); return; } diff --git a/include/linux/mm.h b/include/linux/mm.h index 5f16263d176d..226f2f7cefd7 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2311,8 +2311,6 @@ int follow_pte(struct mm_struct *mm, unsigned long address, pte_t **ptepp, spinlock_t **ptlp); int follow_pfn(struct vm_area_struct *vma, unsigned long address, unsigned long *pfn); -int follow_phys(struct vm_area_struct *vma, unsigned long address, - unsigned int flags, unsigned long *prot, resource_size_t *phys); int generic_access_phys(struct vm_area_struct *vma, unsigned long addr, void *buf, int len, int write); diff --git a/mm/memory.c b/mm/memory.c index 0adf23ea5416..93ad6b45f426 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -5454,34 +5454,6 @@ int follow_pfn(struct vm_area_struct *vma, unsigned long address, EXPORT_SYMBOL(follow_pfn); #ifdef CONFIG_HAVE_IOREMAP_PROT -int follow_phys(struct vm_area_struct *vma, - unsigned long address, unsigned int flags, - unsigned long *prot, resource_size_t *phys) -{ - int ret = -EINVAL; - pte_t *ptep, pte; - spinlock_t *ptl; - - if (!(vma->vm_flags & (VM_IO | VM_PFNMAP))) - goto out; - - if (follow_pte(vma->vm_mm, address, &ptep, &ptl)) - goto out; - pte = *ptep; - - if ((flags & FOLL_WRITE) && !pte_write(pte)) - goto unlock; - - *prot = pgprot_val(pte_pgprot(pte)); - *phys = (resource_size_t)pte_pfn(pte) << PAGE_SHIFT; - - ret = 0; -unlock: - pte_unmap_unlock(ptep, ptl); -out: - return ret; -} - /** * generic_access_phys - generic implementation for iomem mmap access * @vma: the vma to access 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; }