From patchwork Fri Jun 15 04:43:13 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: 10465689 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 AEDE8600F4 for ; Fri, 15 Jun 2018 05:08:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9F90528C81 for ; Fri, 15 Jun 2018 05:08:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9197A28CA2; Fri, 15 Jun 2018 05:08:54 +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 1369D28C81 for ; Fri, 15 Jun 2018 05:08:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E94A86B000E; Fri, 15 Jun 2018 01:08:47 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id E42746B0010; Fri, 15 Jun 2018 01:08:47 -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 C6DFA6B0266; Fri, 15 Jun 2018 01:08:47 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf0-f198.google.com (mail-pf0-f198.google.com [209.85.192.198]) by kanga.kvack.org (Postfix) with ESMTP id 81F866B000E for ; Fri, 15 Jun 2018 01:08:47 -0400 (EDT) Received: by mail-pf0-f198.google.com with SMTP id n19-v6so4098668pff.8 for ; Thu, 14 Jun 2018 22:08:47 -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=OG/FXLccYMA6EWcYYsXr5Y12eqX5mZA9cfSm/yew5CY=; b=F7B1Ais1VKJOroEuA0JF9YKMppQIlCfj1x7qmVFRCkbv0NVmRxqv6HHE6t/gf7QdRJ lRo/yr7K0Bp+0kCaZ9x44aD3Qxb3Jfa33q9KYdC85NRH6s59u2jki/PQj0oEbps97iHO vkV/tRrSBjE7T7ndZ3KBPIAvAqk1wZA+9GfOclQvdOW0Z4qEt00OHIXBgSdkqbBGF9gq YBDTRgujVhX8pUJ4H015NaJvX6AN4ZoqPbdG+5hz2jYQdcH50aKvhrIm626+75+qQ8L0 eHIrvDU9AC5SG10daraZMHbPDzxE2HLCJqaKtOlU+xCGYxKaqAehcHeaeOpUs1hYxIbW UzuQ== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of wei.w.wang@intel.com designates 192.55.52.136 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: APt69E3bE/yB3CbfOSTIy5NHQJhC/GAYg4v3B4K6sy1HnXcvLafdDm/z NQvz7AbOSXJ26ZTjt1T1ffpcMsIkAh/wvjEkpXDt2yTNG2nqGAt3jnHCYkYfacjzmPY2j8KNYr2 t5ekS77+o1lvI6p4KxqbtFNWNY9iQotzjQINXccKzilsKGm00yZPp7nvF82AjhV7WLA== X-Received: by 2002:a63:2682:: with SMTP id m124-v6mr183622pgm.56.1529039327196; Thu, 14 Jun 2018 22:08:47 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKCvZpl6yslFY3V3RJmFYf1g37bbP9bIEkipVBW4jgkZxqjB93eiOF796BfYwPHurjKD+na X-Received: by 2002:a63:2682:: with SMTP id m124-v6mr183596pgm.56.1529039326426; Thu, 14 Jun 2018 22:08:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529039326; cv=none; d=google.com; s=arc-20160816; b=yNnu6E6dCIflSpuMv3szFEOO1oIWeVa6qtEQrYPmY07riAJek/LD68O1Y3zm/VpfuG 9qpHk6+yu9L6L34LtNceGu/UGirFJ86kOd/fz5WxVosHIvRxugsahRoiivH4T4urrrE8 B3d58psak8/0B86gXE3qXIm7FvJnQFCy6thBrwHWw7w05pYtD/8bVOoQZZt3xCa8Lv9x lzS0Qum2f9S6DxXxF+owqvhrkuzBrkGPjJm/+XCU84yYqwHhe6eJvps1tDujdXetz3gt ujpGZBrMsH4s/fiF0bDfK9w9mBvLC0LW1bRXgDhtNUxg61EcXG1vMAWjl3Mf3jUS4q+z 8DGA== 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=OG/FXLccYMA6EWcYYsXr5Y12eqX5mZA9cfSm/yew5CY=; b=h1fBvzTFv/ysxRySJRaYP8/M1RL5SDntwpzEde7CTRFlrxw0nqfpDO54VRGUYWZKnR Q2XcQZrrtkTUULGi+p7U2SApWvj95nRftBG519HjO+ixkfPcIx8UuXk8cvmPL53aqfZk VcxXEjffGxSYY87qdJA/yzHqT86g1QJItbykHXtLlghkQbZqJwopRUg7NC4YmvoRPZV0 VIvfCJkNusgdcqGSen5noOWbIxua/QHUX+Xyx5DbFSSMP3yoWAJW1zBUWO+z7HSiberf 7T1QlphN7HUdAWIcUuU+Tid75jIYjY+1Dnx8HPRGpQT4jsXN9dkstlu3Kkyo5tgAshtM /D3w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of wei.w.wang@intel.com designates 192.55.52.136 as permitted sender) smtp.mailfrom=wei.w.wang@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from mga12.intel.com (mga12.intel.com. [192.55.52.136]) by mx.google.com with ESMTPS id m89-v6si6984006pfi.236.2018.06.14.22.08.46 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Jun 2018 22:08:46 -0700 (PDT) Received-SPF: pass (google.com: domain of wei.w.wang@intel.com designates 192.55.52.136 as permitted sender) client-ip=192.55.52.136; Authentication-Results: mx.google.com; spf=pass (google.com: domain of wei.w.wang@intel.com designates 192.55.52.136 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 fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 14 Jun 2018 22:08:45 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,225,1526367600"; d="scan'208";a="47272205" Received: from devel-ww.sh.intel.com ([10.239.48.110]) by fmsmga007.fm.intel.com with ESMTP; 14 Jun 2018 22:08:43 -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 v33 4/4] virtio-balloon: VIRTIO_BALLOON_F_PAGE_POISON Date: Fri, 15 Jun 2018 12:43:13 +0800 Message-Id: <1529037793-35521-5-git-send-email-wei.w.wang@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1529037793-35521-1-git-send-email-wei.w.wang@intel.com> References: <1529037793-35521-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 582a03b..c59bb380 100644 --- a/drivers/virtio/virtio_balloon.c +++ b/drivers/virtio/virtio_balloon.c @@ -634,6 +634,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) { @@ -671,6 +672,11 @@ static int virtballoon_probe(struct virtio_device *vdev) goto out_del_vqs; } INIT_WORK(&vb->report_free_page_work, report_free_page_func); + 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->hints = kmalloc(FREE_PAGE_HINT_MEM_SIZE, GFP_KERNEL); if (!vb->hints) { err = -ENOMEM; @@ -796,6 +802,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; } @@ -805,6 +814,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 99b8416..f3b6191 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; /* Command sent from host */ __u32 host_cmd; + /* Stores PAGE_POISON if page poisoning is in use */ + __u32 poison_val; }; struct virtio_balloon_free_page_hints {