From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 50AC9C433E1 for ; Wed, 15 Jul 2020 15:22:10 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 23BFF20672 for ; Wed, 15 Jul 2020 15:22:10 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=citrix.com header.i=@citrix.com header.b="IwLYu36S" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 23BFF20672 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=citrix.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jvjEK-0004kj-8I; Wed, 15 Jul 2020 15:21:56 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jvjEJ-0004ke-HM for xen-devel@lists.xenproject.org; Wed, 15 Jul 2020 15:21:55 +0000 X-Inumbo-ID: ea332cf4-c6ae-11ea-bca7-bc764e2007e4 Received: from esa3.hc3370-68.iphmx.com (unknown [216.71.145.155]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id ea332cf4-c6ae-11ea-bca7-bc764e2007e4; Wed, 15 Jul 2020 15:21:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1594826515; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=tIIOFUyNL3Wdct8tKDjv7nitVdE2HsIhnbVMuNFpn8o=; b=IwLYu36SChRIBBBTLcbK/GLBafa+Oj/izF+7E5/Y459zBbxy0CUKf/DR yJQnMDhlMEpKXReVdJ2SiaTwc75olwdGFRxZ3WdsDtpCXPJ9M5SMl7CwL nOplk8K8eGceRoLFaqbCmseeaZIh/uYA8KNuwf2jBQE3sv6R22KO+l3U4 U=; Authentication-Results: esa3.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: W1DqJkeJubrxKu7yPJiWNggEIR7mSRCcbs0MeMnq2nCNDXodK9+9W1jXkiyFf5tUSRnBhVhwTe ztUnWp7F2RqW/rFl0xj+z5jAq0XW5jpqOOJEbXtGub0MY0N6/nLa2Qm0N7yGgSJ/f3jQXW4uMW sChWFKxtVBqZDgOn9GpQmyM9z8d+EmpXL56aSdxzv3S/stBjExjXw8DuUzjLNwSjPnFFQEgKuz zQc9oazQ4wGhMr7y/9WQd3rZbSANlBx2EXMP5s9jTggeZFA1yiVU14Dcn7ibG3qIqKLdvjZPaO zUE= X-SBRS: 2.7 X-MesageID: 22443251 X-Ironport-Server: esa3.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.75,355,1589256000"; d="scan'208";a="22443251" From: Christian Lindig To: Edwin Torok , "xen-devel@lists.xenproject.org" Subject: Re: [PATCH v1 1/1] oxenstored: fix ABI breakage introduced in Xen 4.9.0 Thread-Topic: [PATCH v1 1/1] oxenstored: fix ABI breakage introduced in Xen 4.9.0 Thread-Index: AQHWWro4sadfUNXtWUGmqr5ru6wdMKkIwcwd Date: Wed, 15 Jul 2020 15:21:50 +0000 Message-ID: <1594826510774.33560@citrix.com> References: , <6fcfdb706cc2f666069c1d0bbc59d22f660fc81d.1594825512.git.edvin.torok@citrix.com> In-Reply-To: <6fcfdb706cc2f666069c1d0bbc59d22f660fc81d.1594825512.git.edvin.torok@citrix.com> Accept-Language: en-GB, en-US Content-Language: en-GB X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-transport-fromentityheader: Hosted Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Ian Jackson , Igor Druzhinin , Wei Liu , David Scott Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" =0A= ________________________________________=0A= From: Edwin T=F6r=F6k =0A= Sent: 15 July 2020 16:10=0A= To: xen-devel@lists.xenproject.org=0A= Cc: Edwin Torok; Christian Lindig; David Scott; Ian Jackson; Wei Liu; Igor = Druzhinin=0A= Subject: [PATCH v1 1/1] oxenstored: fix ABI breakage introduced in Xen 4.9.= 0=0A= =0A= dbc84d2983969bb47d294131ed9e6bbbdc2aec49 (Xen >=3D 4.9.0) deleted XS_RESTRI= CT=0A= from oxenstored, which caused all the following opcodes to be shifted by 1:= =0A= reset_watches became off-by-one compared to the C version of xenstored.=0A= =0A= Looking at the C code the opcode for reset watches needs:=0A= XS_RESET_WATCHES =3D XS_SET_TARGET + 2=0A= =0A= So add the placeholder `Invalid` in the OCaml<->C mapping list.=0A= (Note that the code here doesn't simply convert the OCaml constructor to=0A= an integer, so we don't need to introduce a dummy constructor).=0A= =0A= Igor says that with a suitably patched xenopsd to enable watch reset,=0A= we now see `reset watches` during kdump of a guest in xenstored-access.log.= =0A= =0A= Signed-off-by: Edwin T=F6r=F6k =0A= Tested-by: Igor Druzhinin =0A= ---=0A= tools/ocaml/libs/xb/op.ml | 2 +-=0A= 1 file changed, 1 insertion(+), 1 deletion(-)=0A= =0A= diff --git a/tools/ocaml/libs/xb/op.ml b/tools/ocaml/libs/xb/op.ml=0A= index d4f1f08185..9bcab0f38c 100644=0A= --- a/tools/ocaml/libs/xb/op.ml=0A= +++ b/tools/ocaml/libs/xb/op.ml=0A= @@ -28,7 +28,7 @@ let operation_c_mapping =3D=0A= Transaction_end; Introduce; Release;=0A= Getdomainpath; Write; Mkdir; Rm;=0A= Setperms; Watchevent; Error; Isintroduced;=0A= - Resume; Set_target; Reset_watches |]=0A= + Resume; Set_target; Invalid; Reset_watches |]=0A= let size =3D Array.length operation_c_mapping=0A= =0A= let array_search el a =3D=0A= --=0A= 2.25.1=0A= =0A= -- =0A= Acked-by: Christian Lindig =