From nobody Sun Feb 8 21:27:14 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 1531747553847593.7417660096678; Mon, 16 Jul 2018 06:25:53 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9F77330820E4; Mon, 16 Jul 2018 13:25:51 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 64B4DCA5F3; Mon, 16 Jul 2018 13:25:51 +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 123EC1853DAA; Mon, 16 Jul 2018 13:25:51 +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 w6GDP5tn028350 for ; Mon, 16 Jul 2018 09:25:05 -0400 Received: by smtp.corp.redhat.com (Postfix) id 13AD72026D76; Mon, 16 Jul 2018 13:25:05 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.75]) by smtp.corp.redhat.com (Postfix) with ESMTP id 43E122026D65; Mon, 16 Jul 2018 13:25:04 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Mon, 16 Jul 2018 14:24:19 +0100 Message-Id: <20180716132423.10354-34-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 33/37] lxc: 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.27 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Mon, 16 Jul 2018 13:25:53 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Create wrapper functions for each lxc 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 --- lxc.go | 20 ++++++++++------- lxc_wrapper.go | 58 +++++++++++++++++++++++++++++++++++++++++++++++--- lxc_wrapper.h | 26 +++++++++++++++++++++- 3 files changed, 92 insertions(+), 12 deletions(-) diff --git a/lxc.go b/lxc.go index ec685b8..56ab28a 100644 --- a/lxc.go +++ b/lxc.go @@ -47,9 +47,10 @@ import ( func (d *Domain) LxcOpenNamespace(flags uint32) ([]os.File, error) { var cfdlist *C.int =20 - ret :=3D C.virDomainLxcOpenNamespace(d.ptr, &cfdlist, C.uint(flags)) + var err C.virError + ret :=3D C.virDomainLxcOpenNamespaceWrapper(d.ptr, &cfdlist, C.uint(flags= ), &err) if ret =3D=3D -1 { - return []os.File{}, GetLastError() + return []os.File{}, makeError(&err) } fdlist :=3D make([]os.File, ret) for i :=3D 0; i < int(ret); i++ { @@ -69,9 +70,10 @@ func (d *Domain) LxcEnterNamespace(fdlist []os.File, fla= gs uint32) ([]os.File, e cfdlist[i] =3D C.int(fdlist[i].Fd()) } =20 - ret :=3D C.virDomainLxcEnterNamespace(d.ptr, C.uint(len(fdlist)), &cfdlis= t[0], &ncoldfdlist, &coldfdlist, C.uint(flags)) + var err C.virError + ret :=3D C.virDomainLxcEnterNamespaceWrapper(d.ptr, C.uint(len(fdlist)), = &cfdlist[0], &ncoldfdlist, &coldfdlist, C.uint(flags), &err) if ret =3D=3D -1 { - return []os.File{}, GetLastError() + return []os.File{}, makeError(&err) } oldfdlist :=3D make([]os.File, ncoldfdlist) for i :=3D 0; i < int(ncoldfdlist); i++ { @@ -119,9 +121,10 @@ func DomainLxcEnterSecurityLabel(model *NodeSecurityMo= del, label *SecurityLabel, clabel.enforcing =3D 0 } =20 - ret :=3D C.virDomainLxcEnterSecurityLabel(&cmodel, &clabel, &coldlabel, C= .uint(flags)) + var err C.virError + ret :=3D C.virDomainLxcEnterSecurityLabelWrapper(&cmodel, &clabel, &coldl= abel, C.uint(flags), &err) if ret =3D=3D -1 { - return nil, GetLastError() + return nil, makeError(&err) } =20 var oldlabel SecurityLabel @@ -141,10 +144,11 @@ func (d *Domain) DomainLxcEnterCGroup(flags uint32) e= rror { return GetNotImplementedError("virDomainLxcEnterCGroup") } =20 - ret :=3D C.virDomainLxcEnterCGroupWrapper(d.ptr, C.uint(flags)) + var err C.virError + ret :=3D C.virDomainLxcEnterCGroupWrapper(d.ptr, C.uint(flags), &err) =20 if ret =3D=3D -1 { - return GetLastError() + return makeError(&err) } =20 return nil diff --git a/lxc_wrapper.go b/lxc_wrapper.go index 0968870..fa3d910 100644 --- a/lxc_wrapper.go +++ b/lxc_wrapper.go @@ -34,16 +34,68 @@ package libvirt #include #include "lxc_wrapper.h" =20 -int virDomainLxcEnterCGroupWrapper(virDomainPtr domain, - unsigned int flags) +int +virDomainLxcEnterCGroupWrapper(virDomainPtr domain, + unsigned int flags, + virErrorPtr err) { #if LIBVIR_VERSION_NUMBER < 2000000 assert(0); // Caller should have checked version #else - return virDomainLxcEnterCGroup(domain, flags); + int ret =3D virDomainLxcEnterCGroup(domain, flags); + if (ret < 0) { + virCopyLastError(err); + } + return ret; #endif } =20 =20 +int +virDomainLxcEnterNamespaceWrapper(virDomainPtr domain, + unsigned int nfdlist, + int *fdlist, + unsigned int *noldfdlist, + int **oldfdlist, + unsigned int flags, + virErrorPtr err) +{ + int ret =3D virDomainLxcEnterNamespace(domain, nfdlist, fdlist, noldfd= list, oldfdlist, flags); + if (ret < 0) { + virCopyLastError(err); + } + return ret; +} + + +int +virDomainLxcEnterSecurityLabelWrapper(virSecurityModelPtr model, + virSecurityLabelPtr label, + virSecurityLabelPtr oldlabel, + unsigned int flags, + virErrorPtr err) +{ + int ret =3D virDomainLxcEnterSecurityLabel(model, label, oldlabel, fla= gs); + if (ret < 0) { + virCopyLastError(err); + } + return ret; +} + + +int +virDomainLxcOpenNamespaceWrapper(virDomainPtr domain, + int **fdlist, + unsigned int flags, + virErrorPtr err) +{ + int ret =3D virDomainLxcOpenNamespace(domain, fdlist, flags); + if (ret < 0) { + virCopyLastError(err); + } + return ret; +} + + */ import "C" diff --git a/lxc_wrapper.h b/lxc_wrapper.h index 22f2d55..b3afd6e 100644 --- a/lxc_wrapper.h +++ b/lxc_wrapper.h @@ -31,9 +31,33 @@ #include #include =20 + int virDomainLxcEnterCGroupWrapper(virDomainPtr domain, - unsigned int flags); + unsigned int flags, + virErrorPtr err); + +int +virDomainLxcEnterNamespaceWrapper(virDomainPtr domain, + unsigned int nfdlist, + int *fdlist, + unsigned int *noldfdlist, + int **oldfdlist, + unsigned int flags, + virErrorPtr err); + +int +virDomainLxcEnterSecurityLabelWrapper(virSecurityModelPtr model, + virSecurityLabelPtr label, + virSecurityLabelPtr oldlabel, + unsigned int flags, + virErrorPtr err); + +int +virDomainLxcOpenNamespaceWrapper(virDomainPtr domain, + int **fdlist, + unsigned int flags, + virErrorPtr err); =20 =20 #endif /* LIBVIRT_GO_LXC_COMPAT_H__ */ --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list