From patchwork Wed Feb 3 16:37:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 12064761 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.3 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 45ADBC433DB for ; Wed, 3 Feb 2021 16:38:36 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CA25B64E50 for ; Wed, 3 Feb 2021 16:38:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CA25B64E50 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=citrix.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.80966.148638 (Exim 4.92) (envelope-from ) id 1l7LAV-00018q-S0; Wed, 03 Feb 2021 16:38:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 80966.148638; Wed, 03 Feb 2021 16:38:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l7LAV-00018j-Ox; Wed, 03 Feb 2021 16:38:15 +0000 Received: by outflank-mailman (input) for mailman id 80966; Wed, 03 Feb 2021 16:38:13 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l7LAT-000173-T2 for xen-devel@lists.xenproject.org; Wed, 03 Feb 2021 16:38:13 +0000 Received: from esa4.hc3370-68.iphmx.com (unknown [216.71.155.144]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id ae9366f3-35f7-471b-8c00-7c2ea9f0712f; Wed, 03 Feb 2021 16:38:08 +0000 (UTC) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: ae9366f3-35f7-471b-8c00-7c2ea9f0712f DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1612370287; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=/FFMstEv10Fuz2PT9ZSanWC0I4D6HCLPZ/XglOaxIvs=; b=Zvja6IBJWNaVzoIIRLoruVymJU5ikPiSygIOC9IhI3bJHMdqcEIwnoq6 MvBdleU3S86G+P7jQu67SANOHHenRtYTq081hWrIPcC7kKd8z1NzXQXA1 HY6aUvT3b5Xs+hRVODEr6h+k+nC37zabxynGNFykKDC0fUO1nsPyV64dl A=; Authentication-Results: esa4.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: PPlo+BQ4IBmPcKqqpQuwqGCHonp1+s7/0podmDR7vHMVbeEjx8zulOhF0QD0srgP+1/T7QtKjX /YaiA8nImmzAPiIrbnBH66X1YDp8n7vFzUZNr4ozJF2UJPbis1FktYnubQ7ZyfwWdkC6PvIIby kBfUlOQwSk2l5Jbqa4CBBiJzmzAr5KFZIJoQ0J1AUYJDjThOxA+h0XA5XqeioJABxnzdvB5yGx ZuBbwlt8gbEhHCSF1HkYAUjsd+ACvLv68MM/alSRIgN1FNZcc3mWlt2Ed/UaVnMrb+IyYOrb1m PtI= X-SBRS: 4.0 X-MesageID: 37815366 X-Ironport-Server: esa4.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.79,398,1602561600"; d="scan'208";a="37815366" From: Andrew Cooper To: Xen-devel CC: Andrew Cooper , Ian Jackson , Wei Liu , =?utf-8?q?Roger_Pau?= =?utf-8?q?_Monn=C3=A9?= , Manuel Bouyer Subject: [PATCH for-4.15 1/2] libs/foreignmem: Drop useless and/or misleading logging Date: Wed, 3 Feb 2021 16:37:49 +0000 Message-ID: <20210203163750.7564-1-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 These log lines are all in response to single system calls, and do not provide any information which the immediate caller can't determine themselves. It is however exceedinly rude to put junk like this onto stderr, especially as system call failures are not even error conditions in certain circumstances. The FreeBSD logging has stale function names in, and solaris shouldn't have passed code review to start with. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Ian Jackson --- CC: Ian Jackson CC: Wei Liu CC: Roger Pau Monné CC: Manuel Bouyer The errno constructs in osdep_xenforeignmemory_map_resource() are addressed in the following patch, to avoid adding complexity to this one. This reduces the quantity of noise from unit tests, where certain syscall failures are definitely not errors. --- tools/libs/foreignmemory/freebsd.c | 7 ++----- tools/libs/foreignmemory/linux.c | 6 +----- tools/libs/foreignmemory/netbsd.c | 2 -- tools/libs/foreignmemory/solaris.c | 2 +- 4 files changed, 4 insertions(+), 13 deletions(-) diff --git a/tools/libs/foreignmemory/freebsd.c b/tools/libs/foreignmemory/freebsd.c index 9a2796f0b7..04bfa806b0 100644 --- a/tools/libs/foreignmemory/freebsd.c +++ b/tools/libs/foreignmemory/freebsd.c @@ -65,10 +65,7 @@ void *osdep_xenforeignmemory_map(xenforeignmemory_handle *fmem, addr = mmap(addr, num << PAGE_SHIFT, prot, flags | MAP_SHARED, fd, 0); if ( addr == MAP_FAILED ) - { - PERROR("xc_map_foreign_bulk: mmap failed"); return NULL; - } ioctlx.num = num; ioctlx.dom = dom; @@ -80,7 +77,7 @@ void *osdep_xenforeignmemory_map(xenforeignmemory_handle *fmem, if ( rc < 0 ) { int saved_errno = errno; - PERROR("xc_map_foreign_bulk: ioctl failed"); + (void)munmap(addr, num << PAGE_SHIFT); errno = saved_errno; return NULL; @@ -137,7 +134,7 @@ int osdep_xenforeignmemory_map_resource(xenforeignmemory_handle *fmem, int saved_errno; if ( errno != ENOSYS ) - PERROR("mmap resource ioctl failed"); + ; else errno = EOPNOTSUPP; diff --git a/tools/libs/foreignmemory/linux.c b/tools/libs/foreignmemory/linux.c index d0eead1196..050b9ed3a5 100644 --- a/tools/libs/foreignmemory/linux.c +++ b/tools/libs/foreignmemory/linux.c @@ -171,10 +171,7 @@ void *osdep_xenforeignmemory_map(xenforeignmemory_handle *fmem, addr = mmap(addr, num << PAGE_SHIFT, prot, flags | MAP_SHARED, fd, 0); if ( addr == MAP_FAILED ) - { - PERROR("mmap failed"); return NULL; - } ioctlx.num = num; ioctlx.dom = dom; @@ -273,7 +270,6 @@ void *osdep_xenforeignmemory_map(xenforeignmemory_handle *fmem, { int saved_errno = errno; - PERROR("ioctl failed"); (void)munmap(addr, num << PAGE_SHIFT); errno = saved_errno; return NULL; @@ -330,7 +326,7 @@ int osdep_xenforeignmemory_map_resource( int saved_errno; if ( errno != fmem->unimpl_errno && errno != EOPNOTSUPP ) - PERROR("ioctl failed"); + ; else errno = EOPNOTSUPP; diff --git a/tools/libs/foreignmemory/netbsd.c b/tools/libs/foreignmemory/netbsd.c index 4ae60aafdd..565682e064 100644 --- a/tools/libs/foreignmemory/netbsd.c +++ b/tools/libs/foreignmemory/netbsd.c @@ -147,8 +147,6 @@ int osdep_xenforeignmemory_map_resource( rc = ioctl(fmem->fd, IOCTL_PRIVCMD_MMAP_RESOURCE, &mr); if ( rc ) { - PERROR("ioctl failed"); - if ( fres->addr ) { int saved_errno = errno; diff --git a/tools/libs/foreignmemory/solaris.c b/tools/libs/foreignmemory/solaris.c index ee8aae4fbd..958fb01f6d 100644 --- a/tools/libs/foreignmemory/solaris.c +++ b/tools/libs/foreignmemory/solaris.c @@ -83,7 +83,7 @@ void *osdep_map_foreign_batch(xenforeignmem_handle *fmem, uint32_t dom, if ( ioctl(fd, IOCTL_PRIVCMD_MMAPBATCH, &ioctlx) < 0 ) { int saved_errno = errno; - PERROR("XXXXXXXX"); + (void)munmap(addr, num*XC_PAGE_SIZE); errno = saved_errno; return NULL;