From patchwork Fri Sep 14 07:19:01 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 183814 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id B39822C0093 for ; Fri, 14 Sep 2012 17:19:23 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756489Ab2INHTH (ORCPT ); Fri, 14 Sep 2012 03:19:07 -0400 Received: from smtp.eu.citrix.com ([62.200.22.115]:5867 "EHLO SMTP.EU.CITRIX.COM" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756439Ab2INHTE (ORCPT ); Fri, 14 Sep 2012 03:19:04 -0400 X-IronPort-AV: E=Sophos;i="4.80,421,1344211200"; d="scan'208";a="14537719" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 14 Sep 2012 07:19:02 +0000 Received: from [127.0.0.1] (10.80.16.67) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Fri, 14 Sep 2012 08:19:01 +0100 Message-ID: <1347607141.25803.73.camel@dagon.hellion.org.uk> Subject: Re: [PATCH] Xen backend support for paged out grant targets. From: Ian Campbell To: Andres Lagar-Cavilla CC: Andres Lagar-Cavilla , "xen-devel@xen.lists.org" , Konrad Rzeszutek Wilk , David Vrabel , "David Miller" , "linux-kernel@vger.kernel.org" , "netdev@vger.kernel.org" Date: Fri, 14 Sep 2012 08:19:01 +0100 In-Reply-To: References: <1347557306-25453-1-git-send-email-andres@lagarcavilla.org> <1347559899.25803.64.camel@dagon.hellion.org.uk> Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Thu, 2012-09-13 at 20:45 +0100, Andres Lagar-Cavilla wrote: > On Sep 13, 2012, at 2:11 PM, Ian Campbell wrote: > > > On Thu, 2012-09-13 at 18:28 +0100, Andres Lagar-Cavilla wrote: > >> > >> * Add placeholder in array of grant table error descriptions for > >> unrelated error code we jump over. > > > > Why not just define it, it's listed here: > > http://xenbits.xen.org/docs/unstable/hypercall/include,public,grant_table.h.html#Enum_grant_status > Well, a) we'd be defining something no one will be using (for the > moment) Even if no one in the kernel is using it, having "placeholder" as an entry in GNTTABOP_error_msgs is just silly, even things which don't understand GNTST_address_too_big directly could end up looking it up here. > b) I would be signing-off on something unrelated. Lets take this patch instead then. 8<------------------------------------------------ From cb9daaf3029accb6d5fef58b450a625b27190429 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Fri, 14 Sep 2012 08:10:06 +0100 Subject: [PATCH] xen: resynchronise grant table status codes with upstream Adds GNTST_address_too_big and GNTST_eagain. Signed-off-by: Ian Campbell --- include/xen/interface/grant_table.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/include/xen/interface/grant_table.h b/include/xen/interface/grant_table.h index a17d844..84a8fbf 100644 --- a/include/xen/interface/grant_table.h +++ b/include/xen/interface/grant_table.h @@ -519,7 +519,9 @@ DEFINE_GUEST_HANDLE_STRUCT(gnttab_get_version); #define GNTST_no_device_space (-7) /* Out of space in I/O MMU. */ #define GNTST_permission_denied (-8) /* Not enough privilege for operation. */ #define GNTST_bad_page (-9) /* Specified page was invalid for op. */ -#define GNTST_bad_copy_arg (-10) /* copy arguments cross page boundary */ +#define GNTST_bad_copy_arg (-10) /* copy arguments cross page boundary. */ +#define GNTST_address_too_big (-11) /* transfer page address too large. */ +#define GNTST_eagain (-12) /* Operation not done; try again. */ #define GNTTABOP_error_msgs { \ "okay", \ @@ -532,7 +534,9 @@ DEFINE_GUEST_HANDLE_STRUCT(gnttab_get_version); "no spare translation slot in the I/O MMU", \ "permission denied", \ "bad page", \ - "copy arguments cross page boundary" \ + "copy arguments cross page boundary", \ + "page address size too large", \ + "operation not done; try again" \ } #endif /* __XEN_PUBLIC_GRANT_TABLE_H__ */