From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.3 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9613AC18E5A for ; Wed, 11 Mar 2020 14:20:07 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 4804B20727 for ; Wed, 11 Mar 2020 14:20:07 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="XPZBKHUz" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4804B20727 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id EB1E86B0007; Wed, 11 Mar 2020 10:20:06 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E62186B0008; Wed, 11 Mar 2020 10:20:06 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D77C76B000C; Wed, 11 Mar 2020 10:20:06 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0080.hostedemail.com [216.40.44.80]) by kanga.kvack.org (Postfix) with ESMTP id BFE4B6B0007 for ; Wed, 11 Mar 2020 10:20:06 -0400 (EDT) Received: from smtpin09.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 935172494 for ; Wed, 11 Mar 2020 14:20:06 +0000 (UTC) X-FDA: 76583290812.09.board81_3b1b96577644a X-HE-Tag: board81_3b1b96577644a X-Filterd-Recvd-Size: 6193 Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by imf09.hostedemail.com (Postfix) with ESMTP for ; Wed, 11 Mar 2020 14:20:06 +0000 (UTC) Received: by mail-wm1-f67.google.com with SMTP id a5so2306569wmb.0 for ; Wed, 11 Mar 2020 07:20:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:reply-to:references:mime-version :content-disposition:in-reply-to:user-agent; bh=U8yHxOLld6I5yONtEEjc1KYpMfk+7prWIw3BzC1un4I=; b=XPZBKHUzoxtFiu/PBGZnp0TlZJM7RHTR+pRT3HJmGJGEzlUfiPsSCfxa86Kjh+2qxg nfzi+qJIaliw91wL4h/v5MEVCFwDWiv5kYkfNrkcFrAK50mruIgOyvLnuhraVwcyz/T+ +caYMZLv+5eWwP1Tq7ocIDcc1Tfmoc2/La9I5YBDPVTo4TXDqmmLbOKfv4MI92bmeN3b eK3S+N7LCjikrA7tRfFTxtIVdj97FWJ8kLFfqNifcV9hf1GEy1pIbxxcTa9BfTiYKO21 +TiuPN48K2Vpk821PF7hLxze5YkrYxGkZmEyrwfXKvovX71eikmV3M35gWi+sVMLFclT kYPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:reply-to :references:mime-version:content-disposition:in-reply-to:user-agent; bh=U8yHxOLld6I5yONtEEjc1KYpMfk+7prWIw3BzC1un4I=; b=Ks04wjmjbEoj/omGd5Un9xccHwE/7rvaoHxHaPB4CNLHX2bcs3KJufUK3YCJ4zfW8P DLLbclkuQul/wHhQfRV7UPHYaY0aRaFQQGIJlMie+QPI8Rqmoe9ts6V73cmQjVSzzrwy GvQTFwaPt/Wt7hFTGL43XPdYJFzSsuWR2KXNCdzYEyqV4poknH+Ms+hZOaHV/WP9p1FG 45YviNUpb6+3gvaMcsJlT1DFhwqKL9oIiewYMwSbhLbHVPGam2La1CrjLymXb3ardMXu Tc0yt+yKrhMUYI2nT+ZVZ5BUwcL2Kd7hkWXO3ekop6vmLRWuzGR4VJ+nwZwCjUbMOOka scGw== X-Gm-Message-State: ANhLgQ3FEhte6OuJbmtEQJthXAN/2jHQhdmiyEB0UJ+cTWYp0057sf6R fnuogNVb4jEGyHxrLb0Q9Fc= X-Google-Smtp-Source: ADFU+vu6XvNhjX9fUk/vGR9XwGi4Kb+PTmIwG/KCc8VoVTWG4HjFikyiQTu493sCs87Z+jnc8lzQFQ== X-Received: by 2002:a7b:c354:: with SMTP id l20mr3892521wmj.40.1583936404859; Wed, 11 Mar 2020 07:20:04 -0700 (PDT) Received: from localhost ([185.92.221.13]) by smtp.gmail.com with ESMTPSA id i6sm6083016wru.40.2020.03.11.07.20.03 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 11 Mar 2020 07:20:03 -0700 (PDT) Date: Wed, 11 Mar 2020 14:20:02 +0000 From: Wei Yang To: David Hildenbrand Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, linuxppc-dev@lists.ozlabs.org, linux-hyperv@vger.kernel.org, Greg Kroah-Hartman , Andrew Morton , Michal Hocko , Oscar Salvador , "Rafael J. Wysocki" , Baoquan He , Wei Yang Subject: Re: [PATCH v1 3/5] drivers/base/memory: store mapping between MMOP_* and string in an array Message-ID: <20200311142002.2htiv4llyam2svta@master> Reply-To: Wei Yang References: <20200311123026.16071-1-david@redhat.com> <20200311123026.16071-4-david@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200311123026.16071-4-david@redhat.com> User-Agent: NeoMutt/20170113 (1.7.2) 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: On Wed, Mar 11, 2020 at 01:30:24PM +0100, David Hildenbrand wrote: >Let's use a simple array which we can reuse soon. While at it, move the >string->mmop conversion out of the device hotplug lock. > >Cc: Greg Kroah-Hartman >Cc: Andrew Morton >Cc: Michal Hocko >Cc: Oscar Salvador >Cc: "Rafael J. Wysocki" >Cc: Baoquan He >Cc: Wei Yang >Signed-off-by: David Hildenbrand >--- > drivers/base/memory.c | 38 +++++++++++++++++++++++--------------- > 1 file changed, 23 insertions(+), 15 deletions(-) > >diff --git a/drivers/base/memory.c b/drivers/base/memory.c >index e7e77cafef80..8a7f29c0bf97 100644 >--- a/drivers/base/memory.c >+++ b/drivers/base/memory.c >@@ -28,6 +28,24 @@ > > #define MEMORY_CLASS_NAME "memory" > >+static const char *const online_type_to_str[] = { >+ [MMOP_OFFLINE] = "offline", >+ [MMOP_ONLINE] = "online", >+ [MMOP_ONLINE_KERNEL] = "online_kernel", >+ [MMOP_ONLINE_MOVABLE] = "online_movable", >+}; >+ >+static int memhp_online_type_from_str(const char *str) >+{ >+ int i; >+ >+ for (i = 0; i < ARRAY_SIZE(online_type_to_str); i++) { >+ if (sysfs_streq(str, online_type_to_str[i])) >+ return i; >+ } >+ return -EINVAL; >+} >+ > #define to_memory_block(dev) container_of(dev, struct memory_block, dev) > > static int sections_per_block; >@@ -236,26 +254,17 @@ static int memory_subsys_offline(struct device *dev) > static ssize_t state_store(struct device *dev, struct device_attribute *attr, > const char *buf, size_t count) > { >+ const int online_type = memhp_online_type_from_str(buf); In your following patch, you did the same conversion. Is it possible to merge them into this one? > struct memory_block *mem = to_memory_block(dev); >- int ret, online_type; >+ int ret; >+ >+ if (online_type < 0) >+ return -EINVAL; > > ret = lock_device_hotplug_sysfs(); > if (ret) > return ret; > >- if (sysfs_streq(buf, "online_kernel")) >- online_type = MMOP_ONLINE_KERNEL; >- else if (sysfs_streq(buf, "online_movable")) >- online_type = MMOP_ONLINE_MOVABLE; >- else if (sysfs_streq(buf, "online")) >- online_type = MMOP_ONLINE; >- else if (sysfs_streq(buf, "offline")) >- online_type = MMOP_OFFLINE; >- else { >- ret = -EINVAL; >- goto err; >- } >- > switch (online_type) { > case MMOP_ONLINE_KERNEL: > case MMOP_ONLINE_MOVABLE: >@@ -271,7 +280,6 @@ static ssize_t state_store(struct device *dev, struct device_attribute *attr, > ret = -EINVAL; /* should never happen */ > } > >-err: > unlock_device_hotplug(); > > if (ret < 0) >-- >2.24.1 -- Wei Yang Help you, Help me