From nobody Sun May 5 05:51:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1625148216; cv=none; d=zohomail.com; s=zohoarc; b=HSy+YT3fLhcK6g5O1uq1sZb1wRJxO1TFxKAHn3S7aeo1HlF8Mo1tFa0IMMbNrwVqRAPR1zMn2jocxeAHoyW7SqskMonGE/DTyLBrN4TsornJ0liMaRDADA+ZiPARPYtyK3ofDWR16hAust5PfkfSTodvdN4OTsnjqnSPQwceazI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1625148216; h=Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:Message-ID:Sender:Subject:To; bh=mC+UL4mB6P83vegs7bksrkog22RhQJHUhe6zIy+isK0=; b=I2Mh5EEjZ2IsdeMn1YvGhhgSZOh3xlD2FyXJwMeLn3q1N/Q7fsnVcDPjH9l4Wl3/S3nTHP4a4tlkZ2u3Y+09BiHLepqpEdswPb28nGwiWXkcrmngheD/P3e2mnCjMlTALsuaTTKaLxEeeS6+jCTeEJeRLfyc37TAV6JH2AaDwOk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1625148216227978.3766145914723; Thu, 1 Jul 2021 07:03:36 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.148690.274774 (Exim 4.92) (envelope-from ) id 1lyxHe-0002ny-BF; Thu, 01 Jul 2021 14:03:14 +0000 Received: by outflank-mailman (output) from mailman id 148690.274774; Thu, 01 Jul 2021 14:03:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lyxHe-0002nr-7I; Thu, 01 Jul 2021 14:03:14 +0000 Received: by outflank-mailman (input) for mailman id 148690; Thu, 01 Jul 2021 14:03:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lyxHd-0002nl-Gs for xen-devel@lists.xenproject.org; Thu, 01 Jul 2021 14:03:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lyxHc-0006Gm-5r; Thu, 01 Jul 2021 14:03:12 +0000 Received: from 54-240-197-235.amazon.com ([54.240.197.235] helo=ufe34d9ed68d054.ant.amazon.com) by xenbits.xenproject.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1lyxHb-0008GN-Sd; Thu, 01 Jul 2021 14:03:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Message-Id:Date:Subject:Cc:To:From; bh=mC+UL4mB6P83vegs7bksrkog22RhQJHUhe6zIy+isK0=; b=YhkOwdPHoTuIAE0LUzHmnBJGbS Z0/Otu0JTPcagSPeuI7vAPr1+4ju6vqMCe6VbRq8Nh7gra46cpv9tLNOO52SddmwFeIR84LiAMtxz BHUKTKl0T8zDMoM9uC08oNDVSRo1hiAnajgdtK1bgbLaEBw2QnZDL1KJZ4v7HYCs+EdQ=; From: Julien Grall To: xen-devel@lists.xenproject.org Cc: raphning@amazon.co.uk, doebel@amazon.de, Julien Grall , Ian Jackson , Wei Liu , Juergen Gross , Julien Grall Subject: [PATCH] tools/xenstored: Stash the correct request in lu_status->in Date: Thu, 1 Jul 2021 15:03:07 +0100 Message-Id: <20210701140307.2516-1-julien@xen.org> X-Mailer: git-send-email 2.17.1 X-ZohoMail-DKIM: pass (identity @xen.org) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Julien Grall When Live-Updating with some load, Xenstored may hit the assert req->in =3D=3D lu_status->in in do_lu_start(). This is happening because the request is stashed when Live-Update begins. This happens in a different request (see call lu_begin() when select the new binary) from the one performing Live-Update. To avoid the problem, stash the request in lu_start(). Fixes: 65f19ed62aa1 ("tools/xenstore: Don't assume conn->in points to the L= U request") Reported-by: Michael Kurth Signed-off-by: Julien Grall Reviewed-by: Juergen Gross Reviewed-by: luca.fancellu@arm.com ---- This was sadly missed because the on my testing the 2 requests were residing at the same place in memory. This was reproduced by creating domain while Live-Updating. Without the patch, Xenstored will crash. --- tools/xenstore/xenstored_control.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/xenstore/xenstored_control.c b/tools/xenstore/xenstored_= control.c index a1b1bd5a718d..ff9863c17fa4 100644 --- a/tools/xenstore/xenstored_control.c +++ b/tools/xenstore/xenstored_control.c @@ -103,7 +103,6 @@ static const char *lu_begin(struct connection *conn) if (!lu_status) return "Allocation failure."; lu_status->conn =3D conn; - lu_status->in =3D conn->in; talloc_set_destructor(lu_status, lu_destroy); =20 return NULL; @@ -757,6 +756,7 @@ static const char *lu_start(const void *ctx, struct con= nection *conn, lu_status->force =3D force; lu_status->timeout =3D to; lu_status->started_at =3D time(NULL); + lu_status->in =3D conn->in; =20 errno =3D delay_request(conn, conn->in, do_lu_start, conn, false); =20 --=20 2.17.1