Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp3311147pxf; Mon, 15 Mar 2021 06:55:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxBlUyucCK4pgCofeu/io+YS5ZJmBvm/GfBOuQMwqn6yVLbCbHSF1pIhAT/HlJyWm80C7v+ X-Received: by 2002:a05:6402:350f:: with SMTP id b15mr29995365edd.6.1615816537203; Mon, 15 Mar 2021 06:55:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1615816537; cv=none; d=google.com; s=arc-20160816; b=kscsuUZc/WJlhFcJe//wW7Cp6xlplTEEXUkkti6tOdOMH/w6BvKObROf2/PcRCdG/W MupCGGfl3zxHOZZQFzz8wY0sISmbgT2x4FyRdiOU85/ZVopL/WsvHIBmNE5nP3bH/PMP UxJe9Kjc5h401VJ954D+vWK9+RfdBFZdogZXlxFDZ6BXsS65DWPxQLxJbhCu+4PtGs44 K4nimYqGsFTeZECz3fu8C3I52UFkyOZbxeNmfgD0cfC1/r0aI+uUatr1BfqM2apOWk8T RkI0qVqS+15mB7lXRo0RaCLVgbNB8dqj0Mmxjmkpcy4IlIVGcosejZBmDzVPMz9OTGux M09Q== 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=g+5UCLynWGXHeFiiUjGJIBWssHfVZNXuAfllYwINvtQ=; b=o5Tv5rGPijwU4c1VkSjkpUN0abVHO6lIT+fdwgH3oknD0UJllTsfl3GNFDdTQ05/jA QALQsxd6JdqLEdDJPZGB/Ol0yXIvUaQgNOS6WcQJVLpKG7pHawXq74+fJVNVMs3YTQUk xT4zlyppSKeE7hjfrT6r/bO0fLxYA2nefz8jX0aQUJNsYfkfROLie4OKWD1nm1dtOLxU WE6xn+iHIetmWs0rSOiGSDUsJQoTZGFOxmZwW4u8pLZ0aOd5VuIEaITL4yc95fnInf9p lt/X+P0+pRWWt3kAlO8Hu+Ca+V0eaJKiUZ4Cm2ibbPLRQP7X8qpoVCZSdAbxQKroRZTN Yxug== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=c0BGu2k2; 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 mp34si950274ejc.140.2021.03.15.06.55.14; Mon, 15 Mar 2021 06:55:37 -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=c0BGu2k2; 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 S231151AbhCONxw (ORCPT + 99 others); Mon, 15 Mar 2021 09:53:52 -0400 Received: from mail.kernel.org ([198.145.29.99]:55690 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230027AbhCONxJ (ORCPT ); Mon, 15 Mar 2021 09:53:09 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 9D3C964EEE; Mon, 15 Mar 2021 13:53:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1615816388; bh=evTCwKnb3R5yY60YRWT6NmwzJ7cyicuutJgWGsoFtyo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=c0BGu2k2TeX2tOmmrG/HayaN6o7VBDheZSVu1N6kVh5MYzRj4UT3ayeNSm0usNQ+/ wi7thRHzRScIQqr3wY1TctbzLg9tXMWiZ5lMSfjrJHwzb/ANTMjmDpNc0Wu0MKjwaS qjVPPrzIhqdiCwcVNPJsIuwrmPPcJLTvLpDz6+S8= 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.9 11/78] Revert "mm, slub: consider rest of partial list if acquire_slab() fails" Date: Mon, 15 Mar 2021 14:51:34 +0100 Message-Id: <20210315135212.435215008@linuxfoundation.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210315135212.060847074@linuxfoundation.org> References: <20210315135212.060847074@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 @@ -1833,7 +1833,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) {