Received: by 2002:a05:6358:3188:b0:123:57c1:9b43 with SMTP id q8csp2654888rwd; Fri, 19 May 2023 08:28:51 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7z+St/AZSYXw8DWuwfVuXXCTjiMnd9W5DCcfxUsvm3gDMd3EnGIQGYnm2iuNCw9M7v9zfG X-Received: by 2002:a17:902:da81:b0:1ae:40ed:4b8 with SMTP id j1-20020a170902da8100b001ae40ed04b8mr3335510plx.22.1684510131009; Fri, 19 May 2023 08:28:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684510130; cv=none; d=google.com; s=arc-20160816; b=XfkaNB0lNLQ99WPEMmLsNq1a3q3LBiOU/WLlWtuP7lUGBYRCVgwGqFfFlxO3opgFhK uwL5hCDngPptA0wmds6Fpjnj8KUqhdGwFsfFwxLlMubomf0qarvgFzaTo9iChRJvqfyr 5bPJ3lnzBakEjxd2s6qJQc3wJ7zd04u+w3fonV/KicAk2Q41mylJPU4C4NF75PyM9+oS dz/hDxcmEwFcM5TKwXhSOzXDTYsOe65LyPlhPjIs4e+/xJfOmCjFluO9liAkqo4c49FZ cj37yao+bUxB26XQ2DCoLSfLoE2rftdbOth+WnvN7Pty9R2AYu7uVAehXgkMvckepWvY +yAg== 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 :organization:references:in-reply-to:message-id:subject:cc:to:from :date; bh=yh+tXhgcagAwiQTHJwP3dfhRt+iRlGc66/CnKa9nGVw=; b=tjZjn3QQHk6JaxHxzY35+gAY+1eJl4/mzVyKHQw3B3v4gt/jQ0XCrvcJR6UdiV909K 6u+UtLQm4OQIjHRroXSs4+f6kIId2TvFPoIh0PLb8pEte5EKwyV8LTuchKkdT6zEh5Fp 7AY2y2fwmBrxLfNGygG/W2kHNBBlswbYqFtSI31XMl72iQQ7rFWQfCyhbKtPal7nPPy4 pziErEfSx3o1j3wZxmQgMZD4pokqH/QDNBVSYsZMLRcufD2BvaTpvFbpdqHd7DwZbg3E tvVHF081VLqFGNYcRkCDXU+bmfTYCjcbR6IFeyMChEQ6Eq3umDwLTZ02Kn9TJ2Yi//ID 05TQ== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t9-20020a170902e84900b001ac68acb1e8si4038471plg.518.2023.05.19.08.28.38; Fri, 19 May 2023 08:28:50 -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; 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=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232153AbjESPMN (ORCPT + 99 others); Fri, 19 May 2023 11:12:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46172 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230455AbjESPML (ORCPT ); Fri, 19 May 2023 11:12:11 -0400 Received: from frasgout.his.huawei.com (frasgout.his.huawei.com [185.176.79.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 334B5132; Fri, 19 May 2023 08:12:09 -0700 (PDT) Received: from lhrpeml500005.china.huawei.com (unknown [172.18.147.207]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4QN9J74ZZ7z67ZCj; Fri, 19 May 2023 23:10:15 +0800 (CST) Received: from localhost (10.202.227.76) by lhrpeml500005.china.huawei.com (7.191.163.240) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Fri, 19 May 2023 16:12:06 +0100 Date: Fri, 19 May 2023 16:12:06 +0100 From: Jonathan Cameron To: Alison Schofield CC: Vishal Verma , Ira Weiny , Dave Jiang , Ben Widawsky , Dan Williams , , , Davidlohr Bueso , Russ Weight Subject: Re: [PATCH 4/4] tools/testing/cxl: add firmware update emulation to CXL memdevs Message-ID: <20230519161206.0000134d@Huawei.com> In-Reply-To: References: <20230421-vv-fw_update-v1-0-22468747d72f@intel.com> <20230421-vv-fw_update-v1-4-22468747d72f@intel.com> <20230511171816.0000303f@Huawei.com> Organization: Huawei Technologies Research and Development (UK) Ltd. X-Mailer: Claws Mail 4.1.0 (GTK 3.24.33; x86_64-w64-mingw32) MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.202.227.76] X-ClientProxiedBy: lhrpeml100001.china.huawei.com (7.191.160.183) To lhrpeml500005.china.huawei.com (7.191.163.240) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,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 Thu, 18 May 2023 20:01:18 -0700 Alison Schofield wrote: > On Thu, May 11, 2023 at 05:18:16PM +0100, Jonathan Cameron wrote: > > On Fri, 21 Apr 2023 21:09:28 -0600 > > Vishal Verma wrote: > > > > > Add emulation for the 'Get FW Info', 'Transfer FW', and 'Activate FW' > > > CXL mailbox commands to the cxl_test emulated memdevs to enable > > > end-to-end unit testing of a firmware update flow. For now, only > > > advertise an 'offline activation' capability as that is all the CXL > > > memdev driver currently implements. > > > > > > Add some canned values for the serial number fields, and create a > > > platform device sysfs knob to calculate the sha256sum of the firmware > > > image that was received, so a unit test can compare it with the original > > > file that was uploaded. > > > > > > Signed-off-by: Vishal Verma > > Hi Vishal, > > > > A few trivial comments inline, > > > > Thanks, > > > > Jonathan > > > > > --- > > > tools/testing/cxl/test/mem.c | 191 +++++++++++++++++++++++++++++++++++++++++++ > > > 1 file changed, 191 insertions(+) > > > > > > diff --git a/tools/testing/cxl/test/mem.c b/tools/testing/cxl/test/mem.c > > > index 9263b04d35f7..bc99cc673550 100644 > > > --- a/tools/testing/cxl/test/mem.c > > > +++ b/tools/testing/cxl/test/mem.c > > > @@ -7,11 +7,14 @@ > > > #include > > > #include > > > #include > > > +#include > > > #include > > > > > > #include "trace.h" > > > > > > #define LSA_SIZE SZ_128K > > > +#define FW_SIZE SZ_64M > > > +#define FW_SLOTS 3 > > > #define DEV_SIZE SZ_2G > > > #define EFFECT(x) (1U << x) > > > > > > @@ -40,6 +43,18 @@ static struct cxl_cel_entry mock_cel[] = { > > > .opcode = cpu_to_le16(CXL_MBOX_OP_GET_HEALTH_INFO), > > > .effect = cpu_to_le16(0), > > > }, > > > + { > > > + .opcode = cpu_to_le16(CXL_MBOX_OP_GET_FW_INFO), > > > + .effect = cpu_to_le16(0), > > > + }, > > > + { > > > + .opcode = cpu_to_le16(CXL_MBOX_OP_TRANSFER_FW), > > > + .effect = cpu_to_le16(EFFECT(0) | EFFECT(6)), > > > > Beginning to feel like some defines for each effect might be worth > > adding. > > > > > + }, > > > + { > > > + .opcode = cpu_to_le16(CXL_MBOX_OP_ACTIVATE_FW), > > > + .effect = cpu_to_le16(EFFECT(0) | EFFECT(1)), > > > + }, > > > }; > > > > ... > > > > > +static int mock_transfer_fw(struct cxl_dev_state *cxlds, > > > + struct cxl_mbox_cmd *cmd) > > > +{ > > > + struct cxl_mbox_transfer_fw *transfer = cmd->payload_in; > > > + struct cxl_mockmem_data *mdata = dev_get_drvdata(cxlds->dev); > > > + void *fw = mdata->fw; > > > + size_t offset, length; > > > + > > > + offset = le32_to_cpu(transfer->offset) * CXL_FW_TRANSFER_OFFSET_ALIGN; > > > + length = cmd->size_in - sizeof(*transfer); > > > + if (offset + length > FW_SIZE) > > > + return -EINVAL; > > > + > > > + switch (transfer->action) { > > > + case CXL_FW_TRANSFER_ACTION_FULL: > > > + if (offset != 0) > > > + return -EINVAL; > > > + fallthrough; > > > + case CXL_FW_TRANSFER_ACTION_END: > > > + if (transfer->slot == 0 || transfer->slot > FW_SLOTS) > > > + return -EINVAL; > > > + mdata->fw_size = offset + length; > > > + break; > > > + case CXL_FW_TRANSFER_ACTION_START: > > > + case CXL_FW_TRANSFER_ACTION_CONTINUE: > > > + case CXL_FW_TRANSFER_ACTION_ABORT: > > > + break; > > > + default: > > > + return -EINVAL; > > > + } > > > + > > > + memcpy(fw + offset, &transfer->data[0], length); > > > > Slight preference for transfer->data > > > > What's the story behind that Jonathan? > I imagined kernel developers leaned towards the explicit. Meh. In my head it's copying beyond end of that particular element, and transfer->data conveys that 'potential' better. Others may have different opinions. I've never seen a hard and fast rule on this one... Jonathan > > Alison > > > > > + return 0; > > > +} > > > + > > > > ... > > > > > +static int do_sha256(u8 *data, unsigned int length, u8 *hash) > > > > Can't use the one in include/crypto/sha2.h? Don't think anyone really > > cares about extreme performance here. > > > > > +{ > > > + struct crypto_shash *alg; > > > + struct sdesc *sdesc; > > > + size_t size; > > > + int rc; > > > + > > > + alg = crypto_alloc_shash("sha256", 0, 0); > > > + if (IS_ERR(alg)) > > > + return PTR_ERR(alg); > > > + > > > + size = sizeof(struct shash_desc) + crypto_shash_descsize(alg); > > > + sdesc = kzalloc(size, GFP_KERNEL); > > > + if (!sdesc) { > > > + rc = -ENOMEM; > > > + goto out_shash; > > > + } > > > + > > > + sdesc->shash.tfm = alg; > > > + rc = crypto_shash_digest(&sdesc->shash, data, length, hash); > > > + > > > + kfree(sdesc); > > > +out_shash: > > > + crypto_free_shash(alg); > > > + return rc; > > > +} > > > + > > > +#define CHECKSUM_SIZE 32 > > > + > > > +static ssize_t fw_buf_checksum_show(struct device *dev, > > > + struct device_attribute *attr, char *buf) > > > +{ > > > + struct cxl_mockmem_data *mdata = dev_get_drvdata(dev); > > > + unsigned char *hstr, *hptr; > > > + u8 hash[CHECKSUM_SIZE]; > > > + ssize_t written = 0; > > > + int i, rc; > > > + > > > + rc = do_sha256(mdata->fw, mdata->fw_size, &hash[0]); > > > + if (rc) { > > > + dev_err(dev, "error calculating checksum: %d\n", rc); > > > + goto out_free; > > > + } > > > + > > > + hstr = kzalloc((CHECKSUM_SIZE * 2) + 1, GFP_KERNEL); > > > + if (!hstr) > > > + return -ENOMEM; > > > + > > > + hptr = hstr; > > > + for (i = 0; i < CHECKSUM_SIZE; i++) > > > + hptr += sprintf(hptr, "%02x", hash[i]); > > > + > > > + written = sysfs_emit(buf, "%s\n", hstr); > > > + > > > +out_free: > > > + kfree(hstr); > > > + return written; > > > +} > > > + > > > +static DEVICE_ATTR_RO(fw_buf_checksum); > > > + > > > static struct attribute *cxl_mock_mem_attrs[] = { > > > &dev_attr_security_lock.attr, > > > &dev_attr_event_trigger.attr, > > > + &dev_attr_fw_buf_checksum.attr, > > > NULL > > > }; > > > ATTRIBUTE_GROUPS(cxl_mock_mem); > > > > >