From patchwork Wed Apr 19 14:39:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 85434 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp441216vqo; Wed, 19 Apr 2023 07:41:24 -0700 (PDT) X-Google-Smtp-Source: AKy350bfJ64PrDjBDCxOeenjrqcTScGPxGT6sayRFXsnZNMpF7i+e9wPtdn/64yKkCPWrinoNHQd X-Received: by 2002:a05:6a20:1583:b0:f1:5ad5:9118 with SMTP id h3-20020a056a20158300b000f15ad59118mr2540331pzj.61.1681915283974; Wed, 19 Apr 2023 07:41:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681915283; cv=none; d=google.com; s=arc-20160816; b=JAbH+aq6MMBjRTv1boG9guXTElQm5MI1nrjyQhu3oc+aLqhWhWhVB1K0W07B0WZ+K3 Ud8MuK6Zoymn9CkzXOOznTQIeJXxuHMSaDodelJMV8TMF1EWfwv8Lq/G+j6ZV7JoCAJb dYFXYEXLdzLdnA+rFrOCfYC4RPt8fQBfBEG3hOyvThL2dH5BbyV9oJxIJMvMoouEHD9b Pd9BxlQlSBVi2VnEoXlg9VdS6gZnsunD8Hh3RnPOWJL3XeW9/oi5swGe1x59dwJqBsrx qnTZPm4LVMOUFuxLk8uPdTWfmQLj6eP5Uhh2p1lDXv+UQvLh/RiHnFLxP6ODgD1sMg1R Qkdg== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=j+Mh44xk0cFZ0/lmCwxvC+4hW749Wt066b3sFo5xY68=; b=eAwnr4HVfZEcQXErJxmhti85fCZ0YowKOLlpXIAG3xq4IHuZ/Bf5uZT+WPKnIYHDfk Y/Y5O2yyRzpRDdHFiJmLKeyZTC+jAHEl17wjKAYbCQXP8YK4yka8421yl44ASlBzDEDg nLZd8ewwvu0aDLqCwpI/RbPkO5z070nOcEkw4lyZh1u1XXOV2IXBn8cMnvWn5YdNCqCL ZBYrNNWhMCkyZnTN0M97Zf7Q1yZ7CT1209hgwmKtUdmsAOsr8SisI89pKYaj8taloqeH C+2BNGrFaI+A/fVDJgt3grlWwazp6W/P5HseN+z2g/UXpwfttdQGtqwhwIDGriZ/Hl24 oVCA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=adKKWfSR; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d13-20020a65588d000000b00518706a93f1si16881149pgu.361.2023.04.19.07.41.08; Wed, 19 Apr 2023 07:41:23 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=adKKWfSR; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231795AbjDSOkP (ORCPT + 99 others); Wed, 19 Apr 2023 10:40:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40312 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233370AbjDSOkH (ORCPT ); Wed, 19 Apr 2023 10:40:07 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4A1DA448F; Wed, 19 Apr 2023 07:39:58 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id D3916636B2; Wed, 19 Apr 2023 14:39:57 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3CA39C433EF; Wed, 19 Apr 2023 14:39:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1681915197; bh=A+KTO1CpnowqeS9xSSmESo3/GmHQhE1tcZVW5UKDGIk=; h=From:To:Cc:Subject:Date:From; b=adKKWfSRBITSE5x1nqQyJjRcjTGLk6cMvnU9VryUF1J0hXRQ1f++ljGg2aFNE67H6 3FI5hJaxb0Y49qFeZizMhY6Y5xu0be2XBH53YTrw7qHofI7JRJ3ZQ0vCJ5U/cGU2rL Bep8vBZWLM5/rLUEVqVdr9hOfRZnd/GHd6R8RH7HupIR3OOrk0NBM1N+nSF8YzEs6p HdydVSemXVGqdApyq6kXLPPxqGDs2NzoJq6NQn7njC6gc286qp2bwxrByJZol5AfF/ wvToWp+y9Wxzt2MPOIMUdiMmDvpFs6y8Ta/DtojTEyM4PXEiUPaep6uHRWuYXPaKRW w57nNwWJAqT/g== From: broonie@kernel.org To: Jens Axboe Cc: Linux Kernel Mailing List , Linux Next Mailing List , Ming Lei Subject: linux-next: manual merge of the block tree with the origin tree Date: Wed, 19 Apr 2023 15:39:53 +0100 Message-Id: <20230419143953.88507-1-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1763616000790442997?= X-GMAIL-MSGID: =?utf-8?q?1763616000790442997?= Hi all, Today's linux-next merge of the block tree got a conflict in: drivers/block/ublk_drv.c between commit: 8c68ae3b22fa6 ("ublk: read any SQE values upfront") from the origin tree and commit: 2d786e66c9662 ("block: ublk: switch to ioctl command encoding") from the block tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. +++ b/drivers/block/ublk_drv.c @@@ -1261,10 -1259,22 +1259,23 @@@ static void ublk_handle_need_get_data(s ublk_queue_cmd(ubq, req); } + static inline int ublk_check_cmd_op(u32 cmd_op) + { + u32 ioc_type = _IOC_TYPE(cmd_op); + + if (IS_ENABLED(CONFIG_BLKDEV_UBLK_LEGACY_OPCODES) && ioc_type != 'u') + return -EOPNOTSUPP; + + if (ioc_type != 'u' && ioc_type != 0) + return -EOPNOTSUPP; + + return 0; + } + -static int ublk_ch_uring_cmd(struct io_uring_cmd *cmd, unsigned int issue_flags) +static int __ublk_ch_uring_cmd(struct io_uring_cmd *cmd, + unsigned int issue_flags, + struct ublksrv_io_cmd *ub_cmd) { - struct ublksrv_io_cmd *ub_cmd = (struct ublksrv_io_cmd *)cmd->cmd; struct ublk_device *ub = cmd->file->private_data; struct ublk_queue *ubq; struct ublk_io *io; diff --cc drivers/block/ublk_drv.c index 604c1a13c76ef,f554ebf735804..0000000000000 --- a/drivers/block/ublk_drv.c