Received: by 2002:a05:6602:18e:0:0:0:0 with SMTP id m14csp507983ioo; Thu, 26 May 2022 08:19:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwnWu1waRfL/Q7orOybTES9zTIDOIcHCK3cIG7tEgb2LCpeRwfGAz9ikieuJSqsEMBwI7LB X-Received: by 2002:a63:2a0d:0:b0:3ab:392c:f45c with SMTP id q13-20020a632a0d000000b003ab392cf45cmr33453442pgq.575.1653578373908; Thu, 26 May 2022 08:19:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653578373; cv=none; d=google.com; s=arc-20160816; b=mviNdwXvqRKL7KxfyLxQddo7pSXjBAxPMrll7jmmrUZQRcWkD+8fhdQ95uCIaQVDrR ZfQ1UNPd/ABhFfQbK9NwUkQg6AG+Ydyevqmk7kmzJI+34etcD8cq2VQK1B/CZabq8WeU 1keLkr44APEH2F2KLOZqBWh7TsM+6R5au30IXoyzBlLd9wMpdHKbWaykP5aLklcIC06J AfXgtXTX6oX3mdg2qe5/PyrBr5GYb3Z7AILXHr+VyUP4+phpXCTZRW8WjSAnQJq8WJVM De1xBONOlYFQ19WZRMqVW5wPNJ7/R4nDB7ademNu9wtWMiQYOI01Yp/AKiyE53fQeYNt UCNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=U0EdlvmNgLA82rFNPmjP961+7h82amiHZTK2uQRevWY=; b=cH/U995h/tX3uBIPFZVaxtmCEauKTZ9bH01ZYWD1yYv669ATjYFZ3K4IVVeB0Je+Qn I/SXr802A6BVU6Zg7dKz5O9vM0XhZ7ErYbNBCow1Eu6iCiM9Tfzx9p3d5jWLxs7YFkqj Z1BBL/EIM2yNTK0mrBSggpGJmk5+pFad+tgKZtUlXjqcNqLfPV1eaXk5MTs22G5sveE8 oKJzfrUP7yQ60apVo6e8DbIAXldb4uA0l6TuXeGmeWQYe9tMbE5PaIvr6bg58KeFwGlK 3MFCCZu6HPe6TAkJB6dJP6gXGEw9nL8rLCn/+uRYAdqdRz+IB3uA8hdZZ6Roj+EunNCK 4Eog== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=kaSedkaA; 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 Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m10-20020a63fd4a000000b003f5ef329b7csi2447509pgj.607.2022.05.26.08.19.21; Thu, 26 May 2022 08:19:33 -0700 (PDT) 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=kaSedkaA; 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 S229824AbiEZIEJ (ORCPT + 99 others); Thu, 26 May 2022 04:04:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53616 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238251AbiEZIEA (ORCPT ); Thu, 26 May 2022 04:04:00 -0400 Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 31DB270347; Thu, 26 May 2022 01:03:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1653552239; x=1685088239; h=date:from:to:cc:subject:message-id:references: mime-version:in-reply-to; bh=KYJcoeoU15i9ZWPMpNDunjRIVfmvmpiFWdOJ7UiEzQY=; b=kaSedkaAQpwBP1HCTqU53KPs4ITGvsR7jRTkNSbU9D6H1+eeg5J3PV7L dE+VDRt1T5uXEKKwRq6NZGcNNwTakHT5TFSoL2/z7jx5KMnHEOXIJqOWp NuXn3kvgj0ayWkwbd9kJRg1wd/XJVi7M6nomgZ4kW+I5onFYYbDz+hqwF qqy41RlK8xNSf+jMdzRPe0Q8UPM2igGbjD9f26Es1QkTJgspJOgkiUaFk ajZh9vljwUr0+F8+6SgY83+FXQQ1KbSsRCQYqcwOH6E+OtCF0+G3N0dVj Ki3IWP73WZ579uENbhX83D1rtVVYN2wbpm4cNm9Av+lZ70d8aLU+ReAMM g==; X-IronPort-AV: E=McAfee;i="6400,9594,10358"; a="299411965" X-IronPort-AV: E=Sophos;i="5.91,252,1647327600"; d="scan'208";a="299411965" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 May 2022 01:03:59 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.91,252,1647327600"; d="scan'208";a="718149668" Received: from yilunxu-optiplex-7050.sh.intel.com (HELO localhost) ([10.239.159.135]) by fmsmga001.fm.intel.com with ESMTP; 26 May 2022 01:03:56 -0700 Date: Thu, 26 May 2022 15:56:15 +0800 From: Xu Yilun To: Russ Weight Cc: mdf@kernel.org, hao.wu@intel.com, lee.jones@linaro.org, linux-fpga@vger.kernel.org, linux-kernel@vger.kernel.org, trix@redhat.com, marpagan@redhat.com, lgoncalv@redhat.com, matthew.gerlach@linux.intel.com, basheer.ahmed.muddebihal@intel.com, tianfei.zhang@intel.com Subject: Re: [PATCH v21 4/5] fpga: m10bmc-sec: expose max10 canceled keys in sysfs Message-ID: <20220526075615.GE148394@yilunxu-OptiPlex-7050> References: <20220521003607.737734-1-russell.h.weight@intel.com> <20220521003607.737734-5-russell.h.weight@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220521003607.737734-5-russell.h.weight@intel.com> X-Spam-Status: No, score=-7.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE 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 On Fri, May 20, 2022 at 05:36:06PM -0700, Russ Weight wrote: > Extend the MAX10 BMC Secure Update driver to provide sysfs files to > expose the 128 bit code signing key (CSK) cancellation vectors. These use > the standard bitmap list format (e.g. 1,2-6,9). > > Each CSK is assigned an ID, a number between 0-127, during the signing > process. CSK ID cancellation information is stored in 128-bit fields in > write-once locations in flash. The cancellation of a CSK can be used > to prevent the card from being rolled back to older images that were > signed with a CSK that is now cancelled. > > Signed-off-by: Russ Weight > Reviewed-by: Tom Rix Acked-by: Xu Yilun > --- > v21: > - Replace WARN_ON(size % stride) with a more elaborate test. Return > -EINVAL and write a message to the kernel log. Call WARN_ON_ONCE(). > v20: > - Added text to the commit message to further describe the cancellation of > code signing keys. > v19: > - Change "card bmc" naming back to "m10 bmc" naming to be consistent > with the parent driver. > v18: > - No change > v17: > - Update the Date and KernelVersion for the ABI documentation to Jul 2022 > and 5.19 respectively. > - Change "m10bmc" in symbol names to "cardbmc" to reflect the fact that the > future devices will not necessarily use the MAX10. > v16: > - No Change > v15: > - Updated the Dates and KernelVersions in the ABI documentation > v14: > - No changes > v13: > - Updated ABI documentation date and kernel version > v12: > - Updated Date and KernelVersion fields in ABI documentation > v11: > - No change > v10: > - Changed the path expressions in the sysfs documentation to > replace the n3000 reference with something more generic to > accomodate other devices that use the same driver. > v9: > - Rebased to 5.12-rc2 next > - Updated Date and KernelVersion in ABI documentation > v8: > - Previously patch 4/6, otherwise no change > v7: > - Updated Date and KernelVersion in ABI documentation > v6: > - Added WARN_ON() call for (size / stride) to ensure > that the proper count is passed to regmap_bulk_read(). > v5: > - No change > v4: > - Moved sysfs files for displaying the code-signing-key (CSK) > cancellation vectors from the FPGA Security Manger class driver > to here. The m10bmc_csk_vector() and m10bmc_csk_cancel_nbits() > functions are removed and the functionality from these functions > is moved into a show_canceled_csk() function for for displaying > the CSK vectors. > - Added ABI documentation for new sysfs entries > v3: > - Changed: iops -> sops, imgr -> smgr, IFPGA_ -> FPGA_, ifpga_ to fpga_ > - Changed "MAX10 BMC Secure Engine driver" to "MAX10 BMC Secure Update > driver" > - Removed wrapper functions (m10bmc_raw_*, m10bmc_sys_*). The > underlying functions are now called directly. > - Renamed get_csk_vector() to m10bmc_csk_vector() > v2: > - Replaced small function-creation macros for explicit function > declarations. > - Fixed get_csk_vector() function to properly apply the stride > variable in calls to m10bmc_raw_bulk_read() > - Added m10bmc_ prefix to functions in m10bmc_iops structure > --- > .../sysfs-driver-intel-m10-bmc-sec-update | 24 +++++++++ > drivers/fpga/intel-m10-bmc-sec-update.c | 54 +++++++++++++++++++ > 2 files changed, 78 insertions(+) > > diff --git a/Documentation/ABI/testing/sysfs-driver-intel-m10-bmc-sec-update b/Documentation/ABI/testing/sysfs-driver-intel-m10-bmc-sec-update > index 1132e39b2125..ca5a34c1c31f 100644 > --- a/Documentation/ABI/testing/sysfs-driver-intel-m10-bmc-sec-update > +++ b/Documentation/ABI/testing/sysfs-driver-intel-m10-bmc-sec-update > @@ -28,6 +28,30 @@ Description: Read only. Returns the root entry hash for the BMC image > underlying device supports it. > Format: string. > > +What: /sys/bus/platform/drivers/intel-m10bmc-sec-update/.../security/sr_canceled_csks > +Date: Jul 2022 > +KernelVersion: 5.19 > +Contact: Russ Weight > +Description: Read only. Returns a list of indices for canceled code > + signing keys for the static region. The standard bitmap > + list format is used (e.g. "1,2-6,9"). > + > +What: /sys/bus/platform/drivers/intel-m10bmc-sec-update/.../security/pr_canceled_csks > +Date: Jul 2022 > +KernelVersion: 5.19 > +Contact: Russ Weight > +Description: Read only. Returns a list of indices for canceled code > + signing keys for the partial reconfiguration region. The > + standard bitmap list format is used (e.g. "1,2-6,9"). > + > +What: /sys/bus/platform/drivers/intel-m10bmc-sec-update/.../security/bmc_canceled_csks > +Date: Jul 2022 > +KernelVersion: 5.19 > +Contact: Russ Weight > +Description: Read only. Returns a list of indices for canceled code > + signing keys for the BMC. The standard bitmap list format > + is used (e.g. "1,2-6,9"). > + > What: /sys/bus/platform/drivers/intel-m10bmc-sec-update/.../security/flash_count > Date: Jul 2022 > KernelVersion: 5.19 > diff --git a/drivers/fpga/intel-m10-bmc-sec-update.c b/drivers/fpga/intel-m10-bmc-sec-update.c > index 25b21f116976..65fec2a70901 100644 > --- a/drivers/fpga/intel-m10-bmc-sec-update.c > +++ b/drivers/fpga/intel-m10-bmc-sec-update.c > @@ -78,6 +78,57 @@ DEVICE_ATTR_SEC_REH_RO(bmc, BMC_PROG_MAGIC, BMC_PROG_ADDR, BMC_REH_ADDR); > DEVICE_ATTR_SEC_REH_RO(sr, SR_PROG_MAGIC, SR_PROG_ADDR, SR_REH_ADDR); > DEVICE_ATTR_SEC_REH_RO(pr, PR_PROG_MAGIC, PR_PROG_ADDR, PR_REH_ADDR); > > +#define CSK_BIT_LEN 128U > +#define CSK_32ARRAY_SIZE DIV_ROUND_UP(CSK_BIT_LEN, 32) > + > +static ssize_t > +show_canceled_csk(struct device *dev, u32 addr, char *buf) > +{ > + unsigned int i, stride, size = CSK_32ARRAY_SIZE * sizeof(u32); > + struct m10bmc_sec *sec = dev_get_drvdata(dev); > + DECLARE_BITMAP(csk_map, CSK_BIT_LEN); > + __le32 csk_le32[CSK_32ARRAY_SIZE]; > + u32 csk32[CSK_32ARRAY_SIZE]; > + int ret; > + > + stride = regmap_get_reg_stride(sec->m10bmc->regmap); > + if (size % stride) { > + dev_err(sec->dev, > + "CSK vector size (0x%x) not aligned to stride (0x%x)\n", > + size, stride); > + WARN_ON_ONCE(1); > + return -EINVAL; > + } > + > + ret = regmap_bulk_read(sec->m10bmc->regmap, addr, csk_le32, > + size / stride); > + if (ret) { > + dev_err(sec->dev, "failed to read CSK vector: %x cnt %x: %d\n", > + addr, size / stride, ret); > + return ret; > + } > + > + for (i = 0; i < CSK_32ARRAY_SIZE; i++) > + csk32[i] = le32_to_cpu(((csk_le32[i]))); > + > + bitmap_from_arr32(csk_map, csk32, CSK_BIT_LEN); > + bitmap_complement(csk_map, csk_map, CSK_BIT_LEN); > + return bitmap_print_to_pagebuf(1, buf, csk_map, CSK_BIT_LEN); > +} > + > +#define DEVICE_ATTR_SEC_CSK_RO(_name, _addr) \ > +static ssize_t _name##_canceled_csks_show(struct device *dev, \ > + struct device_attribute *attr, \ > + char *buf) \ > +{ return show_canceled_csk(dev, _addr, buf); } \ > +static DEVICE_ATTR_RO(_name##_canceled_csks) > + > +#define CSK_VEC_OFFSET 0x34 > + > +DEVICE_ATTR_SEC_CSK_RO(bmc, BMC_PROG_ADDR + CSK_VEC_OFFSET); > +DEVICE_ATTR_SEC_CSK_RO(sr, SR_PROG_ADDR + CSK_VEC_OFFSET); > +DEVICE_ATTR_SEC_CSK_RO(pr, PR_PROG_ADDR + CSK_VEC_OFFSET); > + > #define FLASH_COUNT_SIZE 4096 /* count stored as inverted bit vector */ > > static ssize_t flash_count_show(struct device *dev, > @@ -125,6 +176,9 @@ static struct attribute *m10bmc_security_attrs[] = { > &dev_attr_bmc_root_entry_hash.attr, > &dev_attr_sr_root_entry_hash.attr, > &dev_attr_pr_root_entry_hash.attr, > + &dev_attr_sr_canceled_csks.attr, > + &dev_attr_pr_canceled_csks.attr, > + &dev_attr_bmc_canceled_csks.attr, > NULL, > }; > > -- > 2.25.1