From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f201.google.com (mail-pl1-f201.google.com [209.85.214.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 97DAF1DFD96 for ; Sun, 19 Jan 2025 18:06:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737309981; cv=none; b=ZfZUfaz4ZwYopKlFUCfSB1ZjPxsWyw7/tUoCXtf9IGdY6oGh32gKyRZQtSLPcEO/1p0zf0k2J/zBVVST8aeSmgQSACCKiEyUjnnTF1WALzg2Oe9QXmGsgcSQEx+TYZIfe1x+E0h9CyCnH1GrEi4/PtD2A8WtuYgjzgrBy6CqL04= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737309981; c=relaxed/simple; bh=QkHSE8aKBfLWTlXV2ky34l8dezpJMZ8dl66ajasAiIY=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=ciZ7Wem/c6KYXnXgq0rWNeQnJAsN8s6tvy8oLy1yViaO9eGuAgNPXlPj/Qsll++m831O6m9FEoCxE9hJ21j7tX70QRvMiyupVO50bPvZal+7KpjrxVp2+KJP4CG1w7IBi7K6cL39pvOsb+aUT3cTU7HrjSwjIruZ2lfjY33hobc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--jiaqiyan.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=mT+IpRJB; arc=none smtp.client-ip=209.85.214.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--jiaqiyan.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="mT+IpRJB" Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-21640607349so87234435ad.0 for ; Sun, 19 Jan 2025 10:06:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1737309979; x=1737914779; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=vgfFFIARtCStVkFiN3Y7mh6lovuYIVjrCOS7aUtFuQ0=; b=mT+IpRJBFz2ToimzyJWC25iq2d4gIJD8WD8AVDMxyi5iY421WEkIAqoxfc02spRHlM MAVct2vihoe+DCk8n+H4qnxLQSdqoBiy1rN3bhmICb+MNrE+iskCXZdnKVrFsdSa/6v2 WdhU/ovTezYcg3yPrGOUhcaRDK3A04EwI5iHjmtgy534QmdVcCc1flJr5GzB6jws8t5k mRanCCft2SY0vMRDEveDzKxSlenrJVlgfOlcigFPUpak9QK2kbaatJWHGsG2s9HpuaHB 70ReJZvjutZyDO0KWXrQtsbwZubzTo6jRnPOO101Qan2G+b0ux2CiKc9M0OOCb5zYzaG xGbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737309979; x=1737914779; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=vgfFFIARtCStVkFiN3Y7mh6lovuYIVjrCOS7aUtFuQ0=; b=ovXxJh2z+uH31SmFrVIfUwsocsKxdHh6i2vZUqCR9vSeje9EQ2F0XlBEMjwcRY3tSQ eAq6pcqnEjmeLugABfG8NpAFiqMZqjlnntQw7tlUkGIh8p6m97q1nzk0iNOVYExlQpah qE2xknNprHHugTMMUvxr7iBaXKU3F0Sef7ufHqxf46DjWQX3WvL+mOYAUfqyHPcKYzAN CD26PuQRSMag02EVOptiXRxIf8kptyy+CblzmP1DAX3ExznCQfJmQfZCJ2WwjB5KbqYA bGxTiiygNVXgux1EV1Su6zgOUq8L5SiI0U4JSqa7wgxcoM+7frJesbND0Q3IJzKi08fn XHyw== X-Forwarded-Encrypted: i=1; AJvYcCVHX0Dz5LH3UXo/tKZsSiOo0+2vp+N3uBA+ZQ5NPwEr/F67oax31WdLUGcVbRdpk5jAhZdRcLloOe/Ux0A=@vger.kernel.org X-Gm-Message-State: AOJu0YzSqg0+Hhb2xi+IVA9uEwzKmozf+SRZ5r7b5swmdaf9MTHNv8vb S+aK8kkxeHnmsvh3re+V8Kw3vJbODX4JvX94iUmYRpQxhzBSo+sYihOD9JmGTJQAEo2x8LmL/TQ XOKb/lZckSw== X-Google-Smtp-Source: AGHT+IHAS67bXCUJs2OIQ7UfIjBMR7UVyDySNgDtOcvl1WDYTlpoiA2k8t5+Ag+yzr17DwX0g6JuMamqP59O8Q== X-Received: from plge12.prod.google.com ([2002:a17:902:cf4c:b0:219:21b2:3071]) (user=jiaqiyan job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:f606:b0:216:4016:5aea with SMTP id d9443c01a7336-21c355835ecmr179457375ad.29.1737309978916; Sun, 19 Jan 2025 10:06:18 -0800 (PST) Date: Sun, 19 Jan 2025 18:06:08 +0000 In-Reply-To: <20250119180608.2132296-1-jiaqiyan@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250119180608.2132296-1-jiaqiyan@google.com> X-Mailer: git-send-email 2.48.0.rc2.279.g1de40edade-goog Message-ID: <20250119180608.2132296-3-jiaqiyan@google.com> Subject: [RFC PATCH v1 2/2] mm/hugetlb: immature fix to handle HWPoisoned folio From: Jiaqi Yan To: nao.horiguchi@gmail.com, linmiaohe@huawei.com, sidhartha.kumar@oracle.com, muchun.song@linux.dev Cc: jane.chu@oracle.com, akpm@linux-foundation.org, osalvador@suse.de, rientjes@google.com, jthoughton@google.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Jiaqi Yan Content-Type: text/plain; charset="UTF-8" The fix has two steps 1. Decrement HWPoison HugeTLB huge folio's refcount when it is 1. It is done in folios_put_refs during truncating or eviting HugeTLB file. 2. Dissolve HugeTLB HWpoison folio in free_huge_folio. Again, just for demo purpose, not a proper fix, especially step 1. Signed-off-by: Jiaqi Yan --- mm/hugetlb.c | 6 ++++++ mm/swap.c | 9 ++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 87761b042ed04..b28e0bc7f199f 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -1818,6 +1818,7 @@ void free_huge_folio(struct folio *folio) int nid = folio_nid(folio); struct hugepage_subpool *spool = hugetlb_folio_subpool(folio); bool restore_reserve; + bool hwpoison = folio_test_hwpoison(folio); unsigned long flags; VM_BUG_ON_FOLIO(folio_ref_count(folio), folio); @@ -1869,6 +1870,11 @@ void free_huge_folio(struct folio *folio) remove_hugetlb_folio(h, folio, true); spin_unlock_irqrestore(&hugetlb_lock, flags); update_and_free_hugetlb_folio(h, folio, true); + } else if (hwpoison) { + remove_hugetlb_folio(h, folio, false); + h->max_huge_pages--; + spin_unlock_irqrestore(&hugetlb_lock, flags); + update_and_free_hugetlb_folio(h, folio, true); } else { arch_clear_hugetlb_flags(folio); enqueue_hugetlb_folio(h, folio); diff --git a/mm/swap.c b/mm/swap.c index 746a5ceba42c9..d6b4d4cb4004f 100644 --- a/mm/swap.c +++ b/mm/swap.c @@ -961,7 +961,14 @@ void folios_put_refs(struct folio_batch *folios, unsigned int *refs) continue; } - if (!folio_ref_sub_and_test(folio, nr_refs)) + folio_ref_sub(folio, nr_refs); + + if (folio_test_hugetlb(folio) && + folio_ref_count(folio) == 1 && + folio_test_hwpoison(folio)) + folio_ref_dec(folio); + + if (folio_ref_count(folio) > 0) continue; /* hugetlb has its own memcg */ -- 2.48.0.rc2.279.g1de40edade-goog