From nobody Thu Mar 9 16:14:31 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PXZ542tDJz3x5V8; Thu, 9 Mar 2023 16:14:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PXZ540CPYz43ql; Thu, 9 Mar 2023 16:14:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678378472; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RB3B04A4i47047lb4B+3Dy0QkYr1j5hYcSmZKiFjRG8=; b=JN0yRCrh9Ekd43gqnyUh4/O7xZfqwU2WtiLU4wc0mpHoITsbQhV+MWoiXAhu0uHQ8HZ7j+ 9LecOOj4XBUCQ0itPz9r39YDjKfEeToC9xh4pOY9gxlzN/IOicE/EC9E+T23Y7jSTcCVNV oAPBaSyhAjJchRb3MGsr6D+VYHV4tBAtJvuJtJ23qboHippJAzUrTrBP99+bgysIrZFQH9 R5kR7H0pcwf+dl3NN46J0sTon9uWtsMcMN4DMkdZ6JYHp4/Rq89velnc/n5KEfZ3TnWlYA fK3yONB9VW11352SM60/DcXtaZQrDNtqw3yASC5+4Q3JomypLUr3YNpWC38TKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678378472; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RB3B04A4i47047lb4B+3Dy0QkYr1j5hYcSmZKiFjRG8=; b=xdZAtbsD47Rqn5NNmhQb/zibh1IqrwbgX2Z7YMsHNm/nUpSXr0YvU3EXnCobEd6l5TrY1L M3ziFMuGPCWVuamUcZI+KeXklPTtrySr24BIrTcpQMcmDLWH2sFcyRUs5EUvRiEgC0gLgF PnHxlDPJfHGJBieit6f7GS66lb8Mea4Vn4Y6bu4MqeqWqLRONNRHhmE4lffEaRDaKU3Nfx A0SIkj72B1TM+7x9oPLLnE8I9XTeE9qwT/kFDSNSfBtRZ7fJVjxS4uvWIkSJtN9Hy2UHRI es3WlNLbv4TqLPce+IQRuOOyP58N/ujaRyp5UOl+7cYFgGmW+TMmqY2ylanFnQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678378472; a=rsa-sha256; cv=none; b=RgmHgWSkzVwYxWMyVnsBmBX9wptMwUAwIUCIzqFTBdBYeffVDK2Xq2wryx7o0B7i9YoiNz pB9V7+mDOuARDlHp5j9xKzOJxlegKm7KlDILsi5lGUBTsYL/VIA5EWqUAgVUyqqUyckXNd zihG7ENDWUZY1QdOGkSE2gATlH/G2zoty3mKagxb6JrguSEoVl1UH1tFSmrvuhkldleMeB GnSfzSNVVdQt0euajwB8RJeKZYP8pl4ZHxoOeGlinecu6T3WToxbTI8936n1Zj9JsotFOw icqVapcVDevX7LWZqTyzulxS1UwrN59VxBq8A60Lg6eSpfj8Ih+d9w01ECgWaw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PXZ536Q28zDyx; Thu, 9 Mar 2023 16:14:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 329GEVWi097621; Thu, 9 Mar 2023 16:14:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 329GEVlx097620; Thu, 9 Mar 2023 16:14:31 GMT (envelope-from git) Date: Thu, 9 Mar 2023 16:14:31 GMT Message-Id: <202303091614.329GEVlx097620@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Roger=20Pau=20Monn=C3=A9?= Subject: git: 5489d7e93a06 - main - xen: bump used interface version List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: royger X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5489d7e93a06fbb5d06d6d7e43a4c56f1571c891 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=5489d7e93a06fbb5d06d6d7e43a4c56f1571c891 commit 5489d7e93a06fbb5d06d6d7e43a4c56f1571c891 Author: Roger Pau Monné AuthorDate: 2022-11-21 15:21:16 +0000 Commit: Roger Pau Monné CommitDate: 2023-03-09 16:13:17 +0000 xen: bump used interface version This is required for a further change that will make use of a field that was added in version 0x00040d00. No functional change expected. Sponsored by: Citrix Systems R&D --- sys/dev/xen/balloon/balloon.c | 2 -- sys/dev/xen/grant_table/grant_table.c | 4 ++-- sys/dev/xen/privcmd/privcmd.c | 6 +++--- sys/x86/xen/xen_intr.c | 3 +++ sys/xen/xen-os.h | 2 +- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/sys/dev/xen/balloon/balloon.c b/sys/dev/xen/balloon/balloon.c index 9fb3164cab7a..02dac3dfe757 100644 --- a/sys/dev/xen/balloon/balloon.c +++ b/sys/dev/xen/balloon/balloon.c @@ -155,7 +155,6 @@ increase_reservation(unsigned long nr_pages) vm_page_t page; long rc; struct xen_memory_reservation reservation = { - .address_bits = 0, .extent_order = 0, .domid = DOMID_SELF }; @@ -217,7 +216,6 @@ decrease_reservation(unsigned long nr_pages) int need_sleep = 0; int ret __diagused; struct xen_memory_reservation reservation = { - .address_bits = 0, .extent_order = 0, .domid = DOMID_SELF }; diff --git a/sys/dev/xen/grant_table/grant_table.c b/sys/dev/xen/grant_table/grant_table.c index 11e5071c7b0b..fdbec8ac14e8 100644 --- a/sys/dev/xen/grant_table/grant_table.c +++ b/sys/dev/xen/grant_table/grant_table.c @@ -41,7 +41,7 @@ __FBSDID("$FreeBSD$"); /* External tools reserve first few grant table entries. */ #define NR_RESERVED_ENTRIES 8 -#define GREFS_PER_GRANT_FRAME (PAGE_SIZE / sizeof(grant_entry_t)) +#define GREFS_PER_GRANT_FRAME (PAGE_SIZE / sizeof(grant_entry_v1_t)) static grant_ref_t **gnttab_list; static unsigned int nr_grant_frames; @@ -59,7 +59,7 @@ static struct resource *gnttab_pseudo_phys_res; /* Resource id for allocated physical address space. */ static int gnttab_pseudo_phys_res_id; -static grant_entry_t *shared; +static grant_entry_v1_t *shared; static struct gnttab_free_callback *gnttab_free_callback_list = NULL; diff --git a/sys/dev/xen/privcmd/privcmd.c b/sys/dev/xen/privcmd/privcmd.c index 459ac8bbe951..614ee8554a71 100644 --- a/sys/dev/xen/privcmd/privcmd.c +++ b/sys/dev/xen/privcmd/privcmd.c @@ -315,7 +315,7 @@ privcmd_ioctl(struct cdev *dev, unsigned long cmd, caddr_t arg, } case IOCTL_PRIVCMD_MMAPBATCH: { struct ioctl_privcmd_mmapbatch *mmap; - struct xen_add_to_physmap_range add; + struct xen_add_to_physmap_batch add; xen_ulong_t *idxs; xen_pfn_t *gpfns; int *errs; @@ -338,7 +338,7 @@ privcmd_ioctl(struct cdev *dev, unsigned long cmd, caddr_t arg, add.domid = DOMID_SELF; add.space = XENMAPSPACE_gmfn_foreign; - add.foreign_domid = mmap->dom; + add.u.foreign_domid = mmap->dom; /* * The 'size' field in the xen_add_to_physmap_range only @@ -370,7 +370,7 @@ privcmd_ioctl(struct cdev *dev, unsigned long cmd, caddr_t arg, bzero(errs, sizeof(*errs) * num); error = HYPERVISOR_memory_op( - XENMEM_add_to_physmap_range, &add); + XENMEM_add_to_physmap_batch, &add); if (error != 0) { error = xen_translate_error(error); goto mmap_out; diff --git a/sys/x86/xen/xen_intr.c b/sys/x86/xen/xen_intr.c index b9a909a14a67..262df1cefeea 100644 --- a/sys/x86/xen/xen_intr.c +++ b/sys/x86/xen/xen_intr.c @@ -71,6 +71,9 @@ __FBSDID("$FreeBSD$"); #include #endif +/* The code below is the implementation of 2L event channels. */ +#define NR_EVENT_CHANNELS EVTCHN_2L_NR_CHANNELS + static MALLOC_DEFINE(M_XENINTR, "xen_intr", "Xen Interrupt Services"); static u_int first_evtchn_irq; diff --git a/sys/xen/xen-os.h b/sys/xen/xen-os.h index 183724be9749..e1d03b7322bc 100644 --- a/sys/xen/xen-os.h +++ b/sys/xen/xen-os.h @@ -30,7 +30,7 @@ #ifndef _XEN_XEN_OS_H_ #define _XEN_XEN_OS_H_ -#define __XEN_INTERFACE_VERSION__ 0x00030208 +#define __XEN_INTERFACE_VERSION__ 0x00040d00 #define GRANT_REF_INVALID 0xffffffff