From patchwork Mon Oct 14 10:58:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Roberts X-Patchwork-Id: 13834702 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7A1DCD1A43B for ; Mon, 14 Oct 2024 11:01:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0C6116B00C1; Mon, 14 Oct 2024 07:01:17 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 04ED26B00C2; Mon, 14 Oct 2024 07:01:16 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DE2B66B00C3; Mon, 14 Oct 2024 07:01:16 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id B89C86B00C1 for ; Mon, 14 Oct 2024 07:01:16 -0400 (EDT) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 5754EABCC6 for ; Mon, 14 Oct 2024 11:01:01 +0000 (UTC) X-FDA: 82671916068.29.E55154D Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf24.hostedemail.com (Postfix) with ESMTP id 3F5C9180027 for ; Mon, 14 Oct 2024 11:01:13 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf24.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1728903644; a=rsa-sha256; cv=none; b=2ozEjjGp8CKspNpIWTroquGflvFkku+HrW1UNIpYPU4n40mMNZQuPUSGwU99lt7anSRSCD AOcmBRGva9019Sj8n02raMK9534dR7nt3JPfrY7+qUqwaLNFdGmZX0NEhOfAxra7cic8NR xvVAuAnCBs28wotnAgKJdl2YiYpVJT4= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf24.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1728903644; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1NGA+tE4zfya25VBkRDEA5yZy6epmiLwve34sECMDkQ=; b=VCe71I5kJgo8F6+88+z7t1BJI5U1BKtwpKX0+KhmBMT2I9oNn4brSpVAk3gXJ3IV+q9anA nI7QISerbvOuHAqrlYjeD8rX3kxY/DIfAT7G+wKAda87FGezYOChg7iJl+7ailnAlusnxu aVmTSmYZ2hi/aCdWiejNmI5KQPjGNUc= Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id C49D916F8; Mon, 14 Oct 2024 04:01:43 -0700 (PDT) Received: from e125769.cambridge.arm.com (e125769.cambridge.arm.com [10.1.196.27]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 679B23F51B; Mon, 14 Oct 2024 04:01:11 -0700 (PDT) From: Ryan Roberts To: Andrew Morton , Anshuman Khandual , Ard Biesheuvel , Catalin Marinas , Damien Le Moal , David Hildenbrand , Greg Marsden , Ivan Ivanov , Kalesh Singh , Marc Zyngier , Mark Rutland , Matthias Brugger , Miroslav Benes , Niklas Cassel , Will Deacon Cc: Ryan Roberts , linux-arm-kernel@lists.infradead.org, linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [RFC PATCH v1 34/57] sata_sil24: Remove PAGE_SIZE compile-time constant assumption Date: Mon, 14 Oct 2024 11:58:41 +0100 Message-ID: <20241014105912.3207374-34-ryan.roberts@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241014105912.3207374-1-ryan.roberts@arm.com> References: <20241014105514.3206191-1-ryan.roberts@arm.com> <20241014105912.3207374-1-ryan.roberts@arm.com> MIME-Version: 1.0 X-Rspam-User: X-Stat-Signature: wrkgubbm85umrgjswywi8pecq7k9zs1b X-Rspamd-Queue-Id: 3F5C9180027 X-Rspamd-Server: rspam02 X-HE-Tag: 1728903673-645190 X-HE-Meta: U2FsdGVkX197JUlDCJ7Z9V2nTxFQE7SUwmv3IH6oUwO8knMKW/CF0rpZwVHFRCvSaoB1KEj6u0lAlMLPISa+grmsFADvKb87j6zh5SMQqX4KbjW4Deb3r4NQGJPZBGad899l15J/FsOgsaG9yIbWKqLA4w4JfNx6xm3qJl3YYEQGqnQDBT0DzNlI4x3vYOQlkJa4pecKQaC+zM5YoxF54WSdRi+N7oxUw3yC18W7Pdi5S9uLApH+Dzx4c/ypwoWdLGTKAKntPg1l976AbQiVU/gYgi3myn171PN4aHELSaNpAhvE7StuT8dn9E2zr0i4mHlUf8QuviaZJYYKpOBiyORW0ghaFB/035rbAEU3N9PJ6zUY093LbyQuewHFJdYax1Dv8VkaHo/zJcWMQHqqesA1jU53z6+1qx9OAkVggvxXEbi0BnP/K19OTPE9F8bHcs8pHqE5pGFgCHe7NtgbultxtgvIGMpkHaTvqSEzLZYt757opE6np4MbeNzwQJEgQuBjwq3J7FjlmjBOE5S45PGglWZfJFfcXujFLrFW8yi0AqBeOI1k04PDgKTYh5/x5g4tI/BPrzbQ1hGTxqmit4qbpIojKrQoT2XQOVVy3UQA5Pcj4S//DWewFEoRwJMUPaxApVvG8i5d1daM4K9KEEsGBSFSyKemjX6wd9N06434lUBxaoHRpchdQrxATF/Z+igorMt4P3G/kKeDl/aFT+tWQAc4MO+WZEfNUrlI3lm4t1oxBn29fVRukoi+WOjLGCuMEyp7S0Asz4cVtCTAfpfgcd9dx6jdqCUWDYegAYB4QyU166eprC7JzkLiaA6HK8wVzRZJYgU8b+bwS0ShoYmLxWLodeBNZqFgFmEMOSSrlBFcsBnpuGt/me8+1Hf/jgT+qViIxhKKX6D1xk2b/gQ1oKvSMSp5O0h8qtCCDXNAVpzMTyF3PMuH9a4lCNloZl89py8PcTusDjSlZg0 sWHdjY9t qPxQDLZM5kP44h23GqD5tjJLWQyFUW1xg5pQv24M997C4IyloWWs2tJxBk7U8UeHyUHYORsoNtR07j9GzMKGApiV0YT/ITFsUR4y0dVhoW0T/yfkecSfGtdMQQqeOS7PZ6frTgFosX/DwCC4Y1n5MkGoyY9ov/Eu2RMVNRReaMvyhvga2JXz48FJq0exJtZ+VFjZXrgfa0Xwx7wXShJkCjKrzBSYW+KJMHW03 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: To prepare for supporting boot-time page size selection, refactor code to remove assumptions about PAGE_SIZE being compile-time constant. Code intended to be equivalent when compile-time page size is active. Convert "struct sil24_ata_block" and "struct sil24_atapi_block" to use a flexible array member for their sge[] array. The previous static size of SIL24_MAX_SGE depends on PAGE_SIZE so doesn't work for boot-time page size. Wrap global variables that are initialized with PAGE_SIZE derived values using DEFINE_GLOBAL_PAGE_SIZE_VAR() so their initialization can be deferred for boot-time page size builds. Signed-off-by: Ryan Roberts --- ***NOTE*** Any confused maintainers may want to read the cover note here for context: https://lore.kernel.org/all/20241014105514.3206191-1-ryan.roberts@arm.com/ drivers/ata/sata_sil24.c | 46 +++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/drivers/ata/sata_sil24.c b/drivers/ata/sata_sil24.c index 72c03cbdaff43..85c6382976626 100644 --- a/drivers/ata/sata_sil24.c +++ b/drivers/ata/sata_sil24.c @@ -42,26 +42,25 @@ struct sil24_sge { __le32 flags; }; +/* + * sil24 fetches in chunks of 64bytes. The first block + * contains the PRB and two SGEs. From the second block, it's + * consisted of four SGEs and called SGT. Calculate the + * number of SGTs that fit into one page. + */ +#define SIL24_PRB_SZ (sizeof(struct sil24_prb) + 2 * sizeof(struct sil24_sge)) +#define SIL24_MAX_SGT ((PAGE_SIZE - SIL24_PRB_SZ) / (4 * sizeof(struct sil24_sge))) + +/* + * This will give us one unused SGEs for ATA. This extra SGE + * will be used to store CDB for ATAPI devices. + */ +#define SIL24_MAX_SGE (4 * SIL24_MAX_SGT + 1) enum { SIL24_HOST_BAR = 0, SIL24_PORT_BAR = 2, - /* sil24 fetches in chunks of 64bytes. The first block - * contains the PRB and two SGEs. From the second block, it's - * consisted of four SGEs and called SGT. Calculate the - * number of SGTs that fit into one page. - */ - SIL24_PRB_SZ = sizeof(struct sil24_prb) - + 2 * sizeof(struct sil24_sge), - SIL24_MAX_SGT = (PAGE_SIZE - SIL24_PRB_SZ) - / (4 * sizeof(struct sil24_sge)), - - /* This will give us one unused SGEs for ATA. This extra SGE - * will be used to store CDB for ATAPI devices. - */ - SIL24_MAX_SGE = 4 * SIL24_MAX_SGT + 1, - /* * Global controller registers (128 bytes @ BAR0) */ @@ -244,13 +243,13 @@ enum { struct sil24_ata_block { struct sil24_prb prb; - struct sil24_sge sge[SIL24_MAX_SGE]; + struct sil24_sge sge[]; }; struct sil24_atapi_block { struct sil24_prb prb; u8 cdb[16]; - struct sil24_sge sge[SIL24_MAX_SGE]; + struct sil24_sge sge[]; }; union sil24_cmd_block { @@ -373,7 +372,7 @@ static struct pci_driver sil24_pci_driver = { #endif }; -static const struct scsi_host_template sil24_sht = { +static DEFINE_GLOBAL_PAGE_SIZE_VAR_CONST(struct scsi_host_template, sil24_sht, { __ATA_BASE_SHT(DRV_NAME), .can_queue = SIL24_MAX_CMDS, .sg_tablesize = SIL24_MAX_SGE, @@ -382,7 +381,7 @@ static const struct scsi_host_template sil24_sht = { .sdev_groups = ata_ncq_sdev_groups, .change_queue_depth = ata_scsi_change_queue_depth, .device_configure = ata_scsi_device_configure -}; +}); static struct ata_port_operations sil24_ops = { .inherits = &sata_pmp_port_ops, @@ -1193,7 +1192,7 @@ static int sil24_port_start(struct ata_port *ap) struct device *dev = ap->host->dev; struct sil24_port_priv *pp; union sil24_cmd_block *cb; - size_t cb_size = sizeof(*cb) * SIL24_MAX_CMDS; + size_t cb_size = PAGE_SIZE * SIL24_MAX_CMDS; dma_addr_t cb_dma; pp = devm_kzalloc(dev, sizeof(*pp), GFP_KERNEL); @@ -1258,7 +1257,6 @@ static void sil24_init_controller(struct ata_host *host) static int sil24_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) { - extern int __MARKER__sil24_cmd_block_is_sized_wrongly; struct ata_port_info pi = sil24_port_info[ent->driver_data]; const struct ata_port_info *ppi[] = { &pi, NULL }; void __iomem * const *iomap; @@ -1266,9 +1264,9 @@ static int sil24_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) int rc; u32 tmp; - /* cause link error if sil24_cmd_block is sized wrongly */ - if (sizeof(union sil24_cmd_block) != PAGE_SIZE) - __MARKER__sil24_cmd_block_is_sized_wrongly = 1; + /* union sil24_cmd_block must be PAGE_SIZE */ + BUG_ON(struct_size_t(struct sil24_atapi_block, sge, SIL24_MAX_SGE) != PAGE_SIZE); + BUG_ON(struct_size_t(struct sil24_ata_block, sge, SIL24_MAX_SGE) > PAGE_SIZE); ata_print_version_once(&pdev->dev, DRV_VERSION);