Commit cccd85bf authored by Harald Freudenberger's avatar Harald Freudenberger Committed by Martin Schwidefsky
Browse files

s390/zcrypt: Rework debug feature invocations. 



Rework the debug feature calls and initialization.  There
are now two debug feature entries used by the zcrypt code.
The first is 'ap' with all the AP bus related stuff and the
second is 'zcrypt' with all the zcrypt and devices and
driver related entries. However, there isn't much traffic on
both debug features. The ap bus code emits only some debug
info and for zcrypt devices on appearance and disappearance
there is an entry written.

The new dbf invocations use the sprintf buffer layout,
whereas the old implementation used the ascii dbf buffer.
There are now 5*8=40 bytes used for each entry, resulting in
5 parameters per call. As the sprintf buffer needs a format
string the first parameter provides this and so up to 4 more
parameters can be used. Alltogehter the new layout should be
much more human readable for customers and test.

Signed-off-by: default avatarHarald Freudenberger <freude@linux.vnet.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent bf9f3119

drivers/s390/crypto/ap_bus.c

+40 −0
Original line number Diff line number Diff line
@@ -47,9 +47,11 @@ 
#include <asm/facility.h>

#include <linux/crypto.h>

#include <linux/mod_devicetable.h>

#include <linux/debugfs.h>



#include "ap_bus.h"

#include "ap_asm.h"

#include "ap_debug.h"



/*

 * Module description.
@@ -81,6 +83,12 @@ LIST_HEAD(ap_card_list); 
static struct ap_config_info *ap_configuration;

static bool initialised;



/*

 * AP bus related debug feature things.

 */

static struct dentry *ap_dbf_root;

debug_info_t *ap_dbf_info;



/*

 * Workqueue timer for bus rescan.

 */
@@ -568,6 +576,8 @@ static int ap_dev_resume(struct device *dev) 


static void ap_bus_suspend(void)

{

	AP_DBF(DBF_DEBUG, "ap_bus_suspend running\n");



	ap_suspend_flag = 1;

	/*

	 * Disable scanning for devices, thus we do not want to scan
@@ -603,6 +613,8 @@ static void ap_bus_resume(void) 
{

	int rc;



	AP_DBF(DBF_DEBUG, "ap_bus_resume running\n");



	/* remove all queue devices */

	bus_for_each_dev(&ap_bus_type, NULL, NULL,

			 __ap_queue_devices_unregister);
@@ -742,6 +754,9 @@ static ssize_t ap_domain_store(struct bus_type *bus, 
	spin_lock_bh(&ap_domain_lock);

	ap_domain_index = domain;

	spin_unlock_bh(&ap_domain_lock);



	AP_DBF(DBF_DEBUG, "store new default domain=%d\n", domain);



	return count;

}
@@ -964,6 +979,8 @@ static void ap_scan_bus(struct work_struct *unused) 
	unsigned int functions = 0;

	int rc, id, dom, borked, domains;



	AP_DBF(DBF_DEBUG, "ap_scan_bus running\n");



	ap_query_configuration();

	if (ap_select_domain() != 0)

		goto out;
@@ -1129,6 +1146,23 @@ static struct reset_call ap_reset_call = { 
	.fn = ap_reset_all,

};



int __init ap_debug_init(void)

{

	ap_dbf_root = debugfs_create_dir("ap", NULL);

	ap_dbf_info = debug_register("ap", 1, 1,

				     DBF_MAX_SPRINTF_ARGS * sizeof(long));

	debug_register_view(ap_dbf_info, &debug_sprintf_view);

	debug_set_level(ap_dbf_info, DBF_ERR);



	return 0;

}



void ap_debug_exit(void)

{

	debugfs_remove(ap_dbf_root);

	debug_unregister(ap_dbf_info);

}



/**

 * ap_module_init(): The module initialization code.

 *
@@ -1139,6 +1173,10 @@ int __init ap_module_init(void) 
	int max_domain_id;

	int rc, i;



	rc = ap_debug_init();

	if (rc)

		return rc;



	if (ap_instructions_available() != 0) {

		pr_warn("The hardware system does not support AP instructions\n");

		return -ENODEV;
@@ -1266,6 +1304,8 @@ void ap_module_exit(void) 
	unregister_reset_call(&ap_reset_call);

	if (ap_using_interrupts())

		unregister_adapter_interrupt(&ap_airq);



	ap_debug_exit();

}



module_init(ap_module_init);

drivers/s390/crypto/ap_debug.h

0 → 100644
+28 −0
Original line number Diff line number Diff line 
/*

 *  Copyright IBM Corp. 2016

 *  Author(s): Harald Freudenberger <freude@de.ibm.com>

 */

#ifndef AP_DEBUG_H

#define AP_DEBUG_H



#include <asm/debug.h>



#define DBF_ERR		3	/* error conditions   */

#define DBF_WARN	4	/* warning conditions */

#define DBF_INFO	5	/* informational      */

#define DBF_DEBUG	6	/* for debugging only */



#define RC2ERR(rc) ((rc) ? DBF_ERR : DBF_INFO)

#define RC2WARN(rc) ((rc) ? DBF_WARN : DBF_INFO)



#define DBF_MAX_SPRINTF_ARGS 5



#define AP_DBF(...)					\

	debug_sprintf_event(ap_dbf_info, ##__VA_ARGS__)



extern debug_info_t *ap_dbf_info;



int ap_debug_init(void);

void ap_debug_exit(void);



#endif /* AP_DEBUG_H */

drivers/s390/crypto/zcrypt_api.c

+14 −24
Original line number Diff line number Diff line
@@ -41,8 +41,8 @@ 
#include <linux/debugfs.h>

#include <asm/debug.h>



#include "zcrypt_debug.h"

#include "zcrypt_api.h"

#include "zcrypt_debug.h"



#include "zcrypt_msgtype6.h"

#include "zcrypt_msgtype50.h"
@@ -71,10 +71,9 @@ EXPORT_SYMBOL(zcrypt_rescan_req); 


static LIST_HEAD(zcrypt_ops_list);



static struct dentry *debugfs_root;

debug_info_t *zcrypt_dbf_common;

debug_info_t *zcrypt_dbf_devices;

debug_info_t *zcrypt_dbf_cards;

/* Zcrypt related debug feature stuff. */

static struct dentry *zcrypt_dbf_root;

debug_info_t *zcrypt_dbf_info;



/**

 * Process a rescan of the transport layer.
@@ -87,7 +86,7 @@ static inline int zcrypt_process_rescan(void) 
		atomic_set(&zcrypt_rescan_req, 0);

		atomic_inc(&zcrypt_rescan_count);

		ap_bus_force_rescan();

		ZCRYPT_DBF_COMMON(DBF_INFO, "rescan%07d",

		ZCRYPT_DBF(DBF_INFO, "rescan count=%07d",

			   atomic_inc_return(&zcrypt_rescan_count));

		return 1;

	}
@@ -1363,28 +1362,19 @@ void zcrypt_rng_device_remove(void) 


int __init zcrypt_debug_init(void)

{

	debugfs_root = debugfs_create_dir("zcrypt", NULL);



	zcrypt_dbf_common = debug_register("zcrypt_common", 1, 1, 16);

	debug_register_view(zcrypt_dbf_common, &debug_hex_ascii_view);

	debug_set_level(zcrypt_dbf_common, DBF_ERR);



	zcrypt_dbf_devices = debug_register("zcrypt_devices", 1, 1, 16);

	debug_register_view(zcrypt_dbf_devices, &debug_hex_ascii_view);

	debug_set_level(zcrypt_dbf_devices, DBF_ERR);



	zcrypt_dbf_cards = debug_register("zcrypt_cards", 1, 1, 16);

	debug_register_view(zcrypt_dbf_cards, &debug_hex_ascii_view);

	debug_set_level(zcrypt_dbf_cards, DBF_ERR);

	zcrypt_dbf_root = debugfs_create_dir("zcrypt", NULL);

	zcrypt_dbf_info = debug_register("zcrypt", 1, 1,

					 DBF_MAX_SPRINTF_ARGS * sizeof(long));

	debug_register_view(zcrypt_dbf_info, &debug_sprintf_view);

	debug_set_level(zcrypt_dbf_info, DBF_ERR);



	return 0;

}



void zcrypt_debug_exit(void)

{

	debugfs_remove(debugfs_root);

	debug_unregister(zcrypt_dbf_common);

	debug_unregister(zcrypt_dbf_devices);

	debugfs_remove(zcrypt_dbf_root);

	debug_unregister(zcrypt_dbf_info);

}



/**
@@ -1434,9 +1424,9 @@ void __exit zcrypt_api_exit(void) 
{

	remove_proc_entry("driver/z90crypt", NULL);

	misc_deregister(&zcrypt_misc_device);

	zcrypt_debug_exit();

	zcrypt_msgtype6_exit();

	zcrypt_msgtype50_exit();

	zcrypt_debug_exit();

}



module_init(zcrypt_api_init);

drivers/s390/crypto/zcrypt_api.h

+0 −8
Original line number Diff line number Diff line
@@ -132,8 +132,6 @@ struct zcrypt_card { 
	atomic_t load;			/* Utilization of the crypto device */



	int request_count;		/* # current requests. */



	debug_info_t *dbf_area;		/* debugging */

};



struct zcrypt_queue {
@@ -149,8 +147,6 @@ struct zcrypt_queue { 
	int request_count;		/* # current requests. */



	struct ap_message reply;	/* Per-device reply structure. */



	debug_info_t *dbf_area;		/* debugging */

};



/* transport layer rescanning */
@@ -160,10 +156,6 @@ extern spinlock_t zcrypt_list_lock; 
extern int zcrypt_device_count;

extern struct list_head zcrypt_card_list;



extern debug_info_t *zcrypt_dbf_common;

extern debug_info_t *zcrypt_dbf_devices;

extern debug_info_t *zcrypt_dbf_cards;



#define for_each_zcrypt_card(_zc) \

	list_for_each_entry(_zc, &zcrypt_card_list, list)

drivers/s390/crypto/zcrypt_card.c

+8 −2
Original line number Diff line number Diff line
@@ -79,7 +79,9 @@ static ssize_t zcrypt_card_online_store(struct device *dev, 


	zc->online = online;

	id = zc->card->id;

	ZCRYPT_DBF_DEV(DBF_INFO, zc, "card%02xo%dman", id, online);



	ZCRYPT_DBF(DBF_INFO, "card=%02x online=%d\n", id, online);



	spin_lock(&zcrypt_list_lock);

	list_for_each_entry(zq, &zc->zqueues, list)

		zcrypt_queue_force_online(zq, online);
@@ -109,7 +111,6 @@ struct zcrypt_card *zcrypt_card_alloc(void) 
		return NULL;

	INIT_LIST_HEAD(&zc->list);

	INIT_LIST_HEAD(&zc->zqueues);

	zc->dbf_area = zcrypt_dbf_cards;

	kref_init(&zc->refcount);

	return zc;

}
@@ -160,6 +161,9 @@ int zcrypt_card_register(struct zcrypt_card *zc) 
	spin_unlock(&zcrypt_list_lock);



	zc->online = 1;



	ZCRYPT_DBF(DBF_INFO, "card=%02x register online=1\n", zc->card->id);



	return rc;

}

EXPORT_SYMBOL(zcrypt_card_register);
@@ -172,6 +176,8 @@ EXPORT_SYMBOL(zcrypt_card_register); 
 */

void zcrypt_card_unregister(struct zcrypt_card *zc)

{

	ZCRYPT_DBF(DBF_INFO, "card=%02x unregister\n", zc->card->id);



	spin_lock(&zcrypt_list_lock);

	list_del_init(&zc->list);

	spin_unlock(&zcrypt_list_lock);

CRA Git | Maintained and supported by SUSTech CRA and CCSE