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=-0.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=no 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 3B092C10F27 for ; Tue, 10 Mar 2020 11:19:24 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id E1677205F4 for ; Tue, 10 Mar 2020 11:19:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="ZvtYbQHp" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E1677205F4 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 960E66B0005; Tue, 10 Mar 2020 07:19:23 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 911716B0006; Tue, 10 Mar 2020 07:19:23 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7FF8E6B0007; Tue, 10 Mar 2020 07:19:23 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0046.hostedemail.com [216.40.44.46]) by kanga.kvack.org (Postfix) with ESMTP id 679FD6B0005 for ; Tue, 10 Mar 2020 07:19:23 -0400 (EDT) Received: from smtpin01.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 5C3298418 for ; Tue, 10 Mar 2020 11:19:23 +0000 (UTC) X-FDA: 76579206606.01.maid80_17bb43cd49a1c X-HE-Tag: maid80_17bb43cd49a1c X-Filterd-Recvd-Size: 7685 Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by imf36.hostedemail.com (Postfix) with ESMTP for ; Tue, 10 Mar 2020 11:19:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1583839162; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rVPH+bBLr/+7VaxZkbIPIzqxNXbhJuL7mx4qStWQku4=; b=ZvtYbQHp5Ptu9/U2hjH04UG64n4AJw+f9/Wa3O6Lmt2VJTfhDsFfCyZkY9od79m9wjJyOz VGLefPljwveMaXRNyqFXN7AQtp25myzyLo1t8tDoknvfoA25+Vj19kG3Hekwr9FZ1sCA5o QTvGrjeUiVhWznjj6KLn0LDkOlUCPA4= Received: from mail-qt1-f197.google.com (mail-qt1-f197.google.com [209.85.160.197]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-168-kzlqvUGTMAuxnvc8BQZpWQ-1; Tue, 10 Mar 2020 07:19:20 -0400 X-MC-Unique: kzlqvUGTMAuxnvc8BQZpWQ-1 Received: by mail-qt1-f197.google.com with SMTP id y3so8886435qti.15 for ; Tue, 10 Mar 2020 04:19:20 -0700 (PDT) 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:references :mime-version:content-disposition:in-reply-to; bh=qfsU9Bh+9ERXSvjXe/Jnk6fWHOirWhBhsnum3jMiYw8=; b=R+EWU55z1664kKjrrN/MVOH8P2LVjjbdqkanOqBZnPgerTBvXkYjs8dZts80PwxRfK vV3ic8ZD88Mdk230cQK0KXpdsqQIvQS7OJUg0Fum5wqHCpqarmI4kQkr7HEYefZzJPKL HfiHxtMw6XcxfIRtB6/TqsumtJ8vMUUM3aQ6vuV4cXkkxw43suvq4jx1bxO0Lohk2t+0 xNFi9SVzwr9b6qpMunK5LQyMQDVUKz/ijlT6XqbXGTvxDsld438Bg5c5z+MsWeGKXWWU S4QNx2J3Y6ktN1QKbju1Gy3fLX1HbLQFt60+j2qhifuay1pnp6YN3UbVPKjbfuok/CRA HH6w== X-Gm-Message-State: ANhLgQ24SrtT2s9KNSzWIlKIVx8up+cdQbmoTIUyn7NR86D+NulKU+Fm xOB8UWTB0SIhHSweXViv8ze5RLSAjqpKAporD5268jXGR6X3p4AIons5vlLmkJTDz11nufEblkw q267314p7lTs= X-Received: by 2002:a37:4141:: with SMTP id o62mr18336379qka.282.1583839160115; Tue, 10 Mar 2020 04:19:20 -0700 (PDT) X-Google-Smtp-Source: ADFU+vvFQXTyeq0C9+jsN/NWv2w1PTOeNblibyZ7JGEqrKf11uCaqcYvWES5T61GOlUp4h635fOhPA== X-Received: by 2002:a37:4141:: with SMTP id o62mr18336356qka.282.1583839159836; Tue, 10 Mar 2020 04:19:19 -0700 (PDT) Received: from redhat.com (bzq-79-178-2-19.red.bezeqint.net. [79.178.2.19]) by smtp.gmail.com with ESMTPSA id e130sm23973211qkb.72.2020.03.10.04.19.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Mar 2020 04:19:18 -0700 (PDT) Date: Tue, 10 Mar 2020 07:19:13 -0400 From: "Michael S. Tsirkin" To: David Hildenbrand Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, virtualization@lists.linux-foundation.org, Jason Wang , Stephen Rothwell , Tyler Sanderson , Wei Wang , Alexander Duyck , David Rientjes , Nadav Amit , Michal Hocko , Andrew Morton Subject: Re: [PATCH v2] virtio-balloon: Switch back to OOM handler for VIRTIO_BALLOON_F_DEFLATE_ON_OOM Message-ID: <20200310071844-mutt-send-email-mst@kernel.org> References: <20200310103903.6014-1-david@redhat.com> <20200310070413-mutt-send-email-mst@kernel.org> <78427916-fc17-b081-6b1e-cbcb00d51752@redhat.com> MIME-Version: 1.0 In-Reply-To: <78427916-fc17-b081-6b1e-cbcb00d51752@redhat.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable Content-Disposition: inline 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 Tue, Mar 10, 2020 at 12:12:50PM +0100, David Hildenbrand wrote: > >> static void virtio_balloon_unregister_shrinker(struct virtio_balloon = *vb) > >> @@ -971,7 +950,22 @@ static int virtballoon_probe(struct virtio_device= *vdev) > >> =09=09=09=09=09=09 VIRTIO_BALLOON_CMD_ID_STOP); > >> =09=09spin_lock_init(&vb->free_page_list_lock); > >> =09=09INIT_LIST_HEAD(&vb->free_page_list); > >> +=09=09/* > >> +=09=09 * We're allowed to reuse any free pages, even if they are > >> +=09=09 * still to be processed by the host. > >> +=09=09 */ > >> +=09=09err =3D virtio_balloon_register_shrinker(vb); > >> +=09=09if (err) > >> +=09=09=09goto out_del_balloon_wq; > >> =09} > >> +=09if (virtio_has_feature(vdev, VIRTIO_BALLOON_F_DEFLATE_ON_OOM)) { > >> +=09=09vb->oom_nb.notifier_call =3D virtio_balloon_oom_notify; > >> +=09=09vb->oom_nb.priority =3D VIRTIO_BALLOON_OOM_NOTIFY_PRIORITY; > >> +=09=09err =3D register_oom_notifier(&vb->oom_nb); > >> +=09=09if (err < 0) > >> +=09=09=09goto out_unregister_shrinker; > >> +=09} > >> + > >=20 > >=20 > > Let's decide whether we want an empty line after }, or not, and stick t= o > > it. I prefer an empty line but no biggie as long as we are consistent. >=20 > Can add one. >=20 > >=20 > >> =09if (virtio_has_feature(vdev, VIRTIO_BALLOON_F_PAGE_POISON)) { > >> =09=09/* Start with poison val of 0 representing general init */ > >> =09=09__u32 poison_val =3D 0; > >> @@ -986,15 +980,6 @@ static int virtballoon_probe(struct virtio_device= *vdev) > >> =09=09virtio_cwrite(vb->vdev, struct virtio_balloon_config, > >> =09=09=09 poison_val, &poison_val); > >> =09} > >> -=09/* > >> -=09 * We continue to use VIRTIO_BALLOON_F_DEFLATE_ON_OOM to decide if= a > >> -=09 * shrinker needs to be registered to relieve memory pressure. > >> -=09 */ > >> -=09if (virtio_has_feature(vb->vdev, VIRTIO_BALLOON_F_DEFLATE_ON_OOM))= { > >> -=09=09err =3D virtio_balloon_register_shrinker(vb); > >> -=09=09if (err) > >> -=09=09=09goto out_del_balloon_wq; > >> -=09} > >> =20 > >> =09vb->pr_dev_info.report =3D virtballoon_free_page_report; > >> =09if (virtio_has_feature(vb->vdev, VIRTIO_BALLOON_F_REPORTING)) { > >> @@ -1003,12 +988,12 @@ static int virtballoon_probe(struct virtio_devi= ce *vdev) > >> =09=09capacity =3D virtqueue_get_vring_size(vb->reporting_vq); > >> =09=09if (capacity < PAGE_REPORTING_CAPACITY) { > >> =09=09=09err =3D -ENOSPC; > >> -=09=09=09goto out_unregister_shrinker; > >> +=09=09=09goto out_unregister_oom; > >> =09=09} > >> =20 > >> =09=09err =3D page_reporting_register(&vb->pr_dev_info); > >> =09=09if (err) > >> -=09=09=09goto out_unregister_shrinker; > >> +=09=09=09goto out_unregister_oom; > >> =09} > >> =20 > >> =09virtio_device_ready(vdev); > >> @@ -1017,8 +1002,11 @@ static int virtballoon_probe(struct virtio_devi= ce *vdev) > >> =09=09virtballoon_changed(vdev); > >> =09return 0; > >> =20 > >> +out_unregister_oom: > >> +=09if (virtio_has_feature(vdev, VIRTIO_BALLOON_F_DEFLATE_ON_OOM)) > >> +=09=09unregister_oom_notifier(&vb->oom_nb); > >> out_unregister_shrinker: > >> -=09if (virtio_has_feature(vb->vdev, VIRTIO_BALLOON_F_DEFLATE_ON_OOM)) > >> +=09if (virtio_has_feature(vdev, VIRTIO_BALLOON_F_FREE_PAGE_HINT)) > >> =09=09virtio_balloon_unregister_shrinker(vb); > >=20 > >=20 > > What's with vdev versus vb->vdev here? > > I suggest we keep using vb->vdev to make the patch minimal if we can. > > Same elsewhere. >=20 > As we touch this line either way, does it really make a difference? No > strong opinion. Can just do a vb->vdev and clean this up globally later. >=20 Let's just be consistent. I guess that means keep using vb->vdev everywhere. > --=20 > Thanks, >=20 > David / dhildenb