Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp161820pxj; Wed, 23 Jun 2021 18:40:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzwjDruIgIOXf8EPwSk8BxoPw8UyjxFOL5fwnPhlomhGiEAEW8KmMzm65WA3V9ZNG4ILDiK X-Received: by 2002:a17:906:ece7:: with SMTP id qt7mr2739085ejb.194.1624498812452; Wed, 23 Jun 2021 18:40:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624498812; cv=none; d=google.com; s=arc-20160816; b=HEf0asf/MoUi8z+nFBmWRQ4KP3yM8pIf9wiK9v6Conghdy1hAJW+djIHu7xJ68EArl hC5nj7JaA7UqZjMZvOv3UNPrg0YSoXNWOcY9srLlpjSUhq+sbELhoQHxw/bgLPAh41hO FQ4ZwHVnOnAo0R5muFR3KkYLti0A4NwGc+LtaOe/+WnqVjfXk4DxfGVS9sXlawGNm3Ph PZlXoYMsHhaqTm7kuwA3yVY+uipJHf3OQW8QNJU90pnw9FIx7r4TKloZvlw/N1K+aAbe wHowXQvNbV0eOrNVJcNNBaVbJy9qE4/Ng9UD2wIWG8RAG4gzkt9aFR4lvlk+UGwCtSHe xfsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from:ironport-sdr:ironport-sdr; bh=+5S3B779niG397coSs1G5XhERjbdbdghIk5GRzO23u4=; b=MgVeVU+6VqrCTKDDVayvkAiPVs5V+x3u55SYr+ufJ7aU4nSOdj/3sIklZDq52tpVoa i7lcL35PhMrUVlAn5yjyT9LgsqQapZLelFr1wsf98aZu8/QOBgPlaFWiRZKA4f/ye7aS 1ySh6K/x04deW0P2dMFJYQ1svZ8a1GcljfptMh/sJamwzbsrD+mozg16q0ceJEh5Pb6E 0dawPm0zhLnB3zYkvM0iBpfg7XtIVTOlkomCkHT1IGJAg9dfsp1a3EcC1l2myeuYBAd+ y1pezIXSmDIlJ2KNwlmv0Dc/ZKkVXOB7koXpb81p/mF91s4sUgAxqOnFVV2QZI0OImZh vdQg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id be3si1520256edb.568.2021.06.23.18.39.50; Wed, 23 Jun 2021 18:40:12 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230136AbhFXBja (ORCPT + 99 others); Wed, 23 Jun 2021 21:39:30 -0400 Received: from mga17.intel.com ([192.55.52.151]:8667 "EHLO mga17.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230073AbhFXBjY (ORCPT ); Wed, 23 Jun 2021 21:39:24 -0400 IronPort-SDR: ACeMn9Q5keVvZ8GDXirNaBFpB4JCrVjLiO3jOV4xVGREiUW7VIyzdQDM+o4hu/WY7KOujsLHc5 QroIMRrKM9/Q== X-IronPort-AV: E=McAfee;i="6200,9189,10024"; a="187757008" X-IronPort-AV: E=Sophos;i="5.83,295,1616482800"; d="scan'208";a="187757008" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2021 18:37:06 -0700 IronPort-SDR: /prgj+bOua6hpWNlY0xsQht/knDxpSKZPknnLggEf1HlP7WTcgJL5G64yZxwzFRnYbI6ZfwKOL tDNUGkTEpUZw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.83,295,1616482800"; d="scan'208";a="490928501" Received: from otc-lr-04.jf.intel.com ([10.54.39.41]) by fmsmga002.fm.intel.com with ESMTP; 23 Jun 2021 18:37:05 -0700 From: kan.liang@linux.intel.com To: peterz@infradead.org, mingo@redhat.com, linux-kernel@vger.kernel.org Cc: eranian@google.com, namhyung@kernel.org, acme@kernel.org, jolsa@redhat.com, ak@linux.intel.com, Kan Liang , stable@vger.kernel.org Subject: [PATCH 7/7] perf/x86/intel/uncore: Fix invalid unit check Date: Wed, 23 Jun 2021 18:22:09 -0700 Message-Id: <1624497729-158864-8-git-send-email-kan.liang@linux.intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1624497729-158864-1-git-send-email-kan.liang@linux.intel.com> References: <1624497729-158864-1-git-send-email-kan.liang@linux.intel.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Kan Liang The uncore unit with the type ID 0 and the unit ID 0 is missed. The table3 of the uncore unit maybe 0. The uncore_discovery_invalid_unit() mistakenly treated it as an invalid value. Remove the !unit.table3 check. Fixes: edae1f06c2cd ("perf/x86/intel/uncore: Parse uncore discovery tables") Reviewed-by: Andi Kleen Signed-off-by: Kan Liang Cc: stable@vger.kernel.org --- arch/x86/events/intel/uncore_discovery.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/events/intel/uncore_discovery.h b/arch/x86/events/intel/uncore_discovery.h index 7280c8a..6d735611 100644 --- a/arch/x86/events/intel/uncore_discovery.h +++ b/arch/x86/events/intel/uncore_discovery.h @@ -30,7 +30,7 @@ #define uncore_discovery_invalid_unit(unit) \ - (!unit.table1 || !unit.ctl || !unit.table3 || \ + (!unit.table1 || !unit.ctl || \ unit.table1 == -1ULL || unit.ctl == -1ULL || \ unit.table3 == -1ULL) -- 2.7.4