From patchwork Wed Sep 26 05:57:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pingfan Liu X-Patchwork-Id: 10615313 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 092EE112B for ; Wed, 26 Sep 2018 05:57:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EDCA52A6B3 for ; Wed, 26 Sep 2018 05:57:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E1D902A969; Wed, 26 Sep 2018 05:57:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 37A572A6B3 for ; Wed, 26 Sep 2018 05:57:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0228B8E0002; Wed, 26 Sep 2018 01:57:25 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id F156A8E0001; Wed, 26 Sep 2018 01:57:24 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E2BB28E0002; Wed, 26 Sep 2018 01:57:24 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pg1-f198.google.com (mail-pg1-f198.google.com [209.85.215.198]) by kanga.kvack.org (Postfix) with ESMTP id 9E9828E0001 for ; Wed, 26 Sep 2018 01:57:24 -0400 (EDT) Received: by mail-pg1-f198.google.com with SMTP id i189-v6so2485908pge.6 for ; Tue, 25 Sep 2018 22:57:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id; bh=XDgmEggjrnnW9texE1hhPpdvDzmjl0PdUxAHb+JCDMM=; b=NqQhmZ9L9dJ1fvw9XWlgzXxYaeD4fZmt+BPF54EfPdmJN+9qDNic3hr1PWHfUYSMwF j5pCo2pg45ip/LLPbYMGbjxXQAgsZRDCq+PjUr0APKgk2UuHsEWbJWERTAuxVPKZrwrT WhUpke4j4Qnyqt/55xHQVVelDjp+5SliFaY0UuMDrdUc3+lmPn2yJFNcrax4MeYla/Ru hzneKE1N/GEUEaAej5zZrYatlIUl5onxx5XJMMXm6d0QJ0x87m9tUcN+GKRYjcXaCHey 11z7ENNO3/0C3HvC+SA2vsLMOH7cxIp5NznAUVd0XrT20EgR9htqjMMBaWKbKfglnzeu KBsQ== X-Gm-Message-State: ABuFfohaWg6DmOAByvHWUT4jrXWHAzK+EdxC0ryPtJN5Xry7hQ0f5NRD Xv5+x+hmjUjiFpzgWesp3viGrIo0o3EFbn+YQPkMvxb0RL8v62vEc0NRqmzoUVWJoaxIfaLPpJU 4g9lmsWO398ShYJkbVv5WaG3DD2oCYR0VXVOGsJk0k44+myd4+CFuGdQW0wVN3xxqAJJTe4uesY o2KSMJgSHGM61ToAvBX4zu3BdhvPfmne2/oNJMuJwRA0c8okylZAEMQjCc/FwTO6Cb13MO+wnpI sCa7tv3lDyp8LIOIPEXli+1mEiAXV4KdVLB2RZJxja4FChJjU0rqp9bCAh1KSbnlsyvQD8Pqtlx 1MRxcjjwBBXuLyqWtFc2Tl9AH+wVeimkQRSaHEEjaKHuaIIDTxNBVP7GeaJHW8P/GuOmD+NPJF0 F X-Received: by 2002:a62:1895:: with SMTP id 143-v6mr4409116pfy.227.1537941444329; Tue, 25 Sep 2018 22:57:24 -0700 (PDT) X-Received: by 2002:a62:1895:: with SMTP id 143-v6mr4409074pfy.227.1537941443556; Tue, 25 Sep 2018 22:57:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537941443; cv=none; d=google.com; s=arc-20160816; b=OPS23prUVNYk9btiF6r9jtAeIvoPZVygW2VaHnPSbMip5FLmbi8noufupPpMJm9vKL i02ufugE5I6N0/1vhu4mGhLEPBv6o7yj8ZCQWc0V+nStx/j27NkxnIcrQNAu1APHWIHW yCJTpVdE2DGdubYAh3XSyq/0+AdIpiHemTWoFGnLoPvCqnRmBEMbQ9eNioZMusRAHOqz ve9LwhxfsfpLqtk6uWo2L4dFLlYLkRGy4DAJoDqQutuopOC+0cr0K22KCUcBCokSTa9C CT1LmuCku5APfdHFyUBbBwo+RK8NHveiaxa1kuSAea1A7M687LHXDY1hCZ1SUjUei3Jv d45w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from:dkim-signature; bh=XDgmEggjrnnW9texE1hhPpdvDzmjl0PdUxAHb+JCDMM=; b=m/tOZUVw9jl75e1H9tnW6PoFddDnJTBYdbsLTyZNwMZkrFJKhkOw0i4/So7rl2G4ZB I+YH6XTV6FbxgERFs3/4va1tSNaPLBB1S/XWIaROPI56aJVr/GYTyYiYKJGpGbX1AncN GZO+J5UxK9cDqToOrvCMJXGDIM0ILkqotX0rMoza2lBc2RePvjKFinswwxPkvVK5TA16 ZCsphvS4xYSET93BnulzhJHXMV2o0z++MknyPH6hc6rOxX861dUw3zpnMSi+6pjzgTUy DMKliV0HbWrSOpxa16lznkm3Mv4iH1ZPbf+Qmsp7tEdW3WpVR5rqEkZ8UYypEXsEgS1+ Y2KQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=GnwtYI7m; spf=pass (google.com: domain of kernelfans@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=kernelfans@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id a13-v6sor576683pgm.62.2018.09.25.22.57.23 for (Google Transport Security); Tue, 25 Sep 2018 22:57:23 -0700 (PDT) Received-SPF: pass (google.com: domain of kernelfans@gmail.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=GnwtYI7m; spf=pass (google.com: domain of kernelfans@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=kernelfans@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=XDgmEggjrnnW9texE1hhPpdvDzmjl0PdUxAHb+JCDMM=; b=GnwtYI7mpzvp8cVfRISBiEYpOUTxDunBT/C8tIqbv69Uoc42vJXKWkoQOr2aPgRxHv CUVbnO0+6tCJXcyqIhQ3IUZzuSmf0j+6mXngmILd7+4W1FWjwp6eSjdS6DBTqJZkAVfD eMjrWsr8NwWpbvSgWpFdc1lmbqsT2jMVaWsOXUkGvhTqpXQssCf9imnQDWAonRUDbh6K SRpl8cLe45OfA/vssDh+1nfvuYv2jP8KMwSKYJOelMuHUvOE/mToPIz4CMnrRp+YcpW/ xfI3KXNmKPuroCcmtXjJKIZjswcVVMBW7d8RBDKYIgSTOIXGouCqMCUw+Yq7TezX35S5 2eMA== X-Google-Smtp-Source: ACcGV63XQ38V8eQ8DSmFa5IaP+hcinwQBqDoKu7O7fy7BSRLqEd6vRY4JxwbOwpx1uQu8EmKtv8ZWQ== X-Received: by 2002:a65:4001:: with SMTP id f1-v6mr3978806pgp.228.1537941442825; Tue, 25 Sep 2018 22:57:22 -0700 (PDT) Received: from mylaptop.nay.redhat.com ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id h82-v6sm9314219pfa.173.2018.09.25.22.57.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 25 Sep 2018 22:57:21 -0700 (PDT) From: Pingfan Liu To: linux-mm@kvack.org Cc: Pingfan Liu , Christoph Lameter , Pekka Enberg , David Rientjes , Joonsoo Kim , Andrew Morton Subject: [PATCH] mm/slub: remove useless condition in deactivate_slab Date: Wed, 26 Sep 2018 13:57:10 +0800 Message-Id: <1537941430-16217-1-git-send-email-kernelfans@gmail.com> X-Mailer: git-send-email 2.7.4 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: X-Virus-Scanned: ClamAV using ClamSMTP The var l should be used to reflect the original list, on which the page should be. But c->page is not on any list. Furthermore, the current code does not update the value of l. Hence remove the related logic Signed-off-by: Pingfan Liu Cc: Christoph Lameter Cc: Pekka Enberg Cc: David Rientjes Cc: Joonsoo Kim Cc: Andrew Morton Acked-by: Christoph Lameter --- mm/slub.c | 30 +++++++----------------------- 1 file changed, 7 insertions(+), 23 deletions(-) diff --git a/mm/slub.c b/mm/slub.c index 8da34a8..a68c2ae 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -1992,7 +1992,7 @@ static void deactivate_slab(struct kmem_cache *s, struct page *page, enum slab_modes { M_NONE, M_PARTIAL, M_FULL, M_FREE }; struct kmem_cache_node *n = get_node(s, page_to_nid(page)); int lock = 0; - enum slab_modes l = M_NONE, m = M_NONE; + enum slab_modes m = M_NONE; void *nextfree; int tail = DEACTIVATE_TO_HEAD; struct page new; @@ -2088,30 +2088,14 @@ static void deactivate_slab(struct kmem_cache *s, struct page *page, } } - if (l != m) { - - if (l == M_PARTIAL) - - remove_partial(n, page); - - else if (l == M_FULL) - - remove_full(s, n, page); - - if (m == M_PARTIAL) { - - add_partial(n, page, tail); - stat(s, tail); - - } else if (m == M_FULL) { - - stat(s, DEACTIVATE_FULL); - add_full(s, n, page); - - } + if (m == M_PARTIAL) { + add_partial(n, page, tail); + stat(s, tail); + } else if (m == M_FULL) { + stat(s, DEACTIVATE_FULL); + add_full(s, n, page); } - l = m; if (!__cmpxchg_double_slab(s, page, old.freelist, old.counters, new.freelist, new.counters,