From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.5 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_MUTT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F36DEC07542 for ; Wed, 29 May 2019 07:21:24 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 8407921019 for ; Wed, 29 May 2019 07:21:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8407921019 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.ibm.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id CE3456B026B; Wed, 29 May 2019 03:21:23 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C948C6B026C; Wed, 29 May 2019 03:21:23 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B5B0C6B026D; Wed, 29 May 2019 03:21:23 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from mail-yb1-f199.google.com (mail-yb1-f199.google.com [209.85.219.199]) by kanga.kvack.org (Postfix) with ESMTP id 8EFBC6B026B for ; Wed, 29 May 2019 03:21:23 -0400 (EDT) Received: by mail-yb1-f199.google.com with SMTP id e7so1219716ybk.22 for ; Wed, 29 May 2019 00:21:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:date:from:to :cc:subject:references:mime-version:content-disposition:in-reply-to :user-agent:message-id; bh=8s1Cyd84uQMLnLM76MePEuV1tpYh1KuPZNFd67UkAds=; b=jZM3+JEAv7+ATZrHYk1ERZp4D0wkzFXBDHf9RHiHKV8BbEc9GU5r9m0F9QMaXLpPRT RFaokI4lmjwvAXho6hkDv46jJ1ef+C2VHhOPyJ070b5VNUtbdkPSmOuMy+bsYbboIqYP x7R2Vw4sx9Q1MPgCgL5Jr4Yg0k3uESzgcZ7wu1IMcF8v9OVLwoWp118Pz3WUYKnSWzHm 982SAqglrasz575mnF5lmRBqUEtg2Ym/DqI+f7dfbzDSbwyDgp5nvSBV2T5CHa68EmC8 OldV4jV9HttIDaR5TKHMlspEFQRxvTAs1DpqJ+g97EeZvSgVobXYTC5+nWUpZiZYQwUk IbLQ== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of rppt@linux.ibm.com designates 148.163.158.5 as permitted sender) smtp.mailfrom=rppt@linux.ibm.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=ibm.com X-Gm-Message-State: APjAAAWjzf/PGh1TgL1z35vPkQMUBta7/kTSpQrilgz3yMMoiWIzldBi AOOXEcoarbNVds4T4X7yEIXoMSQv/ZV7FkAZJb0vQSZcMnIfS2oOAS733G0Q8KlMUrCUqanFaws gzJDdU0YKLYHwqsv/7Ftu3oKh2uHzHRVMaxMS6NPGIlODArucLaU3ENL0Ofirv12cQw== X-Received: by 2002:a25:9d84:: with SMTP id v4mr50184519ybp.88.1559114483125; Wed, 29 May 2019 00:21:23 -0700 (PDT) X-Google-Smtp-Source: APXvYqw/S74dZdZhbgFuKeVnFKCd2tOc8XVCb7jiSer7o77AaJuz6OWeGUAcG3sPVk37fvRYrfGY X-Received: by 2002:a25:9d84:: with SMTP id v4mr50184504ybp.88.1559114482343; Wed, 29 May 2019 00:21:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1559114482; cv=none; d=google.com; s=arc-20160816; b=NjA2+VLDgIwtmapZVaxM2jPocPQqRNeck294Nz4OSiB91IIkx1Un40NZc6D12vRbz0 kZ1EUlNFVGY2OZ56caN7h3cWrDC4LQCVzALxOBcEBOIeqRkN8SuT9/E0541eI87t+8gw u1XVI5UUgpH7dbdF9IKoUeKDvysweC7LX4kMcE9MEt66aAnVLrJn1X4CpMZuwEtSgMm7 P9Jkyq7SfKAqn+NlcorJd8Y9ie2bsnWKpDEk2hvC6YDuo+PQ8PxlVHq3LppNWPVnWtMC oHle1ogGse06PynSjZwmBkoqDAM1vx1zhPrMzEF39zqFAtj4WZfwoWnPBYLg8nOlm620 Wtpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:user-agent:in-reply-to:content-disposition:mime-version :references:subject:cc:to:from:date; bh=8s1Cyd84uQMLnLM76MePEuV1tpYh1KuPZNFd67UkAds=; b=aZAj/Q2KDWDU84hBV7t9mPPoXHiRVNaKDBc2Pp6bjFftpHx00rxF+Qr/4147zf5GaF zLG92A/HYQaGFV/90BkwhUX3+LfUQxViBkhnhSrNSaoU5TiatQMWrM0qYQDkjZg1/Y/q eItoSCqfcrLxhMbbyPBKyFZHnnZPf+sik/QkX/x/puuX3DH/dOvjeM4LzNBxiefOsaCH ZTa6ZJTPz01l7ZXaAOvOXvWhIcTEkOTSXJgZvv5Llww0uI9Vj+nDcWMIKW8m9M56e/23 n8+zwKOs+bIzwKEcyuEhkLym0SdRPHoiPnV+0dLaXwFxdT9ee89Hugh4SRey0wfwrSYk GktA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of rppt@linux.ibm.com designates 148.163.158.5 as permitted sender) smtp.mailfrom=rppt@linux.ibm.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=ibm.com Received: from mx0a-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com. [148.163.158.5]) by mx.google.com with ESMTPS id l207si1823691ywc.380.2019.05.29.00.21.22 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 29 May 2019 00:21:22 -0700 (PDT) Received-SPF: pass (google.com: domain of rppt@linux.ibm.com designates 148.163.158.5 as permitted sender) client-ip=148.163.158.5; Authentication-Results: mx.google.com; spf=pass (google.com: domain of rppt@linux.ibm.com designates 148.163.158.5 as permitted sender) smtp.mailfrom=rppt@linux.ibm.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=ibm.com Received: from pps.filterd (m0098420.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x4T7KBQ6074061 for ; Wed, 29 May 2019 03:21:22 -0400 Received: from e06smtp05.uk.ibm.com (e06smtp05.uk.ibm.com [195.75.94.101]) by mx0b-001b2d01.pphosted.com with ESMTP id 2ssjt2wu24-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 29 May 2019 03:21:21 -0400 Received: from localhost by e06smtp05.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 29 May 2019 08:21:19 +0100 Received: from b06cxnps3075.portsmouth.uk.ibm.com (9.149.109.195) by e06smtp05.uk.ibm.com (192.168.101.135) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Wed, 29 May 2019 08:21:14 +0100 Received: from d06av26.portsmouth.uk.ibm.com (d06av26.portsmouth.uk.ibm.com [9.149.105.62]) by b06cxnps3075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id x4T7LDwl53149950 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 29 May 2019 07:21:13 GMT Received: from d06av26.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 4AEFBAE055; Wed, 29 May 2019 07:21:13 +0000 (GMT) Received: from d06av26.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id E3C3BAE057; Wed, 29 May 2019 07:21:11 +0000 (GMT) Received: from rapoport-lnx (unknown [9.148.8.53]) by d06av26.portsmouth.uk.ibm.com (Postfix) with ESMTPS; Wed, 29 May 2019 07:21:11 +0000 (GMT) Date: Wed, 29 May 2019 10:21:10 +0300 From: Mike Rapoport To: "Kirill A. Shutemov" Cc: Andrew Morton , x86@kernel.org, Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Borislav Petkov , Peter Zijlstra , Andy Lutomirski , David Howells , Kees Cook , Dave Hansen , Kai Huang , Jacob Pan , Alison Schofield , linux-mm@kvack.org, kvm@vger.kernel.org, keyrings@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH, RFC 02/62] mm: Add helpers to setup zero page mappings References: <20190508144422.13171-1-kirill.shutemov@linux.intel.com> <20190508144422.13171-3-kirill.shutemov@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190508144422.13171-3-kirill.shutemov@linux.intel.com> User-Agent: Mutt/1.5.24 (2015-08-30) X-TM-AS-GCONF: 00 x-cbid: 19052907-0020-0000-0000-000003418013 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19052907-0021-0000-0000-000021947F7A Message-Id: <20190529072109.GB3656@rapoport-lnx> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-05-29_04:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1905290049 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Wed, May 08, 2019 at 05:43:22PM +0300, Kirill A. Shutemov wrote: > When kernel setups an encrypted page mapping, encryption KeyID is Nit: "when kernel sets up an encrypted..." > derived from a VMA. KeyID is going to be part of vma->vm_page_prot and > it will be propagated transparently to page table entry on mk_pte(). > > But there is an exception: zero page is never encrypted and its mapping > must use KeyID-0, regardless VMA's KeyID. > > Introduce helpers that create a page table entry for zero page. > > The generic implementation will be overridden by architecture-specific > code that takes care about using correct KeyID. > > Signed-off-by: Kirill A. Shutemov > --- > fs/dax.c | 3 +-- > include/asm-generic/pgtable.h | 8 ++++++++ > mm/huge_memory.c | 6 ++---- > mm/memory.c | 3 +-- > mm/userfaultfd.c | 3 +-- > 5 files changed, 13 insertions(+), 10 deletions(-) > > diff --git a/fs/dax.c b/fs/dax.c > index e5e54da1715f..6d609bff53b9 100644 > --- a/fs/dax.c > +++ b/fs/dax.c > @@ -1441,8 +1441,7 @@ static vm_fault_t dax_pmd_load_hole(struct xa_state *xas, struct vm_fault *vmf, > pgtable_trans_huge_deposit(vma->vm_mm, vmf->pmd, pgtable); > mm_inc_nr_ptes(vma->vm_mm); > } > - pmd_entry = mk_pmd(zero_page, vmf->vma->vm_page_prot); > - pmd_entry = pmd_mkhuge(pmd_entry); > + pmd_entry = mk_zero_pmd(zero_page, vmf->vma->vm_page_prot); > set_pmd_at(vmf->vma->vm_mm, pmd_addr, vmf->pmd, pmd_entry); > spin_unlock(ptl); > trace_dax_pmd_load_hole(inode, vmf, zero_page, *entry); > diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h > index fa782fba51ee..cde8b81f6f2b 100644 > --- a/include/asm-generic/pgtable.h > +++ b/include/asm-generic/pgtable.h > @@ -879,8 +879,16 @@ static inline unsigned long my_zero_pfn(unsigned long addr) > } > #endif > > +#ifndef mk_zero_pte > +#define mk_zero_pte(addr, prot) pte_mkspecial(pfn_pte(my_zero_pfn(addr), prot)) > +#endif > + > #ifdef CONFIG_MMU > > +#ifndef mk_zero_pmd > +#define mk_zero_pmd(zero_page, prot) pmd_mkhuge(mk_pmd(zero_page, prot)) > +#endif > + > #ifndef CONFIG_TRANSPARENT_HUGEPAGE > static inline int pmd_trans_huge(pmd_t pmd) > { > diff --git a/mm/huge_memory.c b/mm/huge_memory.c > index 165ea46bf149..26c3503824ba 100644 > --- a/mm/huge_memory.c > +++ b/mm/huge_memory.c > @@ -675,8 +675,7 @@ static bool set_huge_zero_page(pgtable_t pgtable, struct mm_struct *mm, > pmd_t entry; > if (!pmd_none(*pmd)) > return false; > - entry = mk_pmd(zero_page, vma->vm_page_prot); > - entry = pmd_mkhuge(entry); > + entry = mk_zero_pmd(zero_page, vma->vm_page_prot); > if (pgtable) > pgtable_trans_huge_deposit(mm, pmd, pgtable); > set_pmd_at(mm, haddr, pmd, entry); > @@ -2101,8 +2100,7 @@ static void __split_huge_zero_page_pmd(struct vm_area_struct *vma, > > for (i = 0; i < HPAGE_PMD_NR; i++, haddr += PAGE_SIZE) { > pte_t *pte, entry; > - entry = pfn_pte(my_zero_pfn(haddr), vma->vm_page_prot); > - entry = pte_mkspecial(entry); > + entry = mk_zero_pte(haddr, vma->vm_page_prot); > pte = pte_offset_map(&_pmd, haddr); > VM_BUG_ON(!pte_none(*pte)); > set_pte_at(mm, haddr, pte, entry); > diff --git a/mm/memory.c b/mm/memory.c > index ab650c21bccd..c5e0c87a12b7 100644 > --- a/mm/memory.c > +++ b/mm/memory.c > @@ -2927,8 +2927,7 @@ static vm_fault_t do_anonymous_page(struct vm_fault *vmf) > /* Use the zero-page for reads */ > if (!(vmf->flags & FAULT_FLAG_WRITE) && > !mm_forbids_zeropage(vma->vm_mm)) { > - entry = pte_mkspecial(pfn_pte(my_zero_pfn(vmf->address), > - vma->vm_page_prot)); > + entry = mk_zero_pte(vmf->address, vma->vm_page_prot); > vmf->pte = pte_offset_map_lock(vma->vm_mm, vmf->pmd, > vmf->address, &vmf->ptl); > if (!pte_none(*vmf->pte)) > diff --git a/mm/userfaultfd.c b/mm/userfaultfd.c > index d59b5a73dfb3..ac1ce3866036 100644 > --- a/mm/userfaultfd.c > +++ b/mm/userfaultfd.c > @@ -122,8 +122,7 @@ static int mfill_zeropage_pte(struct mm_struct *dst_mm, > pgoff_t offset, max_off; > struct inode *inode; > > - _dst_pte = pte_mkspecial(pfn_pte(my_zero_pfn(dst_addr), > - dst_vma->vm_page_prot)); > + _dst_pte = mk_zero_pte(dst_addr, dst_vma->vm_page_prot); > dst_pte = pte_offset_map_lock(dst_mm, dst_pmd, dst_addr, &ptl); > if (dst_vma->vm_file) { > /* the shmem MAP_PRIVATE case requires checking the i_size */ > -- > 2.20.1 > -- Sincerely yours, Mike.