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;
Date:   Fri, 26 Feb 2021 11:00:08 -0500
From:   Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
To:     Linus Torvalds <torvalds@linux-foundation.org>,
        linux-kernel@vger.kernel.org
Subject: [GIT PULL] (swiotlb) stable/for-linus-5.12
Message-ID: <YDkbCHHBUOmfI59K@Konrads-MacBook-Pro.local>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
Received: from Konrads-MacBook-Pro.local (209.6.208.110) by SN4PR0201CA0004.namprd02.prod.outlook.com (2603:10b6:803:2b::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3890.20 via Frontend Transport; Fri, 26 Feb 2021 16:00:11 +0000
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-Correlation-Id: 0606f373-ff5d-415e-19e9-08d8da6f993d
X-MS-TrafficTypeDiagnostic: BYAPR10MB3160:
X-Microsoft-Antispam-PRVS: <BYAPR10MB31607944E355D6E6F653075F899D9@BYAPR10MB3160.namprd10.prod.outlook.com>
X-MS-Oob-TLC-OOBClassifiers: OLM:6430;
X-MS-Exchange-SenderADCheck: 1
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: SRAs++uvvmhvfm8X+6jIjtuOCryQA6dgj+CCy78NoxJlxeuI0H4QYVJXLTxNzbo6W2+L1/uc0hcSNqdeCXdAGEdt91kWje2y8BPyHYJfMjH0WGs7qEnne863VY2eITvH4Xr2Ct9GHG22N3gO62i9oFSnPBgCT93kuCKDkcqhf5+PrCodn0qvBKLbzk5/pHNfMAZlcGc0/HMiC6rZ/DRUo6MP+h8F040qCkykHRzAHl0dWnoGTE7Ws3a5H6N/m1N/MN1MRVkMe6W8xQBYVNzaWqlHfGTcwXgTeIku1VzeSSBUIigU2VHC40VxvyTI/yQIK+11mLp1eVWOeaRRjkX8smUHkPbd5jSdBG0sRy/1QiuwN9lY/ALBGB/mcshW9b2TvPb1QxvAwABKzwmoz78IZYfShq+OshNo+T3+Zfhk5FgB+hLGQVvojDa8ndJn+ZLfvkRh+GpLM26uMRCEXN4AJkpMlniAOSMyl5jOIjJACqS1b9VbSKtXVcSvNZabcCaWdHmXTURKNR5V61XOTqVsOA==
X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BYAPR10MB2999.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(376002)(346002)(366004)(396003)(39860400002)(136003)(52116002)(7696005)(6506007)(26005)(66476007)(8676002)(86362001)(316002)(6666004)(478600001)(186003)(55016002)(956004)(66946007)(9686003)(16526019)(83380400001)(8936002)(2906002)(66556008)(5660300002);DIR:OUT;SFP:1101;
X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?rnl2XrUS77MDq+Ue11HRfWB2OLxBexns1S0bN38BdS3jQLCPshzuGaHhc9bi?=
 =?us-ascii?Q?Cr53rGiBdjJIqFyBaEngA1r8a7kvAb8zX+kVN3u0nRxlt2Is505zrbO3xchL?=
 =?us-ascii?Q?Y/OEym2GGDXPHyfuC1CxQTXQhy7Fv5gYFuAwhTfGXe/VKLZt1V1/3IpsJow6?=
 =?us-ascii?Q?FdELuCyrJDWuuFitc+E80EpfD09qLgMXThz0UJajZIe8TTfwg+bhNLEMt9dk?=
 =?us-ascii?Q?jSO8tyT8pvC1EKtwODNBwEhGcLnREMIALyC7rzCMt7uKzBja0ZJPSDZD7k3o?=
 =?us-ascii?Q?LEZ4+ra4UZVf5wyNgqR2vaMcVLATSV7n1u8XGIQOx6DHAfZrbtPraWvtWkLd?=
 =?us-ascii?Q?akgdIElUJPk6JUqwYusD7RYJ+0QKueuq+R5opMN9ZNO2Pc8lC0tRMYjXF0mY?=
 =?us-ascii?Q?agdPW3y+CfbSSje6xKaTloEse3QTQ8C+lOg0zpH8Sycj6KEY8JLMYHYLfmqi?=
 =?us-ascii?Q?HlqaqyxnIw48+vf1U5KUxA1hcbzWeDx3NFz6H+ahHvbc+lwakfqc/AFTabGV?=
 =?us-ascii?Q?sEhXrLwTXTF2n76qmXmLivNAf/DAScq5xCx4BSsBK5DNRSF+8Hn1pGUgkFab?=
 =?us-ascii?Q?6iCTHVo1mgMwXp1ZtnCYAezKWfpgcI26bfWeU3mHd0HwqiuIe/Pp4HEpAI88?=
 =?us-ascii?Q?HuJUXsTgOKITtcE26q5vetf+6CLVnaFdbuysPfFIi3az409R8EDc7lYpcpHQ?=
 =?us-ascii?Q?57NdEt+2+Vtu57P85CDN/Vr+x0b1blk333BQ6n1Pd8FSPATK9IIcx7Qx/IZ2?=
 =?us-ascii?Q?iIu5lzkf/Icd2FEi4dtDVKuh/UYp5RvqmCV0MJ/Nq5k6roDG9nfj7Ai7lCsR?=
 =?us-ascii?Q?wQPP5aSMwle5agmbuqd4Jt5un/cpu/0oVwbYywKxGQx8YnWKIji8ovBz1frC?=
 =?us-ascii?Q?ev8CaceNiFSk0/yK2sFrmdbBk8sQNAMzZUnmZqxoLyucJYwafjRJtk2tFVVU?=
 =?us-ascii?Q?5iTkcmh8Haz4A+gMjfjvElaw4UMybu1KV1UXLfSwlRnoMQjI1c4OgF7Z6Xms?=
 =?us-ascii?Q?pzrW9yKScMdHQz654yUq6dhLMSVwWSK/nO7zWuw5hqRYg75p/uZ+SdaKJDeL?=
 =?us-ascii?Q?DPiRhr2nM3VfBM/h32bXVXA490Ov7BsgROJ7X5YtJaGQYUwfUHrCkBfdEYVh?=
 =?us-ascii?Q?fMbSYl5CAGeRovhvdO1bWaPXh3haOJQGbgCBxd70taXTANp5InV/BZ0/MLrY?=
 =?us-ascii?Q?MU7rNG+GokPwLkAvWXYyQibV0aiuK5KFt6Toof8F8b+Y557XXF6Hb3qBf3ur?=
 =?us-ascii?Q?rCIxzYofURW37XN293hQZg+563tMeu+R+tNJnap8Me7Pb2mUtn0IT1vBCvVc?=
 =?us-ascii?Q?mXtTe7JZ0QifeFAsEWgpIGJZ?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 0606f373-ff5d-415e-19e9-08d8da6f993d
X-MS-Exchange-CrossTenant-AuthSource: BYAPR10MB2999.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Feb 2021 16:00:12.2587
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: kxlzbY48OM16i7b0jwn52v4Ch58b1ZsR2PQDzVU72LLa/K3SUlZTHHiySRDNZg3G+uYhjCedTLm7BENfCPb1VA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR10MB3160
X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=9907 signatures=668683
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 adultscore=0
 phishscore=0 spamscore=0 suspectscore=0 bulkscore=0 malwarescore=0
 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2009150000 definitions=main-2102260121
X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=9907 signatures=668683
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 spamscore=0
 priorityscore=1501 impostorscore=0 bulkscore=0 mlxscore=0 malwarescore=0
 clxscore=1015 phishscore=0 mlxlogscore=999 lowpriorityscore=0 adultscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000
 definitions=main-2102260121
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Hey Linus,

Please git pull the following branch:

git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git stable/for-linus-5.12

which has two memory encryption related patches (SWIOTLB is enabled by
default for AMD-SEV):

 1) Adding support for alignment so that NVME can properly work,
 2) Keep track of requested DMA buffers length, as underlaying hardware devices
    can trip SWIOTLB to bounce too much and crash the kernel.

And a tiny fix to use proper APIs in drivers.

Please note you will see the tree a bit fresh - that is due to me squashing
in a fix earlier this week, which caused a conflict later, and me fixing up
the conflict caused the authorship to shift to me which I just fixed up now.

Argh!


 drivers/mmc/host/sdhci.c    |   9 +-
 drivers/nvme/host/pci.c     |   1 +
 include/linux/device.h      |   1 +
 include/linux/dma-mapping.h |  16 +++
 include/linux/swiotlb.h     |   1 +
 kernel/dma/swiotlb.c        | 310 +++++++++++++++++++++++++++-----------------
 6 files changed, 215 insertions(+), 123 deletions(-)


Christoph Hellwig (8):
      sdhci: stop poking into swiotlb internals
      swiotlb: add a IO_TLB_SIZE define
      swiotlb: factor out an io_tlb_offset helper
      swiotlb: factor out a nr_slots helper
      swiotlb: clean up swiotlb_tbl_unmap_single
      swiotlb: refactor swiotlb_tbl_map_single
      swiotlb: don't modify orig_addr in swiotlb_tbl_sync_single
      swiotlb: respect min_align_mask

Jianxiong Gao (2):
      driver core: add a min_align_mask field to struct device_dma_parameters
      nvme-pci: set min_align_mask

Martin Radev (1):
      swiotlb: Validate bounce size in the sync/unmap path