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 709DCC433EF for ; Thu, 16 Jun 2022 03:05:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F29546B0072; Wed, 15 Jun 2022 23:05:16 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id ED7E56B0073; Wed, 15 Jun 2022 23:05:16 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DA0A36B0074; Wed, 15 Jun 2022 23:05:16 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id CAF0B6B0072 for ; Wed, 15 Jun 2022 23:05:16 -0400 (EDT) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id AC52421264 for ; Thu, 16 Jun 2022 03:05:16 +0000 (UTC) X-FDA: 79582607832.29.D1792D0 Received: from mail-io1-f52.google.com (mail-io1-f52.google.com [209.85.166.52]) by imf26.hostedemail.com (Postfix) with ESMTP id 6559C140097 for ; Thu, 16 Jun 2022 03:05:16 +0000 (UTC) Received: by mail-io1-f52.google.com with SMTP id d123so242659iof.10 for ; Wed, 15 Jun 2022 20:05:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=Ia8NRYuAyorF84NZn0AhWx3rPjmmPgwj0oxuUxbqGH0=; b=EjQ4Hm2C6KM/PT3daezaLxa16j4cevhGJMNxJEuc7R5D1EDHTKlhUb2gvOkVgSs6qD g4KwAL7QeRMJXDrUQBhEyrNLrP2J/h88gk86aP0IboOcS7GmeboLC6Ft1PUsFjLXs87J tyacGNu/D02GuMffl1Eic39yil72G/QR2OzkDzstOPW8hSOzcue6wZMQDNpE7l8lar8R GP+0HHMfK+s8lsCWuZE78qSaGzem/DmnHDPg6CYfsl9SBBz8oJflMSS0P9uIY9ZZbp8W 174Q/Wdn/SSLCNp0Jeq5kSau3kaDTF+Cowm7zoO9lBbd1TWiXkekH7CL2AqLNZyUyYRE hWEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=Ia8NRYuAyorF84NZn0AhWx3rPjmmPgwj0oxuUxbqGH0=; b=lNasmd/pjnZ64Yx9imLexlUDJtmyDRQx97E3s5aRSpvd77AzMjSl3Bg7DNZrYK/ZUk iQemQ4qlguk0hJpWSodlVxCY94S+WCzqdBpofGhepDLK7SRpEceP3Pj+NWqXcxyJ++qQ tqxFIyyP9XghPADnJfynYAEwFEXCK09iVY/BZeh8tujsmc86PBc/zzpQ4YbNo9rn/EIF S11q26luRJl3MOcU8fE+tjT+DCslP8tVaM37yPnYaTB1c8cMp3vk1erHgZQdnMwzU9Gy m99aI5jIT9qAQdiihfSK4PznnNoJvJ/OnzbESa/KqaTLhx3NR0C3OehU6hWLhNlLEgbF EcoA== X-Gm-Message-State: AJIora9ICclOv6z8yUJoyn3n3XJFrZBfm/3nxYjBjmg1Llg2p46Cw971 PIpifY35TR800WJMXAd3iHjt2w== X-Google-Smtp-Source: AGRyM1tUhKipAam+v0qoTfTbqExpcugfO9yBLoMN9WRVDRYM5mW2/QyOGjHDwInDr7R0O1bo7yoNaw== X-Received: by 2002:a05:6638:1342:b0:331:e382:b0af with SMTP id u2-20020a056638134200b00331e382b0afmr1676952jad.32.1655348715522; Wed, 15 Jun 2022 20:05:15 -0700 (PDT) Received: from google.com ([2620:15c:183:200:ca55:eadb:f716:c179]) by smtp.gmail.com with ESMTPSA id 17-20020a921811000000b002d6596e02f6sm388146ily.48.2022.06.15.20.05.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jun 2022 20:05:14 -0700 (PDT) Date: Wed, 15 Jun 2022 21:05:10 -0600 From: Yu Zhao To: Andrew Morton Cc: Marek Szyprowski , Mel Gorman , Nicolas Saenz Julienne , Marcelo Tosatti , Vlastimil Babka , Michal Hocko , Hugh Dickins , LKML , Linux-MM Subject: Re: [PATCH 7/7] mm/page_alloc: Replace local_lock with normal spinlock Message-ID: References: <20220613125622.18628-1-mgorman@techsingularity.net> <20220613125622.18628-8-mgorman@techsingularity.net> <20220615160446.be1f75fd256d67e57b27a9fc@linux-foundation.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220615160446.be1f75fd256d67e57b27a9fc@linux-foundation.org> ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1655348716; a=rsa-sha256; cv=none; b=00ofWQwN2OLZ2grLuz5iB4lkJhZGvmU+KizjRri1/aZd+3O2LeW3MDP/hKqxcRWo1w6hda XxSTOtnRw6u7J+VswLec8JiEFk9+ifeLDyZoLT51ILoFwAo+2ofFZ2ZbT/yohAdOnwFTU8 fMbi5Da3esdiyrQxJ0y+uDYUPvBkKLE= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=EjQ4Hm2C; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf26.hostedemail.com: domain of yuzhao@google.com designates 209.85.166.52 as permitted sender) smtp.mailfrom=yuzhao@google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1655348716; 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=Ia8NRYuAyorF84NZn0AhWx3rPjmmPgwj0oxuUxbqGH0=; b=VBxgjERWrWHrHpCVjM6ygWcV7AMNPeW9a18vLJH8Mhqc5ajhCTW3eRSJN42wwPyvPrY/aS +d+oVcA2SZYEbvgS5KJtpd1cBJLG5YQxXzRjxRpnEgwgGWnGmWX/PiI+CfvLF0hPhYvxOX GuecjOgjguV4AfMzdJjF9HzEWvbrVQg= Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=EjQ4Hm2C; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf26.hostedemail.com: domain of yuzhao@google.com designates 209.85.166.52 as permitted sender) smtp.mailfrom=yuzhao@google.com X-Rspam-User: X-Stat-Signature: q9mdupabwdn96s8q5ecd3cnuj4ng6ck4 X-Rspamd-Queue-Id: 6559C140097 X-Rspamd-Server: rspam08 X-HE-Tag: 1655348716-543569 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: On Wed, Jun 15, 2022 at 04:04:46PM -0700, Andrew Morton wrote: > On Thu, 16 Jun 2022 00:48:55 +0200 Marek Szyprowski wrote: > > > In the logs I see lots of errors like: > > > > BUG: sleeping function called from invalid context at > > ./include/linux/sched/mm.h:274 > > > > BUG: scheduling while atomic: systemd-udevd/288/0x00000002 > > > > BUG: sleeping function called from invalid context at mm/filemap.c:2647 > > > > however there are also a fatal ones like: > > > > Unable to handle kernel paging request at virtual address 00000000017a87b4 > > > > > > The issues seems to be a bit random. Looks like memory trashing. > > Reverting $subject on top of current linux-next fixes all those issues. > > > > > > This? > > --- a/mm/page_alloc.c~mm-page_alloc-replace-local_lock-with-normal-spinlock-fix > +++ a/mm/page_alloc.c > @@ -183,8 +183,10 @@ static DEFINE_MUTEX(pcp_batch_high_lock) > type *_ret; \ > pcpu_task_pin(); \ > _ret = this_cpu_ptr(ptr); \ > - if (!spin_trylock_irqsave(&_ret->member, flags)) \ > + if (!spin_trylock_irqsave(&_ret->member, flags)) { \ > + pcpu_task_unpin(); \ > _ret = NULL; \ > + } \ > _ret; \ > }) > > > I'll drop Mel's patch for next -next. While we are at it, please consider this cleanup: mm/page_alloc.c | 48 +++++++++--------------------------------------- 1 file changed, 9 insertions(+), 39 deletions(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index e538dde2c1c0..a1b76d5fdf75 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -160,61 +160,31 @@ static DEFINE_MUTEX(pcp_batch_high_lock); * Generic helper to lookup and a per-cpu variable with an embedded spinlock. * Return value should be used with equivalent unlock helper. */ -#define pcpu_spin_lock(type, member, ptr) \ -({ \ - type *_ret; \ - pcpu_task_pin(); \ - _ret = this_cpu_ptr(ptr); \ - spin_lock(&_ret->member); \ - _ret; \ -}) - -#define pcpu_spin_lock_irqsave(type, member, ptr, flags) \ -({ \ - type *_ret; \ - pcpu_task_pin(); \ - _ret = this_cpu_ptr(ptr); \ - spin_lock_irqsave(&_ret->member, flags); \ - _ret; \ -}) - -#define pcpu_spin_trylock_irqsave(type, member, ptr, flags) \ -({ \ - type *_ret; \ - pcpu_task_pin(); \ - _ret = this_cpu_ptr(ptr); \ - if (!spin_trylock_irqsave(&_ret->member, flags)) \ - _ret = NULL; \ - _ret; \ -}) - -#define pcpu_spin_unlock(member, ptr) \ -({ \ - spin_unlock(&ptr->member); \ - pcpu_task_unpin(); \ -}) - -#define pcpu_spin_unlock_irqrestore(member, ptr, flags) \ -({ \ - spin_unlock_irqrestore(&ptr->member, flags); \ - pcpu_task_unpin(); \ -}) - -/* struct per_cpu_pages specific helpers. */ -#define pcp_spin_lock(ptr) \ - pcpu_spin_lock(struct per_cpu_pages, lock, ptr) - #define pcp_spin_lock_irqsave(ptr, flags) \ - pcpu_spin_lock_irqsave(struct per_cpu_pages, lock, ptr, flags) +({ \ + struct per_cpu_pages *_ret; \ + pcpu_task_pin(); \ + _ret = this_cpu_ptr(ptr); \ + spin_lock_irqsave(&_ret->lock, flags); \ + _ret; \ +}) #define pcp_spin_trylock_irqsave(ptr, flags) \ - pcpu_spin_trylock_irqsave(struct per_cpu_pages, lock, ptr, flags) - -#define pcp_spin_unlock(ptr) \ - pcpu_spin_unlock(lock, ptr) +({ \ + struct per_cpu_pages *_ret; \ + pcpu_task_pin(); \ + _ret = this_cpu_ptr(ptr); \ + if (!spin_trylock_irqsave(&_ret->lock, flags)) \ + _ret = NULL; \ + _ret; \ +}) #define pcp_spin_unlock_irqrestore(ptr, flags) \ - pcpu_spin_unlock_irqrestore(lock, ptr, flags) +({ \ + spin_unlock_irqrestore(&ptr->lock, flags); \ + pcpu_task_unpin(); \ +}) + #ifdef CONFIG_USE_PERCPU_NUMA_NODE_ID DEFINE_PER_CPU(int, numa_node); EXPORT_PER_CPU_SYMBOL(numa_node); @@ -3488,7 +3458,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(pcp, zone, page, migratetype, order); pcp_spin_unlock_irqrestore(pcp, flags);