From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f181.google.com (mail-pg1-f181.google.com [209.85.215.181]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 98B87264638 for ; Fri, 27 Feb 2026 00:51:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.181 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772153486; cv=none; b=X60zpscrMRsbInAg+rNRC0DLdeUbPEgQribfRszYL2Ce5dGEvh/tT21Rtgn/2yH3i2rmYuT1N/0pmB7SNp0xFJvUUl0TFgGiOhYb2JFLQd9C0lPKnOc0biqmw0sp7M7H26VXiXdFEFzq79IgAK1xglCRXsVjOWN/OIfCVpjZE3A= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772153486; c=relaxed/simple; bh=RyZXx/G7qCicaZId45D0cNgeQ8TX0mKD9axtH69slQo=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=jUaVDRTCdyiSiNos1c83sLAullGQYntSRCbSWQf6W5rndj8Sa1ULp2k+MjHp3VxNSueXXBPvdsVU84Sck6l6GJi9uGZ/hJ8ON3Xoe5LviX8pqhYCwr3icwq5h0gghWvFQQZE7nueqCyk6oLh3/J9vXqbagtyZthoTHjUE6Qd5sk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=KV+yYfL3; arc=none smtp.client-ip=209.85.215.181 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="KV+yYfL3" Received: by mail-pg1-f181.google.com with SMTP id 41be03b00d2f7-c6e734ba92bso687128a12.3 for ; Thu, 26 Feb 2026 16:51:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1772153484; x=1772758284; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=MbrSIpDE3Y8TNhyTW+6lYUs18ku3UAynLvTznEtk/Vk=; b=KV+yYfL3RSTVSGk8zPgiMYi1QxoJ4iyFJaBlfRxKrxMv2CCbZKiRK/6BH23MWBqsZS rF+F0m+o/yWe1FkKbp7TFSVIO6HG6elJYI6oXqrqx3juZ51qFzIswmQIAB4zgwZbKaEN /9B5wVem+oXu9Clr+wFdvqzS+s9aMNZ7XOy+5u0PMl9GXMvX4YwZxxzWRpxce/ygotv5 GHKd+TfodlrNdiOKX9RhHGqNHFTr3CIKkYcd3SXTE9Yrv3Sgp4YKcoGDY+1/A9oXu3wi aZ2AtafAcT3gU2/tugcMopjO6eJgXysOzMHswmwzfqhzXh1LPwCtbxmZmWF0LTT1NQaF vqXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772153484; x=1772758284; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-gg:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MbrSIpDE3Y8TNhyTW+6lYUs18ku3UAynLvTznEtk/Vk=; b=qJg/PjeNbgpYWgX38fgeDjd4p2gPlKgdAwjLwfxNtr1ThnoAsEmDKvlHpoHfZ2gS0v 644wNclO80Ny1+43gjXD8+g8CfS8F/mViAjT8v67Fd+OC3a3p1lWfsw31awp2d/OGm+J l3V/h9BvII7bjNgJeHrFUejFURjSFTlg0RDtcynkgAPVkEij6EMT1p/Oa8eW+82MB/9w /6SesTgsDJY8+C8DD5aOkm9bPBfV5Birvvl00i44fNcYyL26358ArEHGm8abIDjtyML8 q3wcnpWgLLaDnPS+pSFubFHDfuc3aL/lkk4FHO2Utv4rsqwt2rYat66xXKlFtsce08Ts EcVw== X-Forwarded-Encrypted: i=1; AJvYcCUjGrWSpRN6PoMoWM++KTIIrHgJfjmBkg8I7Z5ifRbGArsJH8dpUBqzeQX2tDJFZ6SYmgT2TFMzv8Q=@vger.kernel.org X-Gm-Message-State: AOJu0Yw9Ubnpn3+YZZEFFQ5Gaqu+8EJIOW4md2xyqIePVi7Kjmt63BdZ F2ZHTqpSdcGjz/4UNSgMmG5rBnGSlJZE445CAAWHnf2G2o5/tqCtifF2Q8EDL0b2AA== X-Gm-Gg: ATEYQzzuOJmG236ZrqVxsK0JfSCAnxP3SkytQMQtSfHKJLx2nl7dRq4aJBlqhXlsnui wt/XpMSv0DdYJGzqJfkAdo/V8dmunfhuqWMmzHVSHNqM/CTEQ4K94jtk/zThvMXsVKInQaw+WwN DqdbMKKxlzgOArl4Ayy9/kRjs54vnXIEVEkodavJGCQYKnTG7pQ9dPvP3fX/zDMHjpAECzMKjy8 th97UFA8s5x/mp0PEAzloPpsIwi3oFZ6YFw+62B9NmBjPfGy8EfglZodLCaqIctEMFrd6WOKUuw +1mumwVPfF7bHTK+AD/2Kx29maI3qotZ6TX5XM01kVvt98y8mqemCoxlck8OfXxCiQ5cHDNOdCF u3vI5ohgskX6slRcvjZHLpPtPFcIUZ10l9ozsr5x+H6sgAiJfK2U53ktRWmsgXHXXYghopaypsm jKfdASagvT9dltYvyYn5T7C2vh19L4Igg0g3yuQnt1bUDxHmW+r55ybFVFslkSEA== X-Received: by 2002:a17:903:41cb:b0:2ad:ba04:40ca with SMTP id d9443c01a7336-2ae2e419430mr8325415ad.25.1772153483265; Thu, 26 Feb 2026 16:51:23 -0800 (PST) Received: from google.com (239.23.105.34.bc.googleusercontent.com. [34.105.23.239]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2adfb6b974csm34254135ad.65.2026.02.26.16.51.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Feb 2026 16:51:22 -0800 (PST) Date: Fri, 27 Feb 2026 00:51:18 +0000 From: David Matlack To: Alex Williamson Cc: Adithya Jayachandran , Alexander Graf , Alex Mastro , Alistair Popple , Andrew Morton , Ankit Agrawal , Bjorn Helgaas , Chris Li , David Rientjes , Jacob Pan , Jason Gunthorpe , Jason Gunthorpe , Jonathan Corbet , Josh Hilke , Kevin Tian , kexec@lists.infradead.org, kvm@vger.kernel.org, Leon Romanovsky , Leon Romanovsky , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-mm@kvack.org, linux-pci@vger.kernel.org, Lukas Wunner , =?utf-8?Q?Micha=C5=82?= Winiarski , Mike Rapoport , Parav Pandit , Pasha Tatashin , Pranjal Shrivastava , Pratyush Yadav , Raghavendra Rao Ananta , Rodrigo Vivi , Saeed Mahameed , Samiullah Khawaja , Shuah Khan , Thomas =?iso-8859-1?Q?Hellstr=F6m?= , Tomita Moeko , Vipin Sharma , Vivek Kasireddy , William Tu , Yi Liu , Zhu Yanjun Subject: Re: [PATCH v2 10/22] vfio/pci: Skip reset of preserved device after Live Update Message-ID: References: <20260129212510.967611-1-dmatlack@google.com> <20260129212510.967611-11-dmatlack@google.com> <20260226170030.5a938c74@shazbot.org> Precedence: bulk X-Mailing-List: linux-doc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20260226170030.5a938c74@shazbot.org> On 2026-02-26 05:00 PM, Alex Williamson wrote: > On Thu, 29 Jan 2026 21:24:57 +0000 > David Matlack wrote: > > - /* If reset fails because of the device lock, fail this path entirely */ > > - ret = pci_try_reset_function(pdev); > > - if (ret == -EAGAIN) > > - goto out_disable_device; > > + if (vdev->liveupdate_incoming_state) { > > + /* > > + * This device was preserved by the previous kernel across a > > + * Live Update, so it does not need to be reset. > > + */ > > + vdev->reset_works = vdev->liveupdate_incoming_state->reset_works; > > + } else { > > + /* > > + * If reset fails because of the device lock, fail this path > > + * entirely. > > + */ > > + ret = pci_try_reset_function(pdev); > > + if (ret == -EAGAIN) > > + goto out_disable_device; > > + > > + vdev->reset_works = !ret; > > + } > > This could maybe be incrementally cleaner in a > int vfio_pci_core_probe_reset(struct vfio_pci_core_device *vdev) > helper. Will do. > > > > - vdev->reset_works = !ret; > > pci_save_state(pdev); > > vdev->pci_saved_state = pci_store_saved_state(pdev); > > Isn't this a problem too? In the first kernel we store the initial, > post reset state of the device, now we're storing some arbitrary state. > This is the state we're restore when the device is closed. The previous kernel resets the device and restores it back to its post reset state in vfio_pci_liveupdate_freeze() before handing off control to the next kernel. So my intention here is that VFIO will receive the device in that state, allowing it to call pci_store_saved_state() here to capture the post reset state of the device again. Eventually we want to drop the reset in vfio_pci_liveupdate_freeze() and preserve vdev->pci_saved_state across the Live Update. But I was hoping to add that in a follow up series to avoid this one getting too long. > > diff --git a/include/linux/vfio_pci_core.h b/include/linux/vfio_pci_core.h > > index 350c30f84a13..95835298e29e 100644 > > --- a/include/linux/vfio_pci_core.h > > +++ b/include/linux/vfio_pci_core.h > > @@ -16,6 +16,7 @@ > > #include > > #include > > #include > > +#include > > > > #ifndef VFIO_PCI_CORE_H > > #define VFIO_PCI_CORE_H > > Wouldn't a forward declaration do, and the kho/abi include can be kept > out of the public header? Also should be in the previous patch? Will do.