From: John Starks <jostarks@microsoft.com>
When resuming from hibernation, log any channels that were present
before hibernation but now are gone.
Signed-off-by: John Starks <jostarks@microsoft.com>
Co-developed-by: Naman Jain <namjain@linux.microsoft.com>
Signed-off-by: Naman Jain <namjain@linux.microsoft.com>
---
drivers/hv/vmbus_drv.c | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c
index bd3fc41dc06b..1f56d138210e 100644
--- a/drivers/hv/vmbus_drv.c
+++ b/drivers/hv/vmbus_drv.c
@@ -2462,6 +2462,7 @@ static int vmbus_bus_suspend(struct device *dev)
static int vmbus_bus_resume(struct device *dev)
{
+ struct vmbus_channel *channel;
struct vmbus_channel_msginfo *msginfo;
size_t msgsize;
int ret;
@@ -2494,6 +2495,21 @@ static int vmbus_bus_resume(struct device *dev)
vmbus_request_offers();
+ mutex_lock(&vmbus_connection.channel_mutex);
+ list_for_each_entry(channel, &vmbus_connection.chn_list, listentry) {
+ if (channel->offermsg.child_relid != INVALID_RELID)
+ continue;
+
+ /* hvsock channels are not expected to be present. */
+ if (is_hvsock_channel(channel))
+ continue;
+
+ pr_err("channel %pUl/%pUl not present after resume.\n",
+ &channel->offermsg.offer.if_type,
+ &channel->offermsg.offer.if_instance);
+ }
+ mutex_unlock(&vmbus_connection.channel_mutex);
+
/* Reset the event for the next suspend. */
reinit_completion(&vmbus_connection.ready_for_suspend_event);
--
2.34.1
On Fri, Oct 18, 2024 at 04:58:11AM -0700, Naman Jain wrote: > From: John Starks <jostarks@microsoft.com> > > When resuming from hibernation, log any channels that were present > before hibernation but now are gone. > > Signed-off-by: John Starks <jostarks@microsoft.com> > Co-developed-by: Naman Jain <namjain@linux.microsoft.com> > Signed-off-by: Naman Jain <namjain@linux.microsoft.com> > --- > drivers/hv/vmbus_drv.c | 16 ++++++++++++++++ > 1 file changed, 16 insertions(+) > > diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c > index bd3fc41dc06b..1f56d138210e 100644 > --- a/drivers/hv/vmbus_drv.c > +++ b/drivers/hv/vmbus_drv.c > @@ -2462,6 +2462,7 @@ static int vmbus_bus_suspend(struct device *dev) > > static int vmbus_bus_resume(struct device *dev) > { > + struct vmbus_channel *channel; > struct vmbus_channel_msginfo *msginfo; > size_t msgsize; > int ret; > @@ -2494,6 +2495,21 @@ static int vmbus_bus_resume(struct device *dev) > > vmbus_request_offers(); > > + mutex_lock(&vmbus_connection.channel_mutex); > + list_for_each_entry(channel, &vmbus_connection.chn_list, listentry) { > + if (channel->offermsg.child_relid != INVALID_RELID) > + continue; > + > + /* hvsock channels are not expected to be present. */ > + if (is_hvsock_channel(channel)) > + continue; > + > + pr_err("channel %pUl/%pUl not present after resume.\n", > + &channel->offermsg.offer.if_type, > + &channel->offermsg.offer.if_instance); Do we want to put a TODO here, so as to do cleanup of these channels like force rescind etc later ? - Saurabh
On 10/21/2024 9:56 AM, Saurabh Singh Sengar wrote: > On Fri, Oct 18, 2024 at 04:58:11AM -0700, Naman Jain wrote: >> From: John Starks <jostarks@microsoft.com> >> >> When resuming from hibernation, log any channels that were present >> before hibernation but now are gone. >> >> Signed-off-by: John Starks <jostarks@microsoft.com> >> Co-developed-by: Naman Jain <namjain@linux.microsoft.com> >> Signed-off-by: Naman Jain <namjain@linux.microsoft.com> >> --- >> drivers/hv/vmbus_drv.c | 16 ++++++++++++++++ >> 1 file changed, 16 insertions(+) >> >> diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c >> index bd3fc41dc06b..1f56d138210e 100644 >> --- a/drivers/hv/vmbus_drv.c >> +++ b/drivers/hv/vmbus_drv.c >> @@ -2462,6 +2462,7 @@ static int vmbus_bus_suspend(struct device *dev) >> >> static int vmbus_bus_resume(struct device *dev) >> { >> + struct vmbus_channel *channel; >> struct vmbus_channel_msginfo *msginfo; >> size_t msgsize; >> int ret; >> @@ -2494,6 +2495,21 @@ static int vmbus_bus_resume(struct device *dev) >> >> vmbus_request_offers(); >> >> + mutex_lock(&vmbus_connection.channel_mutex); >> + list_for_each_entry(channel, &vmbus_connection.chn_list, listentry) { >> + if (channel->offermsg.child_relid != INVALID_RELID) >> + continue; >> + >> + /* hvsock channels are not expected to be present. */ >> + if (is_hvsock_channel(channel)) >> + continue; >> + >> + pr_err("channel %pUl/%pUl not present after resume.\n", >> + &channel->offermsg.offer.if_type, >> + &channel->offermsg.offer.if_instance); > > Do we want to put a TODO here, so as to do cleanup of these channels > like force rescind etc later ? > > - Saurabh Sure, we can put that. Regards, Naman
On 10/18/2024 4:58 AM, Naman Jain wrote: > From: John Starks <jostarks@microsoft.com> > > When resuming from hibernation, log any channels that were present > before hibernation but now are gone. > > Signed-off-by: John Starks <jostarks@microsoft.com> > Co-developed-by: Naman Jain <namjain@linux.microsoft.com> > Signed-off-by: Naman Jain <namjain@linux.microsoft.com> > --- > drivers/hv/vmbus_drv.c | 16 ++++++++++++++++ > 1 file changed, 16 insertions(+) > Looks good to me. Reviewed-by: Easwar Hariharan <eahariha@linux.microsoft.com>
© 2016 - 2024 Red Hat, Inc.