From patchwork Mon Jun 25 12:05:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Wei W" X-Patchwork-Id: 10485827 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 58F9E604D3 for ; Mon, 25 Jun 2018 12:30:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3F46E2841C for ; Mon, 25 Jun 2018 12:30:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 340382843B; Mon, 25 Jun 2018 12:30:48 +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.9 required=2.0 tests=BAYES_00, 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 BC79F2841F for ; Mon, 25 Jun 2018 12:30:47 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1A1146B0010; Mon, 25 Jun 2018 08:30:46 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 129676B0266; Mon, 25 Jun 2018 08:30:46 -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 E46E36B0269; Mon, 25 Jun 2018 08:30:45 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl0-f72.google.com (mail-pl0-f72.google.com [209.85.160.72]) by kanga.kvack.org (Postfix) with ESMTP id 966BD6B0010 for ; Mon, 25 Jun 2018 08:30:45 -0400 (EDT) Received: by mail-pl0-f72.google.com with SMTP id x2-v6so8189471plv.0 for ; Mon, 25 Jun 2018 05:30:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:to:cc :subject:date:message-id:in-reply-to:references; bh=9yPEqBM27G8sLapIIRQHY9sYVK820QRbOrcNQ8NcIjE=; b=midG/XEEJW78i8UNqEkzLVTL4aaGAHExKqPnybnS17UYvQXgZUerd5XbGKS9zjnoUX dm8RNATNI3f8FOEnKaWN7iFQJEeEqTaB9ZEropZXxyr4lJE2oXNl1MOw+dU6aquRldA/ 1sWKwFt+vRU1DdzEI7H+FRKFlvMRIyzCwKrwlSABoaKrCqGSOhurrICW5ByQbwJY2SDr mqcVifce+JkMAPOYiqY2Ae6cXjFjcitPgGqTIrx2wx2iLgQ372ihm1MdUhmqxd8VbUbX RUxbf9BnBWDPGrOFHnC6hsz9BnoVLPvTGUS+RiqUTtIB78rQkS4KiubMAObdJkZukG1n 9Zqg== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of wei.w.wang@intel.com designates 192.55.52.151 as permitted sender) smtp.mailfrom=wei.w.wang@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com X-Gm-Message-State: APt69E2zaoUFWzc9se0JHHAC40k/Md3SLv3nC2tA/xMa5RBvqBasMPje OuAK7QcOaXCezKxoqhbr9b0w44U4PjDAVknjEj3fjE3qUPRhN5NZoLWZUoia7Os6izTMyp5SneI qGJdp7W6Kl1BBAYu4/QnUsy/ui56llSCkZNY81QSJ4rcU8ptLoZyp4VPDOSUoXN/EoA== X-Received: by 2002:a65:621a:: with SMTP id d26-v6mr5618714pgv.305.1529929845261; Mon, 25 Jun 2018 05:30:45 -0700 (PDT) X-Google-Smtp-Source: ADUXVKIg9o/ILxrgYTzC2NV5BC3JP8YXGIrwyQGGzXbyu0acy0THuRSSmbRLUWr3s0KY6/RZn1Qn X-Received: by 2002:a65:621a:: with SMTP id d26-v6mr5618644pgv.305.1529929844255; Mon, 25 Jun 2018 05:30:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529929844; cv=none; d=google.com; s=arc-20160816; b=cn5H87qoTEb/u/qnzoKkRIcfqBC6Lgee6IaOEiXcQs4zCpQDXsZCNBM9ejIb/f0MYR aE5D6F+TxvQajbO0CGQGUGSHK/09TZLW51p8aK4tla9BJE8Mn2L4R9RaJ1ReHfUrKssC nTi/S6VY0l/Qi249lvNDQYNWgqRlN0JDXpe26BBYMorv7HYbJHW2fFoeiL4LqVlgnAZh zD0ezaGN5pB64TjGsSj2xSWNDcIAT86XPa8Z+c8yBeDnP9XNrvO3ST9izMSbfpj9O/sl P5veprsvJdCp1wbVH6ChWxM1Zg9SSG0YuBlZapoOgnD5hmbanuTZuPr9OdIAfajVNkR1 b/Nw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=9yPEqBM27G8sLapIIRQHY9sYVK820QRbOrcNQ8NcIjE=; b=gZPa7WUkY++0LeXE+ZJ0bYC61DnZ0AVoK4A31UJyGeqWuK6Hbc3Auwk7x6hdKDOBm0 W8ZcqTCxFJGhzJ7iI4O04HhBETHf+S9mWDnVfQwz5mwt4sYqKgNYiktP1Yyht8/OzVvu 8EzQ2XKyW7QzFD6B4xmJuOtW8JytAbkPMiHzMBuZgCgu+n1SW8xVFd+zeciEPAqYZzxa FyjB2FLSTzxk9p/wpj7diwBX9dth40Z/s02WX/Q/ndDHJBIEU6LDPGyNxjg2lVUyfLH2 OSQKok2071MqejqNIVFPZOczqaaViaJoJslUyRSQ0Mzu9KsSDni6vxNX18UtF16F26DZ Qx6g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of wei.w.wang@intel.com designates 192.55.52.151 as permitted sender) smtp.mailfrom=wei.w.wang@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from mga17.intel.com (mga17.intel.com. [192.55.52.151]) by mx.google.com with ESMTPS id a8-v6si11509942pgu.544.2018.06.25.05.30.44 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 25 Jun 2018 05:30:44 -0700 (PDT) Received-SPF: pass (google.com: domain of wei.w.wang@intel.com designates 192.55.52.151 as permitted sender) client-ip=192.55.52.151; Authentication-Results: mx.google.com; spf=pass (google.com: domain of wei.w.wang@intel.com designates 192.55.52.151 as permitted sender) smtp.mailfrom=wei.w.wang@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 25 Jun 2018 05:30:44 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,270,1526367600"; d="scan'208";a="67044145" Received: from devel-ww.sh.intel.com ([10.239.48.110]) by fmsmga001.fm.intel.com with ESMTP; 25 Jun 2018 05:30:41 -0700 From: Wei Wang To: virtio-dev@lists.oasis-open.org, linux-kernel@vger.kernel.org, virtualization@lists.linux-foundation.org, kvm@vger.kernel.org, linux-mm@kvack.org, mst@redhat.com, mhocko@kernel.org, akpm@linux-foundation.org Cc: torvalds@linux-foundation.org, pbonzini@redhat.com, wei.w.wang@intel.com, liliang.opensource@gmail.com, yang.zhang.wz@gmail.com, quan.xu0@gmail.com, nilal@redhat.com, riel@redhat.com, peterx@redhat.com Subject: [PATCH v34 4/4] virtio-balloon: VIRTIO_BALLOON_F_PAGE_POISON Date: Mon, 25 Jun 2018 20:05:12 +0800 Message-Id: <1529928312-30500-5-git-send-email-wei.w.wang@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1529928312-30500-1-git-send-email-wei.w.wang@intel.com> References: <1529928312-30500-1-git-send-email-wei.w.wang@intel.com> 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 VIRTIO_BALLOON_F_PAGE_POISON feature bit is used to indicate if the guest is using page poisoning. Guest writes to the poison_val config field to tell host about the page poisoning value that is in use. Suggested-by: Michael S. Tsirkin Signed-off-by: Wei Wang Cc: Michael S. Tsirkin Cc: Michal Hocko Cc: Andrew Morton --- drivers/virtio/virtio_balloon.c | 10 ++++++++++ include/uapi/linux/virtio_balloon.h | 3 +++ 2 files changed, 13 insertions(+) diff --git a/drivers/virtio/virtio_balloon.c b/drivers/virtio/virtio_balloon.c index d05f0ba..c834ef1 100644 --- a/drivers/virtio/virtio_balloon.c +++ b/drivers/virtio/virtio_balloon.c @@ -801,6 +801,7 @@ static struct file_system_type balloon_fs = { static int virtballoon_probe(struct virtio_device *vdev) { struct virtio_balloon *vb; + __u32 poison_val; int err; if (!vdev->config->get) { @@ -840,6 +841,11 @@ static int virtballoon_probe(struct virtio_device *vdev) INIT_WORK(&vb->report_free_page_work, report_free_page_func); vb->cmd_id_received = VIRTIO_BALLOON_FREE_PAGE_REPORT_STOP_ID; vb->cmd_id_active = VIRTIO_BALLOON_FREE_PAGE_REPORT_STOP_ID; + if (virtio_has_feature(vdev, VIRTIO_BALLOON_F_PAGE_POISON)) { + memset(&poison_val, PAGE_POISON, sizeof(poison_val)); + virtio_cwrite(vb->vdev, struct virtio_balloon_config, + poison_val, &poison_val); + } } vb->nb.notifier_call = virtballoon_oom_notify; @@ -958,6 +964,9 @@ static int virtballoon_restore(struct virtio_device *vdev) static int virtballoon_validate(struct virtio_device *vdev) { + if (!page_poisoning_enabled()) + __virtio_clear_bit(vdev, VIRTIO_BALLOON_F_PAGE_POISON); + __virtio_clear_bit(vdev, VIRTIO_F_IOMMU_PLATFORM); return 0; } @@ -967,6 +976,7 @@ static unsigned int features[] = { VIRTIO_BALLOON_F_STATS_VQ, VIRTIO_BALLOON_F_DEFLATE_ON_OOM, VIRTIO_BALLOON_F_FREE_PAGE_HINT, + VIRTIO_BALLOON_F_PAGE_POISON, }; static struct virtio_driver virtio_balloon_driver = { diff --git a/include/uapi/linux/virtio_balloon.h b/include/uapi/linux/virtio_balloon.h index 860456f..12b5a4f 100644 --- a/include/uapi/linux/virtio_balloon.h +++ b/include/uapi/linux/virtio_balloon.h @@ -35,6 +35,7 @@ #define VIRTIO_BALLOON_F_STATS_VQ 1 /* Memory Stats virtqueue */ #define VIRTIO_BALLOON_F_DEFLATE_ON_OOM 2 /* Deflate balloon on OOM */ #define VIRTIO_BALLOON_F_FREE_PAGE_HINT 3 /* VQ to report free pages */ +#define VIRTIO_BALLOON_F_PAGE_POISON 4 /* Guest is using page poisoning */ /* Size of a PFN in the balloon interface. */ #define VIRTIO_BALLOON_PFN_SHIFT 12 @@ -47,6 +48,8 @@ struct virtio_balloon_config { __u32 actual; /* Free page report command id, readonly by guest */ __u32 free_page_report_cmd_id; + /* Stores PAGE_POISON if page poisoning is in use */ + __u32 poison_val; }; struct virtio_balloon_free_page_hints_cmd {