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=-6.8 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 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 D03FDC43332 for ; Thu, 19 Mar 2020 16:33:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A839F2072C for ; Thu, 19 Mar 2020 16:33:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="RJtNiJ3k" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727767AbgCSQdX (ORCPT ); Thu, 19 Mar 2020 12:33:23 -0400 Received: from mail-wm1-f66.google.com ([209.85.128.66]:39422 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727212AbgCSQdW (ORCPT ); Thu, 19 Mar 2020 12:33:22 -0400 Received: by mail-wm1-f66.google.com with SMTP id a9so21967wmj.4; Thu, 19 Mar 2020 09:33:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=EV0H/xHTVbYqHl2SwE3LQu0p/ZfnWJaxt/btO6HNCKc=; b=RJtNiJ3k6sAQDNVAqFF3d2CVXcvwFgvzjPC0w+H5R7gWQps28vhYZy7GgZRM06MHya QQToYt3EjmXhucEHTTvjR2hIFJxawkijfrEt8iN8LtDMLt+j6AwONiJSxTULhlCNicK/ +2o07B+kQGc/5U0zBOnKomsAAPEA1SyHhbaxhsqSEVcs2J5aIsAF/b3hnElTY5l/yVGY FW3tBOTVHWiCiVxbKsIH2UfwuUwtau3dd3Z0YMgmaG/L4gaSLfteA3UF0aZQWm1E4kin XVSYSvYkEtok8vrKTtSzm+rcUV6j7CmguoLOaJTsGftxMjOZcOw2ChsJlGdiHRtOWKFj C8UA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=EV0H/xHTVbYqHl2SwE3LQu0p/ZfnWJaxt/btO6HNCKc=; b=lKI/QxGzvatFFAhOb4U4RjWMyDpNyiUB6Njz+fmfzclSzo20MHjNOlCxBlI4mOiFCD iTOc1eS/I0rvjB3H4FifA+GCp538C7dGCb7/s2NfA4t6DsFwq91l4Miv8RV8eO3G/Ghr GDtlm9CuzRJRhcfXwl0FKfCraPUGqf0emnbeQnY+RKVCU5Xwy72t35QJzYKnWrvMGEq8 zwxryCN/xWAHV9rorIg4/ezjyKOY/MgGZclZUMtkZgvWTchJaPyKdDpRno4LbGcygszl qH652o39ksNFGY2rty7IbKtyzHhkhQGH0kcV/4sYdSJVBiv/hYjvv5TY14sBEFfYUKB4 YlpA== X-Gm-Message-State: ANhLgQ2Fk0G1OvTm20nv4hTg1sw4YWGc+t6kRUQQE1A6JndtyR14e7b0 1L8MF2zwHWcsk4FQCMSZSou1vDoZGroh6Y9DrR0= X-Google-Smtp-Source: ADFU+vumPc/wa4n9qWnBfWoVelrKk4kAGib5WSrNdiwqlrFqLF1BlylJKsfGJ5rFJXKaGKbYD3+R/QLpQgtoSmTw7E4= X-Received: by 2002:a1c:1fc7:: with SMTP id f190mr4567359wmf.2.1584635599696; Thu, 19 Mar 2020 09:33:19 -0700 (PDT) MIME-Version: 1.0 References: <20200319131221.14044-1-david@redhat.com> <20200319131221.14044-4-david@redhat.com> In-Reply-To: <20200319131221.14044-4-david@redhat.com> From: Pankaj Gupta Date: Thu, 19 Mar 2020 17:33:08 +0100 Message-ID: Subject: Re: [PATCH v3 3/8] drivers/base/memory: store mapping between MMOP_* and string in an array To: David Hildenbrand Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, linuxppc-dev@lists.ozlabs.org, linux-hyperv@vger.kernel.org, Wei Yang , Michal Hocko , Greg Kroah-Hartman , Andrew Morton , Michal Hocko , Oscar Salvador , "Rafael J. Wysocki" , Baoquan He Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org > 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. > > Reviewed-by: Wei Yang > Acked-by: Michal Hocko > 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); > 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) > -- Nice cleanup patch. Acked-by: Pankaj Gupta > 2.24.1 > >