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=-2.4 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=no 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 0F19DC4360C for ; Fri, 27 Sep 2019 22:21:47 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id B7C922075D for ; Fri, 27 Sep 2019 22:21:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="Z31GDbhF" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B7C922075D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=oracle.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 6337D8E0005; Fri, 27 Sep 2019 18:21:46 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5E4698E0001; Fri, 27 Sep 2019 18:21:46 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4AAB88E0005; Fri, 27 Sep 2019 18:21:46 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0040.hostedemail.com [216.40.44.40]) by kanga.kvack.org (Postfix) with ESMTP id 218498E0001 for ; Fri, 27 Sep 2019 18:21:46 -0400 (EDT) Received: from smtpin16.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with SMTP id 96024180AD803 for ; Fri, 27 Sep 2019 22:21:45 +0000 (UTC) X-FDA: 75982123770.16.jelly15_83b7b23611924 X-HE-Tag: jelly15_83b7b23611924 X-Filterd-Recvd-Size: 5548 Received: from userp2130.oracle.com (userp2130.oracle.com [156.151.31.86]) by imf47.hostedemail.com (Postfix) with ESMTP for ; Fri, 27 Sep 2019 22:21:44 +0000 (UTC) Received: from pps.filterd (userp2130.oracle.com [127.0.0.1]) by userp2130.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x8RMJltK028041; Fri, 27 Sep 2019 22:21:43 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=subject : to : cc : references : from : message-id : date : mime-version : in-reply-to : content-type : content-transfer-encoding; s=corp-2019-08-05; bh=RNgaL208FeYLdTVOsiYrluzaBNgy86DKV94vE4XfMyQ=; b=Z31GDbhFeRsanxUH3FNVoAJMXJP9u5cUWJ18NF4nJutN9WzcDZCG9yqdbFoEhK4+Dn5K iUGNJlHqXgWGfFbpfWXhfWEOswdTredgFRSoT0TxDhOrmCNduMcaM/zcgv4ipnegr/QN t3iGt8vlLK2SAjvNfUUQGhuJvD6loaDEY0Z5jIToJJ+MN91UNCPqi4uYdZ+qTGYsjpK8 iy5mQ6Wd7XMzZXDBkuXXhuz7aZfQGt0lWflEtMvoDtRFaOchyh6LhWmG35qXc5ADB5O+ hBVQ+/Z/IdYljiVQxre+lnNGD89aSOwLj2o6zsWxF83HYm2kaGkG7Dlr++MfKoNm2av0 8Q== Received: from userp3020.oracle.com (userp3020.oracle.com [156.151.31.79]) by userp2130.oracle.com with ESMTP id 2v5b9ucqdt-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 27 Sep 2019 22:21:42 +0000 Received: from pps.filterd (userp3020.oracle.com [127.0.0.1]) by userp3020.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x8RMIt3i089162; Fri, 27 Sep 2019 22:21:42 GMT Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by userp3020.oracle.com with ESMTP id 2v8yk12ae2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 27 Sep 2019 22:21:42 +0000 Received: from abhmp0020.oracle.com (abhmp0020.oracle.com [141.146.116.26]) by userv0121.oracle.com (8.14.4/8.13.8) with ESMTP id x8RMLdmK015764; Fri, 27 Sep 2019 22:21:40 GMT Received: from [192.168.1.222] (/71.63.128.209) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Fri, 27 Sep 2019 15:21:39 -0700 Subject: Re: [PATCH v2 1/3] userfaultfd: use vma_pagesize for all huge page size calculation To: Andrew Morton , Wei Yang Cc: aarcange@redhat.com, hughd@google.com, linux-mm@kvack.org References: <20190927070032.2129-1-richardw.yang@linux.intel.com> <20190927151033.aad57472652a0b3a6948df6e@linux-foundation.org> From: Mike Kravetz Message-ID: Date: Fri, 27 Sep 2019 15:21:38 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.7.0 MIME-Version: 1.0 In-Reply-To: <20190927151033.aad57472652a0b3a6948df6e@linux-foundation.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9393 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1908290000 definitions=main-1909270190 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9393 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default 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-1908290000 definitions=main-1909270190 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 9/27/19 3:10 PM, Andrew Morton wrote: > On Fri, 27 Sep 2019 15:00:30 +0800 Wei Yang wrote: > >> In function __mcopy_atomic_hugetlb, we use two variables to deal with >> huge page size: vma_hpagesize and huge_page_size. >> >> Since they are the same, it is not necessary to use two different >> mechanism. This patch makes it consistent by all using vma_hpagesize. >> >> --- a/mm/userfaultfd.c >> +++ b/mm/userfaultfd.c >> @@ -262,7 +262,7 @@ static __always_inline ssize_t __mcopy_atomic_hugetlb(struct mm_struct *dst_mm, >> pte_t dst_pteval; >> >> BUG_ON(dst_addr >= dst_start + len); >> - VM_BUG_ON(dst_addr & ~huge_page_mask(h)); >> + VM_BUG_ON(dst_addr & (vma_hpagesize - 1)); >> >> /* >> * Serialize via hugetlb_fault_mutex >> @@ -273,7 +273,7 @@ static __always_inline ssize_t __mcopy_atomic_hugetlb(struct mm_struct *dst_mm, >> mutex_lock(&hugetlb_fault_mutex_table[hash]); >> >> err = -ENOMEM; >> - dst_pte = huge_pte_alloc(dst_mm, dst_addr, huge_page_size(h)); >> + dst_pte = huge_pte_alloc(dst_mm, dst_addr, vma_hpagesize); >> if (!dst_pte) { >> mutex_unlock(&hugetlb_fault_mutex_table[hash]); >> goto out_unlock; >> @@ -300,7 +300,8 @@ static __always_inline ssize_t __mcopy_atomic_hugetlb(struct mm_struct *dst_mm, >> >> err = copy_huge_page_from_user(page, >> (const void __user *)src_addr, >> - pages_per_huge_page(h), true); >> + vma_hpagesize / PAGE_SIZE, >> + true); >> if (unlikely(err)) { >> err = -EFAULT; >> goto out; > > Looks right. > > We could go ahead and remove local variable `h', given that > hugetlb_fault_mutex_hash() doesn't actually use its first arg.. Good catch Andrew. I missed that, but I also wrote the original code that is being cleaned up. :) You can add, Reviewed-by: Mike Kravetz to the series. -- Mike Kravetz