From patchwork Thu Nov 17 03:59:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jithu Joseph X-Patchwork-Id: 21409 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp200986wrr; Wed, 16 Nov 2022 20:02:35 -0800 (PST) X-Google-Smtp-Source: AA0mqf77qC91l7XAwyd4nc+btAuQhjiq8BA7AtS8uFx5/xzv4knWuIvtOZNfuYLyMuMkd22qgBgR X-Received: by 2002:aa7:9508:0:b0:56d:3180:e885 with SMTP id b8-20020aa79508000000b0056d3180e885mr1096895pfp.82.1668657755221; Wed, 16 Nov 2022 20:02:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668657755; cv=none; d=google.com; s=arc-20160816; b=m0yQAtcGtVhrcWvVhaW0C8nJH/ZfVQh73bv54XRGhUOGJSYu8Gs34JQt2iONcH90mT 4mLkfpt9QbuK4mKUjn8sTo9pBI+oyRzbr22NwAHVtcSOSffWKVAom2+1IECdrCIMLETL +jMIM1bxYV6G/mCy2awSkATRBLMTq5LVZvBqvOHjHYmtPL/YoFgXeTFXIx+VFymvNAk4 1ijbZUzELFlWhmSrEluG37zYPc2ylODO8Fn1nblt1azPnhq5KE2pw4t+jomxORNM6bzJ vGIfn+En33gPRFd6AG5Hb0WUpjzaFVCZx3F4EDPp4rbYtF+CgqjqzzRGrmu1+luVElQV cAHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=E1/jnY20q9IJiDHF7XtMF9JhMKaGCJX517YN66noNwk=; b=sFGSTLgL/yR/oAZLch6J0DNFZ6/paBT3fHZTtadlmiancwk5ma3rb4NCMSl1war6cU jZlnM4mQLlJHdzUg1HgTQJmz3abfW7z39FLdU70/FxeWpXpc0O/L1qgnaGiFHfQKaRjh teRJYklB5Q2xdwQXLAt02cdSelEDv/+vvVmYbFDQIqDXoLX1toVVZFrOx6zKDOptMIpz m3qiyW9SsAAHZYRfXltNPzYBh5GfJzNDhrm67tqcfdINCfWrhorScTiBhicwGWoZIc6c tnFNBH8HgfgB4Wyl905Y48aqovgT4cSJxFJlpFyReEnBf176ClvrO7ocaW5t4l6Ju1ke u7iQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=KDLng98J; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id p7-20020a170902e74700b00179ec1d9eb4si19426197plf.112.2022.11.16.20.02.21; Wed, 16 Nov 2022 20:02:35 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=KDLng98J; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239160AbiKQEBa (ORCPT + 99 others); Wed, 16 Nov 2022 23:01:30 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34350 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233752AbiKQEA6 (ORCPT ); Wed, 16 Nov 2022 23:00:58 -0500 Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4B4164B987; Wed, 16 Nov 2022 20:00:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1668657657; x=1700193657; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=I+6q8OWkdcOdkqEfAt26lA7GoyOqUkvnJVI6O2aVclE=; b=KDLng98JYJ4nioBucOegbRpREMzuzxhBn18LM9B5JWTVyvHBPk383f2a 4DPZbAPcrpRcYA7e1Q3cLBhRpuzYcg/MZjB84mOqc6gM4XTf+Arn39eNS F3WxFbfP3k+MPPM3WEEACseSuZxSBku/X76pyFlwQf3HsNfvWpfc+Miej LqV9pGRHAh854c84y/93m/KE5dBA9SgZIha5tJvepekRYtWg2qw5u5Ydb P5gYmhPNwlg9WyVw/624tr7E1PrUpdP8QH4Sssr82jdG0rrg6Jq0E7Hc0 vkwHGpnNBkQWnK0ytW+axw2OVtWryld9sc1HBXbaM8I19jLzXJvUfdqpX g==; X-IronPort-AV: E=McAfee;i="6500,9779,10533"; a="292455958" X-IronPort-AV: E=Sophos;i="5.96,169,1665471600"; d="scan'208";a="292455958" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Nov 2022 20:00:56 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10533"; a="590462674" X-IronPort-AV: E=Sophos;i="5.96,169,1665471600"; d="scan'208";a="590462674" Received: from jithujos.sc.intel.com ([172.25.103.66]) by orsmga003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Nov 2022 20:00:56 -0800 From: Jithu Joseph To: hdegoede@redhat.com, markgross@kernel.org Cc: tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, x86@kernel.org, hpa@zytor.com, gregkh@linuxfoundation.org, jithu.joseph@intel.com, ashok.raj@intel.com, tony.luck@intel.com, linux-kernel@vger.kernel.org, platform-driver-x86@vger.kernel.org, patches@lists.linux.dev, ravi.v.shankar@intel.com, thiago.macieira@intel.com, athenas.jimenez.gonzalez@intel.com, sohil.mehta@intel.com Subject: [PATCH v3 04/16] platform/x86/intel/ifs: Remove memory allocation from load path Date: Wed, 16 Nov 2022 19:59:23 -0800 Message-Id: <20221117035935.4136738-5-jithu.joseph@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221117035935.4136738-1-jithu.joseph@intel.com> References: <20221107225323.2733518-1-jithu.joseph@intel.com> <20221117035935.4136738-1-jithu.joseph@intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_PASS,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749714474701316219?= X-GMAIL-MSGID: =?utf-8?q?1749714474701316219?= IFS requires tests to be authenticated once for each CPU socket on a system. scan_chunks_sanity_check() was dynamically allocating memory to store the state of whether tests have been authenticated on each socket for every load operation. Move the memory allocation to init path. Reviewed-by: Tony Luck Suggested-by: Borislav Petkov Signed-off-by: Jithu Joseph --- drivers/platform/x86/intel/ifs/ifs.h | 2 ++ drivers/platform/x86/intel/ifs/core.c | 13 +++++++++++-- drivers/platform/x86/intel/ifs/load.c | 14 ++++---------- 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/drivers/platform/x86/intel/ifs/ifs.h b/drivers/platform/x86/intel/ifs/ifs.h index 3ff1d9aaeaa9..3a051890d9e7 100644 --- a/drivers/platform/x86/intel/ifs/ifs.h +++ b/drivers/platform/x86/intel/ifs/ifs.h @@ -229,4 +229,6 @@ void ifs_load_firmware(struct device *dev); int do_core_test(int cpu, struct device *dev); const struct attribute_group **ifs_get_groups(void); +extern bool *ifs_pkg_auth; + #endif diff --git a/drivers/platform/x86/intel/ifs/core.c b/drivers/platform/x86/intel/ifs/core.c index 5fb7f655c291..4b39f2359180 100644 --- a/drivers/platform/x86/intel/ifs/core.c +++ b/drivers/platform/x86/intel/ifs/core.c @@ -4,6 +4,7 @@ #include #include #include +#include #include @@ -30,6 +31,8 @@ static struct ifs_device ifs_device = { }, }; +bool *ifs_pkg_auth; + static int __init ifs_init(void) { const struct x86_cpu_id *m; @@ -51,8 +54,13 @@ static int __init ifs_init(void) ifs_device.misc.groups = ifs_get_groups(); if ((msrval & BIT(ifs_device.data.integrity_cap_bit)) && - !misc_register(&ifs_device.misc)) - return 0; + !misc_register(&ifs_device.misc)) { + ifs_pkg_auth = kmalloc_array(topology_max_packages(), sizeof(bool), GFP_KERNEL); + if (!ifs_pkg_auth) + return -ENOMEM; + else + return 0; + } return -ENODEV; } @@ -60,6 +68,7 @@ static int __init ifs_init(void) static void __exit ifs_exit(void) { misc_deregister(&ifs_device.misc); + kfree(ifs_pkg_auth); } module_init(ifs_init); diff --git a/drivers/platform/x86/intel/ifs/load.c b/drivers/platform/x86/intel/ifs/load.c index 89ce265887ea..c914e4d359db 100644 --- a/drivers/platform/x86/intel/ifs/load.c +++ b/drivers/platform/x86/intel/ifs/load.c @@ -3,7 +3,6 @@ #include #include -#include #include #include "ifs.h" @@ -118,16 +117,12 @@ static void copy_hashes_authenticate_chunks(struct work_struct *work) */ static int scan_chunks_sanity_check(struct device *dev) { - int metadata_size, curr_pkg, cpu, ret = -ENOMEM; + int metadata_size, curr_pkg, cpu, ret; struct ifs_data *ifsd = ifs_get_data(dev); - bool *package_authenticated; struct ifs_work local_work; char *test_ptr; - package_authenticated = kcalloc(topology_max_packages(), sizeof(bool), GFP_KERNEL); - if (!package_authenticated) - return ret; - + memset(ifs_pkg_auth, 0, (topology_max_packages() * sizeof(bool))); metadata_size = ifs_header_ptr->metadata_size; /* Spec says that if the Meta Data Size = 0 then it should be treated as 2000 */ @@ -150,7 +145,7 @@ static int scan_chunks_sanity_check(struct device *dev) cpus_read_lock(); for_each_online_cpu(cpu) { curr_pkg = topology_physical_package_id(cpu); - if (package_authenticated[curr_pkg]) + if (ifs_pkg_auth[curr_pkg]) continue; reinit_completion(&ifs_done); local_work.dev = dev; @@ -161,12 +156,11 @@ static int scan_chunks_sanity_check(struct device *dev) ret = -EIO; goto out; } - package_authenticated[curr_pkg] = 1; + ifs_pkg_auth[curr_pkg] = 1; } ret = 0; out: cpus_read_unlock(); - kfree(package_authenticated); return ret; }