Received: by 2002:a05:6a10:c604:0:0:0:0 with SMTP id y4csp3779784pxt; Tue, 10 Aug 2021 11:08:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxkUzQ34/KCdRm8SvoBR1XV2wX75I9pnEHOgD7qcRtwgIZP1ZtUJ03q2ddtjoMMNaDZakui X-Received: by 2002:a05:6638:3889:: with SMTP id b9mr28424075jav.83.1628618888601; Tue, 10 Aug 2021 11:08:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628618888; cv=none; d=google.com; s=arc-20160816; b=OoLAzhUODFBEmF7ITg9K6QJZ02VnwJDMCgKew/A3ziEJp/OvLt9fWMrThnR/9jNTnx S6732ncvFh9bZ2YtLRm/O52YBqH4IoeHfJoOgSwgQZfBsahqHZhjii/uG4grAfAlEKzd 6YK1nVzdL3s9ds9eMqzAWIAuQO4yLf61EtONJxC1pNYZvvsUt44pUQ8r8/RamKAiMwBX CBcKowy7e5GDO1Qxj9aMZVgTUFKK5uXTPxGey519lhXTOOkNJe8YwD8NT1tAKwHdmRed mgJbirFQbWcKomioS/cM6qfEBsIQtczfT1E5uRO/17Tfusi7RDj8wQqkryO3vRuqC6bT ujdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=hJYY02o/CWnTJ6PnFC8GkCDUh12Ys5+N0eDs9Nj7xOM=; b=DIgTyQ1X58xMttx/hzctvrtMES0mHnDkss6L1u/Mmps9OigPvDuwuscL5KOlW6Utp/ MZO+1FL7INWtCHZv1wShVTMdre/Upe3C3T/JWEnGgAW8TgCwsQ+vx3781d/OxgtvaQab z7fSnmqGteLgh7b/fdvZ6uJC13lC23KLzKHt6k3NVuxbfordyZKJtNQ2pRhhaR00QGa8 vN6l6JIfBX53lfQaa3L7EnYuMTrPWmEpdUVwPJM4mOdku5KyJuK3JtxCSgXh0h8qS5xv AiiaPKvVRzbdo6uFRnNBGxv1cz9bclFd97Mk1+z9QVBSetx8dAsnRdm0bEZZNtIJrm89 MXsQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Qi0H+Lzn; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id a10si23173377ilv.72.2021.08.10.11.07.57; Tue, 10 Aug 2021 11:08:08 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Qi0H+Lzn; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235411AbhHJSH1 (ORCPT + 99 others); Tue, 10 Aug 2021 14:07:27 -0400 Received: from mail.kernel.org ([198.145.29.99]:37564 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238225AbhHJSDt (ORCPT ); Tue, 10 Aug 2021 14:03:49 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id D9BCC61406; Tue, 10 Aug 2021 17:48:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1628617682; bh=t9rE8d4VGqB4QhBhylvlR5bDJliOPOMKyodt9YHq0vg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Qi0H+LznS5JQTF9eJPtdMY2TCy0Vda33GB7BbQjQ6XndRoNdnub0hTg7Q/ETHjZBd HwVrQ6kvBlHhitxXOWSyn8+lr7qNEqW2FLagLKEwAC8M616+yEa8NAnfOVVv5laMEi bIcCopSMzOokXesxlMus+wsiMWgnWRu7NFf9l9/M= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, kernel test robot , Christoph Hellwig , Jens Axboe , Sasha Levin Subject: [PATCH 5.13 165/175] libata: fix ata_pio_sector for CONFIG_HIGHMEM Date: Tue, 10 Aug 2021 19:31:13 +0200 Message-Id: <20210810173006.389449224@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210810173000.928681411@linuxfoundation.org> References: <20210810173000.928681411@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Christoph Hellwig [ Upstream commit ecef6a9effe49e8e2635c839020b9833b71e934c ] Data transfers are not required to be block aligned in memory, so they span two pages. Fix this by splitting the call to >sff_data_xfer into two for that case. This has been broken since the initial libata import before the damn of git, but was uncovered by the legacy ide driver removal. Reported-by: kernel test robot Signed-off-by: Christoph Hellwig Link: https://lore.kernel.org/r/20210709130237.3730959-1-hch@lst.de Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- drivers/ata/libata-sff.c | 35 +++++++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 8 deletions(-) diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c index ae7189d1a568..b71ea4a680b0 100644 --- a/drivers/ata/libata-sff.c +++ b/drivers/ata/libata-sff.c @@ -637,6 +637,20 @@ unsigned int ata_sff_data_xfer32(struct ata_queued_cmd *qc, unsigned char *buf, } EXPORT_SYMBOL_GPL(ata_sff_data_xfer32); +static void ata_pio_xfer(struct ata_queued_cmd *qc, struct page *page, + unsigned int offset, size_t xfer_size) +{ + bool do_write = (qc->tf.flags & ATA_TFLAG_WRITE); + unsigned char *buf; + + buf = kmap_atomic(page); + qc->ap->ops->sff_data_xfer(qc, buf + offset, xfer_size, do_write); + kunmap_atomic(buf); + + if (!do_write && !PageSlab(page)) + flush_dcache_page(page); +} + /** * ata_pio_sector - Transfer a sector of data. * @qc: Command on going @@ -648,11 +662,9 @@ EXPORT_SYMBOL_GPL(ata_sff_data_xfer32); */ static void ata_pio_sector(struct ata_queued_cmd *qc) { - int do_write = (qc->tf.flags & ATA_TFLAG_WRITE); struct ata_port *ap = qc->ap; struct page *page; unsigned int offset; - unsigned char *buf; if (!qc->cursg) { qc->curbytes = qc->nbytes; @@ -670,13 +682,20 @@ static void ata_pio_sector(struct ata_queued_cmd *qc) DPRINTK("data %s\n", qc->tf.flags & ATA_TFLAG_WRITE ? "write" : "read"); - /* do the actual data transfer */ - buf = kmap_atomic(page); - ap->ops->sff_data_xfer(qc, buf + offset, qc->sect_size, do_write); - kunmap_atomic(buf); + /* + * Split the transfer when it splits a page boundary. Note that the + * split still has to be dword aligned like all ATA data transfers. + */ + WARN_ON_ONCE(offset % 4); + if (offset + qc->sect_size > PAGE_SIZE) { + unsigned int split_len = PAGE_SIZE - offset; - if (!do_write && !PageSlab(page)) - flush_dcache_page(page); + ata_pio_xfer(qc, page, offset, split_len); + ata_pio_xfer(qc, nth_page(page, 1), 0, + qc->sect_size - split_len); + } else { + ata_pio_xfer(qc, page, offset, qc->sect_size); + } qc->curbytes += qc->sect_size; qc->cursg_ofs += qc->sect_size; -- 2.30.2