From patchwork Wed Aug 16 10:51:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 9903441 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 CE480600CA for ; Wed, 16 Aug 2017 10:53:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C26E2289AE for ; Wed, 16 Aug 2017 10:53:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B73C5289B4; Wed, 16 Aug 2017 10:53:17 +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=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 45AE1289AE for ; Wed, 16 Aug 2017 10:53:17 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dhvus-0002cw-U9; Wed, 16 Aug 2017 10:51:14 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dhvur-0002ca-LG for xen-devel@lists.xenproject.org; Wed, 16 Aug 2017 10:51:13 +0000 Received: from [193.109.254.147] by server-6.bemta-6.messagelabs.com id 42/35-03937-1A324995; Wed, 16 Aug 2017 10:51:13 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrIIsWRWlGSWpSXmKPExsXS6fjDS3eB8pR Ig9dPpSy+b5nM5MDocfjDFZYAxijWzLyk/IoE1ozdR5vZClaIV3z+e5WtgXEdXxcjJ4eQQJ7E 58X3mEFsXgE7iWUnXrGB2BIChhKnF95kAbFZBFQlFlydCmazCahLtD3bztrFyMEhImAgce5oU hcjFwezwC9GiTkXpoDVCAuESqz8cosJYn6RxNOde8BmcgrYS9ze8Rqsl1dAUOLvDmGQMLOAls TDX7dYIGxtiWULXzODlDALSEss/8cxgZFvFkLDLCQNs5A0zEJoWMDIsopRozi1qCy1SNfQQi+ pKDM9oyQ3MTNH19DATC83tbg4MT01JzGpWC85P3cTIzD4GIBgB+PNjQGHGCU5mJREeRednRQp xJeUn1KZkVicEV9UmpNafIhRhoNDSYJXQmlKpJBgUWp6akVaZg4wDmDSEhw8SiK81QpAad7ig sTc4sx0iNQpRl2OVxP+f2MSYsnLz0uVEufNApkhAFKUUZoHNwIWk5cYZaWEeRmBjhLiKUgtys 0sQZV/xSjOwagkzJsOMoUnM68EbtMroCOYgI640j4J5IiSRISUVAPjBC2u/YzWLtnFRULR5xh 6lk7yfBoqLFs9d5UHF2u2g5XMFrG/iWd63RO+qik/lEky+XNLaufDI8kH+81zz6pO1T/uXPRm htKGpOj7nimKUzSFN1zJYUj6mia5wMHGzd74eEuLW6ach36Up4eR4kb+nyWK309W/Hj6q2yxl eaFzgfPg17+9VNiKc5INNRiLipOBAB4cbDYxAIAAA== X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1502880670!111239590!1 X-Originating-IP: [137.65.248.74] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 41155 invoked from network); 16 Aug 2017 10:51:12 -0000 Received: from prv-mh.provo.novell.com (HELO prv-mh.provo.novell.com) (137.65.248.74) by server-4.tower-27.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 16 Aug 2017 10:51:12 -0000 Received: from INET-PRV-MTA by prv-mh.provo.novell.com with Novell_GroupWise; Wed, 16 Aug 2017 04:51:10 -0600 Message-Id: <59943FBB020000780017037C@prv-mh.provo.novell.com> X-Mailer: Novell GroupWise Internet Agent 14.2.2 Date: Wed, 16 Aug 2017 04:51:07 -0600 From: "Jan Beulich" To: "xen-devel" References: <59943AC70200007800170343@prv-mh.provo.novell.com> <59943AC70200007800170343@prv-mh.provo.novell.com> In-Reply-To: <59943AC70200007800170343@prv-mh.provo.novell.com> Mime-Version: 1.0 Content-Disposition: inline Cc: Stefano Stabellini , Wei Liu , George Dunlap , Andrew Cooper , Ian Jackson , Tim Deegan Subject: [Xen-devel] [PATCH v2 7/7] gnttab: properly handle transfer slots when changing version X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Reported-by: Andrew Cooper Signed-off-by: Jan Beulich --- v2: New. --- Or should we put ourselves on the position that reserved entries aren#t meant to be used for transfers? --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -2755,6 +2755,11 @@ gnttab_set_version(XEN_GUEST_HANDLE_PARA { switch ( shared_entry_v2(gt, i).hdr.flags & GTF_type_mask ) { + case GTF_accept_transfer: + if ( !(shared_entry_v2(gt, i).hdr.flags & + GTF_transfer_completed) ) + break; + /* fall through */ case GTF_permit_access: if ( !(shared_entry_v2(gt, i).full_page.frame >> 32) ) break; @@ -2784,13 +2789,17 @@ gnttab_set_version(XEN_GUEST_HANDLE_PARA switch ( flags & GTF_type_mask ) { case GTF_permit_access: - reserved_entries[i].flags = flags | status_entry(gt, i); + flags |= status_entry(gt, i); + /* fall through */ + case GTF_accept_transfer: + reserved_entries[i].flags = flags; reserved_entries[i].domid = shared_entry_v2(gt, i).hdr.domid; reserved_entries[i].frame = shared_entry_v2(gt, i).full_page.frame; break; + default: gdprintk(XENLOG_INFO, - "bad flags %#x in grant %#x when switching version\n", + "unstable flags %#x in grant %#x when switching version\n", flags, i); /* fall through */ case GTF_invalid: @@ -2819,10 +2828,20 @@ gnttab_set_version(XEN_GUEST_HANDLE_PARA case 2: for ( i = 0; i < GNTTAB_NR_RESERVED_ENTRIES; i++ ) { - status_entry(gt, i) = - reserved_entries[i].flags & (GTF_reading | GTF_writing); - shared_entry_v2(gt, i).hdr.flags = - reserved_entries[i].flags & ~(GTF_reading | GTF_writing); + if ( (reserved_entries[i].flags & GTF_type_mask) != + GTF_accept_transfer ) + { + status_entry(gt, i) = + reserved_entries[i].flags & (GTF_reading | GTF_writing); + shared_entry_v2(gt, i).hdr.flags = + reserved_entries[i].flags & ~(GTF_reading | GTF_writing); + } + else + { + status_entry(gt, i) = 0; + shared_entry_v2(gt, i).hdr.flags = + reserved_entries[i].flags; + } shared_entry_v2(gt, i).hdr.domid = reserved_entries[i].domid; shared_entry_v2(gt, i).full_page.frame =