From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id D98A12095BB74 for ; Wed, 13 Sep 2017 00:24:02 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1B2FA5D689; Wed, 13 Sep 2017 07:27:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 1B2FA5D689 Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=lersek@redhat.com Received: from lacos-laptop-7.usersys.redhat.com (ovpn-120-116.rdu2.redhat.com [10.10.120.116]) by smtp.corp.redhat.com (Postfix) with ESMTP id 944BB5E1D1; Wed, 13 Sep 2017 07:26:58 +0000 (UTC) To: Brijesh Singh , edk2-devel@lists.01.org Cc: Jordan Justen , Tom Lendacky , Ard Biesheuvel References: <20170911121657.34992-1-brijesh.singh@amd.com> <20170911121657.34992-2-brijesh.singh@amd.com> From: Laszlo Ersek Message-ID: <0dcaccdc-00c7-4100-4c3e-616f7bba6b66@redhat.com> Date: Wed, 13 Sep 2017 09:26:57 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.3.0 MIME-Version: 1.0 In-Reply-To: <20170911121657.34992-2-brijesh.singh@amd.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Wed, 13 Sep 2017 07:27:00 +0000 (UTC) Subject: Re: [PATCH v2 1/8] OvmfPkg/VirtioNetDxe: add helper VirtioNetUninitRing() X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Sep 2017 07:24:03 -0000 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit On 09/11/17 14:16, Brijesh Singh wrote: > Consolidate the virtio VRING resource cleanup into VirtioNetUninitRing(). > > Cc: Ard Biesheuvel > Cc: Jordan Justen > Cc: Tom Lendacky > Cc: Laszlo Ersek > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Brijesh Singh > --- > OvmfPkg/VirtioNetDxe/VirtioNet.h | 7 +++++++ > OvmfPkg/VirtioNetDxe/SnpInitialize.c | 4 ++-- > OvmfPkg/VirtioNetDxe/SnpSharedHelpers.c | 16 ++++++++++++++++ > OvmfPkg/VirtioNetDxe/SnpShutdown.c | 4 ++-- > OvmfPkg/VirtioNetDxe/TechNotes.txt | 5 +++-- > 5 files changed, 30 insertions(+), 6 deletions(-) > > diff --git a/OvmfPkg/VirtioNetDxe/VirtioNet.h b/OvmfPkg/VirtioNetDxe/VirtioNet.h > index 710859bc6115..87a0f06e01a4 100644 > --- a/OvmfPkg/VirtioNetDxe/VirtioNet.h > +++ b/OvmfPkg/VirtioNetDxe/VirtioNet.h > @@ -263,6 +263,13 @@ VirtioNetShutdownTx ( > IN OUT VNET_DEV *Dev > ); > > +VOID > +EFIAPI > +VirtioNetUninitRing ( > + IN OUT VNET_DEV *Dev, > + IN OUT VRING *Ring > + ); > + > // > // event callbacks > // > diff --git a/OvmfPkg/VirtioNetDxe/SnpInitialize.c b/OvmfPkg/VirtioNetDxe/SnpInitialize.c > index 0ecfe044a977..637c978709fd 100644 > --- a/OvmfPkg/VirtioNetDxe/SnpInitialize.c > +++ b/OvmfPkg/VirtioNetDxe/SnpInitialize.c > @@ -510,10 +510,10 @@ AbortDevice: > Dev->VirtIo->SetDeviceStatus (Dev->VirtIo, 0); > > ReleaseTxRing: > - VirtioRingUninit (Dev->VirtIo, &Dev->TxRing); > + VirtioNetUninitRing (Dev, &Dev->TxRing); > > ReleaseRxRing: > - VirtioRingUninit (Dev->VirtIo, &Dev->RxRing); > + VirtioNetUninitRing (Dev, &Dev->RxRing); > > DeviceFailed: > // > diff --git a/OvmfPkg/VirtioNetDxe/SnpSharedHelpers.c b/OvmfPkg/VirtioNetDxe/SnpSharedHelpers.c > index 9fedb72fdbd4..5b75eabc7a6b 100644 > --- a/OvmfPkg/VirtioNetDxe/SnpSharedHelpers.c > +++ b/OvmfPkg/VirtioNetDxe/SnpSharedHelpers.c > @@ -51,3 +51,19 @@ VirtioNetShutdownTx ( > { > FreePool (Dev->TxFreeStack); > } > + > +/** > + Release TX and RX VRING resources. > + > + @param[in,out] Dev The VNET_DEV driver instance which was using the ring. > + @param[in,out] Ring The virtio ring to clean up. > +*/ > +VOID > +EFIAPI > +VirtioNetUninitRing ( > + IN OUT VNET_DEV *Dev, > + IN OUT VRING *Ring > + ) > +{ > + VirtioRingUninit (Dev->VirtIo, Ring); > +} > diff --git a/OvmfPkg/VirtioNetDxe/SnpShutdown.c b/OvmfPkg/VirtioNetDxe/SnpShutdown.c > index 5e84191fbbdd..432e0691d457 100644 > --- a/OvmfPkg/VirtioNetDxe/SnpShutdown.c > +++ b/OvmfPkg/VirtioNetDxe/SnpShutdown.c > @@ -67,8 +67,8 @@ VirtioNetShutdown ( > Dev->VirtIo->SetDeviceStatus (Dev->VirtIo, 0); > VirtioNetShutdownRx (Dev); > VirtioNetShutdownTx (Dev); > - VirtioRingUninit (Dev->VirtIo, &Dev->TxRing); > - VirtioRingUninit (Dev->VirtIo, &Dev->RxRing); > + VirtioNetUninitRing (Dev, &Dev->TxRing); > + VirtioNetUninitRing (Dev, &Dev->RxRing); > > Dev->Snm.State = EfiSimpleNetworkStarted; > Status = EFI_SUCCESS; > diff --git a/OvmfPkg/VirtioNetDxe/TechNotes.txt b/OvmfPkg/VirtioNetDxe/TechNotes.txt > index 9c1dfe6a773e..86b91f561495 100644 > --- a/OvmfPkg/VirtioNetDxe/TechNotes.txt > +++ b/OvmfPkg/VirtioNetDxe/TechNotes.txt > @@ -70,8 +70,9 @@ faithfully indented) that implement the transition. > VirtioNetInitialize | | VirtioNetShutdown > VirtioNetInitRing {Rx, Tx} | | VirtioNetShutdownRx [SnpSharedHelpers.c] > VirtioRingInit | | VirtioNetShutdownTx [SnpSharedHelpers.c] > - VirtioNetInitTx | | VirtioRingUninit {Tx, Rx} > - VirtioNetInitRx | | > + VirtioNetInitTx | | VirtioNetUninitRing [SnpSharedHelpers.c] > + VirtioNetInitRx | | {Tx, Rx} > + | | VirtioRingUninit > v | > +-----------------------------+ > | EfiSimpleNetworkInitialized | > Reviewed-by: Laszlo Ersek