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 12FACC3DA63 for ; Thu, 18 Jul 2024 14:03:05 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 991036B0085; Thu, 18 Jul 2024 10:03:04 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 940DC6B0088; Thu, 18 Jul 2024 10:03:04 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7BAA36B0089; Thu, 18 Jul 2024 10:03:04 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 5BCFD6B0085 for ; Thu, 18 Jul 2024 10:03:04 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id BD7DE1A1B29 for ; Thu, 18 Jul 2024 14:03:03 +0000 (UTC) X-FDA: 82353039846.11.FEF0CA2 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf21.hostedemail.com (Postfix) with ESMTP id EC93A1C0025 for ; Thu, 18 Jul 2024 14:03:00 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="O/ha02Zy"; spf=pass (imf21.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1721311349; 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:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=+loZ0f68kYG8SkIIMusKvmVieDf8D0mD93JjQ1E2Ip4=; b=aOWrY1naW3nmomTcgHd/vYwyYdO4RhaYdDfBhIMYROsi+In336EPlhUQHkGGdn+z5f35za d9bF/ghTc6hb5fwQBdZyWuztPyLsNNqTtEd3jAeKrk/rpOi7mlT3221WtXB0F28SFzHEb0 x5TruJe6yix20HGdtQmVLk2vzsxUFw0= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="O/ha02Zy"; spf=pass (imf21.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1721311349; a=rsa-sha256; cv=none; b=4JR/So90Yi4eSbNDPR7XwqR7sjMKpunfV2JGfrRAEOiHGZPmE2RgAuFVEXzaWxvRBRnqOh PSzhp8bOvjIdDdHBMNUwqPOtWecXHypdl4Ng0/kKSw520iNg1A1HlnKLxzH0EczFnYRhPb 7ujBMfTvIEVEjhWLjZqyFAuY7WJZBYY= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1721311380; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=+loZ0f68kYG8SkIIMusKvmVieDf8D0mD93JjQ1E2Ip4=; b=O/ha02ZypjjF9bnDP71j+T8OVfrN1j6G95xWOSMmg7aaGwcPVd21HcPRPhw2a9KqIXh8L+ 5z6iSyJQHdz+c3AmUhEvTw76r8Fl7zEHgs4nmXfu0C7Hl3LDRiHvZkHF9KTP+zaUIxw470 xfKTXBwwaNsw1AF1e73JBuql9jFUd/0= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-367-0EDnXLraPCKAOt-ZYeYoYA-1; Thu, 18 Jul 2024 10:02:58 -0400 X-MC-Unique: 0EDnXLraPCKAOt-ZYeYoYA-1 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-4265d3bf59dso2644365e9.3 for ; Thu, 18 Jul 2024 07:02:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721311377; x=1721916177; h=content-transfer-encoding:in-reply-to:organization:autocrypt:from :content-language:references:cc:to:subject:user-agent:mime-version :date:message-id:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=+loZ0f68kYG8SkIIMusKvmVieDf8D0mD93JjQ1E2Ip4=; b=MEzyWf1kq029hpHo3Kv7Axc0JkilVgwPJcf350p/MqrVpXOuvCG4KT/SP5G9yR0him UlLwN9V5Dzh6Vqh4tWyNYjyHPLdabSy+ptnVaSfkigcFR2dHh8BUxqpdruEguPiCpFrJ DwXu1vb3DK+pnMjl3Dj0mpf/iVNoU6EVAtL37bYEEycXInyEB4aHe2ilN34S87Mt5zaD /nStlnl0hsa1Lbl8dgTRiUxDdiQAkpiAt0I6qaaMARJy/wXvbk4xzvaQSniRZbXQnMZ/ 8nVSw+fYU8MBsXPPn4V6kUEgn8FeOhuYD94gCpcAt3Pnhu1BXtySeCGcfFaIMZ1SGBaB h9bw== X-Forwarded-Encrypted: i=1; AJvYcCUvji+3+bKFN2Iuv7mbBGrt6y5e2RB0KcqXau8NkCi4bIGokAFkdxr9GyzoACeED41WpRnhMnKPEWa0R7ehG9SATts= X-Gm-Message-State: AOJu0YyOsBJcrzEXvBUIhSsDnuhysBIEQpQuZMCw0J8IYWStqtGj9f/a ys+iish3n6ibf8k4JrhRbejcy8NFF73zjbHNl5ZwKemNCYyeA/wPIvIIsvdKHgW03GHuiOa6lYM vKxdjR8QiyDEP00uk3QmknedRuoucMjx/gKiYR8y9Le0ZoG9/ X-Received: by 2002:a05:600c:3d8e:b0:426:51dc:f6cd with SMTP id 5b1f17b1804b1-427c2cb560bmr34294215e9.18.1721311377277; Thu, 18 Jul 2024 07:02:57 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFK0NZZYcSH7GsGsuzC8RiS4wccHHzwEwUFVEThO1xOI2pK2E8CzHoc18ZBbYPcyJL8pOaUfw== X-Received: by 2002:a05:600c:3d8e:b0:426:51dc:f6cd with SMTP id 5b1f17b1804b1-427c2cb560bmr34294065e9.18.1721311376843; Thu, 18 Jul 2024 07:02:56 -0700 (PDT) Received: from ?IPV6:2a09:80c0:192:0:5dac:bf3d:c41:c3e7? ([2a09:80c0:192:0:5dac:bf3d:c41:c3e7]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-427d2b1825asm14728955e9.15.2024.07.18.07.02.55 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 18 Jul 2024 07:02:56 -0700 (PDT) Message-ID: Date: Thu, 18 Jul 2024 16:02:55 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH RFC] mm/page_alloc: Fix pcp->count race between drain_pages_zone() vs __rmqueue_pcplist() To: "Vlastimil Babka (SUSE)" , Li Zhijian , linux-mm@kvack.org Cc: akpm@linux-foundation.org, linux-kernel@vger.kernel.org, Yasunori Gotou , Yao Xingtao , Lucas Stach References: <20240716073929.843277-1-lizhijian@fujitsu.com> <6f2151a9-da23-4917-b985-8de6b0852e37@kernel.org> From: David Hildenbrand Autocrypt: addr=david@redhat.com; keydata= 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 WNyWQQ== Organization: Red Hat In-Reply-To: <6f2151a9-da23-4917-b985-8de6b0852e37@kernel.org> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Stat-Signature: jadtw6uj6udou8gmmjsiefsdxwgugxr4 X-Rspam-User: X-Rspamd-Queue-Id: EC93A1C0025 X-Rspamd-Server: rspam02 X-HE-Tag: 1721311380-472827 X-HE-Meta: U2FsdGVkX18Zh+RCE9oMjkRU8tqHj+TQHb5lEKTwsDeNWQ509PxS/lQm2UgnLl0ZJ7kxfwIFJhoaoN2yWATqbIQ0r0EE0ZTCjxrLpNBHh63EYTAMLHebkAxiMoUWO7XIJYkguJS/eztopwGbUy+HNythcreRqAGNYupp7/mdCQ+PGr5rprXvabMTqzTCJC10rpOdsaaGNEBLaD2dJid03PAwHn2vSvEaxYNmIMCmqS+xrVAAxPA+2rfZ7d63QlXC7B8NfAmDWSuqfrpvat835Os9ocfbP5bYjkSCHkW4eFCcNiWttVkCVBD34Q+zNosw518iU708X/hEnyzfiNoR+NJibVshZNouiV7a6WUN0s912+dB4q9o207sqFu/DcjCFmopQQ+tupKxi2cJJ/jvVacRywGcpNfs+tOEu+KLPtB6DZMmelJcSAW5I53hSmjsl+r4y1iQGibBnmIr/6mbcQQjJn1p6BGNW+n7KF80zgSDHKyGonD5ug/3RjrGwLrnQlAlVxL1tSUItLH6KeJC6/O/X8mMcxrWc1V4eCU2PJQAQXPReA9MIcfGlKtAqwz3msS7AdVE71az0yv53BiBmM1KscPNtpf2EVuSUgo+86VkDJ68UmQ67XvLFWermdrlrJ53e3SbuL0NZNlZGr36vAx8XmeWMf4f5+w18b6NyDfdySYLwUVonmIeA+Urx280MLAePloO/+RLOTeHZ0lazxm0kpJ8LHbZh19HmbWFw8vHjh5DnOKNlU9y+UoDU4HPYx8QbHbv9l86uFavKFL4y1G8kfeu+NmCJpDiP7/hFcDgHot6zGR7AFBMlei/Q5oaQVCvFIvQ3FmZhOU0sIIf/7U2lyTcLsIUNb2o0BEvSuBKRI85+6JA6rLX5Tn94R+IiWGkgsczUwreyhBRf/x7jER1+H5v53LLQ2m688Mm4ydltkPTeAhiu0i3yZh53gy0GzcIRh0FLngbkStT6PH 6N89lyn1 cmTQ1KJSqwmbpKUUCn6Ix96J7+uerMWC64e1Q7TGFanExEaTXyoKZVIL7AS3q/z0maXRJZJ5PFNMgSNDL7vYdrRRIukSbnYREeVVTdn8owL7ewgmRqfpnS4HwFxC/SoSNjvELKnerKrOlmoUh0zpX3i5nYh3oP/LWZB3GOsgpisD54oui7xEIelfXvjRieDUhoNlUMlSePRwRtLyy6FeH54XbXwSe0N84k0p41DTuKf9DHxoR3tFs7WuzgvOAwkOa9KsLrT71JHf9y3Nm4N8c4+bBBqySyKFgCq44lyIhP1HA5BapTQA5CK1WMm9ggfLO57SsnNBoH9HMst+FVGCJRnJV9DULG8aLpH8OiI7ZibqubOCYfDPsg0znHJb1QBEvY45idu/CEZNv744ma5RW/BrqS3RbsOB14AOF2GvNB9J3ema435zVaMpCqwNipZm626sCWeLryECUsDyvtSHqf+sDjWgzGHYmw2Rz0n9W8Du1t+3+pcZRxc21gJwcvwwhZ/PvdwBnU3NpgWZ8kSg9uYJxFakvY/UzvDfCvov+VavDNPmGiXhz1ifqFKJ9UnQSAlVydbP1tpKeJgKcs+NCGSw6R/zZ9PFbrz1gse6yj15mMvqZQOt0formEBdiQjygguUfqm5sMxnqteDGUyztRnxvJX1F8wtqIr3k 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: On 18.07.24 13:16, Vlastimil Babka (SUSE) wrote: > On 7/16/24 9:39 AM, Li Zhijian wrote: >> It's expected that no page should be left in pcp_list after calling >> zone_pcp_disable() in offline_pages(). Previously, it's observed that >> offline_pages() gets stuck [1] due to some pages remaining in pcp_list. >> >> Cause: >> There is a race condition between drain_pages_zone() and __rmqueue_pcplist() >> involving the pcp->count variable. See below scenario: >> >> CPU0 CPU1 >> ---------------- --------------- >> spin_lock(&pcp->lock); >> __rmqueue_pcplist() { >> zone_pcp_disable() { >> /* list is empty */ >> if (list_empty(list)) { >> /* add pages to pcp_list */ >> alloced = rmqueue_bulk() >> mutex_lock(&pcp_batch_high_lock) >> ... >> __drain_all_pages() { >> drain_pages_zone() { >> /* read pcp->count, it's 0 here */ >> count = READ_ONCE(pcp->count) >> /* 0 means nothing to drain */ >> /* update pcp->count */ >> pcp->count += alloced << order; >> ... >> ... >> spin_unlock(&pcp->lock); >> >> In this case, after calling zone_pcp_disable() though, there are still some >> pages in pcp_list. And these pages in pcp_list are neither movable nor >> isolated, offline_pages() gets stuck as a result. >> >> Solution: >> Expand the scope of the pcp->lock to also protect pcp->count in >> drain_pages_zone(), ensuring no pages are left in the pcp list. >> >> [1] https://lore.kernel.org/linux-mm/6a07125f-e720-404c-b2f9-e55f3f166e85@fujitsu.com/ >> >> Cc: David Hildenbrand >> Reported-by: Yao Xingtao >> Signed-off-by: Li Zhijian >> --- >> mm/page_alloc.c | 7 ++++--- >> 1 file changed, 4 insertions(+), 3 deletions(-) >> >> diff --git a/mm/page_alloc.c b/mm/page_alloc.c >> index 9ecf99190ea2..1780df31d5f5 100644 >> --- a/mm/page_alloc.c >> +++ b/mm/page_alloc.c >> @@ -2323,16 +2323,17 @@ void drain_zone_pages(struct zone *zone, struct per_cpu_pages *pcp) >> static void drain_pages_zone(unsigned int cpu, struct zone *zone) >> { >> struct per_cpu_pages *pcp = per_cpu_ptr(zone->per_cpu_pageset, cpu); >> - int count = READ_ONCE(pcp->count); >> + int count; >> >> + spin_lock(&pcp->lock); >> + count = pcp->count; >> while (count) { >> int to_drain = min(count, pcp->batch << CONFIG_PCP_BATCH_SCALE_MAX); >> count -= to_drain; >> >> - spin_lock(&pcp->lock); >> free_pcppages_bulk(zone, to_drain, pcp, 0); >> - spin_unlock(&pcp->lock); >> } >> + spin_unlock(&pcp->lock); > > This way seems to be partially going against the purpose of 55f77df7d715 > ("mm: page_alloc: control latency caused by zone PCP draining") - the zone > lock hold time will still be limited by the batch, but not the pcp lock > time. It should still be possible to relock between the iterations? To > prevent the race I think the main part is determining pcp->count under the > lock, but release/retake should still be ok if the pcp->count is reread > after relocking. Agreed, had the smame thing in mind when skimming over this patch. @Li, with this patch the problems you have been seeing are fully resolved, correct? -- Cheers, David / dhildenb