From owner-svn-src-head@freebsd.org Wed Jan 29 03:15:35 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A864F1B4DAF; Wed, 29 Jan 2020 03:15:35 +0000 (UTC) (envelope-from cem@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 486pX740Cgz42P6; Wed, 29 Jan 2020 03:15:35 +0000 (UTC) (envelope-from cem@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8439C5A9A; Wed, 29 Jan 2020 03:15:35 +0000 (UTC) (envelope-from cem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 00T3FZjf039774; Wed, 29 Jan 2020 03:15:35 GMT (envelope-from cem@FreeBSD.org) Received: (from cem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 00T3FZGd039773; Wed, 29 Jan 2020 03:15:35 GMT (envelope-from cem@FreeBSD.org) Message-Id: <202001290315.00T3FZGd039773@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cem set sender to cem@FreeBSD.org using -f From: Conrad Meyer Date: Wed, 29 Jan 2020 03:15:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r357240 - in head/sys: kern x86/cpufreq X-SVN-Group: head X-SVN-Commit-Author: cem X-SVN-Commit-Paths: in head/sys: kern x86/cpufreq X-SVN-Commit-Revision: 357240 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Jan 2020 03:15:35 -0000 Author: cem Date: Wed Jan 29 03:15:34 2020 New Revision: 357240 URL: https://svnweb.freebsd.org/changeset/base/357240 Log: hwpstate_intel(4): Silence/fix Coverity reports These were all introduced in the initial import of hwpstate_intel(4). Reported by: Coverity CIDs: 1413161, 1413164, 1413165, 1413167 X-MFC-With: r357002 Modified: head/sys/kern/kern_cpu.c head/sys/x86/cpufreq/hwpstate_intel.c Modified: head/sys/kern/kern_cpu.c ============================================================================== --- head/sys/kern/kern_cpu.c Wed Jan 29 01:57:07 2020 (r357239) +++ head/sys/kern/kern_cpu.c Wed Jan 29 03:15:34 2020 (r357240) @@ -473,11 +473,12 @@ cf_get_method(device_t dev, struct cf_level *level) * first try the driver and if that fails, fall back to * estimating. */ - if (CPUFREQ_DRV_GET(sc->cf_drv_dev, &set) != 0) - goto estimate; - sc->curr_level.total_set = set; - CF_DEBUG("get returning immediate freq %d\n", curr_set->freq); - goto out; + if (CPUFREQ_DRV_GET(sc->cf_drv_dev, &set) == 0) { + sc->curr_level.total_set = set; + CF_DEBUG("get returning immediate freq %d\n", + curr_set->freq); + goto out; + } } else if (curr_set->freq != CPUFREQ_VAL_UNKNOWN) { CF_DEBUG("get returning known freq %d\n", curr_set->freq); error = 0; @@ -522,9 +523,6 @@ cf_get_method(device_t dev, struct cf_level *level) CF_DEBUG("get matched freq %d from drivers\n", curr_set->freq); goto out; } - -estimate: - CF_MTX_ASSERT(&sc->lock); /* * We couldn't find an exact match, so attempt to estimate and then Modified: head/sys/x86/cpufreq/hwpstate_intel.c ============================================================================== --- head/sys/x86/cpufreq/hwpstate_intel.c Wed Jan 29 01:57:07 2020 (r357239) +++ head/sys/x86/cpufreq/hwpstate_intel.c Wed Jan 29 03:15:34 2020 (r357240) @@ -147,17 +147,19 @@ intel_hwp_dump_sysctl_handler(SYSCTL_HANDLER_ARGS) sbuf_printf(sb, "\tLowest Performance: %03ju\n", (data >> 24) & 0xff); rdmsr_safe(MSR_IA32_HWP_REQUEST, &data); - if (sc->hwp_pkg_ctrl && (data & IA32_HWP_REQUEST_PACKAGE_CONTROL)) { + data2 = 0; + if (sc->hwp_pkg_ctrl && (data & IA32_HWP_REQUEST_PACKAGE_CONTROL)) rdmsr_safe(MSR_IA32_HWP_REQUEST_PKG, &data2); - } sbuf_putc(sb, '\n'); -#define pkg_print(x, name, offset) do { \ - if (!sc->hwp_pkg_ctrl || (data & x) != 0) \ - sbuf_printf(sb, "\t%s: %03ju\n", name, (data >> offset) & 0xff);\ - else \ - sbuf_printf(sb, "\t%s: %03ju\n", name, (data2 >> offset) & 0xff);\ +#define pkg_print(x, name, offset) do { \ + if (!sc->hwp_pkg_ctrl || (data & x) != 0) \ + sbuf_printf(sb, "\t%s: %03u\n", name, \ + (unsigned)(data >> offset) & 0xff); \ + else \ + sbuf_printf(sb, "\t%s: %03u\n", name, \ + (unsigned)(data2 >> offset) & 0xff); \ } while (0) pkg_print(IA32_HWP_REQUEST_EPP_VALID, @@ -413,7 +415,7 @@ intel_hwpstate_attach(device_t dev) SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, - "epp", CTLTYPE_INT | CTLFLAG_RWTUN, dev, sizeof(dev), + "epp", CTLTYPE_INT | CTLFLAG_RWTUN, dev, 0, sysctl_epp_select, "I", "Efficiency/Performance Preference " "(range from 0, most performant, through 100, most efficient)");