Commit 11f0e897 authored by Michael J. Ruhl's avatar Michael J. Ruhl Committed by Doug Ledford
Browse files

IB/{hfi1, qib}: Fix a concurrency issue with device name in logging 



The get_unit_name() function crafts a string based on the device name
and the device unit number.  It then stores this in a static variable.

This has concurrency issues as can be seen with this log:

hfi1 0000:02:00.0: hfi1_1: read_idle_message: read idle message 0x203
hfi1 0000:01:00.0: hfi1_1: read_idle_message: read idle message 0x203

The PCI device ID (0000:02:00.0 vs. 0000:01:00.0) is correct for the
message, but the device string hfi1_1 is incorrect (it should be
hfi1_0 for the second log message).

Remove get_unit_name() function.

Instead, use the rvt accessor rvt_get_ibdev_name() to get the IB name
string.

Clean up any hfi1_early_xx calls that can now use the new path.

QIB has the same (qib_get_unit_name()) issue.  Updating as necessary.

Remove qib_get_unit_name() function.

Update log message that has redundant device name.

Reviewed-by: default avatarMike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: default avatarMichael J. Ruhl <michael.j.ruhl@intel.com>
Signed-off-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent db9a2c6f

drivers/infiniband/hw/hfi1/chip.c

+2 −3
Original line number Diff line number Diff line
@@ -14920,8 +14920,7 @@ struct hfi1_devdata *hfi1_init_dd(struct pci_dev *pdev, 


		if (num_vls < HFI1_MIN_VLS_SUPPORTED ||

		    num_vls > HFI1_MAX_VLS_SUPPORTED) {

			hfi1_early_err(&pdev->dev,

				       "Invalid num_vls %u, using %u VLs\n",

			dd_dev_err(dd, "Invalid num_vls %u, using %u VLs\n",

				   num_vls, HFI1_MAX_VLS_SUPPORTED);

			num_vls = HFI1_MAX_VLS_SUPPORTED;

		}

drivers/infiniband/hw/hfi1/driver.c

+0 −8
Original line number Diff line number Diff line
@@ -159,14 +159,6 @@ static int hfi1_caps_get(char *buffer, const struct kernel_param *kp) 
	return scnprintf(buffer, PAGE_SIZE, "0x%lx", cap_mask);

}



const char *get_unit_name(int unit)

{

	static char iname[16];



	snprintf(iname, sizeof(iname), DRIVER_NAME "_%u", unit);

	return iname;

}



struct pci_dev *get_pci_dev(struct rvt_dev_info *rdi)

{

	struct hfi1_ibdev *ibdev = container_of(rdi, struct hfi1_ibdev, rdi);

drivers/infiniband/hw/hfi1/hfi.h

+12 −10
Original line number Diff line number Diff line
@@ -1971,7 +1971,6 @@ int get_platform_config_field(struct hfi1_devdata *dd, 
			      table_type, int table_index, int field_index,

			      u32 *data, u32 len);



const char *get_unit_name(int unit);

struct pci_dev *get_pci_dev(struct rvt_dev_info *rdi);



/*
@@ -2121,39 +2120,42 @@ static inline u64 hfi1_pkt_base_sdma_integrity(struct hfi1_devdata *dd) 


#define dd_dev_emerg(dd, fmt, ...) \

	dev_emerg(&(dd)->pcidev->dev, "%s: " fmt, \

		  get_unit_name((dd)->unit), ##__VA_ARGS__)

		  rvt_get_ibdev_name(&(dd)->verbs_dev.rdi), ##__VA_ARGS__)



#define dd_dev_err(dd, fmt, ...) \

	dev_err(&(dd)->pcidev->dev, "%s: " fmt, \

			get_unit_name((dd)->unit), ##__VA_ARGS__)

		rvt_get_ibdev_name(&(dd)->verbs_dev.rdi), ##__VA_ARGS__)



#define dd_dev_err_ratelimited(dd, fmt, ...) \

	dev_err_ratelimited(&(dd)->pcidev->dev, "%s: " fmt, \

			get_unit_name((dd)->unit), ##__VA_ARGS__)

			    rvt_get_ibdev_name(&(dd)->verbs_dev.rdi), \

			    ##__VA_ARGS__)



#define dd_dev_warn(dd, fmt, ...) \

	dev_warn(&(dd)->pcidev->dev, "%s: " fmt, \

			get_unit_name((dd)->unit), ##__VA_ARGS__)

		 rvt_get_ibdev_name(&(dd)->verbs_dev.rdi), ##__VA_ARGS__)



#define dd_dev_warn_ratelimited(dd, fmt, ...) \

	dev_warn_ratelimited(&(dd)->pcidev->dev, "%s: " fmt, \

			get_unit_name((dd)->unit), ##__VA_ARGS__)

			     rvt_get_ibdev_name(&(dd)->verbs_dev.rdi), \

			     ##__VA_ARGS__)



#define dd_dev_info(dd, fmt, ...) \

	dev_info(&(dd)->pcidev->dev, "%s: " fmt, \

			get_unit_name((dd)->unit), ##__VA_ARGS__)

		 rvt_get_ibdev_name(&(dd)->verbs_dev.rdi), ##__VA_ARGS__)



#define dd_dev_info_ratelimited(dd, fmt, ...) \

	dev_info_ratelimited(&(dd)->pcidev->dev, "%s: " fmt, \

			get_unit_name((dd)->unit), ##__VA_ARGS__)

			     rvt_get_ibdev_name(&(dd)->verbs_dev.rdi), \

			     ##__VA_ARGS__)



#define dd_dev_dbg(dd, fmt, ...) \

	dev_dbg(&(dd)->pcidev->dev, "%s: " fmt, \

		get_unit_name((dd)->unit), ##__VA_ARGS__)

		rvt_get_ibdev_name(&(dd)->verbs_dev.rdi), ##__VA_ARGS__)



#define hfi1_dev_porterr(dd, port, fmt, ...) \

	dev_err(&(dd)->pcidev->dev, "%s: port %u: " fmt, \

			get_unit_name((dd)->unit), (port), ##__VA_ARGS__)

		rvt_get_ibdev_name(&(dd)->verbs_dev.rdi), (port), ##__VA_ARGS__)



/*

 * this is used for formatting hw error messages...

drivers/infiniband/hw/qib/qib.h

+3 −4
Original line number Diff line number Diff line
@@ -1428,7 +1428,6 @@ u64 qib_sps_ints(void); 
 */

dma_addr_t qib_map_page(struct pci_dev *, struct page *, unsigned long,

			  size_t, int);

const char *qib_get_unit_name(int unit);

struct pci_dev *qib_get_pci_dev(struct rvt_dev_info *rdi);



/*
@@ -1487,15 +1486,15 @@ extern struct mutex qib_mutex; 


#define qib_dev_err(dd, fmt, ...) \

	dev_err(&(dd)->pcidev->dev, "%s: " fmt, \

		qib_get_unit_name((dd)->unit), ##__VA_ARGS__)

		rvt_get_ibdev_name(&(dd)->verbs_dev.rdi), ##__VA_ARGS__)



#define qib_dev_warn(dd, fmt, ...) \

	dev_warn(&(dd)->pcidev->dev, "%s: " fmt, \

		qib_get_unit_name((dd)->unit), ##__VA_ARGS__)

		 rvt_get_ibdev_name(&(dd)->verbs_dev.rdi), ##__VA_ARGS__)



#define qib_dev_porterr(dd, port, fmt, ...) \

	dev_err(&(dd)->pcidev->dev, "%s: IB%u:%u " fmt, \

		qib_get_unit_name((dd)->unit), (dd)->unit, (port), \

		rvt_get_ibdev_name(&(dd)->verbs_dev.rdi), (dd)->unit, (port), \

		##__VA_ARGS__)



#define qib_devinfo(pcidev, fmt, ...) \

drivers/infiniband/hw/qib/qib_driver.c

+0 −8
Original line number Diff line number Diff line
@@ -81,14 +81,6 @@ MODULE_DESCRIPTION("Intel IB driver"); 


struct qlogic_ib_stats qib_stats;



const char *qib_get_unit_name(int unit)

{

	static char iname[16];



	snprintf(iname, sizeof(iname), "infinipath%u", unit);

	return iname;

}



struct pci_dev *qib_get_pci_dev(struct rvt_dev_info *rdi)

{

	struct qib_ibdev *ibdev = container_of(rdi, struct qib_ibdev, rdi);

CRA Git | Maintained and supported by SUSTech CRA and CCSE