From patchwork Mon Apr 1 20:26:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vishal Moola X-Patchwork-Id: 13612999 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 9D55ACD128A for ; Mon, 1 Apr 2024 20:27:01 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2EB056B0085; Mon, 1 Apr 2024 16:27:01 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 24CB46B0088; Mon, 1 Apr 2024 16:27:01 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0C7B46B008A; Mon, 1 Apr 2024 16:27:01 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id E6BBC6B0085 for ; Mon, 1 Apr 2024 16:27:00 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id A31CA1C0867 for ; Mon, 1 Apr 2024 20:27:00 +0000 (UTC) X-FDA: 81962097000.06.9B2DD23 Received: from mail-yw1-f176.google.com (mail-yw1-f176.google.com [209.85.128.176]) by imf25.hostedemail.com (Postfix) with ESMTP id DAB5BA000B for ; Mon, 1 Apr 2024 20:26:58 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=nduwGQq4; spf=pass (imf25.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.128.176 as permitted sender) smtp.mailfrom=vishal.moola@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1712003218; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=WwRQK61zxAOtZTuzQkMVrkDP5lES+e4npSppnKc4AGI=; b=f3cB3gFyUj6Qz3numeck+aBaFG6V5qKztEtvnPFZ8B6dfbZXh9b/5AOXLCtUMb2Rm6C6Vc r/l3gSDNjZ1bFOdvgIf/ClITYtN8cp05cv9VbFkKDWn3j8cBTB1nyPtmcKK6uxJjXzLp/2 N3Wm6s8GeaESE77YoUSSY9+3cKhuuD4= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1712003218; a=rsa-sha256; cv=none; b=dMwpat6gGRX55sNJvBwocfP1w6M+rrB2amXcTgljwlXzvanCh98TR6EzmlNcM3ul7Glj1H 5H4BAfqRh7GPuf0QqkCCdDxHyWeZtew+qJvDEr+5UGES7qLdGPQJG3wlzKcxXSsjepuLCC ZBqBfoMRHMCwkCdT8W4ZrWqtS19JB6U= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=nduwGQq4; spf=pass (imf25.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.128.176 as permitted sender) smtp.mailfrom=vishal.moola@gmail.com; dmarc=pass (policy=none) header.from=gmail.com Received: by mail-yw1-f176.google.com with SMTP id 00721157ae682-60a3c48e70fso43810747b3.1 for ; Mon, 01 Apr 2024 13:26:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1712003218; x=1712608018; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=WwRQK61zxAOtZTuzQkMVrkDP5lES+e4npSppnKc4AGI=; b=nduwGQq4riahKCuvefKEowOr37Ie5H8KFnzLX2mfx4ZZb/Fooo/NqiE5cqXztSOJNf 49+frWqlTrEjbCo256qUiri2QMAD4GwMRrTv5J0ac0lZI4S4M5/CfUBxduF/hkgzAkkO NnXKGyF1u44T1Ie0Hu/hQDfq3Hhcri5SSaN4ZaCQvFM20AEfqf4IpgO6TTnN8IGyLRP6 K4o0lxdk1E+vff+rrhkYC+iSiGWgQ8e0vLzSEgCKNuZoEjRSZlqO/vWOxe3hJOQo9Vko D9bN9D9HbQwbwcsclSbsxIt7CKZibAtTYyw1C+s9Xevms2MViVYDzLUQ/rNW6JSlsqoy zRwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712003218; x=1712608018; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WwRQK61zxAOtZTuzQkMVrkDP5lES+e4npSppnKc4AGI=; b=VRze8sGe/PVWkE6U3TYzETDSHCmAs4u3N8EJUTrjmaEh9lNHqa3pE6/TCc2rhZvLO/ vrovZSqKT49XLhvHJVGhy/NR7S4AOxqBmH2xyB+5taKA2Q8/N9GUjtdCuah+xHuztNnl J14CuCKGsxhlqzVHr8ZS6+9T6FVqlQTmPpuCK9QLcfgcLAfD9op7JWeP0WhTxUTU2Cth 0gF8Gmc6w+8UQ0KfIYw84HYV590VZLiS2/VIuE/88pLkv7SeCs4liuFH8ub7wSSqJVM6 JPkDrdE7qwRmWk0xnC5M5dUC1+HL8Zn2bDozcYvjWPVm4Wxx0aa8NwCcP0RB8VJsQ9ji jBKA== X-Gm-Message-State: AOJu0Yx5qYG6GCPmn875Uq4bum9qzXyTKUjYU1x5FHCwtapzjnKjN+/R OABsGbstyD6jZdtX8P2IIndHricLx6QJ/64hInPecSpI7o6f2M1rdiLlBmXh X-Google-Smtp-Source: AGHT+IFisZq4EuxDLU4uS1EpjFvcKMqEqYfO+yamypsLgW77pMy3m4jr7Iv/oNYRYg9OIrA5cUAWAg== X-Received: by 2002:a0d:e7c6:0:b0:611:30a2:1758 with SMTP id q189-20020a0de7c6000000b0061130a21758mr9909937ywe.37.1712003217812; Mon, 01 Apr 2024 13:26:57 -0700 (PDT) Received: from fedora.attlocal.net ([2600:1700:2f7d:1800::23]) by smtp.googlemail.com with ESMTPSA id y72-20020a81a14b000000b006142210a31esm1171181ywg.23.2024.04.01.13.26.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Apr 2024 13:26:57 -0700 (PDT) From: "Vishal Moola (Oracle)" To: linux-mm@kvack.org Cc: linux-kernel@vger.kernel.org, akpm@linux-foundation.org, muchun.song@linux.dev, willy@infradead.org, "Vishal Moola (Oracle)" Subject: [PATCH v2 2/3] hugetlb: Convert hugetlb_no_page() to use struct vm_fault Date: Mon, 1 Apr 2024 13:26:50 -0700 Message-ID: <20240401202651.31440-3-vishal.moola@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240401202651.31440-1-vishal.moola@gmail.com> References: <20240401202651.31440-1-vishal.moola@gmail.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: DAB5BA000B X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: n75qm8yxxypih5dsoxzwn4955bt7bjn5 X-HE-Tag: 1712003218-975339 X-HE-Meta: U2FsdGVkX19GldGfPBtK/MzClPmdmFRCje0hufoyN55YTIfzaN4KrXUYyrsP5XTcvLOV45jpE1gdUA+DGdsPTj2Toq5LV0+nEW/xWleUiKPZq2Sg6wNzuqftlkAB/qtlZoU56SO1gBP2+P9sp+Uqgi29gZW6QiPeNGWiWi/tZI8UlU0nr4m5wU7t/gqlWcmTeaUcJkAaIZsv3WagcWpLb2ayl1mMGO9et8UoklnwKYc+fGWanW2aXTKkjnW0KVSVLjr7l+h41Gi4nUQttoGxIAf/3P5GflWzCJ2n9FmQfWTns8qZIrMZ9YsmF4wJ8idhoAE2rsD6E32p/e+043Y8xBkiF8N4C+SsOlHBr9CbTBk22i3+H79iDa8qSaYRoEOcz2HWkFDu00d1P5YKxvKjAzuB7P/tVXJfzSgMcxvVS6nZOQfqhBQt/T4DIdAPX2sIQpLi8VKou9gX23OZ6g+VzoCEpnEJyEBTLMRKJ9a11L+CMZbLLhiba7OW9TdWA00aNfhREYlHm3V147UeEPlYtT/xsa+T4AMNC3eVe5TlGttKAVRRWcAvHmu1zKFcyaDgUU0aNoWGBTwgG0d2pGsbmCKqXN5I6WOeX5GmxIEu3+vFttiiOlktoqrVHgoPsEWWVhwa6EnXvU+YEdxYYqLURUDumAC11/QexsjGMCB2q5VVRNBDATPP+/0ULkkZGG36+bnXxOAkK0sjt6aMQY2xSpZgvkx31RCm4u/EBicWm7DOel6Amb4JogY7VW3CJgmtG3nQ6J5VEpdp2k6pDoWjcc1GT3yuJtZkqTmAyDrFUEmbzwWz3i1Jto5pazJzvKcCNnMF4MIOJj3fn3lsoY2eitCktvEsojwuO19URLDDh4REdQFsaFkyY7IrAjGbcTleCSraxti1paAaxH3S5OsrXyTg0Y1qw1E8n2bXURZpl2ikYBy0k5f9X5vby/s7lozJ/vCuy8jCEZw6JPsL4pu Kft3nb0n 64RsynEi0PQ3mlf+0YeSPMchy/zXBpQqp6qhTvJIXxEh2dtMTESSaLnhu/ldQ11f5EnnyKSvccBc4LpjsYlTkUMbNF+gZ4eFN/BUzzAmYCtciRJQm8sZb5NWTYcBteN3oX4nROlpolcNdVOM8LyNRm1Mkr+9WF1Nhxl8NKWZW5/C3rNRJnjRNSGPuFhDfC+GncbKQOOrRXh8h+h64qRjn+ztIcCVGSc5GuO00sgjrVwxJRAE22psMabmu31aD3ZY3cvr7FWx40liDLEHnPH7VsAiDqGC0C3eHSTGaOeU5PUnJnTVZnl8OuA3Dqsw+wIDfjA6DYwVvftQW3VKXNi4BN+hbgHaKgRsj0KIlmzP2CIeY6qAzVERSBr+OEllMSGkbCmX2V+O9KwFuRoQI6tZEA+/m45Ow2Kg5OsZeWPkHTxI5FQmi19VwANBwa1iHGTORF2nMMmONkMNSZX05O4/jGLH2zgHHdozGIsxbWSe1LDnHjDm56FOPefrq+rHz3V+0ecgluzLvrq9kNTK3Y7TD5b1T3VtHFQwWLqgaBQZAPcgXxrTZsJQX2ZgEA9JsetTGAc9C 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: List-Subscribe: List-Unsubscribe: hugetlb_no_page() can use the struct vm_fault passed in from hugetlb_fault(). This alleviates the stack by consolidating 7 variables into a single struct. Signed-off-by: Vishal Moola (Oracle) Reviewed-by: Oscar Salvador Signed-off-by: Vishal Moola (Oracle) --- mm/hugetlb.c | 59 ++++++++++++++++++++++++++-------------------------- 1 file changed, 29 insertions(+), 30 deletions(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 360b82374a89..aca2f11b4138 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -6189,9 +6189,7 @@ static bool hugetlb_pte_stable(struct hstate *h, struct mm_struct *mm, static vm_fault_t hugetlb_no_page(struct mm_struct *mm, struct vm_area_struct *vma, - struct address_space *mapping, pgoff_t idx, - unsigned long address, pte_t *ptep, - pte_t old_pte, unsigned int flags, + struct address_space *mapping, struct vm_fault *vmf) { struct hstate *h = hstate_vma(vma); @@ -6200,10 +6198,8 @@ static vm_fault_t hugetlb_no_page(struct mm_struct *mm, unsigned long size; struct folio *folio; pte_t new_pte; - spinlock_t *ptl; - unsigned long haddr = address & huge_page_mask(h); bool new_folio, new_pagecache_folio = false; - u32 hash = hugetlb_fault_mutex_hash(mapping, idx); + u32 hash = hugetlb_fault_mutex_hash(mapping, vmf->pgoff); /* * Currently, we are forced to kill the process in the event the @@ -6222,10 +6218,10 @@ static vm_fault_t hugetlb_no_page(struct mm_struct *mm, * before we get page_table_lock. */ new_folio = false; - folio = filemap_lock_hugetlb_folio(h, mapping, idx); + folio = filemap_lock_hugetlb_folio(h, mapping, vmf->pgoff); if (IS_ERR(folio)) { size = i_size_read(mapping->host) >> huge_page_shift(h); - if (idx >= size) + if (vmf->pgoff >= size) goto out; /* Check for page in userfault range */ if (userfaultfd_missing(vma)) { @@ -6246,7 +6242,7 @@ static vm_fault_t hugetlb_no_page(struct mm_struct *mm, * never happen on the page after UFFDIO_COPY has * correctly installed the page and returned. */ - if (!hugetlb_pte_stable(h, mm, ptep, old_pte)) { + if (!hugetlb_pte_stable(h, mm, vmf->pte, vmf->orig_pte)) { ret = 0; goto out; } @@ -6255,7 +6251,7 @@ static vm_fault_t hugetlb_no_page(struct mm_struct *mm, VM_UFFD_MISSING); } - folio = alloc_hugetlb_folio(vma, haddr, 0); + folio = alloc_hugetlb_folio(vma, vmf->address, 0); if (IS_ERR(folio)) { /* * Returning error will result in faulting task being @@ -6269,18 +6265,20 @@ static vm_fault_t hugetlb_no_page(struct mm_struct *mm, * here. Before returning error, get ptl and make * sure there really is no pte entry. */ - if (hugetlb_pte_stable(h, mm, ptep, old_pte)) + if (hugetlb_pte_stable(h, mm, vmf->pte, vmf->orig_pte)) ret = vmf_error(PTR_ERR(folio)); else ret = 0; goto out; } - clear_huge_page(&folio->page, address, pages_per_huge_page(h)); + clear_huge_page(&folio->page, vmf->real_address, + pages_per_huge_page(h)); __folio_mark_uptodate(folio); new_folio = true; if (vma->vm_flags & VM_MAYSHARE) { - int err = hugetlb_add_to_page_cache(folio, mapping, idx); + int err = hugetlb_add_to_page_cache(folio, mapping, + vmf->pgoff); if (err) { /* * err can't be -EEXIST which implies someone @@ -6289,7 +6287,8 @@ static vm_fault_t hugetlb_no_page(struct mm_struct *mm, * to the page cache. So it's safe to call * restore_reserve_on_error() here. */ - restore_reserve_on_error(h, vma, haddr, folio); + restore_reserve_on_error(h, vma, vmf->address, + folio); folio_put(folio); goto out; } @@ -6319,7 +6318,7 @@ static vm_fault_t hugetlb_no_page(struct mm_struct *mm, folio_unlock(folio); folio_put(folio); /* See comment in userfaultfd_missing() block above */ - if (!hugetlb_pte_stable(h, mm, ptep, old_pte)) { + if (!hugetlb_pte_stable(h, mm, vmf->pte, vmf->orig_pte)) { ret = 0; goto out; } @@ -6334,23 +6333,23 @@ static vm_fault_t hugetlb_no_page(struct mm_struct *mm, * any allocations necessary to record that reservation occur outside * the spinlock. */ - if ((flags & FAULT_FLAG_WRITE) && !(vma->vm_flags & VM_SHARED)) { - if (vma_needs_reservation(h, vma, haddr) < 0) { + if ((vmf->flags & FAULT_FLAG_WRITE) && !(vma->vm_flags & VM_SHARED)) { + if (vma_needs_reservation(h, vma, vmf->address) < 0) { ret = VM_FAULT_OOM; goto backout_unlocked; } /* Just decrements count, does not deallocate */ - vma_end_reservation(h, vma, haddr); + vma_end_reservation(h, vma, vmf->address); } - ptl = huge_pte_lock(h, mm, ptep); + vmf->ptl = huge_pte_lock(h, mm, vmf->pte); ret = 0; /* If pte changed from under us, retry */ - if (!pte_same(huge_ptep_get(ptep), old_pte)) + if (!pte_same(huge_ptep_get(vmf->pte), vmf->orig_pte)) goto backout; if (anon_rmap) - hugetlb_add_new_anon_rmap(folio, vma, haddr); + hugetlb_add_new_anon_rmap(folio, vma, vmf->address); else hugetlb_add_file_rmap(folio); new_pte = make_huge_pte(vma, &folio->page, ((vma->vm_flags & VM_WRITE) @@ -6359,17 +6358,18 @@ static vm_fault_t hugetlb_no_page(struct mm_struct *mm, * If this pte was previously wr-protected, keep it wr-protected even * if populated. */ - if (unlikely(pte_marker_uffd_wp(old_pte))) + if (unlikely(pte_marker_uffd_wp(vmf->orig_pte))) new_pte = huge_pte_mkuffd_wp(new_pte); - set_huge_pte_at(mm, haddr, ptep, new_pte, huge_page_size(h)); + set_huge_pte_at(mm, vmf->address, vmf->pte, new_pte, huge_page_size(h)); hugetlb_count_add(pages_per_huge_page(h), mm); - if ((flags & FAULT_FLAG_WRITE) && !(vma->vm_flags & VM_SHARED)) { + if ((vmf->flags & FAULT_FLAG_WRITE) && !(vma->vm_flags & VM_SHARED)) { /* Optimization, do the COW without a second fault */ - ret = hugetlb_wp(mm, vma, address, ptep, flags, folio, ptl, vmf); + ret = hugetlb_wp(mm, vma, vmf->real_address, vmf->pte, + vmf->flags, folio, vmf->ptl, vmf); } - spin_unlock(ptl); + spin_unlock(vmf->ptl); /* * Only set hugetlb_migratable in newly allocated pages. Existing pages @@ -6386,10 +6386,10 @@ static vm_fault_t hugetlb_no_page(struct mm_struct *mm, return ret; backout: - spin_unlock(ptl); + spin_unlock(vmf->ptl); backout_unlocked: if (new_folio && !new_pagecache_folio) - restore_reserve_on_error(h, vma, haddr, folio); + restore_reserve_on_error(h, vma, vmf->address, folio); folio_unlock(folio); folio_put(folio); @@ -6485,8 +6485,7 @@ vm_fault_t hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma, * hugetlb_no_page will drop vma lock and hugetlb fault * mutex internally, which make us return immediately. */ - return hugetlb_no_page(mm, vma, mapping, vmf.pgoff, address, - vmf.pte, vmf.orig_pte, flags, &vmf); + return hugetlb_no_page(mm, vma, mapping, &vmf); } ret = 0;