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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id C0DADC4332F for ; Wed, 30 Nov 2022 15:37:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3FB626B0074; Wed, 30 Nov 2022 10:37:20 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 3ABAA6B0075; Wed, 30 Nov 2022 10:37:20 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2739F6B0078; Wed, 30 Nov 2022 10:37:20 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 145AF6B0074 for ; Wed, 30 Nov 2022 10:37:20 -0500 (EST) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id E1C6C1A0226 for ; Wed, 30 Nov 2022 15:37:19 +0000 (UTC) X-FDA: 80190512598.30.743732E Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf17.hostedemail.com (Postfix) with ESMTP id 8E78240013 for ; Wed, 30 Nov 2022 15:37:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669822638; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=pVZ07aHdc0TxmTBqqOVsRYEApdKWTFEqb+h72kyUT7U=; b=PS3Mnu9X1Fr9CehVF6eLoTlL6B1SyLnbFJ7alQbOqwZB1bQ2WtB0tos/kR1GPeIVb72Bmy lrqLas3Tl4B/sGhqnKhiOIi+lQuhwhUCYH6+nOhDMtrC0Wvc87qtBrBbe63oIL18ebqY8U AeoFhGPw+J/Wger1cIbCqI3MOB7KPZU= Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-197-8xTkXvW3Og-ZrjbQeINEBQ-1; Wed, 30 Nov 2022 10:37:17 -0500 X-MC-Unique: 8xTkXvW3Og-ZrjbQeINEBQ-1 Received: by mail-qk1-f198.google.com with SMTP id bq13-20020a05620a468d00b006fa5a75759aso40458546qkb.13 for ; Wed, 30 Nov 2022 07:37:17 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=KkCbDmPSlV3ED2kYMn/nY2F1Zfm2btT/2SFqyr4HySI=; b=RznY9CPnMq61H1Yg0EbKn3OVnu7jNKd7H18y4vcTEZOjm900wOBoiF0P0hbJlAjevn /2cwTOUy/ARoYMKSjGCkMsGID2p/sqC3aF+U5rOuLAuRr6mSK/QJqfxrGEdoR3e8JeNs wkuZfESJC1Xe6v1CgmUXFRDBXluXv99F7PdRsjCkYAg957L791NvP1eQgulLaYnTwTRz lKHBDtVqT9HPsMIg4lcBL1vmwBtjj5rb0n/6itF8XFbCOuowVZ0GKcHHMEeBdzBXONZ+ Bji4zHvllw869/Q6Wvgfz42rtP6n2HliQRkcHrwUgze8GgkKUJaU9mJPFtVVG9OYrWfI ED/Q== X-Gm-Message-State: ANoB5pmqX8vppvDnZ+NbnzvorE4lGuNTZ6U+FhMqBQ1SccjqWSsl11Jq 0nPkF9OBItXlnPhtzjNg2i2tJQ0l8TrE+HAlzPRrAFBY0lWWwU8+M7HzFV1v9MFg3ewzy7XuITu suTcbU5vm/Eg= X-Received: by 2002:a0c:fdea:0:b0:4b3:fd4b:e86e with SMTP id m10-20020a0cfdea000000b004b3fd4be86emr39065960qvu.109.1669822636850; Wed, 30 Nov 2022 07:37:16 -0800 (PST) X-Google-Smtp-Source: AA0mqf6P5HJ+dItim/tVlZkLVf1jiPTB+2nXKLau8ou1fOB71h9KeP0G98ZIH2C6XFsEXY8UI753oA== X-Received: by 2002:a0c:fdea:0:b0:4b3:fd4b:e86e with SMTP id m10-20020a0cfdea000000b004b3fd4be86emr39065940qvu.109.1669822636603; Wed, 30 Nov 2022 07:37:16 -0800 (PST) Received: from x1n (bras-base-aurron9127w-grc-46-70-31-27-79.dsl.bell.ca. [70.31.27.79]) by smtp.gmail.com with ESMTPSA id z26-20020ac87cba000000b003a586888a20sm977387qtv.79.2022.11.30.07.37.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Nov 2022 07:37:15 -0800 (PST) Date: Wed, 30 Nov 2022 10:37:14 -0500 From: Peter Xu To: Eric Biggers Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, James Houghton , Jann Horn , Andrew Morton , Andrea Arcangeli , Rik van Riel , Nadav Amit , Miaohe Lin , Muchun Song , Mike Kravetz , David Hildenbrand Subject: Re: [PATCH 10/10] mm/hugetlb: Introduce hugetlb_walk() Message-ID: References: <20221129193526.3588187-1-peterx@redhat.com> <20221129193526.3588187-11-peterx@redhat.com> MIME-Version: 1.0 In-Reply-To: X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: multipart/mixed; boundary="oQiZbfNmI500Ok+U" Content-Disposition: inline ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=PS3Mnu9X; spf=pass (imf17.hostedemail.com: domain of peterx@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=peterx@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1669822639; a=rsa-sha256; cv=none; b=8iXoqkygl1IxbPjkroejUrf2z8skWo5Ave33kEogPwJXeFqGqa01h4QpJ79jKZbJwK/Xci V4/g/Vx/V/xC7TDhkZb9eob4/0Vi5UbzDGNM5zLj2iIWx5kua3j4WGeY+MPEnBZ8Cs+PoT 07qu9i/Oj4yV1iyVdpd/YX/Mex4NFXg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1669822639; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=pVZ07aHdc0TxmTBqqOVsRYEApdKWTFEqb+h72kyUT7U=; b=dRPC9iO+c+XjQU9G0fYiDq+UxSs5AfbxLN7oIibsosSsSvgh8TW1tcnjjBzueyhk+iIEab JY+9zPjqOenr9Hx9bkE1tWM+W4la0WpfVDbGh3xXahxXAf5TaJVxWSzPDnbI5eaPopKsDm hRCFpiNmAm9yolMDhBW+Fw5q8BuuJz0= Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=PS3Mnu9X; spf=pass (imf17.hostedemail.com: domain of peterx@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=peterx@redhat.com; dmarc=pass (policy=none) header.from=redhat.com X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 8E78240013 X-Stat-Signature: 67z6epmyu7s853upkn8djdtiow8k7t67 X-Rspam-User: X-HE-Tag: 1669822639-371497 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: --oQiZbfNmI500Ok+U Content-Type: text/plain; charset=utf-8 Content-Disposition: inline On Tue, Nov 29, 2022 at 09:18:08PM -0800, Eric Biggers wrote: > On Tue, Nov 29, 2022 at 02:35:26PM -0500, Peter Xu wrote: > > +static inline pte_t * > > +hugetlb_walk(struct vm_area_struct *vma, unsigned long addr, unsigned long sz) > > +{ > > +#if defined(CONFIG_ARCH_WANT_HUGE_PMD_SHARE) && defined(CONFIG_LOCKDEP) > > + struct hugetlb_vma_lock *vma_lock = vma->vm_private_data; > > + > > + /* > > + * If pmd sharing possible, locking needed to safely walk the > > + * hugetlb pgtables. More information can be found at the comment > > + * above huge_pte_offset() in the same file. > > + * > > + * NOTE: lockdep_is_held() is only defined with CONFIG_LOCKDEP. > > + */ > > + if (__vma_shareable_flags_pmd(vma)) > > + WARN_ON_ONCE(!lockdep_is_held(&vma_lock->rw_sema) && > > + !lockdep_is_held( > > + &vma->vm_file->f_mapping->i_mmap_rwsem)); > > +#endif > > FYI, in next-20221130 there is a compile error here due to this commit: > > In file included from security/commoncap.c:19: > ./include/linux/hugetlb.h:1262:42: error: incomplete definition of type 'struct hugetlb_vma_lock' > WARN_ON_ONCE(!lockdep_is_held(&vma_lock->rw_sema) && > ~~~~~~~~^ > ./include/linux/lockdep.h:286:47: note: expanded from macro 'lockdep_is_held' > #define lockdep_is_held(lock) lock_is_held(&(lock)->dep_map) > ^~~~ This probably means the config has: CONFIG_HUGETLB_PAGE=n CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y And I'm surprised we didn't have a dependency that ARCH_WANT_HUGE_PMD_SHARE should depend on HUGETLB_PAGE already. Mike, what do you think? I've also attached a quick fix for this patch to be squashed in. Hope it works. Thanks, -- Peter Xu --oQiZbfNmI500Ok+U Content-Type: text/plain; charset=utf-8 Content-Disposition: attachment; filename="0001-fixup-mm-hugetlb-Introduce-hugetlb_walk.patch" >From 9787a7f5492ca251fcce5c09bd7e4a80ac157726 Mon Sep 17 00:00:00 2001 From: Peter Xu Date: Wed, 30 Nov 2022 10:33:44 -0500 Subject: [PATCH] fixup! mm/hugetlb: Introduce hugetlb_walk() Content-type: text/plain Signed-off-by: Peter Xu --- include/linux/hugetlb.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h index 1a51c45fdf2e..ec2a1f93b12d 100644 --- a/include/linux/hugetlb.h +++ b/include/linux/hugetlb.h @@ -1248,7 +1248,8 @@ __vma_shareable_flags_pmd(struct vm_area_struct *vma) static inline pte_t * hugetlb_walk(struct vm_area_struct *vma, unsigned long addr, unsigned long sz) { -#if defined(CONFIG_ARCH_WANT_HUGE_PMD_SHARE) && defined(CONFIG_LOCKDEP) +#if defined(CONFIG_HUGETLB_PAGE) && \ + defined(CONFIG_ARCH_WANT_HUGE_PMD_SHARE) && defined(CONFIG_LOCKDEP) struct hugetlb_vma_lock *vma_lock = vma->vm_private_data; /* -- 2.37.3 --oQiZbfNmI500Ok+U--