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;
Message-ID: <8e51fc0d-1c5c-e1d2-b8fb-e7c6c247c74c@intel.com>
Date:   Tue, 11 Jul 2023 10:49:52 -0700
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
 Firefox/91.0 Thunderbird/91.11.0
Subject: Re: [PATCH v7 01/14] dmaengine: idxd: add wq driver name support for
 accel-config user tool
Content-Language: en-US
To:     Tom Zanussi <tom.zanussi@linux.intel.com>,
        <herbert@gondor.apana.org.au>, <davem@davemloft.net>,
        <vkoul@kernel.org>
CC:     <dave.jiang@intel.com>, <tony.luck@intel.com>,
        <wajdi.k.feghali@intel.com>, <james.guilford@intel.com>,
        <kanchana.p.sridhar@intel.com>, <vinodh.gopal@intel.com>,
        <giovanni.cabiddu@intel.com>, <linux-kernel@vger.kernel.org>,
        <linux-crypto@vger.kernel.org>, <dmaengine@vger.kernel.org>
References: <20230710190654.299639-1-tom.zanussi@linux.intel.com>
 <20230710190654.299639-2-tom.zanussi@linux.intel.com>
From:   Fenghua Yu <fenghua.yu@intel.com>
In-Reply-To: <20230710190654.299639-2-tom.zanussi@linux.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?ZUlsZmhxb290cHUzd29GUXp6a2tXQU9CaCtSYm10YjZSQU9jaHdNNm53cEJw?=
 =?utf-8?B?Qm9tTVlVRGNuZ0N1WmdxenYzdmtCd05JalhZcW0xT3FqWDNVMSt5cnBydlYy?=
 =?utf-8?B?OEgzb1RnczNXVE9xZ2ZrK2FwbkM1NWh5aVhVZU1XdjVsMVVPdUhpVDNlOFd1?=
 =?utf-8?B?TzA4Qk4zNXd1dEd2TXRONkEzalRVR0h1cyt5OGt3YlFpVkNDaDl5NU4zUnpo?=
 =?utf-8?B?ZWxxdDRPZUpQU0JPRjhZMDNlR0tzWUExN3lDaUJQRE5PN2FBaFRvWVJUVlp0?=
 =?utf-8?B?bE1XZFMyM29WbUF1eUVFOHFKNGNaK29xbXZ6OVhPcjFEcXZETi9yY3BZM3p3?=
 =?utf-8?B?RjREbzZLZXNMbUJsWFZsMURvaHBYa2JFUXJRT3Z4c3M2WVRrLzVCTUpOUXJD?=
 =?utf-8?B?WWp1UlB3cUFGRUlmOGIxcVQ1Y09GcFBSR1NldzZpUHl3b1hFa20vZ0FBeHM3?=
 =?utf-8?B?ZHZGSDIvRGd0cUtoMnNnR1BSOUVENmIramJodlIxVk1pZjN4S3llVDRNeGQ1?=
 =?utf-8?B?eHJvWDlKR0c2eE42REZyZEdIa0J4dDVrcUpLK2lHZG5SRnQ5cWpXaGFxRkQy?=
 =?utf-8?B?clNxcDdxTnhGTm1yMGJHa3RYZDRGSE1JSXNHWkdRbjRDYWZkNTJYKzlKc25L?=
 =?utf-8?B?MDUxYXVRVE40SWkyWVZlNHdsZXJMd2VzS203RG5lUTFGUmI0blJNZ0pDUFkr?=
 =?utf-8?B?Umxuc0M0UFkrRTRkOWNOb2hzeERib1hrMGZLK21sdm01NXVVbmlxZG1XbmRW?=
 =?utf-8?B?dlhabDRPby90dm9mdUtDTUV6Wmk3MHFzNFlVbk1FWWFHOHl4Z1l3L3JScUVj?=
 =?utf-8?B?SzRhcFQ5NTVrNVVaNmRsb3ZVUDRYaFNMMjdaQnlndEgrMmx3ZFZnQ3A4Tk1w?=
 =?utf-8?B?M1pPeVM4cmtBSTVaM3NUMENNS2FvTnZWL1pRTXJyR3gzQjFyRTFmbUtJYTNp?=
 =?utf-8?B?dkIxNkFaMjFCLzM0VjAvM3dsQ3pQdDREbzNra0hWV3RjYjdFTlJmZ3BlRzdS?=
 =?utf-8?B?SFlvclY0MEIrSnRrYXQ1d0gxVmlQdEQ4N0F1WUNXMlZYOWhWWTdubGdpbi9u?=
 =?utf-8?B?cVZTbFU4cG9jNzVOdmNpc280NCtuZGhIeEwrelBxSDJjNlZ3czJjY1dOZWs4?=
 =?utf-8?B?cTdVT3FSMHlrNkdIS3V3ZWw2Z2VXVE43Y0lYT25RbXNGRHUwSkJCME0yL3RJ?=
 =?utf-8?B?S1BtTHl4TFRUQ044Rmgxb1NuTE4rL29ub3RST3FrY2o4dnkyMnRjUDhRQktJ?=
 =?utf-8?B?UmRVeWRab2oyaTFoUjBHMXhPVHIyT2ZieUdhTjJkUzhOTnBKbXhjWlZVWnMy?=
 =?utf-8?B?UFFyaTdOcnUrUFRQZ2YzMGFJSWc1bzNQdEQvMHl0V3lPcWl0dWxGNzdQZmRT?=
 =?utf-8?B?SzFwNXVMdUg4a3VjeDdNK3lNV0ZmM0NSeFB4UDl0V3o1ZFQyK051SE9IamZX?=
 =?utf-8?B?VitTc1N0MVFpemFXdEF4MmI2Qnh6ZVZUdjNnT29LeU9LWDdSYjFCdE05bkl2?=
 =?utf-8?B?cU5UNFVXYzZPNEpwOEFDOGFMWHlKL21iSmFMbXpDV1FtNDA5ejJNTDE5aWZD?=
 =?utf-8?B?NXQ3SFBwTk5XeUE1S0M5NGtzVjZ5K3p1cXI5cUttU1VDOGk3R2QreHJiWVh1?=
 =?utf-8?B?TU4wYjNmMm9RQ0pLamtnaDRSdHM2cUpwOGdYdzR4Zzd0eFdMcW84YUpmV0VX?=
 =?utf-8?B?ejl6a0VKQVdEbXNiclRGNFU1d21Jd0hnMzFybkdUa1E2R1YyM3BtV0FIVmor?=
 =?utf-8?B?UWs3TkovUFRUcjRGZVNGVHlGOURYbS9QcVdJeWtXMGY2WnFPOVVlK3JFNktF?=
 =?utf-8?B?YkpTbHg0Z0pRU2sySnFXQVZtc21WeFF0aUcwM3N3QVV6cXM2MVdyZk5ZRnZo?=
 =?utf-8?B?cnZleVRaUDkyVmVOYzFkRElOMmRVOGtTbjJYakcyS3h4Vlg0Ylc5NVJEMTZ2?=
 =?utf-8?B?OUJhTXJqWGxPSmJuSWhIc014eEVDakR0L0JVaU5sNm1FZDZYOXNYa01RUWQv?=
 =?utf-8?B?cThMRmYzUmlHS1UvdlBhTUxpZlArcUhjdFF6QVJOT0g1MlMvaVNReVlFTXRZ?=
 =?utf-8?B?b2lpS3BnV1AyTmFOSlVybDlaaUUzWUpCZFJBRGZGSisralRIWXplQW95QTRq?=
 =?utf-8?Q?jSyY0HdiyKybAr7/og/aMfQm5?=
X-MS-Exchange-CrossTenant-Network-Message-Id: e0df8553-3448-45c7-2f75-08db8237336d
X-MS-Exchange-CrossTenant-AuthSource: IA1PR11MB6097.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jul 2023 17:49:40.2479
 (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: 5ZcYPjQCvq3/FMzfOOAmAibR8WTPUDnHNm9WgetkeFhtJUMmTfqPXJlwmw76d39dTVSPrhyFzm4GL4cEd+Ebow==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA3PR11MB8073
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-2.2 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_BLOCKED,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-crypto.vger.kernel.org>
X-Mailing-List: linux-crypto@vger.kernel.org

Hi, Tom,

On 7/10/23 12:06, Tom Zanussi wrote:
> From: Dave Jiang <dave.jiang@intel.com>
> 
> With the possibility of multiple wq drivers that can be bound to the wq,
> the user config tool accel-config needs a way to know which wq driver to
> bind to the wq. Introduce per wq driver_name sysfs attribute where the user
> can indicate the driver to be bound to the wq. This allows accel-config to
> just bind to the driver using wq->driver_name.
> 
> Signed-off-by: Dave Jiang <dave.jiang@intel.com>
> Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
> ---
>   .../ABI/stable/sysfs-driver-dma-idxd          |  6 ++++
>   drivers/dma/idxd/cdev.c                       |  7 +++++
>   drivers/dma/idxd/dma.c                        |  6 ++++
>   drivers/dma/idxd/idxd.h                       |  9 ++++++
>   drivers/dma/idxd/sysfs.c                      | 28 +++++++++++++++++++
>   include/uapi/linux/idxd.h                     |  1 +
>   6 files changed, 57 insertions(+)
> 
> diff --git a/Documentation/ABI/stable/sysfs-driver-dma-idxd b/Documentation/ABI/stable/sysfs-driver-dma-idxd
> index 534b7a3d59fc..0e577209bee2 100644
> --- a/Documentation/ABI/stable/sysfs-driver-dma-idxd
> +++ b/Documentation/ABI/stable/sysfs-driver-dma-idxd
> @@ -270,6 +270,12 @@ Description:	Shows the operation capability bits displayed in bitmap format
>   		correlates to the operations allowed. It's visible only
>   		on platforms that support the capability.
>   
> +What:		/sys/bus/dsa/devices/wq<m>.<n>/driver_name
> +Date:		Mar 27, 2023
> +KernelVersion:	6.6.0
> +Contact:	dmaengine@vger.kernel.org
> +Description:	Name of driver to be bounded to the wq.
> +
>   What:           /sys/bus/dsa/devices/engine<m>.<n>/group_id
>   Date:           Oct 25, 2019
>   KernelVersion:  5.6.0
> diff --git a/drivers/dma/idxd/cdev.c b/drivers/dma/idxd/cdev.c
> index ecbf67c2ad2b..b1ecfb71d95e 100644
> --- a/drivers/dma/idxd/cdev.c
> +++ b/drivers/dma/idxd/cdev.c
> @@ -510,6 +510,7 @@ void idxd_wq_del_cdev(struct idxd_wq *wq)
>   
>   static int idxd_user_drv_probe(struct idxd_dev *idxd_dev)
>   {
> +	struct device *dev = &idxd_dev->conf_dev;
>   	struct idxd_wq *wq = idxd_dev_to_wq(idxd_dev);
>   	struct idxd_device *idxd = wq->idxd;
>   	int rc;
> @@ -537,6 +538,12 @@ static int idxd_user_drv_probe(struct idxd_dev *idxd_dev)
>   
>   	mutex_lock(&wq->wq_lock);
>   
> +	if (!idxd_wq_driver_name_match(wq, dev)) {
> +		idxd->cmd_status = IDXD_SCMD_WQ_NO_DRV_NAME;
> +		rc = -ENODEV;
> +		goto wq_err;
> +	}
> +
>   	wq->wq = create_workqueue(dev_name(wq_confdev(wq)));
>   	if (!wq->wq) {
>   		rc = -ENOMEM;
> diff --git a/drivers/dma/idxd/dma.c b/drivers/dma/idxd/dma.c
> index eb35ca313684..8bb7e7ff8d6a 100644
> --- a/drivers/dma/idxd/dma.c
> +++ b/drivers/dma/idxd/dma.c
> @@ -305,6 +305,12 @@ static int idxd_dmaengine_drv_probe(struct idxd_dev *idxd_dev)
>   		return -ENXIO;
>   
>   	mutex_lock(&wq->wq_lock);
> +	if (!idxd_wq_driver_name_match(wq, dev)) {
> +		idxd->cmd_status = IDXD_SCMD_WQ_NO_DRV_NAME;
> +		rc = -ENODEV;
> +		goto err;
> +	}
> +
>   	wq->type = IDXD_WQT_KERNEL;
>   
>   	rc = drv_enable_wq(wq);
> diff --git a/drivers/dma/idxd/idxd.h b/drivers/dma/idxd/idxd.h
> index 5428a2e1b1ec..c62c78e1c9fa 100644
> --- a/drivers/dma/idxd/idxd.h
> +++ b/drivers/dma/idxd/idxd.h
> @@ -159,6 +159,8 @@ struct idxd_cdev {
>   	int minor;
>   };
>   
> +#define DRIVER_NAME_SIZE		128
> +
>   #define IDXD_ALLOCATED_BATCH_SIZE	128U
>   #define WQ_NAME_SIZE   1024
>   #define WQ_TYPE_SIZE   10
> @@ -227,6 +229,8 @@ struct idxd_wq {
>   	/* Lock to protect upasid_xa access. */
>   	struct mutex uc_lock;
>   	struct xarray upasid_xa;
> +
> +	char driver_name[DRIVER_NAME_SIZE + 1];
>   };
>   
>   struct idxd_engine {
> @@ -637,6 +641,11 @@ static inline void idxd_wqcfg_set_max_batch_shift(int idxd_type, union wqcfg *wq
>   		wqcfg->max_batch_shift = max_batch_shift;
>   }
>   
> +static inline int idxd_wq_driver_name_match(struct idxd_wq *wq, struct device *dev)
> +{
> +	return (strncmp(wq->driver_name, dev->driver->name, strlen(dev->driver->name)) == 0);
> +}
> +
>   int __must_check __idxd_driver_register(struct idxd_device_driver *idxd_drv,
>   					struct module *module, const char *mod_name);
>   #define idxd_driver_register(driver) \
> diff --git a/drivers/dma/idxd/sysfs.c b/drivers/dma/idxd/sysfs.c
> index 293739ac5596..6caad044f506 100644
> --- a/drivers/dma/idxd/sysfs.c
> +++ b/drivers/dma/idxd/sysfs.c
> @@ -1266,6 +1266,33 @@ static ssize_t wq_op_config_store(struct device *dev, struct device_attribute *a
>   static struct device_attribute dev_attr_wq_op_config =
>   		__ATTR(op_config, 0644, wq_op_config_show, wq_op_config_store);
>   
> +static ssize_t wq_driver_name_show(struct device *dev, struct device_attribute *attr, char *buf)
> +{
> +	struct idxd_wq *wq = confdev_to_wq(dev);
> +
> +	return sysfs_emit(buf, "%s\n", wq->driver_name);
> +}
> +
> +static ssize_t wq_driver_name_store(struct device *dev, struct device_attribute *attr,
> +				    const char *buf, size_t count)
> +{
> +	struct idxd_wq *wq = confdev_to_wq(dev);
> +
> +	if (wq->state != IDXD_WQ_DISABLED)
> +		return -EPERM;
> +
> +	if (strlen(buf) > DRIVER_NAME_SIZE || strlen(buf) == 0)
> +		return -EINVAL;
> +
> +	memset(wq->driver_name, 0, DRIVER_NAME_SIZE + 1);
> +	strncpy(wq->driver_name, buf, DRIVER_NAME_SIZE);
> +	strreplace(wq->name, '\n', '\0');

If user inputs "dmaengine    " (with the trailing white spaces), the 
trailing white spaces will be copied to wq->driver_name. Later driver 
name match will always fail.

A better way is using strim() to remove the trailing white spaces before 
copying the buffer to wq->driver_name. So wq->driver_name is "dmaengine" 
(without the trailing white spaces).

Thanks.

-Fenghua