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 13956D0E6EE for ; Mon, 21 Oct 2024 11:04:18 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7BC226B007B; Mon, 21 Oct 2024 07:04:18 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 744FB6B0082; Mon, 21 Oct 2024 07:04:18 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5E57E6B0083; Mon, 21 Oct 2024 07:04:18 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 407316B007B for ; Mon, 21 Oct 2024 07:04:18 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id E7145141934 for ; Mon, 21 Oct 2024 11:04:01 +0000 (UTC) X-FDA: 82697325228.28.33388FA Received: from nyc.source.kernel.org (nyc.source.kernel.org [147.75.193.91]) by imf27.hostedemail.com (Postfix) with ESMTP id 61ADB40015 for ; Mon, 21 Oct 2024 11:04:01 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=XMo0M35g; spf=pass (imf27.hostedemail.com: domain of cassel@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=cassel@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1729508506; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=g1mgsJtxtcyIbKHEawiOmYwQg8hfW4t9OOiNgpSDgQs=; b=3pTJ+DCtsoBxOjryjfAcJeYkRT1qiLegO4q/NQxSuA48nYoRG03aZeDUprDKsOlrC9EX/a X413BYP/Fcp8yEIPB/XnbTlNdtub5z7luAJya3s7V99DmKfqBeEz9X5HYRKYyIc74CQOWm 5XVyxZ43Ant0ABHI/EXGIQca7U/fM1U= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1729508506; a=rsa-sha256; cv=none; b=idUj08L10ngjS7TAlid3plkcZMlUM7057fse9p7+MDAADgGdTlRfJi5u/FU3EuGWYYdZx/ cGSSFRJNFFfX6PgmaHc3bIWOVrAxAQTBBfMq1olh4aZKCDfW7YU4VkP7+HUf+g/hnu8QZp QhCbx5lof5MKAmA+x9mxQBQKhuGsPNg= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=XMo0M35g; spf=pass (imf27.hostedemail.com: domain of cassel@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=cassel@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id 321A9A41C21; Mon, 21 Oct 2024 11:04:06 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C431AC4CEC3; Mon, 21 Oct 2024 11:04:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1729508655; bh=V2y7vo9LKGOZ0tWW9XkDgj45tINelaxj5+/uHLJyjvA=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=XMo0M35gln5n5YBsOzPzLQvm37tYESmeI89JvjV5mKLuiw28JenGK69a1rBEJ2+7+ WsrIZhcviLD3dBhbO9wFY/86/NNMRulS0xI0cMvbM4yU7ZMDldEPlxtFCjAjICToSo kY6SIHL1MEqf0OE9zIVaClb7PcVGvRL1dCmD+EPZ9R/IagMJ2E0krfoC43JJYcIaAA sFig3yBqrwK7HFZrmkW/glJqPb13wRp/1ObO1GfJwY0XrJ+u229Y8BO/CrJDIOAWGo Xl/unMeQAxU1TxeLhI1n+eXkewP4OrdOVr4EJ9nx2QSecGrNDnOUb8wr9ei3XveoN+ tRk5lexWW8cdQ== Date: Mon, 21 Oct 2024 13:04:08 +0200 From: Niklas Cassel To: Ryan Roberts 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" Subject: Re: [RFC PATCH v1 34/57] sata_sil24: Remove PAGE_SIZE compile-time constant assumption Message-ID: 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> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <2f578256-7e56-491f-a4ca-ad6caa72b7ae@arm.com> X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 61ADB40015 X-Stat-Signature: 5ftz5xnyg4ga6mgdibmea1m3mybe863e X-HE-Tag: 1729508641-97330 X-HE-Meta: U2FsdGVkX1/s2malk8d2H6N88mtuR5qKla1Mnw3SuaUvdgFbIhMKxV59HFmR6CwCUSjGl8Xb8n+RavsPMjkuFZ2DGBYUwghJhBDXSRuiUBvJf4kNNRj9/GFSTvgPJD4FZASBfTSI99zcGzrmJRO7aCHGDXHGNc/iOz1jqGnRjjXyp3mV9UYSd3pNifVIhvI552S0qltUQfwd1Lohe6r59d4swqH2DJhHAkKCO9ccygspS29J47hddIQciTW+EleplbELAmUZClesm8gOK0cLuvYi5S3mSXx/slTG55UKNxC7uEw+LPnH6vPemrbmxQM745UXgXu/elayp1adwPCBDIqcBxl8n6aBO6Vxk00qE7oS6qdwhXQoe0oHqBuGUVXGB+mDrY2DdHvD/qEnUkXrYUpP01qYa78E2xvWoxg5Lxz5wvm5VsnsQMjmDaH8ArhR/sYiho3b9Wg8dazcZDFslWS+UfESVP+y6k1Rjyn/pFlAf4VDQqYFH4uYzjKJhdTxVkF4dkCJjTbsE6tAG6jZ0bd/z1D2kLuS+FOoUvgiTuPzGV/BNgL+5AMfPbpXHn/gXr1L1PRexuJLGQgjvSvCFWzUwZaLfrWoaWOUteHMh4zwdDFCEL3WcVM+6ErHiWEKzcAWBYl/aqw2Nv60SXJOFfICSlxn6peM4yAPgj+Y0cSbt+a5sHvH0Fdk9AFDWDlxy74nvB313kwHfUIaSkFnIYgMEDpgYQqKV+Gq4VpGjlxguYrX04p9DqofzHx4PRJRZ4p7etS1DAm/bLjNKkflGOxII65FypVD+tdEoZk4liwjDyqU1+hvJ/ceJgCou3ZsOMCVViu74femr2KNrSGEinRm/BTLuc46ogbUzkNJYxv7/FjcUs3+pML/NEcNzep6vPgs3mrNnoTgMwEpNZkVt4tNXT5RfcclQSlKZoq4bnNpiRCvuKqN5lBnRw9hxI2jpOAHi2uDFKEEj/v99N0 zyuvkd3o vFugCuNsbbAw3pOHeOc96EqGKgq14udxhnKfnt0j7/9NQva0WbtMz2M8xAadCMqT7TcnqLtLBqP3ha7kPgHfoddqmZnGhlJ4kf5t5BhD9YtTg5PvefiX2gg0eWrhsakM9/lB/TmIyImhU4E+6nwnjADhJ+rrnZtVFYYp6dtsxamfJ5Va8r+vNqaTPGtQwtQ4uxaCno/R4ELOLMaMpVMITTnlIQRE1WvFCLa1DhqIC4sj2dY++Mb79hVjh5rI0LE9vikzDkH+MNVBwsho= 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 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. > > 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. > - 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<---