Received: by 2002:a05:7412:8d10:b0:f3:1519:9f41 with SMTP id bj16csp6339970rdb; Thu, 14 Dec 2023 15:53:34 -0800 (PST) X-Google-Smtp-Source: AGHT+IH8YV4XM6L6CU1RsgDhbGmRIwRSFsL3MHZ0dSfcqICYmEh6JsPb/AwTzZuMJtZbZm0Y40Sy X-Received: by 2002:a17:90b:31ce:b0:28a:e560:7ae8 with SMTP id jv14-20020a17090b31ce00b0028ae5607ae8mr2457480pjb.31.1702598014152; Thu, 14 Dec 2023 15:53:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702598014; cv=none; d=google.com; s=arc-20160816; b=dJlFv7opZaXybnyJxZTEm29shte9wupxVJZwKOl862gxK9QQ/iQ+ADgxNbz90FhjcA 3XFwoy+wxTK7MnFAhUvn8AJ9kuZTKI+g/k8KFNFiCsdoB8blD90KrMGYsIbsA6pP463P SI9WEUZTyLq4XBbO9vVpyDjiuDJmXlBjYtI6bQKE5a1/bwEd3zMBEn3PI2i0oHN/2Mke P+qeYoAih4mgi/De/6KOj8QHOxUqpI4Iury/1Mqc+JlmJr6I2Mt+AEXlKrQda3gqfYAM KhG11z8bO16nWrxN35xeHGO7jf/PfMpOzHpO6+7hZT5Ku5voKnpAFzOCZOlb1lRjZ0ta eqSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:date:message-id:subject :references:in-reply-to:cc:to:from:dkim-signature; bh=G2vr8wpG8JZogZBD1SoHqQxA1hO0CmvmdHIdK9DqzWc=; fh=jYxHniCW6zU64ohT0ahHJBiSf3nJxyB3b2aXh16P0a8=; b=h7bfxmXYQQ0haHBrd8uPFVJfljWOVta7p2szBE8MicvtgwakePFh/fMvDHmO4sGbr0 dlrlqidnZDBKNPVzCzOVcQtR43e8LG6bMVJfNKZ5HK5ibPfIMRs7YMcZFnBRAovsDuMe Kwd7VAxCxKJXGoB3NwjOhdunFBDGwQnDRGTAEtXklJ2GhcPoN5SH2ZT9qvRClMvquBAp fLHSj60amSvX4XHWCUWLJ04qUHDvhwMXi2KehPUkd72FeL80MDd8ymXlc7gd7CfpxNKs nwkDX08rMIK0MiP425rtsA2SoXMeuRuKN4NeNvjwgTuEUlCk3NKYzZzoZHg9r56GWH0P gEOQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel-dk.20230601.gappssmtp.com header.s=20230601 header.b=EUOiamSg; spf=pass (google.com: domain of linux-kernel+bounces-261-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-261-linux.lists.archive=gmail.com@vger.kernel.org" Return-Path: Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [147.75.48.161]) by mx.google.com with ESMTPS id f2-20020a17090ab94200b0028656d4ffacsi2896068pjw.147.2023.12.14.15.53.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Dec 2023 15:53:34 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-261-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel-dk.20230601.gappssmtp.com header.s=20230601 header.b=EUOiamSg; spf=pass (google.com: domain of linux-kernel+bounces-261-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-261-linux.lists.archive=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id BABC1B21AAE for ; Thu, 14 Dec 2023 23:53:31 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id DCBB82DB6F; Thu, 14 Dec 2023 23:53:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel-dk.20230601.gappssmtp.com header.i=@kernel-dk.20230601.gappssmtp.com header.b="EUOiamSg" X-Original-To: linux-kernel@vger.kernel.org Received: from mail-pg1-f182.google.com (mail-pg1-f182.google.com [209.85.215.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2DA526C6FE for ; Thu, 14 Dec 2023 23:53:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=kernel.dk Received: by mail-pg1-f182.google.com with SMTP id 41be03b00d2f7-55b5a37acb6so34540a12.0 for ; Thu, 14 Dec 2023 15:53:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20230601.gappssmtp.com; s=20230601; t=1702597996; x=1703202796; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:date:message-id:subject :references:in-reply-to:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=G2vr8wpG8JZogZBD1SoHqQxA1hO0CmvmdHIdK9DqzWc=; b=EUOiamSgIdBaO7Re8e4NBX5yYd1QWJc6Yg86PlUiDdw0OfZst3nLhxgLaUtSdvL6J6 C+7I2TUz0aWSatbAhOVJeVAGc2XuWGGj+vHm7lMPjPA1wlBXDCD23cSxLRjUgRvGQkVw TZYapr2nZz5TDeASPPXAmbFpee8eSH1+arftG5LG5z8hnOypo7uNNRdSyhpkO5+SJDmu 3aR0D2jC1eGWmOldoIMYd7fUgRPuLLTPBODRpRPJW8bwAuQa/y7n3Lbg3HlqtbZuEFFh 9PI+pdiyzjaTDJTKKnPkYUrrWWHVnhtZoWbUplF44sGsuFfzbOwFi5vlclDZRwY9fAKy MeLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702597996; x=1703202796; h=content-transfer-encoding:mime-version:date:message-id:subject :references:in-reply-to:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=G2vr8wpG8JZogZBD1SoHqQxA1hO0CmvmdHIdK9DqzWc=; b=YxKlkn7eB9+8mir/30YeO3XG0ofvmSmuRL5BZH2qWMUqucFktcU4i3QFyICtsfA2iv /VGbcPjYeri+gfr8wv6ZmVo8qTNj6+cbzJKG4x1r8OER68gkjC2KSnhxaFnMAwZWsAOi 5VFhZsdkdplPFRkst7amIM7+lZxcirbmH3HkSCDmoWLCxdHUhFCsYEOIsFbrzj3oDPCv cy4Nld+5wsRkiSQO2BDfe/OJcE92kJw1sA4GzC1tzzUQv+9ln0MQF7jdROv9EVVJ+XOb Q1ygp6wU7BkqNq3s9wifXCSgK8WnR4tdhUC3FCJUEHSv10uXtZ3WWs43yqS4p+OxD6DF Th2w== X-Gm-Message-State: AOJu0YzSWpj4qnH/dQ1EVj3AaFGJ+KjfpWWSeI5+8n2gzBV2jtVpmG+v byhgyQJSlQQaiYP7OEJZDJ/zvALjkd+51aDoqnTVMA== X-Received: by 2002:a05:6a00:2401:b0:6ce:4f4c:d475 with SMTP id z1-20020a056a00240100b006ce4f4cd475mr23105297pfh.3.1702597996082; Thu, 14 Dec 2023 15:53:16 -0800 (PST) Received: from [127.0.0.1] ([198.8.77.194]) by smtp.gmail.com with ESMTPSA id z19-20020aa78893000000b006cb884c0362sm12178060pfe.87.2023.12.14.15.53.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Dec 2023 15:53:15 -0800 (PST) From: Jens Axboe To: Al Viro Cc: Breno Leitao , Jakub Kicinski , io-uring@vger.kernel.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org In-Reply-To: <20231214213408.GT1674809@ZenIV> References: <20231214213408.GT1674809@ZenIV> Subject: Re: [PATCH] fix breakage in SOCKET_URING_OP_SIOC* implementation Message-Id: <170259799501.410702.15075202098496334749.b4-ty@kernel.dk> Date: Thu, 14 Dec 2023 16:53:15 -0700 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Mailer: b4 0.13-dev-7edf1 On Thu, 14 Dec 2023 21:34:08 +0000, Al Viro wrote: > In 8e9fad0e70b7 "io_uring: Add io_uring command support for sockets" > you've got an include of asm-generic/ioctls.h done in io_uring/uring_cmd.c. > That had been done for the sake of this chunk - > + ret = prot->ioctl(sk, SIOCINQ, &arg); > + if (ret) > + return ret; > + return arg; > + case SOCKET_URING_OP_SIOCOUTQ: > + ret = prot->ioctl(sk, SIOCOUTQ, &arg); > > [...] Applied, thanks! [1/1] fix breakage in SOCKET_URING_OP_SIOC* implementation commit: 1ba0e9d69b2000e95267c888cbfa91d823388d47 Best regards, -- Jens Axboe