Received: by 2002:a05:6358:e9c4:b0:b2:91dc:71ab with SMTP id hc4csp4262270rwb; Sun, 7 Aug 2022 19:42:04 -0700 (PDT) X-Google-Smtp-Source: AA6agR4xuTyysAxkf68/qAY+0g5yC4iQHZIYq76FaSsOe9LYBfX4o5r6hsNLiVZzgCO/p7/Q3pw0 X-Received: by 2002:a17:906:cc5a:b0:730:8374:7ba5 with SMTP id mm26-20020a170906cc5a00b0073083747ba5mr12356302ejb.144.1659926523966; Sun, 07 Aug 2022 19:42:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1659926523; cv=none; d=google.com; s=arc-20160816; b=ntMCLvb3j0FiKpZJzcV20+PpWxMBr8UGgIcATKC4TfRjNtl0UtidsDRpyBThtcdf0Z Tg+eOUIFYzDcS8Qu3hZ4pHYR5nO/BYeZpm83UuXv7qVi7B7c0iM7qfSAdsyZXCxHYByC VLlPgvEqA2o8wKVcCUpTdXvInrNXmanQWORuriPJFRg33dQapVK0ZDlWke9BAxBZ/p/u Y2vku7ssnJ2P3BO46y9Ve71TXR61UXmQUlG4AMB1D9CfToVZ2bUvDI0UFvKhhez0PdQK GQFfAaiQ1/BMr/UEMVGwSWXOUEbaEIZVSUnRx/6D3OmP3LM8OA5qwml5FVLSezwh0Ffl FxvQ== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=wpyos/h/UDZ+IKBcc+Or59jSR1d2h4Okk82nKidsOd8=; b=CgVWOqcDWZfS18ZyyKquxu52bCWWZfvUcOMnb7hOdNX/n3RxC0qR/giJCUC81BQzei re2QrKUgKOZZyN6geeOtfXq4KbbssCENwWcEKOkjeRDj2Dg5fkvQ1F/B5EIfqCQ6kM2G QsxIRJiiTELVs9VA6BXZ3+Ah0KhHjCD85emgoGW2gOkL2FfgVygRXIqBx1DqFF88XL0K VTNqd3tOXBHhMcyf6tJsfKlCHngz2vC5I4l/dVcSt6lH7KJQcstDSFR/ClPddsCRzlSH yMulrazYUxbtN19xX9R1n56S8Xs0CuhHdYLETnFnq6Gb9YBwtjumpg81+pGrRWm0g2qJ YURA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=TO+otVEV; 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 Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id p21-20020a170907911500b00731745a7eefsi228003ejq.441.2022.08.07.19.41.39; Sun, 07 Aug 2022 19:42:03 -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=TO+otVEV; 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 S242377AbiHHBie (ORCPT + 99 others); Sun, 7 Aug 2022 21:38:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41230 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242509AbiHHBhW (ORCPT ); Sun, 7 Aug 2022 21:37:22 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 92F8DE009; Sun, 7 Aug 2022 18:33:45 -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 233D160DB9; Mon, 8 Aug 2022 01:33:45 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 41120C433C1; Mon, 8 Aug 2022 01:33:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1659922424; bh=Yjb9Y4qVJPHM6/fkJw0FSZx+TJgkUbWAT0nB14c/RKE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TO+otVEVkSvJcuhpZhruXEbo6TDr1gFDAgG442ZNxHXxFd4ezDVX7bkZTjgfQynHS oAcSLwosib1pQnpMZD9KHKmlSHU0LREWdpVjBirTtJN3p4qfIWbliTdCewxF5cetFY mXvGFYT2RLb/icfKBYtmwYUktKjYm+Ct8PuyPBxK9H+1RyRhvDbLDjn5TlyQJ3doYK k/YcZkPZ7Gs/2sS1wsZ7/TWpfV6Hu09hnJuGzOTHnGdgPQeWrzzAcWTnd5QRjQuhfS U+uCYM13oGDXUzKg2vdbn9u4uyNNKkCtigEhfJo17UvBvo1cZMrmvAWhY5lRyhM6rS gG4PhhVN3o+HQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Dylan Yudaken , Jens Axboe , Sasha Levin , rostedt@goodmis.org, mingo@redhat.com, shr@fb.com, joshi.k@samsung.com, usama.arif@bytedance.com, vasily.averin@linux.dev, asml.silence@gmail.com Subject: [PATCH AUTOSEL 5.19 56/58] io_uring: fix io_uring_cqe_overflow trace format Date: Sun, 7 Aug 2022 21:31:14 -0400 Message-Id: <20220808013118.313965-56-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220808013118.313965-1-sashal@kernel.org> References: <20220808013118.313965-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, 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 From: Dylan Yudaken [ Upstream commit 9b26e811e934eebda59362c9a03d082852552574 ] Make the trace format consistent with io_uring_complete for cflags Signed-off-by: Dylan Yudaken Link: https://lore.kernel.org/r/20220630091231.1456789-12-dylany@fb.com Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- include/trace/events/io_uring.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/trace/events/io_uring.h b/include/trace/events/io_uring.h index aa2f951b07cd..6a12eef3ffb7 100644 --- a/include/trace/events/io_uring.h +++ b/include/trace/events/io_uring.h @@ -622,7 +622,7 @@ TRACE_EVENT(io_uring_cqe_overflow, __entry->ocqe = ocqe; ), - TP_printk("ring %p, user_data 0x%llx, res %d, flags %x, " + TP_printk("ring %p, user_data 0x%llx, res %d, cflags 0x%x, " "overflow_cqe %p", __entry->ctx, __entry->user_data, __entry->res, __entry->cflags, __entry->ocqe) -- 2.35.1