Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp3514454pxf; Mon, 15 Mar 2021 11:13:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw7UPVjrg0totyyAwgT7kNQ8YrXrI3QrCAehoVmamr3f16a3ALSoh1eH7WSx4K9d5cFL83i X-Received: by 2002:a17:906:f10c:: with SMTP id gv12mr25222783ejb.53.1615832038344; Mon, 15 Mar 2021 11:13:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1615832038; cv=none; d=google.com; s=arc-20160816; b=ZEiQ8P/Vt6kPuWOX8gBT8/yOC/jmARQXZYKi3SBB338kDiihnSHUrW1sNQwN/XQl4L WGeYJz+ALf7bjVq6GoVbvN8g7pEu5QV6GB0tXZKrr0X9KXzIq4grRrejuRU6c61i27eH p2xeB4s6y0P99YvDhUH0rBLKH1jthOT1T82+DesiKbcLG8wg930qlRdOL5dpx1ULI/TD yx85vwqWBUAh7WxZMbhpSFhsUg1PSOfVbZVyUG5yA6qhqmOgTV2eYaT0qub2G0FSrHHJ beLdPuk3QsRSJmMoM+/DSc8yOKTuRon3nc9autwewKmRuGaIPOmaKIjThAJUYXSZeW2W 997A== 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=cTiIbgJacxOf9Zh7DetJhx/owfSkH9DLxy/iWQGWwmA=; b=a+N8vfDAqyniam2VZyCzewFtBNaXSpT5FR5VDU7/6P2JKUDN0ifN//FWjrkyGvNtW1 XbR/vPds/FF9ioypW9V2MvA8FiJcy5jQAb/hbvowULf9aQeVkcXXrDvpFOM5gmVRYb9n 07bud9ImMJKw1drQ2maKOLo5jdW/YJ36UzKTZCFIv9Hk38xnWxzqNcPy5oGjKwwEcp5p +57QGCOOjRrVq4MT1VFi+yqPLS+UTVjL+q3MkILwUiAqalPaVqvJjfW2nBx7RuM/a+gr nh1zPiF3QqhGRC1zWcNDReobu4JUIuyxkOkAIaG55L2CprH4LpkYi8UNMVIJxFakS1Dm ZviA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=cTcVdwVU; 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 v25si11124184edx.598.2021.03.15.11.13.36; Mon, 15 Mar 2021 11:13:58 -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=cTcVdwVU; 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 S235942AbhCOOMB (ORCPT + 99 others); Mon, 15 Mar 2021 10:12:01 -0400 Received: from mail.kernel.org ([198.145.29.99]:35610 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232319AbhCON6X (ORCPT ); Mon, 15 Mar 2021 09:58:23 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 3EB2864F31; Mon, 15 Mar 2021 13:58:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1615816703; bh=wuUEYzZl/cljc3mkmIIxRbbzx2y8Rkgm6wcWQcn/rjg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cTcVdwVUsifTCEvqQM6sVPEbbHQdM5QkKfJrUiUm1JhNjTApCjsMeYCX76QFyI26Q 1pbSysE1oax++SGjKA4DcAeliZsvqnEbdwU0U1NyyP7Tc30VnubiZuGAM0OgilvGY3 B2w/LJBchY6lUddDBzbCqBxQNwNgUr28hHDy+Jb8= 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.19 016/120] Revert "mm, slub: consider rest of partial list if acquire_slab() fails" Date: Mon, 15 Mar 2021 14:56:07 +0100 Message-Id: <20210315135720.546304426@linuxfoundation.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210315135720.002213995@linuxfoundation.org> References: <20210315135720.002213995@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 @@ -1830,7 +1830,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) {