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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B067BC433F5 for ; Mon, 25 Oct 2021 10:44:09 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 3C66B60EE9 for ; Mon, 25 Oct 2021 10:44:09 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 3C66B60EE9 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.cz Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id 5A8E46B006C; Mon, 25 Oct 2021 06:44:08 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5319F6B0072; Mon, 25 Oct 2021 06:44:08 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3D294940007; Mon, 25 Oct 2021 06:44:08 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0057.hostedemail.com [216.40.44.57]) by kanga.kvack.org (Postfix) with ESMTP id 2948E6B006C for ; Mon, 25 Oct 2021 06:44:08 -0400 (EDT) Received: from smtpin11.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id CC11D8249980 for ; Mon, 25 Oct 2021 10:44:07 +0000 (UTC) X-FDA: 78734624934.11.C88B7BB Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by imf15.hostedemail.com (Postfix) with ESMTP id 8792DD000097 for ; Mon, 25 Oct 2021 10:44:01 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 929302170C; Mon, 25 Oct 2021 10:44:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1635158645; h=from:from:reply-to: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; bh=lEUgwEaaXgwXqJGehgKoBIZQhwSSvO+JjCWBXgTRQYg=; b=NnXqHesmxkhJISwI6mS9JKeSCnlRE17BJKYt8bS5flL548mOFMOMvM/yxc5zGun7dm31rg Jtnab7+/6cUEXADnKI0tuAID7AR/H+ncS2naDwzHdyBYe/irAf8vrBJ0AxY+MUOo5Xl83V zCsHf9zVeFrYktqdgjb8vYetzsXFDlE= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1635158645; h=from:from:reply-to: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; bh=lEUgwEaaXgwXqJGehgKoBIZQhwSSvO+JjCWBXgTRQYg=; b=jj9Pac8/pAhW6Cde7AWW5mSfdlssaly4P523KSIVTE7MajEzcHrmSO0WCVkZ4nxe3Uh43e GjBlAYZDfGem10Bw== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 7075713BA4; Mon, 25 Oct 2021 10:44:05 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id 0Ma4GnWKdmEDAgAAMHmgww (envelope-from ); Mon, 25 Oct 2021 10:44:05 +0000 Message-ID: Date: Mon, 25 Oct 2021 12:44:05 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.2.0 Subject: Re: [PATCH] memcg: Optimise relock_page_lruvec functions Content-Language: en-US To: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org Cc: Alexander Duyck , Alex Shi , Hugh Dickins , Johannes Weiner , Thomas Gleixner , Peter Zijlstra References: <20211019125034.2799438-1-willy@infradead.org> From: Vlastimil Babka In-Reply-To: <20211019125034.2799438-1-willy@infradead.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 8792DD000097 Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=NnXqHesm; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b="jj9Pac8/"; spf=pass (imf15.hostedemail.com: domain of vbabka@suse.cz designates 195.135.220.28 as permitted sender) smtp.mailfrom=vbabka@suse.cz; dmarc=none X-Stat-Signature: mj1bab35oicdeusm3bn9gnqzanwna4ds X-Rspamd-Server: rspam06 X-HE-Tag: 1635158641-705937 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 10/19/21 14:50, Matthew Wilcox (Oracle) wrote: > Leave interrupts disabled when we change which lru lock is held. > > Signed-off-by: Matthew Wilcox (Oracle) Acked-by: Vlastimil Babka Assuming lockdep is fine with e.g.: spin_lock_irqsave(A); spin_unlock(A); spin_lock(B); spin_unlock_irqrestore(B); (with A and B of same class). > --- > include/linux/memcontrol.h | 27 ++++++++++++++------------- > 1 file changed, 14 insertions(+), 13 deletions(-) > > diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h > index 3096c9a0ee01..a6a90b00a22b 100644 > --- a/include/linux/memcontrol.h > +++ b/include/linux/memcontrol.h > @@ -1524,16 +1524,22 @@ static inline bool page_matches_lruvec(struct page *page, struct lruvec *lruvec) > } > > /* Don't lock again iff page's lruvec locked */ > -static inline struct lruvec *relock_page_lruvec_irq(struct page *page, > +static inline struct lruvec *relock_page_lruvec(struct page *page, > struct lruvec *locked_lruvec) > { > - if (locked_lruvec) { > - if (page_matches_lruvec(page, locked_lruvec)) > - return locked_lruvec; > + if (page_matches_lruvec(page, locked_lruvec)) > + return locked_lruvec; > > - unlock_page_lruvec_irq(locked_lruvec); > - } > + unlock_page_lruvec(locked_lruvec); > + return lock_page_lruvec(page); > +} > > +/* Don't lock again iff page's lruvec locked */ > +static inline struct lruvec *relock_page_lruvec_irq(struct page *page, > + struct lruvec *locked_lruvec) > +{ > + if (locked_lruvec) > + return relock_page_lruvec(page, locked_lruvec); > return lock_page_lruvec_irq(page); > } > > @@ -1541,13 +1547,8 @@ static inline struct lruvec *relock_page_lruvec_irq(struct page *page, > static inline struct lruvec *relock_page_lruvec_irqsave(struct page *page, > struct lruvec *locked_lruvec, unsigned long *flags) > { > - if (locked_lruvec) { > - if (page_matches_lruvec(page, locked_lruvec)) > - return locked_lruvec; > - > - unlock_page_lruvec_irqrestore(locked_lruvec, *flags); > - } > - > + if (locked_lruvec) > + return relock_page_lruvec(page, locked_lruvec); > return lock_page_lruvec_irqsave(page, flags); > } > >