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;
Message-ID: <3093d78c-6edc-4b87-f5f4-cddb84999f2e@intel.com>
Date:   Tue, 13 Jun 2023 11:41:13 -0700
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Betterbird/102.11.0
Subject: Re: [PATCH v3 4/4] tools/testing/cxl: add firmware update emulation
 to CXL memdevs
To:     Vishal Verma <vishal.l.verma@intel.com>,
        Alison Schofield <alison.schofield@intel.com>,
        Ira Weiny <ira.weiny@intel.com>,
        Ben Widawsky <bwidawsk@kernel.org>,
        Dan Williams <dan.j.williams@intel.com>
CC:     <linux-cxl@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
        "Davidlohr Bueso" <dave@stgolabs.net>,
        Jonathan Cameron <Jonathan.Cameron@Huawei.com>,
        Russ Weight <russell.h.weight@intel.com>
References: <20230602-vv-fw_update-v3-0-869f82069c95@intel.com>
 <20230602-vv-fw_update-v3-4-869f82069c95@intel.com>
Content-Language: en-US
From:   Dave Jiang <dave.jiang@intel.com>
In-Reply-To: <20230602-vv-fw_update-v3-4-869f82069c95@intel.com>
Content-Type: text/plain; charset="UTF-8"; format=flowed
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?aWJZa0F5QXd1bWxlQkorSExEbG50eTZZV1RrT25YSE9LWmN4ajdLRlJOb0g4?=
 =?utf-8?B?bVB6QW9NTU9GSjlDdXd0dFN3MURUSTg2SnRaQ2xqZnhXcXBYUEd6T3A2UW1p?=
 =?utf-8?B?VS9jeER6c25rNjF0REdtbURtK21vQVpJUGxaeUdEbTB3Y2FMWGcrOUpVK0o2?=
 =?utf-8?B?ajVsdGp1NHRySC9zNmdsV3VWK0Q3S1V4U05IVVRiZW44TGxXRVR4aHFEOW9s?=
 =?utf-8?B?dlhpeFIzWVB3eUtTWTUvVGw5Z1BMalhQakZjM1RWTzNSaVczL3NCMHhJNTdQ?=
 =?utf-8?B?akpNNUZIS0lLeUE2dVFHTnJYT1pKSElKeXJVTnJMRU5IaVArT2ZnTW1SSXU2?=
 =?utf-8?B?UGQ2R2ZEMmZWTGVsNHVKVzlnY3NnSUxiWlk4bmdVWVh1N1psK3BoS2xsWU9t?=
 =?utf-8?B?SUhvTHh2aVVYbExrOFNYeEgyaXFUNVhFU0trRWxiV1NsZEkxeTU5L0Q3NFMx?=
 =?utf-8?B?bnRwWjdEOFdPWmk0aW1pZjBwNGVaZ0pRTURvOFRocWo0cnc3K1RBQXFaY3Zh?=
 =?utf-8?B?WGVnNEtFbllxWGw4UDVTaDg2ZlQwWGZSYzlkZkc1VDYvWXZVK0NBa0dHd01v?=
 =?utf-8?B?Z0Z1ZUs0MUVFZlp5bVNpTGRMaldZU05lMFZYbUdDMWEzTnZuUVFCdkVxWitM?=
 =?utf-8?B?QXdWWFl2OVpPeVhKUFRuaFIzK2JVaE1PdEpwTWZ3V1JRRnZtQXlvSWdrN3hw?=
 =?utf-8?B?NForTk1tTnplSTliaGhoVEJNbDh6Q0lqV09lYWxSRVcvd09HK3pLYlVaWEZG?=
 =?utf-8?B?a0pmN2doTEJTdTYrb0pJZy9OOEtiWVRyeitsaVV2UEUzNFRuWjR6WE5pS08v?=
 =?utf-8?B?ekdOUnZuSEJPUG9mRkVLbU1sa3hHMU5aMjhST3BVenF2SEVlSVhFM2V3cnh2?=
 =?utf-8?B?TW1nRG5WUDVYL2ovTjV2R2kvWTlzeDNQZXNWcXZFeDloN0s3Y2M5Q1FFU0Yr?=
 =?utf-8?B?UUpmdlZVeGhLR1FxOGtDR1FieE1uT1R4RnFQVk44M3dCZnNqd05pTTlHN3lV?=
 =?utf-8?B?Q0pXMk9HVXlNUzlIK3hnb1lvd0lIYXNUZnRQS2NjYldJZk1wODJZWURTdnpD?=
 =?utf-8?B?dndlWVZhTFUrMy9wZFJuMGRJRHJjYm10aG5NRUFGVzFsQlN2cFNBVkR1UEtt?=
 =?utf-8?B?MjZqUGl2OFNveFZ6R1hYaktVcVNYdzNJTTRXWTdISHJpWEY2WjJxOEhDRkU3?=
 =?utf-8?B?LzlpVnB3V2phZzlsZFJwQXgvWE42UXNwWlZYeWtEbFVITWZVVEVvT3pyaGhG?=
 =?utf-8?B?Uy9iclVWOVI3bHNSbTlkRHN5M1FnS01CL3JnNDFJR1U4TUxXZWw1dGdxSW1x?=
 =?utf-8?B?RXlxdVNUa2NPVW1PT21KOVJyOWtzalJYMkdhd1dGNnQxc1ZHaVUzMWRYbzNH?=
 =?utf-8?B?V2czZGpBdVUrektkSXFmd2ZOZjEvcHVRRERlaXpyeFJhRmk0NWp6WHhuRmpm?=
 =?utf-8?B?NTNXdlk5dHpOVkhaRFhnbE1ReFhDT2tpYld3LzljQU9ndkx2MkhXQzM2NmYv?=
 =?utf-8?B?QTMzNnRrZkQycVlMVFR3RkN2RXozQnFrZncwbHFhMXFCVk9qRFFPNTlqNE0w?=
 =?utf-8?B?eTNiQ0tQYkZCUkdYbFBWaEJNRmpNWkZ5a0ZVeXRqQlE4bVc2N2hkeVR4dHFL?=
 =?utf-8?B?VTJRbVVoKzN6dENVWm43dkFwaVRsTWlyaWI3UjZrekF4UC93UHBOZVp0bnI0?=
 =?utf-8?B?dFVEblV2OXBiaGh3UCtCUjg4QnFQRDFWVEZKdWcza3BxaW1zbUdGcG9Udzkr?=
 =?utf-8?B?R0t6U3hNU1h6aEtOUjg5TEMzSDdHR2YrdUFERlVnOEl3bmQzU1J1clJDZmJo?=
 =?utf-8?B?YTRIU2graWR3d01SNlB5Qzd5UmRYT1M2cExiSC9PSkR0RXRZYVlsZVU5Y2Nj?=
 =?utf-8?B?Zlc1L1RKWEFpNzFtR25PeW9MZ1gwN3dtTFhDenlHb1FpeWVwWFVYaUNqcjJo?=
 =?utf-8?B?eFVkVTFyL0ZaV2xSZVpIeHQyWEtVMWFJVjVYMmFjKzFidFBOaE5UYytLa24z?=
 =?utf-8?B?V2FQTU1SOWZ3YjRPRk93T2RXajlrLzA0VjREbU1JamdwWVNSQ0UwOEw5MHlv?=
 =?utf-8?B?YkRwTkQwUzFKUFNIU3dGSndpS2o1eFlHWVphZGhNVTJGRTR1MGlHNlZtNEdV?=
 =?utf-8?Q?QC4uETd5E+OQYZp7svNbVD+2W?=
X-MS-Exchange-CrossTenant-Network-Message-Id: f7285cd2-d509-436c-35b2-08db6c3dc609
X-MS-Exchange-CrossTenant-AuthSource: PH7PR11MB5984.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Jun 2023 18:41:17.7559
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: rF844ap50GH1WzRS6ie92Gskkjb/2xCStGbpvLPmj776POnm6cHonjJHs9zdA++S43DYZV/uICVkw4Pr5/7ipA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR11MB5538
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-4.5 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,
        RCVD_IN_DNSWL_MED,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,
        SPF_NONE,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


On 6/11/23 23:55, 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.
>
> Cc: Davidlohr Bueso <dave@stgolabs.net>
> Cc: Jonathan Cameron <Jonathan.Cameron@Huawei.com>
> Cc: Russ Weight <russell.h.weight@intel.com>
> Cc: Alison Schofield <alison.schofield@intel.com>
> Cc: Ira Weiny <ira.weiny@intel.com>
> Cc: Dave Jiang <dave.jiang@intel.com>
> Cc: Ben Widawsky <bwidawsk@kernel.org>
> Cc: Dan Williams <dan.j.williams@intel.com>
> Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
> Signed-off-by: Vishal Verma <vishal.l.verma@intel.com>

Reviewed-by: Dave Jiang <dave.jiang@intel.com>


> ---
>   tools/testing/cxl/test/mem.c | 160 +++++++++++++++++++++++++++++++++++++++++++
>   1 file changed, 160 insertions(+)
>
> diff --git a/tools/testing/cxl/test/mem.c b/tools/testing/cxl/test/mem.c
> index 68668d8df1cd..1166f470e0c7 100644
> --- a/tools/testing/cxl/test/mem.c
> +++ b/tools/testing/cxl/test/mem.c
> @@ -8,11 +8,14 @@
>   #include <linux/sizes.h>
>   #include <linux/bits.h>
>   #include <asm/unaligned.h>
> +#include <crypto/sha2.h>
>   #include <cxlmem.h>
>   
>   #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)
>   
> @@ -72,6 +75,20 @@ static struct cxl_cel_entry mock_cel[] = {
>   		.opcode = cpu_to_le16(CXL_MBOX_OP_CLEAR_POISON),
>   		.effect = cpu_to_le16(EFFECT(DATA_CHANGE_IMMEDIATE)),
>   	},
> +	{
> +		.opcode = cpu_to_le16(CXL_MBOX_OP_GET_FW_INFO),
> +		.effect = CXL_CMD_EFFECT_NONE,
> +	},
> +	{
> +		.opcode = cpu_to_le16(CXL_MBOX_OP_TRANSFER_FW),
> +		.effect = cpu_to_le16(EFFECT(CONF_CHANGE_COLD_RESET) |
> +				      EFFECT(BACKGROUND_OP)),
> +	},
> +	{
> +		.opcode = cpu_to_le16(CXL_MBOX_OP_ACTIVATE_FW),
> +		.effect = cpu_to_le16(EFFECT(CONF_CHANGE_COLD_RESET) |
> +				      EFFECT(CONF_CHANGE_IMMEDIATE)),
> +	},
>   };
>   
>   /* See CXL 2.0 Table 181 Get Health Info Output Payload */
> @@ -123,6 +140,10 @@ struct mock_event_store {
>   
>   struct cxl_mockmem_data {
>   	void *lsa;
> +	void *fw;
> +	int fw_slot;
> +	int fw_staged;
> +	size_t fw_size;
>   	u32 security_state;
>   	u8 user_pass[NVDIMM_PASSPHRASE_LEN];
>   	u8 master_pass[NVDIMM_PASSPHRASE_LEN];
> @@ -1128,6 +1149,87 @@ static struct attribute *cxl_mock_mem_core_attrs[] = {
>   };
>   ATTRIBUTE_GROUPS(cxl_mock_mem_core);
>   
> +static int mock_fw_info(struct cxl_dev_state *cxlds,
> +			    struct cxl_mbox_cmd *cmd)
> +{
> +	struct cxl_mockmem_data *mdata = dev_get_drvdata(cxlds->dev);
> +	struct cxl_mbox_get_fw_info fw_info = {
> +		.num_slots = FW_SLOTS,
> +		.slot_info = (mdata->fw_slot & 0x7) |
> +			     ((mdata->fw_staged & 0x7) << 3),
> +		.activation_cap = 0,
> +	};
> +
> +	strcpy(fw_info.slot_1_revision, "cxl_test_fw_001");
> +	strcpy(fw_info.slot_2_revision, "cxl_test_fw_002");
> +	strcpy(fw_info.slot_3_revision, "cxl_test_fw_003");
> +	strcpy(fw_info.slot_4_revision, "");
> +
> +	if (cmd->size_out < sizeof(fw_info))
> +		return -EINVAL;
> +
> +	memcpy(cmd->payload_out, &fw_info, sizeof(fw_info));
> +	return 0;
> +}
> +
> +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_ALIGNMENT;
> +	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_INITIATE:
> +	case CXL_FW_TRANSFER_ACTION_CONTINUE:
> +		break;
> +	case CXL_FW_TRANSFER_ACTION_ABORT:
> +		return 0;
> +	default:
> +		return -EINVAL;
> +	}
> +
> +	memcpy(fw + offset, transfer->data, length);
> +	return 0;
> +}
> +
> +static int mock_activate_fw(struct cxl_dev_state *cxlds,
> +			    struct cxl_mbox_cmd *cmd)
> +{
> +	struct cxl_mbox_activate_fw *activate = cmd->payload_in;
> +	struct cxl_mockmem_data *mdata = dev_get_drvdata(cxlds->dev);
> +
> +	if (activate->slot == 0 || activate->slot > FW_SLOTS)
> +		return -EINVAL;
> +
> +	switch (activate->action) {
> +	case CXL_FW_ACTIVATE_ONLINE:
> +		mdata->fw_slot = activate->slot;
> +		mdata->fw_staged = 0;
> +		return 0;
> +	case CXL_FW_ACTIVATE_OFFLINE:
> +		mdata->fw_staged = activate->slot;
> +		return 0;
> +	}
> +
> +	return -EINVAL;
> +}
> +
>   static int cxl_mock_mbox_send(struct cxl_dev_state *cxlds, struct cxl_mbox_cmd *cmd)
>   {
>   	struct device *dev = cxlds->dev;
> @@ -1194,6 +1296,15 @@ static int cxl_mock_mbox_send(struct cxl_dev_state *cxlds, struct cxl_mbox_cmd *
>   	case CXL_MBOX_OP_CLEAR_POISON:
>   		rc = mock_clear_poison(cxlds, cmd);
>   		break;
> +	case CXL_MBOX_OP_GET_FW_INFO:
> +		rc = mock_fw_info(cxlds, cmd);
> +		break;
> +	case CXL_MBOX_OP_TRANSFER_FW:
> +		rc = mock_transfer_fw(cxlds, cmd);
> +		break;
> +	case CXL_MBOX_OP_ACTIVATE_FW:
> +		rc = mock_activate_fw(cxlds, cmd);
> +		break;
>   	default:
>   		break;
>   	}
> @@ -1209,6 +1320,11 @@ static void label_area_release(void *lsa)
>   	vfree(lsa);
>   }
>   
> +static void fw_buf_release(void *buf)
> +{
> +	vfree(buf);
> +}
> +
>   static bool is_rcd(struct platform_device *pdev)
>   {
>   	const struct platform_device_id *id = platform_get_device_id(pdev);
> @@ -1241,10 +1357,19 @@ static int cxl_mock_mem_probe(struct platform_device *pdev)
>   	mdata->lsa = vmalloc(LSA_SIZE);
>   	if (!mdata->lsa)
>   		return -ENOMEM;
> +	mdata->fw = vmalloc(FW_SIZE);
> +	if (!mdata->fw)
> +		return -ENOMEM;
> +	mdata->fw_slot = 2;
> +
>   	rc = devm_add_action_or_reset(dev, label_area_release, mdata->lsa);
>   	if (rc)
>   		return rc;
>   
> +	rc = devm_add_action_or_reset(dev, fw_buf_release, mdata->fw);
> +	if (rc)
> +		return rc;
> +
>   	cxlds = cxl_dev_state_create(dev);
>   	if (IS_ERR(cxlds))
>   		return PTR_ERR(cxlds);
> @@ -1286,6 +1411,10 @@ static int cxl_mock_mem_probe(struct platform_device *pdev)
>   	if (IS_ERR(cxlmd))
>   		return PTR_ERR(cxlmd);
>   
> +	rc = cxl_memdev_setup_fw_upload(cxlds);
> +	if (rc)
> +		return rc;
> +
>   	cxl_mem_get_event_records(cxlds, CXLDEV_EVENT_STATUS_ALL);
>   
>   	return 0;
> @@ -1324,9 +1453,40 @@ static ssize_t security_lock_store(struct device *dev, struct device_attribute *
>   
>   static DEVICE_ATTR_RW(security_lock);
>   
> +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);
> +	u8 hash[SHA256_DIGEST_SIZE];
> +	unsigned char *hstr, *hptr;
> +	struct sha256_state sctx;
> +	ssize_t written = 0;
> +	int i;
> +
> +	sha256_init(&sctx);
> +	sha256_update(&sctx, mdata->fw, mdata->fw_size);
> +	sha256_final(&sctx, hash);
> +
> +	hstr = kzalloc((SHA256_DIGEST_SIZE * 2) + 1, GFP_KERNEL);
> +	if (!hstr)
> +		return -ENOMEM;
> +
> +	hptr = hstr;
> +	for (i = 0; i < SHA256_DIGEST_SIZE; i++)
> +		hptr += sprintf(hptr, "%02x", hash[i]);
> +
> +	written = sysfs_emit(buf, "%s\n", hstr);
> +
> +	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);
>