Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp3514510pxf; Mon, 15 Mar 2021 11:14:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy+CWIXxvRB+CTzVYA81G3OjZPjoPld0s97yja01wKhSDga0jSVhMhOg62i6ICrjdGR8O1d X-Received: by 2002:a50:ec07:: with SMTP id g7mr31208291edr.72.1615832042948; Mon, 15 Mar 2021 11:14:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1615832042; cv=none; d=google.com; s=arc-20160816; b=oMGOJ1RqxZ7dLwjAqihuRjbOwtHQ8oJbRhDpc0JOX7TIFuIb6N+YiBrj4Njn1ZQ6v7 mCp6hGoIHkvArUKMoRXKJhsIhSGYfOxMRSc0BHTtmrJS9/dunNDYVAK7+S0tSz7U7hsz HDaNDnqWzHG+VT9sAr3XrmAkEeU7rIROPzbTkoJx77z48ZLy/6N0C7lRN26xl6xIzjlp 0vaBl5FsoCLramaJ4wuPbTfkSXkZreBQ82aQqRuOuCtkWcS04GY3VhluZoG9Q0CPHeML aRnCYlHhCAwvbBowJ0RhzQcl25wLQAv7evRNoS/0FEg09pAnJ0v+XGWTtXvr3LMSNscV pivQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Qa9uMYabALQlvUJ/7A9wAxSMEm9f8Z/37XVA328uiNU=; b=DCNdaTtgw6AsroxFKo5eoS8fDS0ZhhzJpFpagwM75GnZJThpJavewaN9O3sZkvPmyO ptCtlFWpi4Ivg5gNQkkuLNA27VOhRDxeNxQqlYFhbWinVoygxwAK9H6qzhzBqqWV41hq ItZfh4HfFWeVOSaJXmXyIVyLBLddr/CTg/QKlV19wHdGw7M1778Z2cGov4jeUDbrx4Hm U8BntBRJ9J1EvK0hDQNQaJe33iLVvqQvfu2J8DFiSGP7o3CXT+2ixgjeFKEG5gzCh6QQ gcz3KkKA9KKyze8/U3pJE4d7frx32bOEJsJa3Ejg95Fqu2iuCAmDaWhKIHYQ4ygOxzJ7 AAsw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=CTmQqT2z; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id ga24si11229063ejc.422.2021.03.15.11.13.40; Mon, 15 Mar 2021 11:14:02 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=CTmQqT2z; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236352AbhCOOMs (ORCPT + 99 others); Mon, 15 Mar 2021 10:12:48 -0400 Received: from mail.kernel.org ([198.145.29.99]:36594 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232465AbhCON65 (ORCPT ); Mon, 15 Mar 2021 09:58:57 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id CC6F764F3F; Mon, 15 Mar 2021 13:58:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1615816714; bh=kIE7+JWYHo6gcimnVLboVMJ0lGJorM7c6yvFGIdYEUU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CTmQqT2ztL1SO5C0+Cq/KXPZiTOsl6max8/6JAzWSWmZyYtUyGDIELDe/au+oAa3y u1BAZRWmqV1M3LR0qZG6SMr1r2ZP41hiegDzRevG4Zv/nsMN42OC+xFPsugNJscV4R SHtao8JfWzBfu40J/301Ivog3KpaSkslQ7u5thRU= From: gregkh@linuxfoundation.org To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, kernel test robot , Jann Horn , David Rientjes , Joonsoo Kim , Christoph Lameter , Linus Torvalds Subject: [PATCH 4.14 14/95] Revert "mm, slub: consider rest of partial list if acquire_slab() fails" Date: Mon, 15 Mar 2021 14:56:44 +0100 Message-Id: <20210315135740.737668913@linuxfoundation.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210315135740.245494252@linuxfoundation.org> References: <20210315135740.245494252@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Greg Kroah-Hartman From: Linus Torvalds commit 9b1ea29bc0d7b94d420f96a0f4121403efc3dd85 upstream. This reverts commit 8ff60eb052eeba95cfb3efe16b08c9199f8121cf. The kernel test robot reports a huge performance regression due to the commit, and the reason seems fairly straightforward: when there is contention on the page list (which is what causes acquire_slab() to fail), we do _not_ want to just loop and try again, because that will transfer the contention to the 'n->list_lock' spinlock we hold, and just make things even worse. This is admittedly likely a problem only on big machines - the kernel test robot report comes from a 96-thread dual socket Intel Xeon Gold 6252 setup, but the regression there really is quite noticeable: -47.9% regression of stress-ng.rawpkt.ops_per_sec and the commit that was marked as being fixed (7ced37197196: "slub: Acquire_slab() avoid loop") actually did the loop exit early very intentionally (the hint being that "avoid loop" part of that commit message), exactly to avoid this issue. The correct thing to do may be to pick some kind of reasonable middle ground: instead of breaking out of the loop on the very first sign of contention, or trying over and over and over again, the right thing may be to re-try _once_, and then give up on the second failure (or pick your favorite value for "once"..). Reported-by: kernel test robot Link: https://lore.kernel.org/lkml/20210301080404.GF12822@xsang-OptiPlex-9020/ Cc: Jann Horn Cc: David Rientjes Cc: Joonsoo Kim Acked-by: Christoph Lameter Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- mm/slub.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/mm/slub.c +++ b/mm/slub.c @@ -1846,7 +1846,7 @@ static void *get_partial_node(struct kme t = acquire_slab(s, n, page, object == NULL, &objects); if (!t) - continue; /* cmpxchg raced */ + break; available += objects; if (!object) {