From patchwork Fri Feb 24 17:44:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Christie X-Patchwork-Id: 13151592 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5BBF5C7EE2F for ; Fri, 24 Feb 2023 17:48:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229805AbjBXRsD (ORCPT ); Fri, 24 Feb 2023 12:48:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44016 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229538AbjBXRrz (ORCPT ); Fri, 24 Feb 2023 12:47:55 -0500 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1251710FC; Fri, 24 Feb 2023 09:47:49 -0800 (PST) Received: from pps.filterd (m0246631.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 31OHhpes013466; Fri, 24 Feb 2023 17:45:21 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2022-7-12; bh=1R7ol92paWr96ozufOHeJP7umAgX5mbtYlMAGXh+qQM=; b=Quajmw5yIW97cn0O7CzRrwrBak4M+pLhIyjjBLMn4JYuK1HeGlYLx881vEeM1BTENq83 r0qMFiuTjLCdyclB5NtDK1Ls6cEPAtMkzrTzSCFy5DIIl+adAzmlFSq7C9b097Ld3pcj Y24LlNCNXND8gvjlYyjGNrzc9xPOFt6hqt9uG0HgSdHNmSzRZGh5WPwa3ArawfRTENTn tnGyLMpsv7niETPXIcohgw8USMA+kv/omYNCIeM/KPELMzy91yBTsWRYcSRXG85Ec5lv u0JPIYsrECev+o+P5BmPQNSjp/st1rIsya3CR9EvhQKHnI5rUaezuLlsAXnzmxF1VGUK fA== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3ntnf3nqxq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 24 Feb 2023 17:45:21 +0000 Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 31OHJGXU031548; Fri, 24 Feb 2023 17:45:21 GMT Received: from nam11-dm6-obe.outbound.protection.outlook.com (mail-dm6nam11lp2170.outbound.protection.outlook.com [104.47.57.170]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3ntn49wjuh-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 24 Feb 2023 17:45:20 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dtbnlQiDUPDgSWoVxpeHJ0SQchAzZVO4L3rPohyfMrGTuC6tnijEiXlcCPJOaJx+Vj9s8PuSmytUbtNlirwOYvBVgmOZeAT6tVLAWUYC9GKA3CSAA2JQeRaGoQmMpUUYkf06LTfFGhkPfex6iTK/waOkNMwBFPps9iaKMjuMFmLO/FF+ZkemoEp6P5K2VfieFO82/cuSeHEkqdvVS2m10Ire2dTb/9HXfoSJq99oD6l30gkhphyFBedurPgsF3252Cq4pnXgepOg8+wL3ailUqGbvt9qAeoFk/ElQ6jzF/JbM1QVafoGKkf0FJ6dPCCQJ/anVcmcFZvkmUPm2SlTnw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=1R7ol92paWr96ozufOHeJP7umAgX5mbtYlMAGXh+qQM=; b=l+8P9hYIBJYZPVQRXR43xAR71tp1jvyid9qAeZmcTZ/lp7ug8FXra91DBQi9mHOllcS+kDfQT58gaQmpOymnjI740ZZy3seQTTNv2rHWqr/+kouB3FYCkeWeiI+XpcxA4AzcMx2DSmqLjlBICmfDmPtEHXr8/W0resOLKxw/zqW0Fvf4mdjV5/4FdVfU0I2P1m0IWiryAesdriaqqPx7hVf9saB6vk4ajrGmNbH9ixPs62RE2Good+Ld9m4bkBMo0W/6CuYBdZxJ3hEJJDJc2LyjADSBzv1szOUHoOaSOfFRHI1dI3bW18WpNMAqjSRRiiepp++nIMXhtyi4B1jSaA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=1R7ol92paWr96ozufOHeJP7umAgX5mbtYlMAGXh+qQM=; b=vSuK8gw94lafmbLcpTLvb1EMIe4Lq0h/Zd+biQcX7XQKzZFUuBa8c2SgdINR6pclPr5HYuczXAxFgNFFTW/nyCUSo7YCqTL+BF7wdoCqF4hDY/VEuz6E103cr022A8Kf9695ct+B1ND+wudzIY1mxzEPJ70bSnhGFNrRXDMKpnI= Received: from DM5PR10MB1466.namprd10.prod.outlook.com (2603:10b6:3:b::7) by CH0PR10MB7535.namprd10.prod.outlook.com (2603:10b6:610:187::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6156.7; Fri, 24 Feb 2023 17:45:17 +0000 Received: from DM5PR10MB1466.namprd10.prod.outlook.com ([fe80::7dd7:8d22:104:8d64]) by DM5PR10MB1466.namprd10.prod.outlook.com ([fe80::7dd7:8d22:104:8d64%7]) with mapi id 15.20.6156.007; Fri, 24 Feb 2023 17:45:17 +0000 From: Mike Christie To: bvanassche@acm.org, hch@lst.de, martin.petersen@oracle.com, linux-scsi@vger.kernel.org, james.bottomley@hansenpartnership.com, linux-block@vger.kernel.org, dm-devel@redhat.com, snitzer@kernel.org, axboe@kernel.dk, linux-nvme@lists.infradead.org, chaitanyak@nvidia.com, kbusch@kernel.org, target-devel@vger.kernel.org Cc: Mike Christie , Chaitanya Kulkarni Subject: [PATCH v4 08/18] nvme: Don't hardcode the data len for pr commands Date: Fri, 24 Feb 2023 11:44:52 -0600 Message-Id: <20230224174502.321490-9-michael.christie@oracle.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230224174502.321490-1-michael.christie@oracle.com> References: <20230224174502.321490-1-michael.christie@oracle.com> X-ClientProxiedBy: DS7PR03CA0304.namprd03.prod.outlook.com (2603:10b6:8:2b::16) To DM5PR10MB1466.namprd10.prod.outlook.com (2603:10b6:3:b::7) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM5PR10MB1466:EE_|CH0PR10MB7535:EE_ X-MS-Office365-Filtering-Correlation-Id: 74a50198-3000-4993-cf82-08db168ee446 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: o3yrTG2V6V8sTfrkH0O+3dWEQiJ9Zi80KZSuv8nW9ANClcob/isD8gvX9uwd8FpS6l2yVYPOZySMe98yMVRAa2ONuyIK1nUYe+KEaWZvBAlBCOYTqp0C4NG2wbQTXt15nb+v1kTZZfwYXFpGa+Q6w6rzrjZDrbHstxzr/h5BfHo7amz7nAslanolLeqRxEwe408tueBBzhl99JGchDSNUG9Lp6ZHhsNlIlBlZNge5Cbm1XtlQIpUz25I0zIsOMjSqvj8oROvLjbSIDGnxBsZ/K23aaMMB/qb19Z7ZiNSYt+wguI1NYtH6t1wnuH8D89x0wZ0dK3ueCzx7ue14dwnkDpVhZvZ7BHmZFhZ7UMsuYSP1JmiQPgqHy3Eg88SHrbmLzI6/oYkJKR22JFIcHqQfXnvt+5aXaN70DQKtF8N7dYhRgI1bv5itbB8gFY/P7rIZOVQxZeH6GDWORJDXmKs7T1fiGMT7EuhGZ/+KzAwzs/RIYD2jyC3lGjTW3zQBrIfmt32DbFA48LF1DxC8UVjwRJ1+xz4iJ3wjvGXz1LyMo7jiM89oFNHC1enKcMl6xSVAOaUc90GR/I1dTnbwHhmqzdODetQ71jDc2v0c99fl9o3SJfD6ieAywyVaqEqDfGeIqQjUYkXJ/gbe0c5RWAvuhrQx3eSaV94MWFP3hLnRndJTIT6Fmo8qel7Fyu+I8/O X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM5PR10MB1466.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230025)(346002)(366004)(376002)(39860400002)(136003)(396003)(451199018)(4326008)(66476007)(66556008)(66946007)(8676002)(83380400001)(41300700001)(316002)(36756003)(186003)(8936002)(54906003)(26005)(5660300002)(2616005)(38100700002)(7416002)(6512007)(921005)(86362001)(478600001)(2906002)(6486002)(6506007)(1076003)(6666004);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: OphU5baYiq+owFN32hjUCI2ezFpBUbA3WdkknYxSy5JAnjW+OqqqrvEKHpu3Pn08DoLcakUqDsSs/GvzBM9REixuhZen3OumnzivH8uQ3rWkyYE8OczqJAO/nonZdmZpMy6pfF//BxGI0RiVTBlmUV7PQUWoa/htw226Sip3hswmR5WriHH428pRGq4uAMc5AvvLNnBYCmXOhEBh7emaaoOQwt2DmvzcY9Qyiqods/bZDN+XxsF519zl7dL0U7VQ7XMhyJevh4ACxp3SFpu0J22QahQsEVBG/MYZXIHx0WuvPDryJKhUjygzBeKhIQeTgMcEApnNUwgyguEziS7uF6fNFUgHPa8JR2HK7hzgNtshLrRfSaS6EpHpeFijprqDCGfYjoLzNEWVkTj/5r5pbDRzdN7JR8sMMcOgPkNDABb8gCrgFI10fl66GgNZ2k7obmIvQV/g6gL655wTti7Kk+QA3dOgdivjqYFVrJjRmF2/TdIYrWeklTaQlBGxFNdvXn8oeHcNaJRhmESswJUSc8FK+bdEqeAfzlpXlzmDl0AhaTUxsK/bdB9CSV+gZJS4KmDt4zTbehox/0f9NNBS+s6XINI+ZFCePK38IfZ0rpVwRh2FAerLcGTkDkJLOiljHPbJsUiinMu0z8p+ha/GRQuMvLBSsH1d21ZwIbqwJwz3vSMDJRnmoMonEccvvJJmAfymgL/PPgK4gjLoo2cdRirM/9YMP1pxcFaP1lbzWBCngI9tw0a6W8RzL1ZJynhDm1nR39X484ppmvZ4ofl4Dn9J7X6TdPnXd1WYwhKQsosXPWWoD3IZuiLd5Lp0Dg7jkN79hqDIaAYBxcicd0CDiFNGbkA+N+266uoPsQyuvcKt3eo4tcdDkXm2pdbgoCdv1/QlNMNndICmwZPwwnNX7I4d6LnoOgubfUXWvoE0yE5kM9NMhZ4P+al0Z330gui4lGNiE+AT8r92YcroEmoTbDmpkWjIS1hNn3Tqd31mcxkAHSxnygRxQLoOZnM15t5795YzCizNx/7VhW3BiX+XDwAM7SqKUSZkibK2FjdXTynLCum2tFTC8w+t/vLgbLZQnKV+CmQqmtE5C1lukfZbga/mbRPimrQJSbkmWnqsy5ltb+Y55t2fntcRkSX4teKCXbJbEyw56b4rR+JGqK+L4Gmot+Rax92g5oIjhWzKnXvwN9wjDT86zWnZG821i+Rter30RdbIz4aJrwJq2QB2v1UAFN4vfz6her/R02/npkF3Ncm7wR2qgHYs/nGpWnyMDNROtto0U+mzeupBhJTb3PVT4NTeTNg7Mh6CR2uc6ylazKEKlzYDOKJrvWFdbkxYutkc2BppAcgjOXEgrffEqOx5fWqPC0fqnhF3av+WALRMSMcfPvh/E2k3LrfO5HUz33TDlfZsvL6OE/j3rUlP5fOwr94bCQ5yZLAA5VW4GOTDRLljKKS6NPqltIRcxweqngWyopytw3nrNQmMf3YDcZnqPSQWCJqIaXuFxU/ECh8BLGPkjNjmkGBSF0Fk2Eio/RJeWwhalyBf/HrUNiw09pLMVr+unLpnId2Onsgs596yJGY8wOCRlkfCB7N0rOQWEVdQPVTcqgjxFzAyRzeLKA== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: PJc3JfXk6g0JogdSuh4cP7pKzzE0kKKg2JhkbO8fX95eoAXA/iaOPYizEydLzty8HO5kXVjiiphDfxNa2oz8DXPXpBbWLLbkDm82yHJJjy1z+OgGEhN5j2rKxLRgFiwW+2zBJ1mMZhSuScv8BdlJIHnyy08En94Mj9MU8ljS/CxkMeglpeEyBHycBqtlG6E96SXMUvlL3MmeVFsH6qtlBvEvRnFOqs9oXKv9S4QdA6XCRBELz3gjrp6ouYGrjiqjoj7eQsVWXUmfN2cfM4GFrJ5xB/oJVO4QpGn9FOmYGlsATiddIrqKd7bBFnYNLLB/z7GvzSAVp/jRSCyeH5J73R1NEkeMzx6qfGaXHWbioxUi+13CxP65sqj571u2tPexlu/6XJpSyQ6II2EA3LaRnFVHQNu0WQqsVKn9rlSycXrusDcxTwpMUQKUUocqS0dDv0MJtf0NtWftq5K/NpYTtPDFRMl9meUqLIh8mrPaAYZyHkBhFIXOHulS8SWy0J9zcbmvKSElfzI/4o53MhjBSiTN/qXaAEKRjYv588xlM2JezrwQGzKfB6cM7qqnHz72XVqFFgF2Is+BRQZ+YRrewyjZO8N34TGNWM38ef5/3Pw9qTo4bvBq3WTP6o1BzLBBlyqXCBPgR3G9CwdgyCvEc3R0tBgnSAdscCcpM/2aLewlAWMXx/6PLIJ7TggWoH97CoZM7gU8jl8XwQmByM8WMluHMTqUpi3SbrjuGnA2FaKXUj/X6k5oDIQIkcVfhhxhsAosCW7vnz6GOVuBBxrXtPSPQqd14kjs0wdBWwOm6Y5IzMi1CyXDs1yGJ/F9NErq4HoYYZOzEH5wWA5VtAfjL2010sBOuyY4aVHLu6RUqp3PyuIffFrtG6iexO8hHgbjCBYi2FZYo5pgcWdnhGBIh26xDylBgX5JCdL5uD757lmtp6WlG0FxK1qeICcjsC90YMyXrSVpo9+ihrRxR03CGe9OYyi1t2hjbpQUYWzfGyjxkMqGJ9DmOfjVoECifZyNtPxGSLubnmrdqLv6ZVi7zQ== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 74a50198-3000-4993-cf82-08db168ee446 X-MS-Exchange-CrossTenant-AuthSource: DM5PR10MB1466.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Feb 2023 17:45:17.5632 (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: gDi/IvQ6py8TbjNjMlfsttyuVN2r/1tkNz1fFIQNe7xDmJ8wlM8qD8OBPBeYL4/ag68bh/9PmFe/1WS5Bk8UOWi8yjGoTdb2oKsQON2RwE0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR10MB7535 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.930,Hydra:6.0.562,FMLib:17.11.170.22 definitions=2023-02-24_12,2023-02-24_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 phishscore=0 malwarescore=0 mlxscore=0 spamscore=0 adultscore=0 bulkscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2302240139 X-Proofpoint-GUID: okasKYKA-brnZu_b21o7fK6hZd8BwFvz X-Proofpoint-ORIG-GUID: okasKYKA-brnZu_b21o7fK6hZd8BwFvz Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org Reservation Report support needs to pass in a variable sized buffer, so this patch has the pr command helpers take a data length argument. Signed-off-by: Mike Christie Reviewed-by: Christoph Hellwig Reviewed-by: Keith Busch Reviewed-by: Chaitanya Kulkarni --- drivers/nvme/host/core.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index ba6f1911f7ea..6323ff79386a 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -2072,7 +2072,7 @@ static char nvme_pr_type(enum pr_type type) } static int nvme_send_ns_head_pr_command(struct block_device *bdev, - struct nvme_command *c, u8 data[16]) + struct nvme_command *c, u8 *data, unsigned int data_len) { struct nvme_ns_head *head = bdev->bd_disk->private_data; int srcu_idx = srcu_read_lock(&head->srcu); @@ -2081,17 +2081,17 @@ static int nvme_send_ns_head_pr_command(struct block_device *bdev, if (ns) { c->common.nsid = cpu_to_le32(ns->head->ns_id); - ret = nvme_submit_sync_cmd(ns->queue, c, data, 16); + ret = nvme_submit_sync_cmd(ns->queue, c, data, data_len); } srcu_read_unlock(&head->srcu, srcu_idx); return ret; } static int nvme_send_ns_pr_command(struct nvme_ns *ns, struct nvme_command *c, - u8 data[16]) + u8 *data, unsigned int data_len) { c->common.nsid = cpu_to_le32(ns->head->ns_id); - return nvme_submit_sync_cmd(ns->queue, c, data, 16); + return nvme_submit_sync_cmd(ns->queue, c, data, data_len); } static int nvme_sc_to_pr_err(int nvme_sc) @@ -2131,10 +2131,11 @@ static int nvme_pr_command(struct block_device *bdev, u32 cdw10, if (IS_ENABLED(CONFIG_NVME_MULTIPATH) && bdev->bd_disk->fops == &nvme_ns_head_ops) - ret = nvme_send_ns_head_pr_command(bdev, &c, data); + ret = nvme_send_ns_head_pr_command(bdev, &c, data, + sizeof(data)); else ret = nvme_send_ns_pr_command(bdev->bd_disk->private_data, &c, - data); + data, sizeof(data)); if (ret < 0) return ret;