Received: by 2002:a6b:fb09:0:0:0:0:0 with SMTP id h9csp1406855iog; Tue, 14 Jun 2022 05:34:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxZ9cRqxL3t+D9CJMKA8Qu+qsqF77l5ru6/Juv+wVOVovU9UiJZQpE6hEEcuAufkMs+6bAS X-Received: by 2002:a17:906:3b87:b0:70d:3189:6aae with SMTP id u7-20020a1709063b8700b0070d31896aaemr4168877ejf.222.1655210091373; Tue, 14 Jun 2022 05:34:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655210091; cv=none; d=google.com; s=arc-20160816; b=LFepYlOvzRIre6cGGnIDpbnDMiwNgKbV4tJuK9Ulrrfm8kS3exio+rWlXEUUhSVYZh iO0n/9WVBNgEgxVPMnoBUwPO5cE1eNZ/AzxvMNknP/lHcx1sffTDoeZZ/rAK0vobxPaI k4p3ojyMhkxcHJYN5GM85tFcU5ZPvZa2wWHVsYrD1Ar6V10v1LR1gepFQU0K1DjsLt1v aTn65DkkBt63jwxRydyddmzC2w0mg1NCv+khSxkfz6vzQ6LB/sTa1+wVH9rzRiOYKf0J lzytTYVHn1mZE1Q7uEzPVG3J0uhAYV12jukA7/boIyMmqud6hiqkP0x8nSPtrDckMFD9 aD7g== 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; bh=rQPW6i2xE6aM4PT315eUw7FdBed3RH3KUjU2WrK6IBI=; b=NGliIv7CD5WfjO1HX2GQwy5OTBRxD2GXxdGJZotf1lPQWEjjnaMfBTEba2UtW4o+pf BKi1mkDNqMIo6RFYBarltrwXWKGhdwbR15EAerbvSZF9SPWRSy4/bcJaBzhXCT2grpPd 0rUmx/7Tm0HbbNZsCVrRTkt+yrt5k3iu6vOSb+fm8zE8JrIWIdY/r2ji6AK+O7if1KQm hmkRRtgq3fryLeBHNa4Sl6jVpblQND/XXMkjWbAk8BVA5E+tzaGGTblnCWdH8fpkxSm4 HFTMKdkc0urvSiuiOM+ADgh1W3ykxOteG6FC0Um8djxoArz8K8x4UPjIbQQlyTHUXj6S SKQQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-crypto-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-crypto-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 u1-20020a170906124100b00711d06c0e97si9903555eja.521.2022.06.14.05.34.21; Tue, 14 Jun 2022 05:34:51 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-crypto-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-crypto-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-crypto-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 S1356447AbiFNMbt (ORCPT + 99 others); Tue, 14 Jun 2022 08:31:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60022 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1356353AbiFNM3h (ORCPT ); Tue, 14 Jun 2022 08:29:37 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3390022B34; Tue, 14 Jun 2022 05:29:35 -0700 (PDT) Received: from dggpeml500023.china.huawei.com (unknown [172.30.72.56]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4LMnlS1ZZczjXq3; Tue, 14 Jun 2022 20:28:04 +0800 (CST) Received: from dggpeml100012.china.huawei.com (7.185.36.121) by dggpeml500023.china.huawei.com (7.185.36.114) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Tue, 14 Jun 2022 20:29:33 +0800 Received: from huawei.com (10.67.165.24) by dggpeml100012.china.huawei.com (7.185.36.121) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Tue, 14 Jun 2022 20:29:33 +0800 From: Kai Ye To: , CC: , , , , , , Subject: [PATCH v2 1/3] uacce: supports device isolation feature Date: Tue, 14 Jun 2022 20:23:06 +0800 Message-ID: <20220614122311.824-2-yekai13@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20220614122311.824-1-yekai13@huawei.com> References: <20220614122311.824-1-yekai13@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.67.165.24] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To dggpeml100012.china.huawei.com (7.185.36.121) 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-crypto@vger.kernel.org UACCE add the hardware error isolation API. Users can configure the error frequency threshold by this vfs node. This API interface certainly supports the configuration of user protocol strategy. Then parse it inside the device driver. UACCE only reports the device isolate state. When the error frequency is exceeded, the device will be isolated. The isolation strategy should be defined in each driver module. Signed-off-by: Kai Ye Reviewed-by: Zhou Wang --- drivers/misc/uacce/uacce.c | 37 +++++++++++++++++++++++++++++++++++++ include/linux/uacce.h | 16 +++++++++++++--- 2 files changed, 50 insertions(+), 3 deletions(-) diff --git a/drivers/misc/uacce/uacce.c b/drivers/misc/uacce/uacce.c index b6219c6bfb48..525623215132 100644 --- a/drivers/misc/uacce/uacce.c +++ b/drivers/misc/uacce/uacce.c @@ -346,12 +346,47 @@ static ssize_t region_dus_size_show(struct device *dev, uacce->qf_pg_num[UACCE_QFRT_DUS] << PAGE_SHIFT); } +static ssize_t isolate_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct uacce_device *uacce = to_uacce_device(dev); + + return sysfs_emit(buf, "%d\n", uacce->ops->get_isolate_state(uacce)); +} + +static ssize_t isolate_strategy_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct uacce_device *uacce = to_uacce_device(dev); + + return sysfs_emit(buf, "%s\n", uacce->isolate_strategy); +} + +static ssize_t isolate_strategy_store(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t count) +{ + struct uacce_device *uacce = to_uacce_device(dev); + int ret; + + if (!buf || sizeof(buf) > UACCE_MAX_ISOLATE_STRATEGY_LEN) + return -EINVAL; + + memcpy(uacce->isolate_strategy, buf, strlen(buf)); + + ret = uacce->ops->isolate_strategy_write(uacce, buf); + + return ret ? ret : count; +} + static DEVICE_ATTR_RO(api); static DEVICE_ATTR_RO(flags); static DEVICE_ATTR_RO(available_instances); static DEVICE_ATTR_RO(algorithms); static DEVICE_ATTR_RO(region_mmio_size); static DEVICE_ATTR_RO(region_dus_size); +static DEVICE_ATTR_RO(isolate); +static DEVICE_ATTR_RW(isolate_strategy); static struct attribute *uacce_dev_attrs[] = { &dev_attr_api.attr, @@ -360,6 +395,8 @@ static struct attribute *uacce_dev_attrs[] = { &dev_attr_algorithms.attr, &dev_attr_region_mmio_size.attr, &dev_attr_region_dus_size.attr, + &dev_attr_isolate.attr, + &dev_attr_isolate_strategy.attr, NULL, }; diff --git a/include/linux/uacce.h b/include/linux/uacce.h index 48e319f40275..0f7668bfa645 100644 --- a/include/linux/uacce.h +++ b/include/linux/uacce.h @@ -8,6 +8,7 @@ #define UACCE_NAME "uacce" #define UACCE_MAX_REGION 2 #define UACCE_MAX_NAME_SIZE 64 +#define UACCE_MAX_ISOLATE_STRATEGY_LEN 256 struct uacce_queue; struct uacce_device; @@ -30,6 +31,8 @@ struct uacce_qfile_region { * @is_q_updated: check whether the task is finished * @mmap: mmap addresses of queue to user space * @ioctl: ioctl for user space users of the queue + * @get_isolate_state: get the device state after set the isolate strategy + * @isolate_strategy_store: stored the isolate strategy to the device */ struct uacce_ops { int (*get_available_instances)(struct uacce_device *uacce); @@ -43,6 +46,8 @@ struct uacce_ops { struct uacce_qfile_region *qfr); long (*ioctl)(struct uacce_queue *q, unsigned int cmd, unsigned long arg); + enum uacce_dev_state (*get_isolate_state)(struct uacce_device *uacce); + int (*isolate_strategy_write)(struct uacce_device *uacce, const char *buf); }; /** @@ -57,6 +62,12 @@ struct uacce_interface { const struct uacce_ops *ops; }; +enum uacce_dev_state { + UACCE_DEV_ERR = -1, + UACCE_DEV_NORMAL, + UACCE_DEV_ISOLATE, +}; + enum uacce_q_state { UACCE_Q_ZOMBIE = 0, UACCE_Q_INIT, @@ -117,6 +128,7 @@ struct uacce_device { struct list_head queues; struct mutex queues_lock; struct inode *inode; + char isolate_strategy[UACCE_MAX_ISOLATE_STRATEGY_LEN]; }; #if IS_ENABLED(CONFIG_UACCE) @@ -125,7 +137,7 @@ struct uacce_device *uacce_alloc(struct device *parent, struct uacce_interface *interface); int uacce_register(struct uacce_device *uacce); void uacce_remove(struct uacce_device *uacce); - +struct uacce_device *dev_to_uacce(struct device *dev); #else /* CONFIG_UACCE */ static inline @@ -140,8 +152,6 @@ static inline int uacce_register(struct uacce_device *uacce) return -EINVAL; } -static inline void uacce_remove(struct uacce_device *uacce) {} - #endif /* CONFIG_UACCE */ #endif /* _LINUX_UACCE_H */ -- 2.33.0