From patchwork Mon Oct 23 07:12:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Huacai Chen X-Patchwork-Id: 10022041 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 93D56601E8 for ; Mon, 23 Oct 2017 07:10:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 853A728782 for ; Mon, 23 Oct 2017 07:10:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 77FDC287A7; Mon, 23 Oct 2017 07:10:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0EEEE2875B for ; Mon, 23 Oct 2017 07:10:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751297AbdJWHKm (ORCPT ); Mon, 23 Oct 2017 03:10:42 -0400 Received: from smtpbgbr2.qq.com ([54.207.22.56]:34489 "EHLO smtpbgbr2.qq.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751291AbdJWHKk (ORCPT ); Mon, 23 Oct 2017 03:10:40 -0400 X-QQ-mid: bizesmtp3t1508742624tzjl6aj3l Received: from software.domain.org (unknown [222.92.8.142]) by esmtp4.qq.com (ESMTP) with id ; Mon, 23 Oct 2017 15:10:20 +0800 (CST) X-QQ-SSF: 01100000008000F0FOF0B00A0000000 X-QQ-FEAT: JlEBx5H+23c8F40Wl93kVveJxWVYhUn/XAWJdeUnmIHPHX9CP9+kreN72VEj6 BswFSc7x0j+f7v+hEXDSscpK0RGy2lHZtlbk4cmsFHexrxZcgeAwyGQHHWzpRHK61SW2Hbc MtTRGvn10yAAR+yYJsup85SlRqpe0hj5cgB21OO6Cf4swGfEXjUhofhcaGhm1but0sWyusZ 3zjr4v7TVFB5vCB8Q20LElYd8kRsVUAV0uDPL89mjxfEqo+iHqEz8nKMHdKgvsRc6e2EV4M 1z3f0ridhHd/S2RR3Bslb+xmKI2bQfLxucX4kG5sx+As8mTrjCIza0V3c= X-QQ-GoodBg: 0 From: Huacai Chen To: Christoph Hellwig Cc: Marek Szyprowski , Robin Murphy , Andrew Morton , Fuxin Zhang , linux-kernel@vger.kernel.org, Ralf Baechle , James Hogan , linux-mips@linux-mips.org, "James E . J . Bottomley" , "Martin K . Petersen" , linux-scsi@vger.kernel.org, Huacai Chen , stable@vger.kernel.org Subject: [PATCH V9 4/4] libsas: Align sata_device's rps_resp on a cacheline Date: Mon, 23 Oct 2017 15:12:47 +0800 Message-Id: <1508742767-28366-4-git-send-email-chenhc@lemote.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1508742767-28366-1-git-send-email-chenhc@lemote.com> References: <1508742767-28366-1-git-send-email-chenhc@lemote.com> X-QQ-Bgrelay: 1 Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The rps_resp buffer in ata_device is a DMA target, but it isn't explicitly cacheline aligned. Due to this, adjacent fields can be overwritten with stale data from memory on non-coherent architectures. As a result, the kernel is sometimes unable to communicate with an SATA device behind a SAS expander. Fix this by ensuring that the rps_resp buffer is cacheline aligned. This issue is similar to that fixed by Commit 84bda12af31f93 ("libata: align ap->sector_buf") and Commit 4ee34ea3a12396f35b26 ("libata: Align ata_device's id on a cacheline"). Cc: stable@vger.kernel.org Signed-off-by: Huacai Chen --- include/scsi/libsas.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/scsi/libsas.h b/include/scsi/libsas.h index 6c0dc61..a966d28 100644 --- a/include/scsi/libsas.h +++ b/include/scsi/libsas.h @@ -165,11 +165,11 @@ struct expander_device { struct sata_device { unsigned int class; - struct smp_resp rps_resp; /* report_phy_sata_resp */ u8 port_no; /* port number, if this is a PM (Port) */ struct ata_port *ap; struct ata_host ata_host; + struct smp_resp rps_resp ____cacheline_aligned; /* report_phy_sata_resp */ u8 fis[ATA_RESP_FIS_SIZE]; };