From nobody Sun Feb 8 07:52:40 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1531747509987921.4282060608118; Mon, 16 Jul 2018 06:25:09 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.25]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 748CA81DE2; Mon, 16 Jul 2018 13:25:08 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 37C972010CC1; Mon, 16 Jul 2018 13:25:08 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id CF77C4BB78; Mon, 16 Jul 2018 13:25:07 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w6GDOrDK028196 for ; Mon, 16 Jul 2018 09:24:53 -0400 Received: by smtp.corp.redhat.com (Postfix) id 75AC92027047; Mon, 16 Jul 2018 13:24:53 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.75]) by smtp.corp.redhat.com (Postfix) with ESMTP id D96092026D65; Mon, 16 Jul 2018 13:24:52 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Mon, 16 Jul 2018 14:24:11 +0100 Message-Id: <20180716132423.10354-26-berrange@redhat.com> In-Reply-To: <20180716132423.10354-1-berrange@redhat.com> References: <20180716132423.10354-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [go PATCH 25/37] nwfilter binding: fix error reporting thread safety X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.25 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Mon, 16 Jul 2018 13:25:09 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Create wrapper functions for each nwfilter binding C API that accepts a virErrorPtr parameter. This avoids accessing a thread local from a goroutine which may race with other goroutines doing native API calls in the same OS thread. Signed-off-by: Daniel P. Berrang=C3=A9 --- nwfilter_binding.go | 30 +++++++++++------- nwfilter_binding_wrapper.go | 63 +++++++++++++++++++++++++++++-------- nwfilter_binding_wrapper.h | 27 ++++++++++------ 3 files changed, 85 insertions(+), 35 deletions(-) diff --git a/nwfilter_binding.go b/nwfilter_binding.go index 722303b..5999d3e 100644 --- a/nwfilter_binding.go +++ b/nwfilter_binding.go @@ -45,9 +45,10 @@ func (f *NWFilterBinding) Free() error { if C.LIBVIR_VERSION_NUMBER < 4005000 { return GetNotImplementedError("virNWFilterBindingFree") } - ret :=3D C.virNWFilterBindingFreeWrapper(f.ptr) + var err C.virError + ret :=3D C.virNWFilterBindingFreeWrapper(f.ptr, &err) if ret =3D=3D -1 { - return GetLastError() + return makeError(&err) } return nil } @@ -57,9 +58,10 @@ func (c *NWFilterBinding) Ref() error { if C.LIBVIR_VERSION_NUMBER < 4005000 { return GetNotImplementedError("virNWFilterBindingRef") } - ret :=3D C.virNWFilterBindingRefWrapper(c.ptr) + var err C.virError + ret :=3D C.virNWFilterBindingRefWrapper(c.ptr, &err) if ret =3D=3D -1 { - return GetLastError() + return makeError(&err) } return nil } @@ -69,9 +71,10 @@ func (f *NWFilterBinding) Delete() error { if C.LIBVIR_VERSION_NUMBER < 4005000 { return GetNotImplementedError("virNWFilterBindingDelete") } - result :=3D C.virNWFilterBindingDeleteWrapper(f.ptr) + var err C.virError + result :=3D C.virNWFilterBindingDeleteWrapper(f.ptr, &err) if result =3D=3D -1 { - return GetLastError() + return makeError(&err) } return nil } @@ -81,9 +84,10 @@ func (f *NWFilterBinding) GetPortDev() (string, error) { if C.LIBVIR_VERSION_NUMBER < 4005000 { return "", GetNotImplementedError("virNWFilterBindingGetPortDev") } - result :=3D C.virNWFilterBindingGetPortDevWrapper(f.ptr) + var err C.virError + result :=3D C.virNWFilterBindingGetPortDevWrapper(f.ptr, &err) if result =3D=3D nil { - return "", GetLastError() + return "", makeError(&err) } name :=3D C.GoString(result) C.free(unsafe.Pointer(result)) @@ -95,9 +99,10 @@ func (f *NWFilterBinding) GetFilterName() (string, error= ) { if C.LIBVIR_VERSION_NUMBER < 4005000 { return "", GetNotImplementedError("virNWFilterBindingGetFilterName") } - result :=3D C.virNWFilterBindingGetFilterNameWrapper(f.ptr) + var err C.virError + result :=3D C.virNWFilterBindingGetFilterNameWrapper(f.ptr, &err) if result =3D=3D nil { - return "", GetLastError() + return "", makeError(&err) } name :=3D C.GoString(result) C.free(unsafe.Pointer(result)) @@ -109,9 +114,10 @@ func (f *NWFilterBinding) GetXMLDesc(flags uint32) (st= ring, error) { if C.LIBVIR_VERSION_NUMBER < 4005000 { return "", GetNotImplementedError("virNWFilterBindingGetXMLDesc") } - result :=3D C.virNWFilterBindingGetXMLDescWrapper(f.ptr, C.uint(flags)) + var err C.virError + result :=3D C.virNWFilterBindingGetXMLDescWrapper(f.ptr, C.uint(flags), &= err) if result =3D=3D nil { - return "", GetLastError() + return "", makeError(&err) } xml :=3D C.GoString(result) C.free(unsafe.Pointer(result)) diff --git a/nwfilter_binding_wrapper.go b/nwfilter_binding_wrapper.go index fdafaef..b0950b5 100644 --- a/nwfilter_binding_wrapper.go +++ b/nwfilter_binding_wrapper.go @@ -30,63 +30,100 @@ package libvirt #include #include "nwfilter_binding_wrapper.h" =20 -const char *virNWFilterBindingGetPortDevWrapper(virNWFilterBindingPtr bind= ing) + +int +virNWFilterBindingDeleteWrapper(virNWFilterBindingPtr binding, + virErrorPtr err) { #if LIBVIR_VERSION_NUMBER < 4005000 assert(0); // Caller should have checked version #else - return virNWFilterBindingGetPortDev(binding); + int ret =3D virNWFilterBindingDelete(binding); + if (ret < 0) { + virCopyLastError(err); + } + return ret; #endif } =20 =20 -const char *virNWFilterBindingGetFilterNameWrapper(virNWFilterBindingPtr b= inding) +int +virNWFilterBindingFreeWrapper(virNWFilterBindingPtr binding, + virErrorPtr err) { #if LIBVIR_VERSION_NUMBER < 4005000 assert(0); // Caller should have checked version #else - return virNWFilterBindingGetFilterName(binding); + int ret =3D virNWFilterBindingFree(binding); + if (ret < 0) { + virCopyLastError(err); + } + return ret; #endif } =20 =20 -char *virNWFilterBindingGetXMLDescWrapper(virNWFilterBindingPtr binding, - unsigned int flags) +const char * +virNWFilterBindingGetFilterNameWrapper(virNWFilterBindingPtr binding, + virErrorPtr err) { #if LIBVIR_VERSION_NUMBER < 4005000 assert(0); // Caller should have checked version #else - return virNWFilterBindingGetXMLDesc(binding, flags); + const char * ret =3D virNWFilterBindingGetFilterName(binding); + if (!ret) { + virCopyLastError(err); + } + return ret; #endif } =20 =20 -int virNWFilterBindingDeleteWrapper(virNWFilterBindingPtr binding) +const char * +virNWFilterBindingGetPortDevWrapper(virNWFilterBindingPtr binding, + virErrorPtr err) { #if LIBVIR_VERSION_NUMBER < 4005000 assert(0); // Caller should have checked version #else - return virNWFilterBindingDelete(binding); + const char * ret =3D virNWFilterBindingGetPortDev(binding); + if (!ret) { + virCopyLastError(err); + } + return ret; #endif } =20 =20 -int virNWFilterBindingRefWrapper(virNWFilterBindingPtr binding) +char * +virNWFilterBindingGetXMLDescWrapper(virNWFilterBindingPtr binding, + unsigned int flags, + virErrorPtr err) { #if LIBVIR_VERSION_NUMBER < 4005000 assert(0); // Caller should have checked version #else - return virNWFilterBindingRef(binding); + char * ret =3D virNWFilterBindingGetXMLDesc(binding, flags); + if (!ret) { + virCopyLastError(err); + } + return ret; #endif } =20 =20 -int virNWFilterBindingFreeWrapper(virNWFilterBindingPtr binding) +int +virNWFilterBindingRefWrapper(virNWFilterBindingPtr binding, + virErrorPtr err) { #if LIBVIR_VERSION_NUMBER < 4005000 assert(0); // Caller should have checked version #else - return virNWFilterBindingFree(binding); + int ret =3D virNWFilterBindingRef(binding); + if (ret < 0) { + virCopyLastError(err); + } + return ret; #endif } =20 diff --git a/nwfilter_binding_wrapper.h b/nwfilter_binding_wrapper.h index 63942be..0bcbfb7 100644 --- a/nwfilter_binding_wrapper.h +++ b/nwfilter_binding_wrapper.h @@ -30,24 +30,31 @@ #include #include "nwfilter_binding_compat.h" =20 + +int +virNWFilterBindingDeleteWrapper(virNWFilterBindingPtr binding, + virErrorPtr err); + +int +virNWFilterBindingFreeWrapper(virNWFilterBindingPtr binding, + virErrorPtr err); + const char * -virNWFilterBindingGetPortDevWrapper(virNWFilterBindingPtr binding); +virNWFilterBindingGetFilterNameWrapper(virNWFilterBindingPtr binding, + virErrorPtr err); =20 const char * -virNWFilterBindingGetFilterNameWrapper(virNWFilterBindingPtr binding); +virNWFilterBindingGetPortDevWrapper(virNWFilterBindingPtr binding, + virErrorPtr err); =20 char * virNWFilterBindingGetXMLDescWrapper(virNWFilterBindingPtr binding, - unsigned int flags); - -int -virNWFilterBindingDeleteWrapper(virNWFilterBindingPtr binding); - -int -virNWFilterBindingRefWrapper(virNWFilterBindingPtr binding); + unsigned int flags, + virErrorPtr err); =20 int -virNWFilterBindingFreeWrapper(virNWFilterBindingPtr binding); +virNWFilterBindingRefWrapper(virNWFilterBindingPtr binding, + virErrorPtr err); =20 =20 #endif /* LIBVIRT_GO_NWFILTER_BINDING_WRAPPER_H__ */ --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list