From mboxrd@z Thu Jan 1 00:00:00 1970 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 A21B9D0E6EE for ; Mon, 21 Oct 2024 11:26:24 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2C7926B007B; Mon, 21 Oct 2024 07:26:24 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2771E6B0082; Mon, 21 Oct 2024 07:26:24 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1670E6B0083; Mon, 21 Oct 2024 07:26:24 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id ED3D56B007B for ; Mon, 21 Oct 2024 07:26:23 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 547671A192E for ; Mon, 21 Oct 2024 11:25:56 +0000 (UTC) X-FDA: 82697380458.27.636AACB Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf03.hostedemail.com (Postfix) with ESMTP id 6AD0120011 for ; Mon, 21 Oct 2024 11:26:14 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf03.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=1729509860; a=rsa-sha256; cv=none; b=4f5hPSsEums7SPHJolv5kbmIgeXTXBDsqzy7NpuWc/m/yNo5wxCstH0m4Yh5Go/xoto9mo WfMLRdliPcjq8jb2rYI3740lIRN2G8vLVIixe9hjngvKx65WUUn4XoWZg2LU3YMd9cq+DD mB82fZ5DeEm9B/uzm7jqr8ZFxPCv3CI= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf03.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=1729509860; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=R00xu2+cZcuEzQsapV1BulakTAj4CGhOTkO5NqX96Ek=; b=5HOv32QOlCCpWXic/iVp/50V+AMI5sDwe+Dcp+u/7rTJQOsKvYIfLd8DERMnkQ/czXVmrN EDR8G/uQNjR0Tqj2dOkiAY0Z/L8SKe5Q13GvyOpcw6pK6betoEw3wGvAIdvWPlk+9D/Rjh twk5lrjDaqOPYAjCgLiFV5fuv0VCDU0= 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 4F95ADA7; Mon, 21 Oct 2024 04:26:50 -0700 (PDT) Received: from [10.57.87.148] (unknown [10.57.87.148]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 700F03F528; Mon, 21 Oct 2024 04:26:17 -0700 (PDT) Message-ID: <8e1e0824-1022-4f8f-9753-e134c7244d3a@arm.com> Date: Mon, 21 Oct 2024 12:26:15 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [RFC PATCH v1 34/57] sata_sil24: Remove PAGE_SIZE compile-time constant assumption Content-Language: en-GB To: Niklas Cassel Cc: 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 , Will Deacon , linux-arm-kernel@lists.infradead.org, linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Kees Cook , "Gustavo A. R. Silva" References: <20241014105514.3206191-1-ryan.roberts@arm.com> <20241014105912.3207374-1-ryan.roberts@arm.com> <20241014105912.3207374-34-ryan.roberts@arm.com> <7aa84080-6845-496a-a394-30d334632298@arm.com> <2f578256-7e56-491f-a4ca-ad6caa72b7ae@arm.com> From: Ryan Roberts In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 6AD0120011 X-Stat-Signature: sisqmh93ppwxqtnamij5msunnqhmdp9a X-Rspam-User: X-HE-Tag: 1729509974-87087 X-HE-Meta: U2FsdGVkX1/cBk2DdXjnrRl5h8RZKhPbjrusS/ScCqEISxjeq1kprI2gKnhMbXoCJR4aJAC4s8DAo72k8aH8f+upPOgSP6jNNdfETIyyy3Wmdc5DnrvpstFD5hIoVwLwhE7IVQn4RpYT63ZubIvSq5GQxJjNdC1DzgXuv6W9GtLVZqhW755XwZZgS5ys9qa7zd+oBFFL3vQZbnFZtYxgqxmfa6yYKBX0F7yZrHZrtY7SKPuKAknROukrOwjwUlWDcYK6wyNDYEABuHEU2dY1+SbuSM3vAdE67pkQYNGqc/QeRdkp/2CPGLa6drb/EXyhwtVoEee/x4VwCBWqO1RnXQYDHIGLLhRsjt+ofUObS3JvzFXKbKDpvovMgOcD54S+rw2zTtkpQp+SRER6tDLFgqqxCv/NF/4DGWheeQ+VRY8iyE8KzlRrAI7CJe6ceBNQXVKpY9NtcoJgOPAdK6BxyeUarKhBykiQWQrFb/DjSJkKbR3rkrjOrK99gOuO7jb2QLTgXkRpE36J5tSndsbCazF66AFxdgojq76ebvFgH6bpYWGEG1tPyU6ad2tcfREyRYJPICqKTbXkkr/VSyDF0zNq9e5+VN+2PPgJqXGRL8Nrz+1y/6C7Zg9rVoYjCEhmGrDYUabfccw47ogaK2OCCBGlCNNk4MgurMztYmbb+ZPwXyCLoYnEOoYs53wr1jWYeY/IC5D2m+OGcYyXgVshE51rDSN6ROniUvKiqfwg1JMQIgflp4LhyOs4KbQaBBTDXitF4KDzt7IjhWpXM1baTKES5KN8jc10uSWn2ClRuOD54DgbMVQ3Qge9LUEstlj4jU21BMR74flAQHNDevYxaQBlB7PUIaULd1VsabvAu57h3QVcBOSSJPhyAXmncedwD/6yLEpG5zbo3mmtp5qtryfBKHRuwOnssNzJZN7OZtvRdQbxNh8Fi2N2ZyBEaaRHMeXFsXoOkViRNKaBehn sfN67qlL FTgQCSl7swkwG7qGbvP1LG9Zsmlqd1RAMdo7uO4bVnJ+FlzyMK8dZTTBULIhiyP+0GKJbvmB1P0K5haO7V9I0gHLon52kuhrG1sWf1IgZwU3YZlair0HUojRpCnRNAQRPyCt+vPaPqcJXWnoxE7txSfyfKTwdMK4lcDmAt10EYGl4KQnxskrMUb+0l3puywQ6+dMR 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: On 21/10/2024 12:04, Niklas Cassel wrote: > On Mon, Oct 21, 2024 at 10:24:37AM +0100, Ryan Roberts wrote: >> On 17/10/2024 13:51, Niklas Cassel wrote: >>> On Thu, Oct 17, 2024 at 01:42:22PM +0100, Ryan Roberts wrote: > > (snip) > >> That said, while investigating this, I've spotted a bug in my change. paddr calculation in sil24_qc_issue() is incorrect since sizeof(*pp->cmd_block) is no longer PAGE_SIZE. Based on feedback in another patch, I'm also converting the BUG_ONs to WARN_ON_ONCEs. > > Side note: Please wrap you lines to 80 characters max. Yes sorry, I turned off line wrapping for that last mail because I didn't want it to wrap the copy/pasted patch. I'll figure out how to mix and match for future. > > >> >> Additional proposed change, which I'll plan to include in the next version: >> >> ---8<--- >> diff --git a/drivers/ata/sata_sil24.c b/drivers/ata/sata_sil24.c >> index 85c6382976626..c402bf998c4ee 100644 >> --- a/drivers/ata/sata_sil24.c >> +++ b/drivers/ata/sata_sil24.c >> @@ -257,6 +257,10 @@ union sil24_cmd_block { >> struct sil24_atapi_block atapi; >> }; >> >> +#define SIL24_ATA_BLOCK_SIZE struct_size_t(struct sil24_ata_block, sge, SIL24_MAX_SGE) >> +#define SIL24_ATAPI_BLOCK_SIZE struct_size_t(struct sil24_atapi_block, sge, SIL24_MAX_SGE) >> +#define SIL24_CMD_BLOCK_SIZE max(SIL24_ATA_BLOCK_SIZE, SIL24_ATAPI_BLOCK_SIZE) >> + >> static const struct sil24_cerr_info { >> unsigned int err_mask, action; >> const char *desc; >> @@ -886,7 +890,7 @@ static unsigned int sil24_qc_issue(struct ata_queued_cmd *qc) >> dma_addr_t paddr; >> void __iomem *activate; >> >> - paddr = pp->cmd_block_dma + tag * sizeof(*pp->cmd_block); >> + paddr = pp->cmd_block_dma + tag * SIL24_CMD_BLOCK_SIZE; >> activate = port + PORT_CMD_ACTIVATE + tag * 8; >> >> /* >> @@ -1192,7 +1196,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 = PAGE_SIZE * SIL24_MAX_CMDS; >> + size_t cb_size = SIL24_CMD_BLOCK_SIZE * SIL24_MAX_CMDS; >> dma_addr_t cb_dma; >> >> pp = devm_kzalloc(dev, sizeof(*pp), GFP_KERNEL); >> @@ -1265,8 +1269,8 @@ static int sil24_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) >> u32 tmp; >> >> /* union sil24_cmd_block must be PAGE_SIZE */ > > This comment should probably be rephrased to be more clear then, since like > you said sizeof(union sil24_cmd_block) will no longer be PAGE_SIZE. How about: /* * union sil24_cmd_block must be PAGE_SIZE once taking into account the 'sge' * flexible array members in struct sil24_atapi_block and struct sil24_ata_block */ > > >> - 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); >> + WARN_ON_ONCE(SIL24_ATAPI_BLOCK_SIZE != PAGE_SIZE); >> + WARN_ON_ONCE(SIL24_ATA_BLOCK_SIZE != PAGE_SIZE - 16); >> >> ata_print_version_once(&pdev->dev, DRV_VERSION); >> ---8<---