From patchwork Mon Feb 24 12:42:19 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Begunkov X-Patchwork-Id: 13987986 Received: from mail-ed1-f45.google.com (mail-ed1-f45.google.com [209.85.208.45]) (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 E244C233734 for ; Mon, 24 Feb 2025 12:41:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740400895; cv=none; b=ISy2sVcA6Bapr7dN7x6F/e4aPU90Ah2g+md8uMpV7r9khG71tc3fBu4g6j2PfWO/50rylslaXsqoUb6dXFX0UAKJoXZz8efeCyuxhMjLb8S3PbAt6ku1GnMG/zbqLlruON2e0pWPtZRjPBTATrYlCnzZf5aN2x4buQ9NU3V2ilk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740400895; c=relaxed/simple; bh=qkGfU7SiShCPMkuQUNL1RqDDOnKfbRsv+FTjN7ldlJ8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=L8Hk6Xs2Zx+9UAl+AY+d80++dQEVJebViwL5QBHbMfLnin2NsT/rg3F4GjLY5T00mnBcdaMNxI8Rsan9RoB4dsJsaNtiQWZBvn8vwBxTldz9Xas3ui03tgRiTypTU10HMyScaSNzkCAJEk7y0Fg5Zuq0K7d15zGiXh4a1yxA9IY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=kr7suwjd; arc=none smtp.client-ip=209.85.208.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="kr7suwjd" Received: by mail-ed1-f45.google.com with SMTP id 4fb4d7f45d1cf-5e050b1491eso9326382a12.0 for ; Mon, 24 Feb 2025 04:41:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740400892; x=1741005692; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=QJ6hNd1BNc/EvBYXhsLk1BzMTv5/8ySZa/E/7n/qpNI=; b=kr7suwjdHkPjfzX3a0RPY3YkqmId8Gd3HCBKdva8LIV+IsENLgDgYm3I7OqofDS6P1 2YJP2OJ6ujHucs/C8comdh2LT6TpDjb/sUt1H4JZl2bywQyLoyad9KEelT4mu1MfyPa8 GcDUCn3UUEAfw+2pUD5DgKh4s9yEXaHIvQjVramynysvpX3z+XNFlPKZQB2OWmAFu4KF kbKdFsCafUsAUNi+M/M9hpvNuwQ1WnE+z8cRVxXZEmC2UQVBCwufY0Qg68RSGO0/i1Js I59WwVEEPhJNYrMuwIMHwYP0nNoBxpJ7tpByMltaWIXwfcpLhKY0P8Gp6Y0Kr7q2gwi9 jIbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740400892; x=1741005692; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=QJ6hNd1BNc/EvBYXhsLk1BzMTv5/8ySZa/E/7n/qpNI=; b=E66OKxK0X/G2jVcJr++W2RUB/h6RrcVibZlS18HDbuec9iyBR8pJgk+HsUuV0+kYnu QyTh7p67ISmNTwp5LoFz6XHmaD5I7EixPXBpRcK3NvvMhiwX/nFZmaXG9LxKqb1VYTc/ m5C4qgRdbvbNLlhu5JrDVskI37oShJOoBoYIqf4UFvLXILYybuanSJa18LOfERoq+N64 WjQi0IVScwQRWxX1n+DuPnhcgbvZ7M9WC6INZAtBdTgcSBybfDgXPGTM+QR/qRf4u+0T 8RGVjkBsB+/OrLMH2SUP1O2PVS7QdkYeZ757yxYe467FX+VgKVCBsrx2CcsDPrUYqbe2 VYbA== X-Gm-Message-State: AOJu0YwP3hrSu0dEbNGPDB0LkynPQuVbyhFPWc9VxHNzYMLBrxcLQ/de NFWeqMFJqXYH9K83FwRrVJ6A7qw31+gIOxEjb5g6DABOl5B9NB7cbZr+tg== X-Gm-Gg: ASbGncuuJmLs/YgWAFxCdhFvvasLtL0CgHk6AQ0vNnUQfpkQtsX+h9g3OibsTl3XC4C KOp2XontCBF7kc56RR3S/g7mzoDpiMd1ryapGHf1P747G9WXylIYCBl4mmiNoyPKV2MjukePe/a n32IeQ6/k4gbc/Q0VduVbAUsut9aYSULF+rBnlteRJR/vDeDibOiDr2kWtpP5Yh0EHWbQ4FwIYH yBljl9UpuPVsnb9yf1KyTWwgg5jlGPSNJhdTDvzxRr0x5j81+yzSMbrRsBvrNwMkyVjnLVffo5v 0GcDMYJSQA== X-Google-Smtp-Source: AGHT+IH0FNGxthliUWH+OP6D2ArVEBUIufU8VBw5BhizUpHJ+iNeKOsCj7IofVzkeIPe1hM2b7bwpw== X-Received: by 2002:a05:6402:5194:b0:5de:a972:8c7 with SMTP id 4fb4d7f45d1cf-5e0b62ea622mr10874604a12.5.1740400891618; Mon, 24 Feb 2025 04:41:31 -0800 (PST) Received: from 127.com ([2620:10d:c092:600::1:bd30]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5dece1b4f65sm18165110a12.1.2025.02.24.04.41.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Feb 2025 04:41:31 -0800 (PST) From: Pavel Begunkov To: io-uring@vger.kernel.org Cc: asml.silence@gmail.com, Anuj gupta , Jens Axboe Subject: [PATCH v2 1/6] io_uring: introduce io_is_compat() Date: Mon, 24 Feb 2025 12:42:19 +0000 Message-ID: <1a87a640265196a67bc38300128e0bfd7839ab1f.1740400452.git.asml.silence@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: io-uring@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 A preparation patch adding a simple helper for gauging the compat state. It'll help us to optimise and compile out more code in the following commits. Signed-off-by: Pavel Begunkov Reviewed-by: Anuj Gupta --- io_uring/io_uring.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/io_uring/io_uring.h b/io_uring/io_uring.h index 650f81dac5d0..daf0e3b740ee 100644 --- a/io_uring/io_uring.h +++ b/io_uring/io_uring.h @@ -147,6 +147,11 @@ static inline void io_lockdep_assert_cq_locked(struct io_ring_ctx *ctx) #endif } +static inline bool io_is_compat(struct io_ring_ctx *ctx) +{ + return IS_ENABLED(CONFIG_COMPAT) && unlikely(ctx->compat); +} + static inline void io_req_task_work_add(struct io_kiocb *req) { __io_req_task_work_add(req, 0); From patchwork Mon Feb 24 12:42:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Begunkov X-Patchwork-Id: 13987987 Received: from mail-ed1-f44.google.com (mail-ed1-f44.google.com [209.85.208.44]) (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 51D2C23BCE7 for ; Mon, 24 Feb 2025 12:41:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740400896; cv=none; b=luIxbG0Pj3LIXuxrF3fGYs0qbSYQhLFxSai1AVZYy3xoWuFRAvt58uZiBzmN3Jmo2sJXiCFQfSWfAjseF+tEEOyuDtArecV1PLDB/NP+IX11fCc6yIW4Ogq0n5Qlb1FLfI4lCe/btV+9nJqXdJy9rpiuTBGRW2tfh/LaBj3ujbA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740400896; c=relaxed/simple; bh=Uef6Z3PD9t31rLQfhF6s6QG9HPN2oC5US4T6Vo0uaC8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FyOgtFi+uBWLZRPzEjJaUBSkTEFpgmZevIICX27mRwobKBiAIv2hinki2u5ARJcsp1fKtbF1tHHmJM+lJomULOb3A5EQMhNmDc/fZCmJ79XZLqx4eyOZUshQe1EcmpqG95Zxh84ZKbG3rIVQ3gi1ZBFxxZg1tXABjIdhukX1O0k= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Ndyz5bvv; arc=none smtp.client-ip=209.85.208.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Ndyz5bvv" Received: by mail-ed1-f44.google.com with SMTP id 4fb4d7f45d1cf-5e04cb346eeso7239360a12.2 for ; Mon, 24 Feb 2025 04:41:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740400893; x=1741005693; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=s9VUFtn2K6wFe96f33YVilmD2xqnBhBUmD8F1IuXerA=; b=Ndyz5bvvswcLN1Mf8q1d4CFKHJmmZZdsg0raDTcdH+OinkqW/YnNv6n/CGesgiH5f6 +RDz/7KamTJRRrhZ5VkTH9kRlStAD3JYTYv57NECFnWhpD8HKGSzEHou5GSFWGMUaagM mTKpKDavFSsgrshhlWN13ZIbI6A0DXa572vRuGILqTFQNOPhCn95yjQ3FkZ0hGPF4xmk iVmj45r53431EiiXoBgAejWs0ndXhs6oeI6ahyawt97mcGcliHW/hzkOKX222rO1o7JP mKdvnalAHLPUznyZqg89YDJCUuQ54MAt+RQ+OCGFh7G4UYpBlvXpJ5SV2H2xr2a/0xnv Qz5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740400893; x=1741005693; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=s9VUFtn2K6wFe96f33YVilmD2xqnBhBUmD8F1IuXerA=; b=TfbE1BgYdU7v++WWN+dUAW6c02tVk3ztuj9SWLkHbP8dSwtgcD4QKmUbcvGSDmqM8T cJpPmDQ6oWrPVPNNrfQ9VXkZwbDpUIM+6Pxq6tD9fmOdxHZAMckAqH/izXUMvTLJ8kid 9QX6yxj1ZHGmVQ/43EeNlp0opuNja98H4X/OY1WeqHJTte62MEBGLFmd2SSxDoWf6qWo 4uz8tBDmcgliBvNjcQXoqbsY7+nXgEtvN16ekqx9dgaVi30syjhfkumWde/bC/Aq34ob euolVDpZoqZtE53TUv1Tx20d9Zgw55WrM+JAwi7au79W+pTxgHxnXWlsx4O7ZnHJSZOb Nlvw== X-Gm-Message-State: AOJu0YwqIVnI6M62nOGah7Zw8b7m9TIpbXP7nqtHx3NGsiQ10VedUKte loAUMXHG/8tYGa4pAM6xlppO6JifDIvdn4v51y5mnsLNky9OrJvitOdyvw== X-Gm-Gg: ASbGncsojCpWraTCHfMrD6ikHRBtjSBvfoe064tK21yda28G1DXQOht7oLH/qDwCDy8 utOnLcPDur7J5iMcLBwrd2H7wwazaSByRjjTYpqPOqWkTpmYpUELLwdzsuomz8526MHAN3jLFut TS6YbmQawEW1BMKTLkGm6cuzKbQzH/Ar/Jk0UFWVmBBxlpBXhLmAlfAevdHInJi7IN3Z8jhEhZJ rQy8wE1vDr6gtpqREKTwdYCPeFuPTxO3OATatVtPyp/+FZUey3Hi5Wa2zGxQW1XXQ1EMJDzm4ys kJBy9LDfHg== X-Google-Smtp-Source: AGHT+IEH0J3ZZCQkSAk1lE7Gm+U1ncav75ZaCzYmAnTitJpnxYnpwtRRVKmFW5qgKr+KaevKd8ayqw== X-Received: by 2002:a05:6402:5192:b0:5de:4f37:e59c with SMTP id 4fb4d7f45d1cf-5e0b724782amr13101108a12.31.1740400892881; Mon, 24 Feb 2025 04:41:32 -0800 (PST) Received: from 127.com ([2620:10d:c092:600::1:bd30]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5dece1b4f65sm18165110a12.1.2025.02.24.04.41.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Feb 2025 04:41:32 -0800 (PST) From: Pavel Begunkov To: io-uring@vger.kernel.org Cc: asml.silence@gmail.com, Anuj gupta , Jens Axboe Subject: [PATCH v2 2/6] io_uring/cmd: optimise !CONFIG_COMPAT flags setting Date: Mon, 24 Feb 2025 12:42:20 +0000 Message-ID: X-Mailer: git-send-email 2.48.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: io-uring@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Use io_is_compat() to avoid extra overhead in io_uring_cmd() for flag setting when compat is compiled out. Signed-off-by: Pavel Begunkov Reviewed-by: Anuj Gupta --- io_uring/uring_cmd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/io_uring/uring_cmd.c b/io_uring/uring_cmd.c index 8bdf2c9b3fef..14086a266461 100644 --- a/io_uring/uring_cmd.c +++ b/io_uring/uring_cmd.c @@ -237,7 +237,7 @@ int io_uring_cmd(struct io_kiocb *req, unsigned int issue_flags) issue_flags |= IO_URING_F_SQE128; if (ctx->flags & IORING_SETUP_CQE32) issue_flags |= IO_URING_F_CQE32; - if (ctx->compat) + if (io_is_compat(ctx)) issue_flags |= IO_URING_F_COMPAT; if (ctx->flags & IORING_SETUP_IOPOLL) { if (!file->f_op->uring_cmd_iopoll) From patchwork Mon Feb 24 12:42:21 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Begunkov X-Patchwork-Id: 13987988 Received: from mail-ed1-f43.google.com (mail-ed1-f43.google.com [209.85.208.43]) (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 87DF523BCE5 for ; Mon, 24 Feb 2025 12:41:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740400898; cv=none; b=lNPNyZ4jj/l84gm36xIZ1DbHaUUzkCqFBA7pgTIhbYR/ASPv2flqrTwFx27W4IQajJTStVAJZoZGeVkNdMruEEf8U9WZSyHOQtvyzYiaMnxqsjEuYdsV4A3Hl+0A8AVilhZCVhkD/Lnzt5+aTxkd83iqUI0JmNGIzg6yv57MX18= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740400898; c=relaxed/simple; bh=fVQsquoLJ8KcVI0bFbuIav0NyFRfu3+x85NYd6+nHtg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sUEDyODcG4V7cOX86STLCV6b+0XA/2g9fMIljpg0KCl4hb0RcAw8ZcoKOMC0GzBpJFjhVyTW7345g1w7KdNwaz56vEW3096rZfa+TC4MY6YlxJBiaEsTAxAoCrQyHFS/435WrNqFSE7gz+br8im5IloV3I79KD9G7ZpwgHov8/Y= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=D6Uy8dfS; arc=none smtp.client-ip=209.85.208.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="D6Uy8dfS" Received: by mail-ed1-f43.google.com with SMTP id 4fb4d7f45d1cf-5deb1266031so7949307a12.2 for ; Mon, 24 Feb 2025 04:41:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740400894; x=1741005694; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=nIJ3m0SPWqFKWfkGjvetnixJEAxdceXPEmFpo5d/CKI=; b=D6Uy8dfSyP3/BUpdH1XmX27rE+p1csTVJd46Y+95FIf2XLbPBoLbxkb5fvxqAJ64fX kpXECJwmQaXG7spO4HqDH6BuKM28gWiPYwmHOWgy25dl94Dm5rL2XS1WhdYWcddtcFAF nTtiOfJB01cSpweB7OJCPHeX8jcqk+97XUsCXnQQcYYI3tUBzNtjbJTigc5AWqOkeGEE 6qmkoPhjbEhdZ/TQ9K3+1R0l63fZu+vTyJL/u/oSHsmkjlWJvvGineQKp0hpKmI2E0kp AVxr02mmGNoq9UdpL05wPBRulAoNn++YbGc9XO+UaP/juIekWCWMzkPAXLOARoiEaOSs hIgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740400894; x=1741005694; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=nIJ3m0SPWqFKWfkGjvetnixJEAxdceXPEmFpo5d/CKI=; b=HNGJDPmGfJ93ZHlAePsAYSBoufo3jxcb2IwU3x6/9Sa8Xo933yWX9qWUB/NIBrJk5n FjQZDzHvtgLdUByRHIc67tIfA1+gJmLhU8pqmVvRERCKmjnJ/bZ1ft5lQ+o9BaL2yMMf G9ZbqxiIVNq7KFDGiLVRclCVUpAAOy39lxO4iITD23OaxHcRyiq56PgslZd57jhGhRj7 SY7Iu7ZXMqSg7V6rsCGCQ+xyxdnTd5vFUsg6e6NkD+i9H6ZVEAZtJOP7Vd7h8syPirBs q7xiDDI63ocaPniyw+6sZHWwVr9mlm0J7beWixLUP2EKJvbwupraeMXfw6Op0mAl/N0q 4h9g== X-Gm-Message-State: AOJu0YwOkEMxHj8XBu4Lg1VaJyhCQ3Vdc3z7gPFIBfUyDGHVP/SAQXvp nkxSdZ5IpwTGzdxHP3Kkzl7Y3YItWZxUMNg2oVWretWI49kXVjpULVrNuQ== X-Gm-Gg: ASbGnct//cOmPLYP/BYRFxubKBECPWDMZEbTrU5PCPFyPptR0iHLHj+CZ6EP7flM+dH +bQaXjk9D7E5Z8s/u29XdoRvPs6uvqcCDWIdqgUbVyO+wMv6BdfV8CVjJ/zkAK0JAWm5IBDuzzb T/XOWTeVMaw6CD494sYcqE5FMQmTOCw1eIXoWM/Zyaqn4+D/MVbG4JwXiosS2z+IEke31PYSGXF zVc7xi6Rz1h5x3NFk1GugBUelX5FsRp87vJdKw4qwEg7sb2EwIa7mlYmHVVaZWQY/LqhW58tFp9 mFi3/G75vw== X-Google-Smtp-Source: AGHT+IGgtdFXQeoP+g0zKJ4czsSBGE6yJ+i/CSHnkpuAGvVq20GCackL7n2f/r0TX9pugkpSmWKRqA== X-Received: by 2002:a05:6402:268c:b0:5de:4b81:d3ff with SMTP id 4fb4d7f45d1cf-5e0b70fa016mr13657989a12.13.1740400894235; Mon, 24 Feb 2025 04:41:34 -0800 (PST) Received: from 127.com ([2620:10d:c092:600::1:bd30]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5dece1b4f65sm18165110a12.1.2025.02.24.04.41.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Feb 2025 04:41:33 -0800 (PST) From: Pavel Begunkov To: io-uring@vger.kernel.org Cc: asml.silence@gmail.com, Anuj gupta , Jens Axboe Subject: [PATCH v2 3/6] io_uring/rw: compile out compat param passing Date: Mon, 24 Feb 2025 12:42:21 +0000 Message-ID: <2819df9c8533c36b46d7baccbb317a0ec89da6cd.1740400452.git.asml.silence@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: io-uring@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Even when COMPAT is compiled out, we still have to pass ctx->compat to __import_iovec(). Replace the read with an indirection with a constant when the kernel doesn't support compat. Signed-off-by: Pavel Begunkov Reviewed-by: Anuj Gupta --- io_uring/rw.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/io_uring/rw.c b/io_uring/rw.c index 16f12f94943f..7133029b4396 100644 --- a/io_uring/rw.c +++ b/io_uring/rw.c @@ -46,7 +46,6 @@ static bool io_file_supports_nowait(struct io_kiocb *req, __poll_t mask) return false; } -#ifdef CONFIG_COMPAT static int io_iov_compat_buffer_select_prep(struct io_rw *rw) { struct compat_iovec __user *uiov; @@ -63,7 +62,6 @@ static int io_iov_compat_buffer_select_prep(struct io_rw *rw) rw->len = clen; return 0; } -#endif static int io_iov_buffer_select_prep(struct io_kiocb *req) { @@ -74,10 +72,8 @@ static int io_iov_buffer_select_prep(struct io_kiocb *req) if (rw->len != 1) return -EINVAL; -#ifdef CONFIG_COMPAT - if (req->ctx->compat) + if (io_is_compat(req->ctx)) return io_iov_compat_buffer_select_prep(rw); -#endif uiov = u64_to_user_ptr(rw->addr); if (copy_from_user(&iov, uiov, sizeof(*uiov))) @@ -120,7 +116,7 @@ static int __io_import_iovec(int ddir, struct io_kiocb *req, nr_segs = 1; } ret = __import_iovec(ddir, buf, sqe_len, nr_segs, &iov, &io->iter, - req->ctx->compat); + io_is_compat(req->ctx)); if (unlikely(ret < 0)) return ret; if (iov) { From patchwork Mon Feb 24 12:42:22 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Begunkov X-Patchwork-Id: 13987989 Received: from mail-ed1-f47.google.com (mail-ed1-f47.google.com [209.85.208.47]) (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 3150123BCED for ; Mon, 24 Feb 2025 12:41:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740400898; cv=none; b=m04UucfjgPJgvvFdywqgO/MSkT0W+Tn8/XghLyHDiw1LLlG7HcTs34Ty63pXDYqR5ZL1B9sjWxwXbIgUbUn3m/GNTyMhmVnaCbOZ1zT7G/px1yIsgtDpe3uWG4tHB/vNQfvUrISK95/Sc4+q1/thdo1HOWlPR5efQUHRvLHsUBA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740400898; c=relaxed/simple; bh=3QU4q8iXcFGLbSXXEgtj284mS6q20pqcFQeIiGMPYGU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ohYpRVnQ1HuTn6TJell5bPGIsCwGfyCAOs3kM+aQVYW0MAMgf4/CQMyCPahknZaJ5wQJ9dR0pwFA5qCPVGEK14B2fY2mxYYHuv9RyAeDMtBHozLojTodlhHriRSNS3IiXj7cQyJiD8gcir0C+NKs795LQ4dQyId61hDqJOdZtj8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=NC7Sm9DN; arc=none smtp.client-ip=209.85.208.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="NC7Sm9DN" Received: by mail-ed1-f47.google.com with SMTP id 4fb4d7f45d1cf-5dc89df7eccso7872033a12.3 for ; Mon, 24 Feb 2025 04:41:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740400895; x=1741005695; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=FpRDb9Jc6m/HtHMq4BA9JO0pJq4DDZoA3bizjMcy5DI=; b=NC7Sm9DNfte3FpW/x03zLowy7GLi5u2rp+6iUWbqATQrDlJrYQ1dYZBMUC3IoiDXV0 F7Wu102Duy67xct8V9+RarqhAtkpFp5BMsg5yEHQZ3eoByWezBo/9yBWjyc8NNXTPtbS dzzOqrgWtWYLLAvtlMM0e5ArAT/af+2EEhwoHuJe1HSlMLIK9InBzMChOLUFLM8x1LDB Ih2aPje2G7a81VisICLc2pfCKsDrrw3BXg+hteRe/xaFu9DYX1ZmHlyGfES6GvI3C3Ib ffE7yfWGRl4fHMhVN5B+Jq/QcIGSrzqzJnvpG8MYhVLmcMNo5L3MjuotQDjpSWUanbo3 Wpig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740400895; x=1741005695; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=FpRDb9Jc6m/HtHMq4BA9JO0pJq4DDZoA3bizjMcy5DI=; b=Ugn30O/aZlCjfTYGropgF8jPcKyMsyxuS00Zv4rAFFAAZWhrWS3vxST0xDGZwQ0W5F EYa1emAmzGSgYN++P3ayJ00KSBgcC6aWnpFku5lGeN9aXJujH2+gGnPd3dwHPxwjK0oi 3EYt03VBr+zbayiezYCyscHGx7QyQG42Uv9JUPKLs+uNIs6WCd9bhsDw1m402URV1Uxi OeyDxa7QZOl2NGKCcIB91Rb2KWkOgrBSv1THfUCLmlAxTHXzcNQwF3UvjLwUOafJgDX4 uWPBwKwNp/vJ+euoaBasNjT++vs/37hmnSBP4eUJ7yfkIVM1KWYWE2gEj1H8/WcQ0KNT nJhw== X-Gm-Message-State: AOJu0YzZ9kQwSMjpDN5Med6PnDgo79xvpt7m6YVKggRHrL+jek1LB5AN tpL82vTSaI672xVxIT/P7UcZuWMfCYiRXK8oDQATd/+YWMeyjssVThdfQw== X-Gm-Gg: ASbGncvG7Q+aT8YsNQJuaHF6eZPQdjsG//y7C1myuGiRd50dJ+EMx89ck5U4zRq7wVS N0muZCHchb0DDw8aqbEFRavutYoxZIakCiIab6oU10dqKMuuIUX/RJl7rKuagofFU0e6LopYxmZ DuHax8YgJlEsiWDBKniRFOPP96lXX2PgVOwwkNTdCxHU5MU8+Pi4VtX7AHhbukQHlNjR4JcBkSU PPM0Fjjlsj3WnYpQ5QWJ7FhwATAoEGbB88Y7Kk67L/O6c8p4lpT7jvk+efp/GbFWPwjwoNS1acW W3IPdvHybw== X-Google-Smtp-Source: AGHT+IGZGM73LHX+t5UqOGADPN7LrjZ9BvfiklKpwSsTR8CorX392wqpjJGw/WBlEKHXmWB/7W/Xjg== X-Received: by 2002:a05:6402:1d4b:b0:5e0:36c0:7b00 with SMTP id 4fb4d7f45d1cf-5e0b7257b92mr13400911a12.31.1740400895118; Mon, 24 Feb 2025 04:41:35 -0800 (PST) Received: from 127.com ([2620:10d:c092:600::1:bd30]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5dece1b4f65sm18165110a12.1.2025.02.24.04.41.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Feb 2025 04:41:34 -0800 (PST) From: Pavel Begunkov To: io-uring@vger.kernel.org Cc: asml.silence@gmail.com, Anuj gupta , Jens Axboe Subject: [PATCH v2 4/6] io_uring/rw: shrink io_iov_compat_buffer_select_prep Date: Mon, 24 Feb 2025 12:42:22 +0000 Message-ID: X-Mailer: git-send-email 2.48.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: io-uring@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Compat performance is not important and simplicity is more appreciated. Let's not be smart about it and use simpler copy_from_user() instead of access + __get_user pair. Signed-off-by: Pavel Begunkov --- io_uring/rw.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/io_uring/rw.c b/io_uring/rw.c index 7133029b4396..22612a956e75 100644 --- a/io_uring/rw.c +++ b/io_uring/rw.c @@ -48,18 +48,12 @@ static bool io_file_supports_nowait(struct io_kiocb *req, __poll_t mask) static int io_iov_compat_buffer_select_prep(struct io_rw *rw) { - struct compat_iovec __user *uiov; - compat_ssize_t clen; + struct compat_iovec __user *uiov = u64_to_user_ptr(rw->addr); + struct compat_iovec iov; - uiov = u64_to_user_ptr(rw->addr); - if (!access_ok(uiov, sizeof(*uiov))) - return -EFAULT; - if (__get_user(clen, &uiov->iov_len)) + if (copy_from_user(&iov, uiov, sizeof(iov))) return -EFAULT; - if (clen < 0) - return -EINVAL; - - rw->len = clen; + rw->len = iov.iov_len; return 0; } From patchwork Mon Feb 24 12:42:23 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Begunkov X-Patchwork-Id: 13987990 Received: from mail-ed1-f45.google.com (mail-ed1-f45.google.com [209.85.208.45]) (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 A536423BCE5 for ; Mon, 24 Feb 2025 12:41:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740400900; cv=none; b=TOxXKVgljoza1CZsKAicn6AGhQi7qcCcfMzGpnCpSQjTEsWy05NoU3idTHo9RFHKnPTR38vy5e2cfVyF2GzuK5AT40XMN44Mc7C4HOGnSbgWU1mxbApaZIV6bnvnR/d0wl3pUEM+Qk/1z9MrO5ovDCoyWFtvQk5YcSBmlyFuqfI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740400900; c=relaxed/simple; bh=dfo7ORxeQnNkiO0yCRsn4mUmZSjPu3IlvKZs4DGD37M=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WbHdcj64fIlZGJlLPjUSyD2Uc1iwBTxrtbQEySveYl2xsWPxKPqqCxQEhMHHkEjZlCbyxMcSFZRg8lzIRlCEMJ/y1mjJO8ujo3aar/4LhPwRwbHteO2BFEoVwdldXbDJKXUoXY4HDv/o7OB/a1gLGPss3dVCm4wqZDz/ThJp7wg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=kPHQ7DQp; arc=none smtp.client-ip=209.85.208.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="kPHQ7DQp" Received: by mail-ed1-f45.google.com with SMTP id 4fb4d7f45d1cf-5dca468c5e4so7795665a12.1 for ; Mon, 24 Feb 2025 04:41:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740400896; x=1741005696; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=TeA492I5jGdk9YG+o5IQXdThhoW9fDkBeoIep9VFMIs=; b=kPHQ7DQpYxaq/6nwZZ9chVtUXf6U2NG/fpHu3L3Q5kfIgFhJ5kaw+ajqsaxKQNNdZc AjwiubhpyPYzg5cHtXoHk0446QWxbaIHz/ty9f8YHzarGxt8MSTIh9LhJlovLIX8zCZa N3UtCrhbT5jJeg2aIkNC5KardJHm9SMoUg6oyxTv5Y3R5d9UqnpA2h9pHjcSWLRKmIqx hZI22puk+9rrcDnagxfEgsevZTMyQqG87Zlu/1nF82J9MKw7peuR8EQSLIyYdEhbGav8 ZVhg+50Ns+o4k6uL9c5vEfaIjRGqqAMRt+2rRZs/dzwKRMuQOfHOZoN6H0WFf3xXEf2J gNSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740400896; x=1741005696; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=TeA492I5jGdk9YG+o5IQXdThhoW9fDkBeoIep9VFMIs=; b=WSowfEew4jdZ4Fdna2Lpr2dv3YtN8Lmv5MLkE1nCyQwK/sDPsmGJZKnGhRltfeDBmh 0RSnM0hbslvWM23xa8GLpmBoWF3cLjQ9GlwPzwSEhW6pVOmagTSzsRoirU+FZj8/IXrr 5rpJKnKEEiuHC7J93xe3tMeWeMbolJAAm/4ONvvvSe1llVQjx83odt57B7ByTclS9nRq aBG/28jDyc/MYer+PqB9bu6Z0EeOj2hOlFhJXAU2UwdcmZIS/Y5uvvARZTzHhnDooFwo AIk+mC205Epyo/3pebrGBV+uFCzjYS0eiI9guZ/sm9jHzXCXKy0ZaPaq/2RlLVCZRhUi +Q+g== X-Gm-Message-State: AOJu0Yy/g33TE+3UeVj2P+kENn5l0Uh/2UXxlgU2hTiPtojICcQvRVCx +lpNZZ9lZry3J1QybKG2pC+4IeKOTBPjC4TDweF4owAJbXfpCwO92CFR5A== X-Gm-Gg: ASbGncsXMK1VgUzmT/8xfXTIRfBUlB3rOq8ifEXS/KWBIrAURdH0oShzO7Er8gVQy02 ns28UECG0w8oBz/fwZexZKaOFpUAlSYwcP9lQfSblIYTdWx6jcK6xCrb+tqeV0nmddUonxMRt2w 4L4FFFwo1kXWtOfSBExADBPV0zTDiZl83kAMLA4JXwaI/cN0AldFmvNTotSN4fTRYrccpG4Fa2O 1KZfVxexBC8v7V4eE5CsKucAbphPymn7VbQHLkHHpRrPAsxf31zVWuEckisGQ+3I4RdsrUMHp4k nDLSMYU94A== X-Google-Smtp-Source: AGHT+IEDxQeib5P8YEUXq6vIx8BmZ0YmygiL2mr8rxalYItyPfrp1rWLY8ZC2gUSFNu7IIUGTS0TRg== X-Received: by 2002:a05:6402:43c8:b0:5e0:8b68:ffae with SMTP id 4fb4d7f45d1cf-5e0b70f9ac6mr12144417a12.17.1740400896162; Mon, 24 Feb 2025 04:41:36 -0800 (PST) Received: from 127.com ([2620:10d:c092:600::1:bd30]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5dece1b4f65sm18165110a12.1.2025.02.24.04.41.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Feb 2025 04:41:35 -0800 (PST) From: Pavel Begunkov To: io-uring@vger.kernel.org Cc: asml.silence@gmail.com, Anuj gupta , Jens Axboe Subject: [PATCH v2 5/6] io_uring/waitid: use io_is_compat() Date: Mon, 24 Feb 2025 12:42:23 +0000 Message-ID: <28c5b5f1f1bf7f4d18869dafe6e4147ce1bbf0f5.1740400452.git.asml.silence@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: io-uring@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Use io_is_compat() for consistency. Signed-off-by: Pavel Begunkov Reviewed-by: Anuj Gupta --- io_uring/waitid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/io_uring/waitid.c b/io_uring/waitid.c index 347b8f53efa7..4034b7e3026f 100644 --- a/io_uring/waitid.c +++ b/io_uring/waitid.c @@ -78,7 +78,7 @@ static bool io_waitid_copy_si(struct io_kiocb *req, int signo) return true; #ifdef CONFIG_COMPAT - if (req->ctx->compat) + if (io_is_compat(req->ctx)) return io_waitid_compat_copy_si(iw, signo); #endif From patchwork Mon Feb 24 12:42:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Begunkov X-Patchwork-Id: 13987991 Received: from mail-ed1-f48.google.com (mail-ed1-f48.google.com [209.85.208.48]) (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 1A45223BD03 for ; Mon, 24 Feb 2025 12:41:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740400900; cv=none; b=qj3jVoHC/rD8R8+IB9tx2/holmZj9B3cDkq++HvFJlEbLP5+eZ15+eP5Jp4rDLYB4oYngwvxxCLu3/l01tWgUQFGzkszaqOLjbZpgFpVLIP1Xt4y55Fuv+4KdIpRtQmHFhLFTIYBapmn4yxJqxN1/VbHNPsk056x1tyd0FO7Be8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740400900; c=relaxed/simple; bh=oVCREMHKNF3VZ4lqmQYHZWqPemM+41W2yecYx/7O4+U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oeYQanMNBVWJh9tNzGjPTjsl0lTaOePd8fm990c3yesS2ufgtWR0mJVS0dia5xbtToduf2HF37vFyVR/IXGukq2iyzUESDWLQPXXQl4JWSEDqYiq5kyiSiC2Iz5v65WbQCOt62duwWnhln71q04OmSGc35UZ5G4+c8i2cSf78Bw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=PHk8hAx2; arc=none smtp.client-ip=209.85.208.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="PHk8hAx2" Received: by mail-ed1-f48.google.com with SMTP id 4fb4d7f45d1cf-5e058ca6806so7931000a12.3 for ; Mon, 24 Feb 2025 04:41:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740400897; x=1741005697; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=mU08h0wsEkVVxTM0lrp99OqQ0vO1MRMeRbUk8WqQxRE=; b=PHk8hAx2BipczMtel5+vOyM4ucu/OO6jEPOIbCHYXx2IN4G6VjP/lICu+o1n5tEVwZ F5VTIVDLTSUULPZ0Cp93Iv3yZn6b2UpnXHRzqTecYAOCQ0/CQTyn6X/TXmTndXMyyKvr v/MIklCAN1Lwf4exypOZtGqBfc06ct/eJNGRcX08bS4uNBQT0lDcNRk8/Yg5/wPVn0lO s4GAfWNjM5eoYI5RRfs62VruVeBDTM6k+t3HQ6lH1JXfsKU2UVHVe3BTXE7M57xANMe0 vFBqmeklLiC9u6ep/d8a+nmtiVxXn6go3McK71tqu31HMfL36NZ+xd51ycGMXfx5TSUc 2k6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740400897; x=1741005697; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mU08h0wsEkVVxTM0lrp99OqQ0vO1MRMeRbUk8WqQxRE=; b=VQN2YZD/rWVLjmNHYmK6q0cLcXy24nITwcKrf9APY75hFupD4eQhIkdr19ptWqNU/w HvOVVF+Lfyw6jOhsrKP8df6BcfKjK1Ik1ufE2q0LOrp+HoMwHDgMQDGgfBY9uyXAG3J8 KMDsHDW0AMPL5Glrd7g85ZBpdHitFf73CebQFfinrTPUK0lBe0VuHwrD+f6kpog2NNbx KV8zmYuQDOb1cBD5vL5qXwX/7ql5rH8HqhU9b/gL6cwAlQwmHjSkMQK4NHurqJ9FWcn2 0Ju4fq2br+p5cGzXAUIjkmXKYj8bEW9f/Wb/vg5QuxMrDmFM9Ot77wazHE0jv8I9oQqp fIdA== X-Gm-Message-State: AOJu0YxJj/Xp6bK0q81iXZOOmOHlWwZrsFvaidrpFIkUD7zBpGQMZTWt owQVaj1f8GPWGUxvxGeLcxM7xZc+3FbJxvBWjJZmP3EftVO7NjSouNUs5Q== X-Gm-Gg: ASbGncuOngzXvHtJysP5YnXxOd0utmObBTizh6mw8SR5iDjX5tVRSV76psOLzhaK6cX 8ifGQTmsaruKQPvjAQxoWfrxFRTza/Ogg18T6b5BqaFF0mz6wj1Hr3ktga7odq1BROpF6Kz1Sj1 eBTHKfMU8lyAXyObnO1SWaH3/5hQpPxpw9dWeD3Pchd3nKNiKSPYhRbk85Y2g7xrCqT/G/NL3U8 jsuLtUHH+kD9F3cMDmG6hYTdbNYo/MPm5ao1AW1hdGixwfnar3CWSIsdI+Qa7J359MdRdvQIRvk pKrSTeAd6Q== X-Google-Smtp-Source: AGHT+IFfFl5rvFzaSY4b+pE8rGRPqeFkxNe3KpGY6aOZ0sSIjny6yzJe0g55OXxePzSE2jNGhsvchg== X-Received: by 2002:a05:6402:360d:b0:5de:5025:2bd9 with SMTP id 4fb4d7f45d1cf-5e0b70e95demr11894575a12.11.1740400897036; Mon, 24 Feb 2025 04:41:37 -0800 (PST) Received: from 127.com ([2620:10d:c092:600::1:bd30]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5dece1b4f65sm18165110a12.1.2025.02.24.04.41.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Feb 2025 04:41:36 -0800 (PST) From: Pavel Begunkov To: io-uring@vger.kernel.org Cc: asml.silence@gmail.com, Anuj gupta , Jens Axboe Subject: [PATCH v2 6/6] io_uring/net: use io_is_compat() Date: Mon, 24 Feb 2025 12:42:24 +0000 Message-ID: X-Mailer: git-send-email 2.48.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: io-uring@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Use io_is_compat() for consistency. Signed-off-by: Pavel Begunkov Reviewed-by: Anuj Gupta --- io_uring/net.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/io_uring/net.c b/io_uring/net.c index d22fa61539a3..e795253632d1 100644 --- a/io_uring/net.c +++ b/io_uring/net.c @@ -325,7 +325,7 @@ static int io_sendmsg_copy_hdr(struct io_kiocb *req, iomsg->msg.msg_iter.nr_segs = 0; #ifdef CONFIG_COMPAT - if (unlikely(req->ctx->compat)) { + if (io_is_compat(req->ctx)) { struct compat_msghdr cmsg; ret = io_compat_msg_copy_hdr(req, iomsg, &cmsg, ITER_SOURCE); @@ -436,10 +436,9 @@ int io_sendmsg_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) req->buf_list = NULL; } -#ifdef CONFIG_COMPAT - if (req->ctx->compat) + if (io_is_compat(req->ctx)) sr->msg_flags |= MSG_CMSG_COMPAT; -#endif + if (unlikely(!io_msg_alloc_async(req))) return -ENOMEM; if (req->opcode != IORING_OP_SENDMSG) @@ -725,7 +724,7 @@ static int io_recvmsg_copy_hdr(struct io_kiocb *req, iomsg->msg.msg_iter.nr_segs = 0; #ifdef CONFIG_COMPAT - if (unlikely(req->ctx->compat)) { + if (io_is_compat(req->ctx)) { struct compat_msghdr cmsg; ret = io_compat_msg_copy_hdr(req, iomsg, &cmsg, ITER_DEST); @@ -837,10 +836,9 @@ int io_recvmsg_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) return -EINVAL; } -#ifdef CONFIG_COMPAT - if (req->ctx->compat) + if (io_is_compat(req->ctx)) sr->msg_flags |= MSG_CMSG_COMPAT; -#endif + sr->nr_multishot_loops = 0; return io_recvmsg_prep_setup(req); } @@ -1367,10 +1365,9 @@ int io_send_zc_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) if (zc->msg_flags & MSG_DONTWAIT) req->flags |= REQ_F_NOWAIT; -#ifdef CONFIG_COMPAT - if (req->ctx->compat) + if (io_is_compat(req->ctx)) zc->msg_flags |= MSG_CMSG_COMPAT; -#endif + if (unlikely(!io_msg_alloc_async(req))) return -ENOMEM; if (req->opcode != IORING_OP_SENDMSG_ZC)