From:   John Garry <john.g.garry@oracle.com>
To:     jejb@linux.ibm.com, martin.petersen@oracle.com
Cc:     linux-scsi@vger.kernel.org, bvanassche@acm.org,
        linux-kernel@vger.kernel.org, dgilbert@interlog.com,
        John Garry <john.g.garry@oracle.com>
Subject: [PATCH RESEND v2 01/11] scsi: scsi_debug: Don't hold driver host struct pointer in host->hostdata[]
Date:   Mon, 13 Mar 2023 09:31:04 +0000
Message-Id: <20230313093114.1498305-2-john.g.garry@oracle.com>
In-Reply-To: <20230313093114.1498305-1-john.g.garry@oracle.com>
References: <20230313093114.1498305-1-john.g.garry@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ZhQCMw1jkV0GAGrYQXPHPqvCVQWapBLbvyZwu6XCR4WpF2k8XCNFvkrKUi66?=
 =?us-ascii?Q?hAknNSIwvVDvaObV14W5OTrwbU+wCo266VoxVQUrdJWkqPmn6u29UjbJGnOZ?=
 =?us-ascii?Q?90DcjLqLmDqRvh/ozpWGTc2AMn/fvapeY4U43E80EV2fOk9wdzViwIkfZyDU?=
 =?us-ascii?Q?xErIoNQpCPsB9TwMm/6eIGAofcjSsEhdj4KT345spQVYteLbd6ofqU2VhA9Y?=
 =?us-ascii?Q?SEXZJmTRKdSHM23GkCDMLcSvBHWbkFsj4GD6NENM/Lga9f9c+MU/m/Xsz/Vm?=
 =?us-ascii?Q?HKqs8vu0eYiXhuzQGYTWHaWc+Ht60Qt5NIz5W0YvftsvFvsdTOg4dfB7indl?=
 =?us-ascii?Q?p0OgDPM0zCQ47Lrk8vrTa0eKJt3l9sLdI8YOuG/GKuzvhhrKCrheRezjo43p?=
 =?us-ascii?Q?ShEZlt1dswfe/WpavPf8iXPbfKLnAHIc8vL8PXlSumhfXKBVKxJkO8p5vYwg?=
 =?us-ascii?Q?rt0yDrehKtistZf5K80EzwqIUvLAXY/t1bGdA2NSB3t8xEnHhuN8Tyw6Pbgh?=
 =?us-ascii?Q?ebP6IA1VXX/83vRG9UUDHOrBlfcwH6/EtnRvTAeKvhF4VWm9M+AGfR0J27AS?=
 =?us-ascii?Q?npFXfJfX2abb7YdxK1fCIzEa7sydffNz6LNWewTIuFtTXcpiLdTG+J5NSH1d?=
 =?us-ascii?Q?KFpfGKh8sPPLTer9RHfpbhs/nHjrtBr1jrssumns89+WwPSRkMGlCNP7S7+L?=
 =?us-ascii?Q?cvG+zKIRRKz1rkqfL0HJNllQmCgPG7RIf+CHXEIrIdki7t1RS8+gF8llcnBG?=
 =?us-ascii?Q?uj5IgRnGFSKyO7RaBrMi+uO9AUv1h8k58f2c02pS9dKfYaGo1A+9mSRENCpi?=
 =?us-ascii?Q?GR9hMpUb2GsmJ3wQjFiskwR7GA3I+3xIgPmKKzVTyUKgJblfvgJFSnRbqtgk?=
 =?us-ascii?Q?x1CFf5Z0KmzqBZmP1uSp3FvYfv1hjs2VUKKsHGTKBHIHjA9BC3MMenYVlg40?=
 =?us-ascii?Q?GGb0U6SPq+ROmnGgjpk2Nm3zEKbGF91lHNAPUiwXAiaf5qqeyGY6CUNdaFCa?=
 =?us-ascii?Q?Rb7vSK0jcUmWRp/LucA/epsTezFfVfTEKun68LAzY2aImCCUf2l8q1VXwdjH?=
 =?us-ascii?Q?vrvIDMyxTopfnSS/ZvEw03F4VyU+Zt507IH/fbS3K18R1kJSwXHP5yDrlI6j?=
 =?us-ascii?Q?vmrN4ACNU5olC/7Qe6tW+wUokGRIAYLo4D64EMDz475sHCUBa5kJh+JweYZ6?=
 =?us-ascii?Q?D5Ntod9xxm96pOejNHOSHlYUKX6Walnx7vK7Es767T12cWFrYjnjY6DDIhbJ?=
 =?us-ascii?Q?H27nicc30jJRuK7vabgBY5bJW1VSKAAngbWuTXmjPS83SE2DLNmEzbUDPwk4?=
 =?us-ascii?Q?CnAnNr7xwxE+l5CgVZswFDk+74Xl5dPR4f4T7LCiRm7IsZYedCZovTjcwEBy?=
 =?us-ascii?Q?t5C2dEvNW38bY47mPgfl6dc6fCBgZTRof2vBLI+nRLLoYRBZZVJF0Lq+fSeq?=
 =?us-ascii?Q?87G7UU5SB8k/ft4+doDtwt/9gwqzXz/9ub1ddbebgwv/L+zI1z3zQmw8DFqP?=
 =?us-ascii?Q?oK6LREieAcBto2X+Um+AkXbL/ERzHhEeVCWn/P7NVHhqyW/p4hT4+r6TC9X7?=
 =?us-ascii?Q?PdffIciZJg/uh7pdKTNQhVDMNdKhe0rBSqysdwjSMgq4F34XTri5z1ji/BPt?=
 =?us-ascii?Q?zQ=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: OpdoivxQ0V6Ly3cHaoXVnF6KqQxlc+OulPr+CUkqUTyPj1zNa2ripqroQsZ8uZ7TWxM6zc5DD/v+PHh46dYYuZ8eIS4rVv5CAGHW3kAKdZzRzzJoUMePq0bQ1686+qzRilUGCqBWLVckq3SeiMag/jLBhJzS4VEvEl0G766YiJj452xwyfD9ou/aEvmlg+W+dcXjn63Ayy2L84t0iaqauIz/zh2q+teD7BVODkrThKgvN/D7puFloWbc8ZUF1BAHPvYOcMHVtFkYhmvQYSRppfzYV9otI6Ww2JYv0G2TmgzsFfkMPsRLXgASJfsnfIXsMswxAhrsVAZUdDbySnlhjRsdY3sT38mweXLs2N+rnGy058mtZCpnZ90dyhOw6fww61KDvEjz+Ur6gvD7Jc+KRTN5LBhaHt6tZphtwChVA6KtVve/Tl/AkflB7BahMCwIESFGNVC5yqnjLZ6IZ/aMzNoeJ1LK7BfCi5GyynOfxWLCkbftpeN27GIhFT7DdWfOB9z4u3QgIQDQ1EyBcK6oc5xLf+tB/AGFkPM3KkClS/1/lASkhP+M5/8oIKW0lld8oLXwaoj5qJFlC5tj4TnqNqa3haFZf1iF6Da6l9T8edY+5vBycq2taFaaPtuJ9k7fD4Vu5mKRktbvht9uCRm6cjjEkhLeCL573rQAg47tm3FZyXZejX2MGk4RCOhpCwbSkBy0n+wHVnS/YLtGUryrfLyja7UcJGW9NLt3N+NHdbxd6KKS8Nqbzny+SQiAdHNLEbqcpDuB8BFF8WOxBarwbKp3msBIA/bzStoKl4kLAs9sA+XcE63nvMIqMKOq64vSgbU5ZSlub7GZuWl4VGL303QvwlxiouQslMK8+55nH4M=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 262f4bc2-f5e2-404b-a1c1-08db23a5b8fc
X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Mar 2023 09:31:28.4290
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: ohw3GPsx+x0hV02TPFDdZpQF7ONfjefhl/J0VrIGogXrGCYN0SmetQ7T/Rskj0SqcnsDwdeB/0+RVO7TwCLQXg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR10MB7048
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22
 definitions=2023-03-13_02,2023-03-10_01,2023-02-09_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 adultscore=0 malwarescore=0
 mlxlogscore=999 mlxscore=0 suspectscore=0 bulkscore=0 phishscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000
 definitions=main-2303130077
X-Proofpoint-GUID: 6KA6UJZ3iXNF4nZSdRvNq4mA_KXbgeA4
X-Proofpoint-ORIG-GUID: 6KA6UJZ3iXNF4nZSdRvNq4mA_KXbgeA4
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

This driver stores just a pointer to the driver host structure in
host->hostdata[]. Most other drivers actually have the driver host
structure allocated in host->hostdata[], but this driver is different as
we allocate that memory separately before allocating the shost memory.

However there is no need to allocate this memory only in host->hostdata[]
when we can already look up the driver host structure from shost->dma_dev,
so add a macro for this - shost_to_sdebug_host(). Rename to_sdebug_host()
-> dev_to_sdebug_host() to avoid ambiguity.

Also remove a check for !sdbg_host in find_build_dev_info(), as this cannot
be true. Other similar checks will be later removed.

Signed-off-by: John Garry <john.g.garry@oracle.com>
---
 drivers/scsi/scsi_debug.c | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c
index 72149eeee6e6..554c03d7a648 100644
--- a/drivers/scsi/scsi_debug.c
+++ b/drivers/scsi/scsi_debug.c
@@ -324,9 +324,12 @@ struct sdeb_store_info {
 	void *map_storep;	/* provisioning map */
 };
 
-#define to_sdebug_host(d)	\
+#define dev_to_sdebug_host(d)	\
 	container_of(d, struct sdebug_host_info, dev)
 
+#define shost_to_sdebug_host(shost)	\
+	dev_to_sdebug_host(shost->dma_dev)
+
 enum sdeb_defer_type {SDEB_DEFER_NONE = 0, SDEB_DEFER_HRT = 1,
 		      SDEB_DEFER_WQ = 2, SDEB_DEFER_POLL = 3};
 
@@ -5166,11 +5169,7 @@ static struct sdebug_dev_info *find_build_dev_info(struct scsi_device *sdev)
 	struct sdebug_dev_info *open_devip = NULL;
 	struct sdebug_dev_info *devip;
 
-	sdbg_host = *(struct sdebug_host_info **)shost_priv(sdev->host);
-	if (!sdbg_host) {
-		pr_err("Host info NULL\n");
-		return NULL;
-	}
+	sdbg_host = shost_to_sdebug_host(sdev->host);
 
 	list_for_each_entry(devip, &sdbg_host->dev_info_list, dev_list) {
 		if ((devip->used) && (devip->channel == sdev->channel) &&
@@ -5407,7 +5406,7 @@ static int scsi_debug_target_reset(struct scsi_cmnd *SCpnt)
 	hp = sdp->host;
 	if (!hp)
 		goto lie;
-	sdbg_host = *(struct sdebug_host_info **)shost_priv(hp);
+	sdbg_host = shost_to_sdebug_host(hp);
 	if (sdbg_host) {
 		list_for_each_entry(devip,
 				    &sdbg_host->dev_info_list,
@@ -5440,7 +5439,7 @@ static int scsi_debug_bus_reset(struct scsi_cmnd *SCpnt)
 		sdev_printk(KERN_INFO, sdp, "%s\n", __func__);
 	hp = sdp->host;
 	if (hp) {
-		sdbg_host = *(struct sdebug_host_info **)shost_priv(hp);
+		sdbg_host = shost_to_sdebug_host(hp);
 		if (sdbg_host) {
 			list_for_each_entry(devip,
 					    &sdbg_host->dev_info_list,
@@ -7165,7 +7164,7 @@ static void sdebug_release_adapter(struct device *dev)
 {
 	struct sdebug_host_info *sdbg_host;
 
-	sdbg_host = to_sdebug_host(dev);
+	sdbg_host = dev_to_sdebug_host(dev);
 	kfree(sdbg_host);
 }
 
@@ -7812,14 +7811,14 @@ static int sdebug_driver_probe(struct device *dev)
 	struct Scsi_Host *hpnt;
 	int hprot;
 
-	sdbg_host = to_sdebug_host(dev);
+	sdbg_host = dev_to_sdebug_host(dev);
 
 	sdebug_driver_template.can_queue = sdebug_max_queue;
 	sdebug_driver_template.cmd_per_lun = sdebug_max_queue;
 	if (!sdebug_clustering)
 		sdebug_driver_template.dma_boundary = PAGE_SIZE - 1;
 
-	hpnt = scsi_host_alloc(&sdebug_driver_template, sizeof(sdbg_host));
+	hpnt = scsi_host_alloc(&sdebug_driver_template, 0);
 	if (NULL == hpnt) {
 		pr_err("scsi_host_alloc failed\n");
 		error = -ENODEV;
@@ -7862,7 +7861,6 @@ static int sdebug_driver_probe(struct device *dev)
 		hpnt->nr_maps = 3;
 
 	sdbg_host->shost = hpnt;
-	*((struct sdebug_host_info **)hpnt->hostdata) = sdbg_host;
 	if ((hpnt->this_id >= 0) && (sdebug_num_tgts > hpnt->this_id))
 		hpnt->max_id = sdebug_num_tgts + 1;
 	else
@@ -7936,7 +7934,7 @@ static void sdebug_driver_remove(struct device *dev)
 	struct sdebug_host_info *sdbg_host;
 	struct sdebug_dev_info *sdbg_devinfo, *tmp;
 
-	sdbg_host = to_sdebug_host(dev);
+	sdbg_host = dev_to_sdebug_host(dev);
 
 	scsi_remove_host(sdbg_host->shost);
 
-- 
2.35.3