From patchwork Mon Jun 27 08:46:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mel Gorman X-Patchwork-Id: 12896427 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 4D5E4C43334 for ; Mon, 27 Jun 2022 08:58:51 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C59EF6B0071; Mon, 27 Jun 2022 04:58:50 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C07FD6B0072; Mon, 27 Jun 2022 04:58:50 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id ACE978E0001; Mon, 27 Jun 2022 04:58:50 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 99C366B0071 for ; Mon, 27 Jun 2022 04:58:50 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 61C2521094 for ; Mon, 27 Jun 2022 08:58:50 +0000 (UTC) X-FDA: 79623415620.25.8E00095 Received: from outbound-smtp36.blacknight.com (outbound-smtp36.blacknight.com [46.22.139.219]) by imf10.hostedemail.com (Postfix) with ESMTP id DE12CC0018 for ; Mon, 27 Jun 2022 08:58:49 +0000 (UTC) Received: from mail.blacknight.com (pemlinmail01.blacknight.ie [81.17.254.10]) by outbound-smtp36.blacknight.com (Postfix) with ESMTPS id 5E75421B9 for ; Mon, 27 Jun 2022 09:58:48 +0100 (IST) Received: (qmail 23735 invoked from network); 27 Jun 2022 08:58:48 -0000 Received: from unknown (HELO techsingularity.net) (mgorman@techsingularity.net@[84.203.198.246]) by 81.17.254.9 with ESMTPSA (AES256-SHA encrypted, authenticated); 27 Jun 2022 08:58:48 -0000 Date: Mon, 27 Jun 2022 09:46:45 +0100 From: Mel Gorman To: Yu Zhao Cc: Andrew Morton , Nicolas Saenz Julienne , Marcelo Tosatti , Vlastimil Babka , Michal Hocko , Hugh Dickins , Marek Szyprowski , LKML , Linux-MM Subject: [PATCH] mm/page_alloc: Replace local_lock with normal spinlock -fix Message-ID: <20220627084645.GA27531@techsingularity.net> References: <20220624125423.6126-1-mgorman@techsingularity.net> <20220624125423.6126-8-mgorman@techsingularity.net> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.10.1 (2018-07-13) ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1656320330; a=rsa-sha256; cv=none; b=mCUJlgmYRSEw5tYWtgMsUQZATO2p7ZN9eXTbjvAYolrDDIeVqv8eHH4xJnLrlZSiy8eZP3 ag50l3sQtFazKv7VaGMkBh+9BYC2hQolhMKmXwbVqdqUnsdwcsoHdX9bIweig+hTM5DQKJ Ak/tNTvFntNr1i50Xg4GJT5os8yiQ3U= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf10.hostedemail.com: domain of mgorman@techsingularity.net designates 46.22.139.219 as permitted sender) smtp.mailfrom=mgorman@techsingularity.net ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1656320330; 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; bh=963NkraK7dEYMM4z2YoaLw6rwznX4KCQYfpKYDI8qbk=; b=6OmPrLAAwcgth/wYIZsBCdMRjJ3xFH5vgIa20r7LkDuH4astwsfrtTIOZD6PrmDuYWjMlD VhUMLgCiT7FueZq9Keix2+pjkSWIqIPwYI92kJkJCCRTVfa8sRwhzUfK0aeHaxHurF42yL Z1w0mL0KOu+gXX9qF5DHsjE1cKVOM1Y= X-Stat-Signature: g3jw33fwgnzkzge6maemig7dfqwb19cm X-Rspam-User: X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: DE12CC0018 Authentication-Results: imf10.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf10.hostedemail.com: domain of mgorman@techsingularity.net designates 46.22.139.219 as permitted sender) smtp.mailfrom=mgorman@techsingularity.net X-HE-Tag: 1656320329-610493 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: As noted by Yu Zhao, use pcp_spin_trylock_irqsave instead of pcpu_spin_trylock_irqsave. This is a fix to the mm-unstable patch mm-page_alloc-replace-local_lock-with-normal-spinlock.patch Reported-by: Yu Zhao Signed-off-by: Mel Gorman --- mm/page_alloc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 71065b01827b..934d1b5a5449 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -3493,7 +3493,7 @@ void free_unref_page(struct page *page, unsigned int order) zone = page_zone(page); pcp_trylock_prepare(UP_flags); - pcp = pcpu_spin_trylock_irqsave(struct per_cpu_pages, lock, zone->per_cpu_pageset, flags); + pcp = pcp_spin_trylock_irqsave(zone->per_cpu_pageset, flags); if (pcp) { free_unref_page_commit(zone, pcp, page, migratetype, order); pcp_spin_unlock_irqrestore(pcp, flags);