From patchwork Sat Jun 2 11:06:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?56a56Iif6ZSu?= X-Patchwork-Id: 10444747 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8E12160375 for ; Sat, 2 Jun 2018 11:07:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6E47628803 for ; Sat, 2 Jun 2018 11:07:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 61B6C28A0B; Sat, 2 Jun 2018 11:07:07 +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=-2.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, FROM_EXCESS_BASE64, 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 966FB28803 for ; Sat, 2 Jun 2018 11:07:06 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EA64F6B0005; Sat, 2 Jun 2018 07:07:04 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id E56D26B0006; Sat, 2 Jun 2018 07:07:04 -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 D1FF86B0007; Sat, 2 Jun 2018 07:07:04 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-lf0-f71.google.com (mail-lf0-f71.google.com [209.85.215.71]) by kanga.kvack.org (Postfix) with ESMTP id 5C7B46B0005 for ; Sat, 2 Jun 2018 07:07:04 -0400 (EDT) Received: by mail-lf0-f71.google.com with SMTP id y17-v6so3849201lfj.19 for ; Sat, 02 Jun 2018 04:07:04 -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:mime-version:from:date:message-id :subject:to:cc; bh=Qyy4JsqUAR1ws38434qI+72dOUOY786AlAwVYqqSdPA=; b=phUxJS2YXOLoBbQnrN48oG0Z4djQBKBUgaFBY+IKToDjd1lp1Q/sM/g0AzVBIzUb1N u9hoIHGqi+A3hhyH+wa+QCMrldnqQZ5r/TudTtpoHOA9Lp2nqfOz1fFnV6dJ+rB631Eu y9VLkfInPuqL9OtRW0e+TAKB4h+uWT9wnqpSoOdw/v5BZm5SXyR2FsAKSypbxFt5pckg VeWt/ToJ0Ti5K88e6hoFhRtf99EEZXf3/AT8RpcDYdM9qnOIHXRlHhocXnkgm5wTS+Z6 eDdUIRDyLGe0jZeiK5Gux8tmqu93ux6QaPcV2uNM1LfV6XPnFhIheZGjsH8V4zEKjIUc 6Bpg== X-Gm-Message-State: APt69E2OTVL/F0s3Rs8ZZOII07efVydGeZ1AtH4iBMP9L/CZ1mfe6Sba uswekzFjO3kVA0O1iI7uB/sAAd1R5lxZNTKsXy7ROwwjuTZowG9IWKVg5U3+MqI+BBw25ly1LFm 3njotwrwvY7aPxgvLQxxerN5fx8sXbtKU2y/bJmjKMurStkSi0gaO5VxR+3a6Lch1evZJczMEhO KbCncRaaTBFOoIPZ1dAPFPZLKKnBDn43DLEsJ8yupXp78QVuTBQm1hD4cfqZfGEjbgF13+nalRe ozt6UWZb0wiLoZVWJT6sNNC73YxcnhqFJR+8IlITbh1lwLZfHCFKLBGEJGi1kVix/D+cBtoY+Qi nnU8RU6LvZdxelusGbTP5SFyhWM7Bp3IhvENh8h2SozJvKSauVEnRFNFpi3T62P2/zLFAEnCY1j z X-Received: by 2002:a2e:5687:: with SMTP id k7-v6mr1210103lje.140.1527937623534; Sat, 02 Jun 2018 04:07:03 -0700 (PDT) X-Received: by 2002:a2e:5687:: with SMTP id k7-v6mr1210081lje.140.1527937622689; Sat, 02 Jun 2018 04:07:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527937622; cv=none; d=google.com; s=arc-20160816; b=mmmloSmIFucpUUS3A4ZEfEHCDapEQBeRA5hnG77rfYPFwpccpjCpH6FvKL0hVZvmPZ yf1QFr1sXq6RLm14O/N7+UgMUGihw3cWb3KtL81P3dKDha2BrYs1Iar1s39+vUv/TV4Y Md9T85tI5Rw8g3c16AfuyMxnzs9X9hKj+cf95J7sPRA3l04XLrjZJkpPV5HXkfUzILLP thzDmlg2hzdAEEqfzhELdILW76FkMQ36XuJNNHNl0bwE/i/v2aA82YtMRSf4PgQxXr2F HJmSLJkz8b5bh419oQk/VWuxtpgopDm0M418wXvZwXgnZAn/retNoLG6A4fOadP7IVJx IpVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=cc:to:subject:message-id:date:from:mime-version:dkim-signature :arc-authentication-results; bh=Qyy4JsqUAR1ws38434qI+72dOUOY786AlAwVYqqSdPA=; b=uc+VdEsbVMqDLxqKDIZMLBP0tBDOL5PmniBvD62yuBIA5pLokh4guGiJQOq+aItugx rw4s9X4G5RHIaBhwqmFBR5vJhkBp5XvL3vZkVRZpI+D5oKtyoz52hynCin16rabKHIvh QCVJgktP3l4HVUKk2YEnHG3udD+fSO4j59NU1uitUBN7qde51FE/+dSRo2eMf1xt+fzN 6Ylru3fwqNwHp3PRxdGj+KX70opuKua3p65lsUU7nLM9kskdX3LnsGuB1dOLiIFqA4xX SgpUbBZYiXnutTnnNQwmtHy1f+C2l3+w1Surtd4SE5hlG4W3SMSkamAssfj75/gTjphb 8qlg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=nwGKvCHf; spf=pass (google.com: domain of ufo19890607@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=ufo19890607@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 e7-v6sor731260lfi.66.2018.06.02.04.07.02 for (Google Transport Security); Sat, 02 Jun 2018 04:07:02 -0700 (PDT) Received-SPF: pass (google.com: domain of ufo19890607@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=nwGKvCHf; spf=pass (google.com: domain of ufo19890607@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=ufo19890607@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=mime-version:from:date:message-id:subject:to:cc; bh=Qyy4JsqUAR1ws38434qI+72dOUOY786AlAwVYqqSdPA=; b=nwGKvCHfrN4gHL9QXaBNrEW7eJ2yZVh1KFa5ia7Con+RX4ADng10VVrmZE2OvxM4vL gKVAF0Dxa/ekjFYe/rHoo6lgOjXRtho5Dfeca5L812Bm9+EkuoOrt+MIYRiC+piX8FiJ K27RPVmfo4T/PdZ19TBZGeff9bOr1lS/PCfcjJ7hzquMs0oPeSIZJCHeytLI5Vd/B4Cq Mux4JdQODxlD+9uLMz51FEU6O/loJQa8CaUvZGWgDaInA+NgCOHxXrbGG/qjN14hSm9V TkdhAblV4YSkG57fL/JCy0z18E6TQyssHAxrg1L7BlNkKO02il9TOnseyCQv08++uuz3 ttKw== X-Google-Smtp-Source: ADUXVKJ+TgVOVgGP6CtvgRvoXzUOHI7ZfGEVmx8ruT+rpOXVzzMHxHHpRY+0LpJbWbOrOT72OigFCaca6+6+CeFQOq0= X-Received: by 2002:a19:ea1b:: with SMTP id i27-v6mr8478033lfh.98.1527937622289; Sat, 02 Jun 2018 04:07:02 -0700 (PDT) MIME-Version: 1.0 From: =?UTF-8?B?56a56Iif6ZSu?= Date: Sat, 2 Jun 2018 19:06:44 +0800 Message-ID: Subject: [PATCH v7 1/2] Add an array of const char and enum oom_constraint in memcontrol.h To: akpm@linux-foundation.org, mhocko@suse.com, rientjes@google.com, kirill.shutemov@linux.intel.com, aarcange@redhat.com, penguin-kernel@i-love.sakura.ne.jp, guro@fb.com, yang.s@alibaba-inc.com Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Wind Yu 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 From: yuzhoujian This patch will make some preparation for the follow-up patch: Refactor part of the oom report in dump_header. It puts enum oom_constraint in memcontrol.h and adds an array of const char for each constraint. Signed-off-by: yuzhoujian --- include/linux/memcontrol.h | 14 ++++++++++++++ mm/oom_kill.c | 7 ------- 2 files changed, 14 insertions(+), 7 deletions(-) */ diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index d99b71bc2c66..57311b6c4d67 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -62,6 +62,20 @@ struct mem_cgroup_reclaim_cookie { unsigned int generation; }; +enum oom_constraint { + CONSTRAINT_NONE, + CONSTRAINT_CPUSET, + CONSTRAINT_MEMORY_POLICY, + CONSTRAINT_MEMCG, +}; + +static const char * const oom_constraint_text[] = { + [CONSTRAINT_NONE] = "CONSTRAINT_NONE", + [CONSTRAINT_CPUSET] = "CONSTRAINT_CPUSET", + [CONSTRAINT_MEMORY_POLICY] = "CONSTRAINT_MEMORY_POLICY", + [CONSTRAINT_MEMCG] = "CONSTRAINT_MEMCG", +}; + #ifdef CONFIG_MEMCG #define MEM_CGROUP_ID_SHIFT 16 diff --git a/mm/oom_kill.c b/mm/oom_kill.c index 8ba6cb88cf58..c806cd656af6 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c @@ -237,13 +237,6 @@ unsigned long oom_badness(struct task_struct *p, struct mem_cgroup *memcg, return points > 0 ? points : 1; } -enum oom_constraint { - CONSTRAINT_NONE, - CONSTRAINT_CPUSET, - CONSTRAINT_MEMORY_POLICY, - CONSTRAINT_MEMCG, -}; - /* * Determine the type of allocation constraint.