From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.openvz.org (unknown [69.168.225.77]) by lore.virtuozzo.com (Postfix) with ESMTPS id 1CE718015B for ; Tue, 15 Sep 2026 16:02:45 +0000 (UTC) Received: from mail.openvz.org (localhost [127.0.0.1]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 68FG1WEN006088; Tue, 15 Sep 2026 19:01:32 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 68FG1WEN006088 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="Xojger5e" Received: from mail-pf1-f200.google.com (mail-pf1-f200.google.com [209.85.210.200]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 68FG1T2S006084 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Tue, 15 Sep 2026 19:01:30 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 68FG1T2S006084 Received: by mail-pf1-f200.google.com with SMTP id d2e1a72fcca58-8663802b58fso4947832b3a.2 for ; Tue, 15 Sep 2026 09:01:30 -0700 (PDT) X-Gm-Message-State: AFuF++kh79QtTflZ/kA0LVAtUkjYE8tOb0dIvWFCU9Fe+Di677ie6LOh gavzyiut9lDWin9o9bZycHJWYWrQ2a94Koeni7aOAHUL7JfBzqWKUhIufBr2cd8O5M/FVz8muUr o87yzHYqpGFq1WMQYzuJ485LLD2oLDqo+P28WNy5Q3n2m/hOeLBqAaQ== X-Gm-Gg: AYBFou3I7Ma9nm4cnnrUxJU0dYoZkpX8bP7SiLfOy/LI1rVyObyDv0CNoDUlfWCwHoy P5fTZhkkYsiDqf2eHW8ScwHb0DikYyQjT/4o8S3XocAPf5CGZQjfS/y+x5Cr865uL0KPqq9RytS bP87faXwANqgx/wGZqNaheVrwDrr9mS5gwKP5c8fKveMebEfGXJyYUDW7LjtFVW12MShgyEJ7Me QBdexXYTQZUCqmwnejd0xrpJJ3y4QKdfLwxgeAZkXgjhmxOnu69r15TIt6+sZmk8jyHczDRtizJ Zht+VUC8Q+yLBmWOXOSxQgEXZ/QyB0uaMhBmP5gJzAgwlaPihoFl7vIa4lq4MbF/a05iCeBVPnV JoSVFWdTwLMUr5iAd3YJ1avYrsQvc9iPpzr0SxQ9ODtHDKIuiCOieUqyZsW8DrEyLncTEcIwbSr hgtBISVm20lf0YXohn6A== X-Received: by 2002:a05:6a00:e0c:b0:868:e6d3:fc18 with SMTP id d2e1a72fcca58-86f858edb56mr18577026b3a.15.1789488088585; Tue, 15 Sep 2026 09:01:28 -0700 (PDT) X-Received: by 2002:a05:6a00:e0c:b0:868:e6d3:fc18 with SMTP id d2e1a72fcca58-86f858edb56mr18576830b3a.15.1789488087360; Tue, 15 Sep 2026 09:01:27 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1789488087; cv=pass; d=google.com; s=arc-20260327; b=BaZS33yzyfIwTYmNn2X48TNF0p48PoSrL1g41HodddT1QKsCivKrvRsra0oX78kW0W 2hLB870npo4iVhorEcwZgoe66r4793U9wOflWtHqZVM0ZBBuKT0Z/JaKOUQERwFAD9UQ xx0WrUKzyrbvfJJVtVFvfkdCY2+0zb9Ksm3g5yHjIjS4L4tG2D4g6IxQs6eVinQUWp/i KSSD174QkbF9a2WzSYwKDW9O9JbjArWpUGXTpZOsQ65cWvM9y3JYRWBTtXpEWBHk48P6 Hwdv3ZyAZlF2J+UNZKhPf/9Q8lM4K8AGTfkFLeiSIr9mU5GVens0ts/duqDdIKxFuUTL fJKw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=mime-version:content-disposition:message-id:subject:to:from:date :dkim-signature; bh=x6ppR9/VWBn9TOmhF4kAZyP2Tc5xB2D80vYRBn+aEEE=; fh=DHZ2Y/hE6dhVx0UmP7zWEGZ5iFhKn/velJV5CC1BbgU=; b=L0NupvQfuZLzhiQFVkdEp2qoDxQBw7gbnztsJYZBfdStbMfVYNLHu5uwTWRUypT/d7 3dt+5KS6SWvO7HQEKwA0n/XpZ3VGy1G6BFcnHZcv95XWm8v8dJUhuu9i2Pc6HPCKafuT envqSEJxcKwhIYJHJ2srv0w4gwunYtZ7ajOjMD2TMKwzTRboSRwE5DOwRFu8cb3z4YZ/ DDDmfEXARFLVx8KxbHu0gbL05fZmK0jJBE2c1JFY0A2zG1MTXqWuxLGhGAR7EsvTVEFK 8hvrIs2wa0tDxzsunopypRAikPYAz5l+1WcOrXgyKNWIVFROqpG3y84Ed41McImn1qIS gO+w==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=selector2 header.b=Xojger5e; arc=pass (i=1 spf=pass spfdomain=virtuozzo.com dkim=pass dkdomain=virtuozzo.com dmarc=pass fromdomain=virtuozzo.com); spf=pass (google.com: domain of kuznet@virtuozzo.com designates 2a01:111:f403:c20f::7 as permitted sender) smtp.mailfrom=kuznet@virtuozzo.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=virtuozzo.com Received: from OSPPR02CU001.outbound.protection.outlook.com (mail-norwayeastazlp170130007.outbound.protection.outlook.com. [2a01:111:f403:c20f::7]) by mx.google.com with ESMTPS id d2e1a72fcca58-86b263c20a8si27932004b3a.2.2026.09.15.09.01.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Sep 2026 09:01:27 -0700 (PDT) Received-SPF: pass (google.com: domain of kuznet@virtuozzo.com designates 2a01:111:f403:c20f::7 as permitted sender) client-ip=2a01:111:f403:c20f::7; Authentication-Results: mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=selector2 header.b=Xojger5e; arc=pass (i=1 spf=pass spfdomain=virtuozzo.com dkim=pass dkdomain=virtuozzo.com dmarc=pass fromdomain=virtuozzo.com); spf=pass (google.com: domain of kuznet@virtuozzo.com designates 2a01:111:f403:c20f::7 as permitted sender) smtp.mailfrom=kuznet@virtuozzo.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=virtuozzo.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=hR92Jl1scX1+xwReWcb4oG+oIZhnBPYUhJrSNXsl/N/mbp13GKLovB4sngG7g2EGAtFk7zr6CdQ3yVchctv7spow7XQCsorWhnngCzyLWdxCM3Io7hpNqjkHT7d5SMpUIE2+tncGc/N3UhoDZsQkvT5LLln2yZpYxU25IRmSHYtML0vah+C/CQys/XjbvSVc4DcgVQ63y3lgr1jrAnH7LNFkRUfobOnn2WeiStUEMXkxUPN0YZ0XjQKxMIMvt9LhHJ6SiZWGGu2DThfCgg9ticgeWuOl1U0T4A8lPllF/yBVPBiACHg53oQhcrjb0IjPgFN6DayX4HLr6AjjQS/5dg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=x6ppR9/VWBn9TOmhF4kAZyP2Tc5xB2D80vYRBn+aEEE=; b=anXf248sk+Sboeq7T8rsldMZUE2sj05EH1O7iyvVX3ZRpgRydOTJI/8AaCeNXDlfWPJpPvme2vtXXZdPsoIZB2G49muEKbKC2vj4dkXxGBJWmkQzT0jnEWZhGWI2U9CCC+tVNMj092TS/bLSp5HWN3OQ5ofpgldOQC1bEUu1NP8r0kBx9ZY8EcRybssGYUI1abmNiMljcvZ3dBr4UiOoqheQ6U+bupV3wwebcgwW0ZJlR2uFqURojn6ZQLNDM03ecIsELniOX2VMDWzZiisayWmFw++fXtYKQ8H0GZrAH/WpJgyEvu03MAuX/0KFJgWzpC/xR5/2BWBEl70DHw3u0A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=x6ppR9/VWBn9TOmhF4kAZyP2Tc5xB2D80vYRBn+aEEE=; b=Xojger5e7WCzs1m4llYY5vzpTM77GL6GtaHplcua3bzI9XE+qnWyo+WLLLH3jUQQAaiqqtQLj/ggD8RqGcffCOTbE+UpzqM2T8FMweLeNC6C3eF6FyT4z4aA8dMSYAPYhjk9rbBEyVogsyxqpml9W0z00vuy/LkioxoEsRWLDU87LOBhbW+iutBQGfhvZNSUa+Po8C/4ei0x4xcB6Ys9xJ20abgSHarIjyAq0sk+PEg1XBn4lHeh2pEIKxb2iTzYfTjjP5iS+9s/EC1X06oKE94mC2tWbzZrGFg70WlB6zQat+zppTeZQSv1mzBZBGD707L1rYDrST8nf5mJlVoWvA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=virtuozzo.com; Received: from DU0PR08MB8254.eurprd08.prod.outlook.com (2603:10a6:10:412::11) by MMZPR08MB266317.eurprd08.prod.outlook.com (2603:10a6:190:54::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.428.9; Tue, 15 Sep 2026 16:01:24 +0000 Received: from DU0PR08MB8254.eurprd08.prod.outlook.com ([fe80::66a7:414d:72e6:4327]) by DU0PR08MB8254.eurprd08.prod.outlook.com ([fe80::66a7:414d:72e6:4327%5]) with mapi id 15.21.0428.004; Tue, 15 Sep 2026 16:01:24 +0000 Date: Wed, 16 Sep 2026 00:01:16 +0800 From: Alexey Kuznetsov To: devel@openvz.org, khorenko@virtuozzo.com, kui.liu@virtuozzo.com, azaitsev@virtuozzo.com Message-ID: Content-Disposition: inline X-ClientProxiedBy: SI2PR06CA0003.apcprd06.prod.outlook.com (2603:1096:4:186::14) To DU0PR08MB8254.eurprd08.prod.outlook.com (2603:10a6:10:412::11) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU0PR08MB8254:EE_|MMZPR08MB266317:EE_ X-MS-Office365-Filtering-Correlation-Id: e0aece0b-15ce-469f-fb5f-08df13429776 X-LD-Processed: 0bc7f26d-0264-416e-a6fc-8352af79c58f,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|23010399003|1800799024|376014|366016|6133799003|3023799007|10067099003|56012099006|5023799004|18002099003; X-Microsoft-Antispam-Message-Info: eQkDZwCde5uNFEQUz6sEqzlzUP8IS5XaxtWVYApV29XE5PfOJLuVGEFr5eejrI8oq21HiO0xsSvr+6nBINkSUXW5QjPp3lyxiM3yqSOKdQBpvGNAYWadz6Mkbczbkm/Xp4jetcHrUinNIQOhMNZuOYeJwu7Gs+x574uOkWAOsp8TuZvC3WzudfNmk9E3tZMf4rzBc5lc8BnAOm76zEfleDaVa1Tm0olFE1C+4AEJhC3TZdgmiEWOVY0Qd8ZBj+QX08Tq6JY42c5ORlvzoW5Zzu7QsAzr1oIig/8lHDnykqu9pLFlXl5XDohPV+AWg+MmJxwbnL+pA57TtqnECmie1AQaQd7qkEpShXoYYyCK3vx56kB24MktDNCADMUUNTGiHr1Ns5/S5X5xZ2Ny+b9rNfHwHjmkqYThEFIRH9Q3O5CBfQa9X4p0iPhgvjdMHwSdcTdU9od5+6F4Vsb2mO+asaxiBvhKU7BoP1oWZ7zVYqRdheLR8dei2ywAXbwihg/OdEUjnSNVMHK4VZLVt0m5lYXHa6F7jH2IQgEgLO32icoeLg6XsPEFJOXfBz5N/2NGuTFgTdzOPSGDAoEM/6H9e0k4fXB+hoaGt3cibdXOAZCBqGdy8mtV615fI1RiH96Kf/KillT4e3rwJGP+I/sPrrMelwCOdWJAquEB5LA4FZg= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DU0PR08MB8254.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(23010399003)(1800799024)(376014)(366016)(6133799003)(3023799007)(10067099003)(56012099006)(5023799004)(18002099003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?FmL23VjD0L357gWmsPvZcvhTjOtZZA6fB0Fsn7xt+lGlsdgHwFEmoKldoBQr?= =?us-ascii?Q?oZx+UWRJjhcok0FonDjh1huk3pCSyNpTTXPMCxu20nLHZRyAFMflMnK5OUxY?= =?us-ascii?Q?axT4MhuB9S8bTPYyCdU9AzTWBXuqh+b1FRZJRLz1TGozYZbYzsIaKqs6m5W2?= =?us-ascii?Q?IPzCveLq+V1zmqedXtGe6zAOHs2ETwq6VAjyTmrI72kDPAFeptcFZd6eosGi?= =?us-ascii?Q?yUj5f1IyIzDywrMkQm4pejOCDUJRRcBS+U9/dsjo0jIVMD9pqhzpq6F6sltE?= =?us-ascii?Q?QgKmOSZWNu90Cthr3HcyOROxYy+H/63cNn6T6+ZBf7tflXlmx5DmCKgjplgQ?= =?us-ascii?Q?cCQZ5eRuFeMQsDqBCTZh4FbKSvRZZJITtE+SyFmQnpLwXTl19sJsIxkhTIll?= =?us-ascii?Q?8Mz0zIV5JPNpb687ubEc5xjloh9Q/j9ecw5FD2pmlAM0cOhHG7ylT9KIDdQB?= =?us-ascii?Q?HXdEIAbr5Z73+aRrmJav/xm9V4InBmy/YzKEh3QHw/R0xFuJXDvSP+/L+A4G?= =?us-ascii?Q?9IDbS+zS2uh02GqZARSCJSm+t9TFr/7jRoHxuxQM+Ldo/Q8GsbIH2nKBqcuz?= =?us-ascii?Q?b/5vw7tf11Tcq9i+xlB6B/RJabhohRu1rir2J6z38MFoKMPr2pWmAVbnBfzF?= =?us-ascii?Q?dgXLgM//c2VzBDHNAnlPtaVq3rFcfZbbMHU+/WQZ+DnzR48/MZglBYz0t8JQ?= =?us-ascii?Q?B9fgla+zzNei31DRQD2F3Fcg5UBFl2je9tBPtsuWvRGkF8xU+PJF36Th/65d?= =?us-ascii?Q?ZN905jPdIPG5RwEay/lFCgoUbPB623/WpcIvy9eVGKoSvWaaXrjiHDHl54Am?= =?us-ascii?Q?gnvs9YJ9ffInHYST5gwTbM9+HxbVPAccUKKwjRWvSiGfNNDcKU2kxqbaluJW?= =?us-ascii?Q?v4/oDEkHaLEsAM/fHen0Om0Wfx0quJzSda42n+WpAPi/SFalx/UrZak1zscq?= =?us-ascii?Q?glr4Ryh3/+oRwGyGSByAknQPmf2f3vS8mM0PJc0Va9QUqgGmkxdU8mpiRnaS?= =?us-ascii?Q?BMG2HZS8jhMplTS1oxJk6bVva8Gs1NeSo+tCBwwtdHsP3V6PUnksHnXono/E?= =?us-ascii?Q?0KiL2FrzpTaxYZk3chXZv7O1LXCDuO0zoUXxHMN2uvpUX+U5J+KhD5ZRobrL?= =?us-ascii?Q?EUN8AqtvD2Y4naDo814eHfYtdjoG6NJdGuJNeYVWcEewJbQzql/3lLCHBeH1?= =?us-ascii?Q?j4wAhfTNj/5FQE/fvZ8WzgO9MOep6RlXtS6hkWnEJ8I1h2ccO5ohZ7+0TYlt?= =?us-ascii?Q?I6Bqs4cD0koj6aJTootGGD3Wya0DsdkYwCVvyeVMMSfn3wgI3oT7xeOnbXrt?= =?us-ascii?Q?EWHgtZyhKxMf0r1lv4+LQuKpgZVjg9U17Pgmw5la2HLW7EqGeVY5xHpXNda3?= =?us-ascii?Q?zuKIs+IRDrZTK8tnPeAZ2SUn7DT93ilgTi9JPzf0yQ6v9M5HJL/qDbyhydpd?= =?us-ascii?Q?ZFLE2cT2nr4/LRHBiJX3gjiPNFRw6ULCvn2cNjvjZTxAG0w/EkrTQx22lWqn?= =?us-ascii?Q?mwvK91Z04xompojOwqcmgnnYi4UOsaKxRvNJuWnmW4cd+cAIvnM/6DFTRceq?= =?us-ascii?Q?e8O1IxF/uiqO/8vnV0dz6D6LNrfAOCRpTF68fztGjFw3RyyTY1duMo9UK0u5?= =?us-ascii?Q?wtmc4dOvo9Pq3Z3s66ou2Q2Sw+3TbQQwuaUOp7duT9HkKthE7ETmgEGQOOWk?= =?us-ascii?Q?PQyjCXZbRYgMwxmk6Nt48z3KkvSV7JE4NMs1X/MuMGiRvtKHfv5gIgqhvrom?= =?us-ascii?Q?L8piRvvmMw=3D=3D?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: e0aece0b-15ce-469f-fb5f-08df13429776 X-MS-Exchange-CrossTenant-AuthSource: DU0PR08MB8254.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Sep 2026 16:01:24.3504 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: z51jgETLr0jncB/aRl2/MDZ3oDm1ZIQJbEHYnm+4lrxVQGi1H+SqA3eCCuTCPT7N2Hn3cT48fkO42xJiv44vPA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MMZPR08MB266317 X-OZ-Fwd: true Subject: [Devel] [PATCH VZ10] fs/fuse pcs: logging improvement X-BeenThere: devel@openvz.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: OpenVZ development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: devel-bounces@openvz.org Errors-To: devel-bounces@openvz.org Engage the second log in kernel, some important not-abusive messages are duplicated in the secondary log which is rotated out much slower. Note, at the moment we are actually not sure exactly what messages are really not-abusive. Now we follow the same guidelines as we have recently done in user space. If some of them will be too frequent we will eliminate them later, hopefully, before release. F.e. one dubious place: errors like CSD_STALE_MAP and CSD_REPLICATING, they are interesting and can help to understand some anomalies, yet they are not actual errors and can be too frequent. Also, convert all %p to %px in internal traces. These traces are internal and their purpose is to link traced history to live state and/or crashdumps so that it does not make sense to mangle them Affects: #VSTOR-144510 Signed-off-by: Alexey Kuznetsov --- fs/fuse/kio/pcs/fuse_io.c | 16 +++--- fs/fuse/kio/pcs/fuse_ktrace.h | 17 +++++-- fs/fuse/kio/pcs/fuse_ktrace_prot.h | 1 + fs/fuse/kio/pcs/pcs_cluster.c | 2 +- fs/fuse/kio/pcs/pcs_cluster_core.c | 2 +- fs/fuse/kio/pcs/pcs_cs.c | 38 +++++++-------- fs/fuse/kio/pcs/pcs_cs_accel.c | 24 ++++----- fs/fuse/kio/pcs/pcs_fuse_kdirect.c | 31 ++++++------ fs/fuse/kio/pcs/pcs_map.c | 42 ++++++++-------- fs/fuse/kio/pcs/pcs_map.h | 12 ++--- fs/fuse/kio/pcs/pcs_rdma_conn.c | 12 ++--- fs/fuse/kio/pcs/pcs_rdma_io.c | 78 +++++++++++++++--------------- fs/fuse/kio/pcs/pcs_req.c | 2 +- fs/fuse/kio/pcs/pcs_rpc.c | 22 ++++----- fs/fuse/kio/pcs/pcs_sock_conn.c | 2 +- fs/fuse/kio/pcs/pcs_sock_io.c | 22 ++++----- 16 files changed, 165 insertions(+), 158 deletions(-) diff --git a/fs/fuse/kio/pcs/fuse_io.c b/fs/fuse/kio/pcs/fuse_io.c index 0562809e8bee..9d0467a902e1 100644 --- a/fs/fuse/kio/pcs/fuse_io.c +++ b/fs/fuse/kio/pcs/fuse_io.c @@ -71,7 +71,7 @@ static void on_read_done(struct pcs_fuse_req *r, size_t size) struct fuse_io_args *ia = container_of(r->req.args, typeof(*ia), ap.args); struct fuse_read_in * in = &ia->read.in; - DTRACE("do fuse_request_end req:%p op:%d err:%d\n", &r->req, r->req.in.h.opcode, r->req.out.h.error); + DTRACE("do fuse_request_end req:%px op:%d err:%d\n", &r->req, r->req.in.h.opcode, r->req.out.h.error); if (r->req.out.h.error && r->req.args->page_zeroing) { pcs_zero_fill_read_resp(&r->req, 0, in->size); @@ -90,7 +90,7 @@ static void on_sync_done(struct pcs_fuse_req *r) struct pcs_fuse_cluster *pfc = cl_from_req(r); struct fuse_inode *fi = get_fuse_inode(r->req.args->io_inode); - DTRACE("do fuse_request_end req:%p op:%d err:%d\n", &r->req, r->req.in.h.opcode, r->req.out.h.error); + DTRACE("do fuse_request_end req:%px op:%d err:%d\n", &r->req, r->req.in.h.opcode, r->req.out.h.error); fuse_stat_observe(pfc->fc, KFUSE_OP_FSYNC, ktime_sub(ktime_get(), r->exec.ireq.ts)); fuse_stat_account(pfc->fc, KFUSE_OP_FSYNC, 0); fuse_read_dio_end(fi); @@ -107,7 +107,7 @@ static void on_write_done(struct pcs_fuse_req *r, off_t pos, size_t size) out->size = size; - DTRACE("do fuse_request_end req:%p op:%d err:%d\n", &r->req, r->req.in.h.opcode, r->req.out.h.error); + DTRACE("do fuse_request_end req:%px op:%d err:%d\n", &r->req, r->req.in.h.opcode, r->req.out.h.error); fuse_stat_observe(pfc->fc, KFUSE_OP_WRITE, ktime_sub(ktime_get(), r->exec.ireq.ts)); fuse_stat_account(pfc->fc, KFUSE_OP_WRITE, size); fuse_write_dio_end(fi); @@ -119,7 +119,7 @@ static void on_fallocate_done(struct pcs_fuse_req *r, off_t pos, size_t size) struct pcs_fuse_cluster *pfc = cl_from_req(r); struct fuse_inode *fi = get_fuse_inode(r->req.args->io_inode); - DTRACE("do fuse_request_end req:%p op:%d err:%d\n", &r->req, r->req.in.h.opcode, r->req.out.h.error); + DTRACE("do fuse_request_end req:%px op:%d err:%d\n", &r->req, r->req.in.h.opcode, r->req.out.h.error); fuse_stat_observe(pfc->fc, KFUSE_OP_FALLOCATE, ktime_sub(ktime_get(), r->exec.ireq.ts)); fuse_stat_account(pfc->fc, KFUSE_OP_FALLOCATE, 0); fuse_write_dio_end(fi); @@ -131,7 +131,7 @@ static void on_fiemap_done(struct pcs_fuse_req *r) { struct fuse_inode *fi = get_fuse_inode(r->req.args->io_inode); - DTRACE("do fuse_request_end req:%p op:%d err:%d\n", &r->req, r->req.in.h.opcode, r->req.out.h.error); + DTRACE("do fuse_request_end req:%px op:%d err:%d\n", &r->req, r->req.in.h.opcode, r->req.out.h.error); fuse_write_dio_end(fi); fuse_request_end(&r->req); @@ -191,8 +191,8 @@ static void prepare_io_(struct pcs_fuse_req *r, unsigned short type, off_t offse /* Use inline request structure */ struct pcs_int_request *ireq = &r->exec.ireq; - TRACE("INIT r(%p) ireq:%p {%ld, %ld}\n", r, ireq, offset, size); - FUSE_KDTRACE(ireq->cc->fc, "req %d {%p} " DENTRY_FMT " %ld+%ld", type, ireq, DENTRY_ARGS(ireq->dentry), offset, size); + TRACE("INIT r(%px) ireq:%px {%ld, %ld}\n", r, ireq, offset, size); + FUSE_KDTRACE(ireq->cc->fc, "req %d {%px} " DENTRY_FMT " %ld+%ld", type, ireq, DENTRY_ARGS(ireq->dentry), offset, size); /* Initialize IO request */ switch (type) @@ -293,7 +293,7 @@ static void falloc_req_complete(struct pcs_int_request *ireq) list_del_init(&r->req.list); spin_unlock(&di->kq_lock); - DTRACE("do fuse_request_end req:%p op:%d err:%d\n", &r->req, r->req.in.h.opcode, r->req.out.h.error); + DTRACE("do fuse_request_end req:%px op:%d err:%d\n", &r->req, r->req.in.h.opcode, r->req.out.h.error); fuse_stat_observe(pfc->fc, KFUSE_OP_FALLOCATE, ktime_sub(ktime_get(), ireq->ts)); fuse_write_dio_end(fi); diff --git a/fs/fuse/kio/pcs/fuse_ktrace.h b/fs/fuse/kio/pcs/fuse_ktrace.h index 2f3622ac83a6..c12d49bee7c8 100644 --- a/fs/fuse/kio/pcs/fuse_ktrace.h +++ b/fs/fuse/kio/pcs/fuse_ktrace.h @@ -60,10 +60,19 @@ static inline void * fuse_trace_prepare(struct fuse_ktrace * tr, int type, int l #define FUSE_TRACE_PREPARE(tr, type, len) fuse_trace_prepare((tr), (type), (len)) #define FUSE_TRACE_COMMIT(tr) preempt_enable() -void __printf(3, 4) __kfuse_trace(struct fuse_conn * fc, unsigned long ip, const char * fmt, ...); +void __printf(4, 5) __kfuse_trace(struct fuse_conn *fc, int level, unsigned long ip, const char *fmt, ...); -#define FUSE_KTRACE(fc, fmt, args...) do { struct fuse_conn * __fc = (fc); if (__fc->ktrace_level >= LOG_TRACE) __kfuse_trace(__fc, _THIS_IP_, "%s: " fmt, __FUNCTION__, ## args); } while (0) -#define FUSE_KDTRACE(fc, fmt, args...) do { struct fuse_conn * __fc = (fc); if (__fc->ktrace_level >= LOG_DTRACE) __kfuse_trace(__fc, _THIS_IP_, "%s: " fmt, __FUNCTION__, ## args); } while (0) -#define FUSE_KLOG(fc, level, fmt, args...) do { struct fuse_conn * __fc = (fc); if (__fc->ktrace_level >= (level)) __kfuse_trace(__fc, 0, "%s: " fmt, __FUNCTION__, ## args); } while (0) +#define FUSE_KTRACE(fc, fmt, args...) do { struct fuse_conn *__fc = (fc); \ + if (__fc->ktrace_level >= LOG_TRACE) \ + __kfuse_trace(__fc, LOG_TRACE, _THIS_IP_, "%s: " fmt, __func__, ## args); } while (0) +#define FUSE_KDTRACE(fc, fmt, args...) do { struct fuse_conn *__fc = (fc); \ + if (__fc->ktrace_level >= LOG_DTRACE) \ + __kfuse_trace(__fc, LOG_DTRACE, _THIS_IP_, "%s: " fmt, __func__, ## args); } while (0) +#define FUSE_KDEBUG(fc, fmt, args...) do { struct fuse_conn *__fc = (fc); \ + if (__fc->ktrace_level >= LOG_DEBUG) \ + __kfuse_trace(__fc, LOG_DEBUG, _THIS_IP_, "%s: " fmt, __func__, ## args); } while (0) +#define FUSE_KLOG(fc, level, fmt, args...) do { struct fuse_conn *__fc = (fc); \ + if (__fc->ktrace_level >= (level)) \ + __kfuse_trace(__fc, (level), 0, "%s: " fmt, __func__, ## args); } while (0) #endif /* _FUSE_KTRACE_H_ */ diff --git a/fs/fuse/kio/pcs/fuse_ktrace_prot.h b/fs/fuse/kio/pcs/fuse_ktrace_prot.h index 53356c7cfddc..c3e6472435d2 100644 --- a/fs/fuse/kio/pcs/fuse_ktrace_prot.h +++ b/fs/fuse/kio/pcs/fuse_ktrace_prot.h @@ -23,6 +23,7 @@ struct fuse_trace_hdr #define FUSE_KTRACE_STRING 1 #define FUSE_KTRACE_IOTIMES 2 +#define FUSE_KTRACE_STRING_WARN 3 struct fuse_tr_iotimes_hdr { diff --git a/fs/fuse/kio/pcs/pcs_cluster.c b/fs/fuse/kio/pcs/pcs_cluster.c index 85fdeb932611..e5ecb93447bb 100644 --- a/fs/fuse/kio/pcs/pcs_cluster.c +++ b/fs/fuse/kio/pcs/pcs_cluster.c @@ -347,7 +347,7 @@ static noinline void __pcs_cc_process_ireq_rw(struct pcs_int_request *ireq) return; } - TRACE(DENTRY_FMT " %p op=%d at %llu [%llu]\n", DENTRY_ARGS(di), ireq, ireq->apireq.req->type, + TRACE(DENTRY_FMT " %px op=%d at %llu [%llu]\n", DENTRY_ARGS(di), ireq, ireq->apireq.req->type, (unsigned long long)ireq->apireq.req->pos, (unsigned long long)ireq->apireq.req->size); diff --git a/fs/fuse/kio/pcs/pcs_cluster_core.c b/fs/fuse/kio/pcs/pcs_cluster_core.c index 098d8e02757b..f79ce1ae09d0 100644 --- a/fs/fuse/kio/pcs/pcs_cluster_core.c +++ b/fs/fuse/kio/pcs/pcs_cluster_core.c @@ -109,7 +109,7 @@ static void cc_workqueue_handler(struct work_struct *w) struct pcs_int_request *ireq = list_first_entry(&queue, struct pcs_int_request, list); list_del_init(&ireq->list); - TRACE("process ireq:%p" DENTRY_FMT " type=%u\n", ireq, DENTRY_ARGS(ireq->dentry), ireq->type); + TRACE("process ireq:%px" DENTRY_FMT " type=%u\n", ireq, DENTRY_ARGS(ireq->dentry), ireq->type); cc->op.ireq_process(ireq); } } diff --git a/fs/fuse/kio/pcs/pcs_cs.c b/fs/fuse/kio/pcs/pcs_cs.c index f6f2d16b0e48..85e5af2d28c1 100644 --- a/fs/fuse/kio/pcs/pcs_cs.c +++ b/fs/fuse/kio/pcs/pcs_cs.c @@ -208,7 +208,7 @@ struct pcs_cs *pcs_cs_find_create(struct pcs_cs_set *csset, PCS_NODE_ID_T *id, P cs->addr_serno = atomic_inc_return(&csset->cs_addr_change_sn); - FUSE_KTRACE(cc_from_csset(csset)->fc, + FUSE_KDEBUG(cc_from_csset(csset)->fc, "Port change CS" NODE_FMT " seq=%d", NODE_ARGS(*id), cs->addr_serno); pcs_rpc_set_address(rpc, addr); @@ -380,7 +380,7 @@ static void cs_response_done(struct pcs_msg *msg) pcs_map_verify_sync_state(ireq->dentry, ireq, msg); } else { - FUSE_KTRACE(ireq->cc->fc, XID_FMT " IO error %d %lu, ireq:%p : %llu:%u+%u", + FUSE_KDEBUG(ireq->cc->fc, XID_FMT " IO error %d %lu, ireq:%px : %llu:%u+%u", XID_ARGS(ireq->iochunk.ir.hbuf.hdr.xid), msg->error.value, msg->error.remote ? (unsigned long)msg->error.offender.val : 0UL, ireq, (unsigned long long)ireq->iochunk.chunk, @@ -408,7 +408,7 @@ static void cs_get_read_response_iter(struct pcs_msg *msg, int offset, struct io msg->_inline_kv.iov_len = sizeof(struct pcs_cs_iohdr); iov_iter_kvec(it, direction, &msg->_inline_kv, 1, sizeof(struct pcs_cs_iohdr)); iov_iter_advance(it, offset); - TRACE("return msg:%p->size:%d off:%d it_len:%ld\n", msg, msg->size, offset, iov_iter_count(it)); + TRACE("return msg:%px->size:%d off:%d it_len:%ld\n", msg, msg->size, offset, iov_iter_count(it)); return; } else { struct pcs_msg *req = msg->private; @@ -426,7 +426,7 @@ static void cs_get_read_response_iter(struct pcs_msg *msg, int offset, struct io iov_iter_truncate(it, msg->size - sizeof(struct pcs_cs_iohdr)); iov_iter_advance(it, offset); - TRACE("return msg:%p->size:%d off:%d it_len:%ld\n", msg, msg->size, offset, iov_iter_count(it)); + TRACE("return msg:%px->size:%d off:%d it_len:%ld\n", msg, msg->size, offset, iov_iter_count(it)); return; } else BUG(); @@ -493,7 +493,7 @@ static void cs_get_data(struct pcs_msg *msg, int offset, struct iov_iter *it, un iov_iter_kvec(it, direction, &ireq->iochunk.ir.hbuf_kv, 1, sizeof(struct pcs_cs_iohdr)); iov_iter_advance(it, offset); - TRACE("return msg:%p->size:%d off:%d it_len:%ld\n", msg, msg->size, offset, iov_iter_count(it)); + TRACE("return msg:%px->size:%d off:%d it_len:%ld\n", msg, msg->size, offset, iov_iter_count(it)); return; } else { @@ -508,7 +508,7 @@ static void cs_get_data(struct pcs_msg *msg, int offset, struct iov_iter *it, un iov_iter_truncate(it, ireq->iochunk.size); iov_iter_advance(it, offset); - TRACE("return msg:%p->size:%d off:%d it_len:%ld\n", msg, msg->size, offset, iov_iter_count(it)); + TRACE("return msg:%px->size:%d off:%d it_len:%ld\n", msg, msg->size, offset, iov_iter_count(it)); return; } else BUG(); @@ -570,7 +570,7 @@ static void ireq_complete_fo(struct pcs_int_request * ireq) return; if (pcs_if_error(&ireq->error)) { - FUSE_KTRACE(ireq->cc->fc, "IO error %d %lu, ireq:%p : %llu:%u+%u", + FUSE_KDEBUG(ireq->cc->fc, "IO error %d %lu, ireq:%px : %llu:%u+%u", ireq->error.value, ireq->error.remote ? (unsigned long)ireq->error.offender.val : 0UL, ireq, (unsigned long long)ireq->iochunk.chunk, @@ -736,7 +736,7 @@ static void do_cs_submit(struct pcs_cs *cs, struct pcs_int_request *ireq) ireq->wait_origin.val = 0; - DTRACE(XID_FMT " About to send msg:%p, ireq:%p, cmd:%u," + DTRACE(XID_FMT " About to send msg:%px, ireq:%px, cmd:%u," " id:"CUID_FMT" v:"VER_FMT" - %llu:%u+%u\n", XID_ARGS(ireq->iochunk.ir.hbuf.hdr.xid), msg, ireq, ireq->iochunk.cmd, CUID_ARGS(ioh->uid), @@ -835,7 +835,7 @@ void cs_handle_congestion(struct pcs_rpc *ep, struct pcs_rpc_hdr *h) struct pcs_cluster_core *cc = cc_from_rpc(ep->eng); struct pcs_cs *who; - FUSE_KTRACE(cc->fc, "Received congestion notification from CS" NODE_FMT, NODE_ARGS(h->xid.origin)); + FUSE_KDEBUG(cc->fc, "Received congestion notification from CS" NODE_FMT, NODE_ARGS(h->xid.origin)); who = lookup_and_lock_cs(&cc->css, h->xid.origin.val); if (unlikely(!who)) @@ -934,7 +934,7 @@ void cs_keep_waiting(struct pcs_rpc *ep, struct pcs_msg *req, struct pcs_msg *ms && may_reroute(ireq->iochunk.csl, h->xid.origin)) { ireq->iochunk.banned_cs = h->xid.origin; spin_unlock(&who->lock); - FUSE_KTRACE(cc->fc, "Canceling read on CS" NODE_FMT, NODE_ARGS(h->xid.origin)); + FUSE_KDEBUG(cc->fc, "Canceling read on CS" NODE_FMT, NODE_ARGS(h->xid.origin)); pcs_rpc_cancel_request(req); return; } @@ -1228,7 +1228,7 @@ static void cs_probe_done(struct pcs_msg *msg) if (!pcs_if_error(&msg->error)) { cs_whitelist(cs, "probe"); } else { - FUSE_KTRACE(cc_from_csset(css)->fc, "probe error %d", msg->error.value); + FUSE_KDEBUG(cc_from_csset(css)->fc, "probe error %d", msg->error.value); cs_blacklist(cs, msg->error.value, "probe"); } cs->use_count--; @@ -1430,7 +1430,7 @@ void pcs_dislog_host_add(struct pcs_cs_set *css, u64 host_id) if (h && nh) kfree(nh); if (!h) - FUSE_KTRACE(cc_from_csset(css)->fc, + FUSE_KDEBUG(cc_from_csset(css)->fc, "Host#%lu is down%s", (unsigned long)val, complain ? ", failed to remember" : ""); } @@ -1450,7 +1450,7 @@ void pcs_dislog_host_del(struct pcs_cs_set *css, u64 host_id) hlist_del_rcu(&h->link); spin_unlock(&css->lock); if (h) { - FUSE_KTRACE(cc_from_csset(css)->fc, "Host#%lu is up", (unsigned long)val); + FUSE_KDEBUG(cc_from_csset(css)->fc, "Host#%lu is up", (unsigned long)val); call_rcu(&h->rcu, host_destroy_rcu); } } @@ -1561,7 +1561,7 @@ int __pcs_cs_cong_enqueue_cond(struct pcs_int_request *ireq, struct pcs_cs *cs) ireq->qdepth = cs->cong_queue_len; } if (queued && ireq->type == PCS_IREQ_IOCHUNK) - FUSE_KDTRACE(ireq->cc->fc, "queued%d {%p} cpu%u %d %u/%u " DENTRY_FMT " %llu+%llu", + FUSE_KDTRACE(ireq->cc->fc, "queued%d {%px} cpu%u %d %u/%u " DENTRY_FMT " %llu+%llu", queued, ireq, smp_processor_id(), cs->cong_queue_len, cs->in_flight, cs->eff_cwnd, DENTRY_ARGS(ireq->dentry), ireq->iochunk.chunk + ireq->iochunk.offset, ireq->iochunk.size); @@ -1611,12 +1611,12 @@ int pcs_cs_dislog_event(struct pcs_cluster_core *cc, struct pcs_mds_cached_event switch (evt->flags & PCS_MDS_EVT_F_TYPE_MASK) { case PCS_MDS_EVT_F_ADDR_CHANGED: cs->addr_serno = atomic_inc_return(&cc->css.cs_addr_change_sn); - FUSE_KTRACE(cc_from_csset(cs->css)->fc, + FUSE_KDEBUG(cc_from_csset(cs->css)->fc, "Dislog addr change CS" NODE_FMT " seq=%d", NODE_ARGS(cs->id), cs->addr_serno); break; case PCS_MDS_EVT_F_MAINTENANCE_IN: - FUSE_KTRACE(cc_from_csset(cs->css)->fc, + FUSE_KDEBUG(cc_from_csset(cs->css)->fc, "Dislog enter maintanance CS" NODE_FMT, NODE_ARGS(cs->id)); cs->mds_flags |= CS_FL_MAINTENANCE; @@ -1625,7 +1625,7 @@ int pcs_cs_dislog_event(struct pcs_cluster_core *cc, struct pcs_mds_cached_event case PCS_MDS_EVT_F_MAINTENANCE_OUT: cs->mds_flags &= ~CS_FL_MAINTENANCE; clear_bit(CS_SF_MAINTENANCE, &cs->state); - FUSE_KTRACE(cc_from_csset(cs->css)->fc, + FUSE_KDEBUG(cc_from_csset(cs->css)->fc, "Dislog leave maintanance CS" NODE_FMT, NODE_ARGS(cs->id)); break; @@ -1633,14 +1633,14 @@ int pcs_cs_dislog_event(struct pcs_cluster_core *cc, struct pcs_mds_cached_event cs->mds_flags |= CS_FL_ILL; set_bit(CS_SF_ILL, &cs->state); atomic_inc(&cc->css.ill_cs_sn); - FUSE_KTRACE(cc_from_csset(cs->css)->fc, + FUSE_KDEBUG(cc_from_csset(cs->css)->fc, "Dislog enter ILL CS" NODE_FMT, NODE_ARGS(cs->id)); break; case PCS_MDS_EVT_F_ILL_OUT: cs->mds_flags &= ~CS_FL_ILL; clear_bit(CS_SF_ILL, &cs->state); - FUSE_KTRACE(cc_from_csset(cs->css)->fc, + FUSE_KDEBUG(cc_from_csset(cs->css)->fc, "Dislog leave ILL CS" NODE_FMT, NODE_ARGS(cs->id)); break; diff --git a/fs/fuse/kio/pcs/pcs_cs_accel.c b/fs/fuse/kio/pcs/pcs_cs_accel.c index f57e93b98731..bc11f47352db 100644 --- a/fs/fuse/kio/pcs/pcs_cs_accel.c +++ b/fs/fuse/kio/pcs/pcs_cs_accel.c @@ -279,7 +279,7 @@ static int verify_crc(struct pcs_int_request *ireq, unsigned int size, u32 *crc) ccrc = ~ccrc; if (ccrc != crc[i]) { - FUSE_KTRACE(ireq->cc->fc, "CRC error pg=%d@%u %08x %08x\n", i, + FUSE_KDEBUG(ireq->cc->fc, "CRC error pg=%d@%u %08x %08x", i, (unsigned)ireq->iochunk.offset, ccrc, crc[i]); return 1; } @@ -501,7 +501,7 @@ static void __pcs_csa_final_completion(struct pcs_aio_req *areq) FUSE_TRACE_COMMIT(fc->ktrace); } } else { - FUSE_KTRACE(ireq->cc->fc, "AIO error %d %lu, ireq:%p : %llu:%u+%u", + FUSE_KDEBUG(ireq->cc->fc, "AIO error %d %lu, ireq:%px : %llu:%u+%u", ireq->error.value, ireq->error.remote ? (unsigned long)ireq->error.offender.val : 0UL, ireq, (unsigned long long)ireq->iochunk.chunk, @@ -603,7 +603,7 @@ static void csa_crc_work(struct work_struct *w) */ sz = kernel_read(areq->cfile, areq->crc, ncrc, &pos); if (sz != ncrc) { - FUSE_KTRACE(ireq->cc->fc, "Did not read crc res=%u expected=%u", (unsigned)sz, (unsigned)ncrc); + FUSE_KDEBUG(ireq->cc->fc, "Did not read crc res=%u expected=%u", (unsigned int)sz, (unsigned int)ncrc); goto out; } FUSE_KDTRACE(ireq->cc->fc, "Read crc page %08lx at %llu", (unsigned long)areq->cfile, pos); @@ -694,7 +694,7 @@ static inline int csa_submit(struct file * file, struct file *cfile, int do_csum if (ret != size) { /* Do not drop refs, we do not want to complete ireq. */ fput(areq->iocb.ki_filp); - FUSE_KTRACE(ireq->cc->fc, "AIO submit rejected ret=%d %lu, ireq:%p : %llu:%u+%u", + FUSE_KDEBUG(ireq->cc->fc, "AIO submit rejected ret=%d %lu, ireq:%px : %llu:%u+%u", ret, ireq->error.remote ? (unsigned long)ireq->error.offender.val : 0UL, ireq, (unsigned long long)ireq->iochunk.chunk, (unsigned)ireq->iochunk.offset, @@ -703,7 +703,7 @@ static inline int csa_submit(struct file * file, struct file *cfile, int do_csum } /* IO already finished. Drop AIO refcnt and proceed to crc */ - FUSE_KTRACE(ireq->cc->fc, "No good, AIO executed synchronously, ireq:%p : %llu:%u+%u", + FUSE_KTRACE(ireq->cc->fc, "No good, AIO executed synchronously, ireq:%px : %llu:%u+%u", ireq, (unsigned long long)ireq->iochunk.chunk, (unsigned)ireq->iochunk.offset, (unsigned)size); @@ -793,8 +793,8 @@ static void csa_rpc_aio_work(struct work_struct *w) if (unlikely(ret != -EIOCBQUEUED)) { if (ret != ireq->iochunk.size) { - FUSE_KTRACE(ireq->cc->fc, - "AIO submit rejected ret=%d %lu, ireq:%p : %llu:%u+%u", + FUSE_KDEBUG(ireq->cc->fc, + "AIO submit rejected ret=%d %lu, ireq:%px : %llu:%u+%u", ret, ireq->error.remote ? (unsigned long)ireq->error.offender.val : 0UL, @@ -802,7 +802,7 @@ static void csa_rpc_aio_work(struct work_struct *w) (unsigned int)ireq->iochunk.offset, (unsigned int)ireq->iochunk.size); if (ret < 0) { - FUSE_KTRACE(ireq->cc->fc, "segs=%d %d %u %u+%u", (int)it->nr_segs, + FUSE_KDEBUG(ireq->cc->fc, "segs=%d %d %u %u+%u", (int)it->nr_segs, (int)it->count, (unsigned int)it->iov_offset, it->bvec[0].bv_offset, it->bvec[0].bv_len @@ -812,7 +812,7 @@ static void csa_rpc_aio_work(struct work_struct *w) } else { /* IO already finished. Drop AIO refcnt and proceed to crc */ FUSE_KTRACE(ireq->cc->fc, - "No good, AIO executed synchronously, ireq:%p : %llu:%u+%u", + "No good, AIO executed synchronously, ireq:%px : %llu:%u+%u", ireq, (unsigned long long)ireq->iochunk.chunk, (unsigned int)ireq->iochunk.offset, (unsigned int)ireq->iochunk.size); @@ -1084,7 +1084,7 @@ static void __complete_acr_work(struct work_struct * w) } if (pcs_if_error(&ireq->error)) { - FUSE_KTRACE(ireq->cc->fc, "IO error %d %lu, ireq:%p : %llu:%u+%u", + FUSE_KDEBUG(ireq->cc->fc, "IO error %d %lu, ireq:%px : %llu:%u+%u", ireq->error.value, ireq->error.remote ? (unsigned long)ireq->error.offender.val : 0UL, ireq, (unsigned long long)ireq->iochunk.chunk, @@ -1403,7 +1403,7 @@ static inline int csa_submit_write(struct file * file, struct pcs_int_request * if (ret != size) { /* Do not drop refs, we do not want to complete ireq. */ fput(areq->iocb.ki_filp); - FUSE_KTRACE(ireq->cc->fc, "AIO submit rejected ret=%d %lu, ireq:%p : %llu:%u+%u", + FUSE_KDEBUG(ireq->cc->fc, "AIO submit rejected ret=%d %lu, ireq:%px : %llu:%u+%u", ret, ireq->error.remote ? (unsigned long)ireq->error.offender.val : 0UL, ireq, (unsigned long long)ireq->iochunk.chunk, (unsigned)ireq->iochunk.offset, @@ -1414,7 +1414,7 @@ static inline int csa_submit_write(struct file * file, struct pcs_int_request * } /* IO already finished. Drop AIO refcnt yet. */ - FUSE_KTRACE(ireq->cc->fc, "No good, AIO executed synchronously, ireq:%p : %llu:%u+%u", + FUSE_KTRACE(ireq->cc->fc, "No good, AIO executed synchronously, ireq:%px : %llu:%u+%u", ireq, (unsigned long long)ireq->iochunk.chunk, (unsigned)ireq->iochunk.offset, (unsigned)size); diff --git a/fs/fuse/kio/pcs/pcs_fuse_kdirect.c b/fs/fuse/kio/pcs/pcs_fuse_kdirect.c index 9f345daec2a2..efbab75654c8 100644 --- a/fs/fuse/kio/pcs/pcs_fuse_kdirect.c +++ b/fs/fuse/kio/pcs/pcs_fuse_kdirect.c @@ -301,7 +301,7 @@ static void kpcs_conn_fini(struct fuse_mount *fm) if (!pfc) return; - TRACE("%s fc:%p\n", __FUNCTION__, fc); + TRACE("%s fc:%px\n", __func__, fc); WRITE_ONCE(fc->kio.ctx, NULL); unregister_client(pfc); @@ -527,7 +527,7 @@ static void kpcs_file_close(struct file *file, struct inode *inode) lockdep_assert_held(&inode->i_rwsem); - TRACE("file close - fi: %p, di: %p", fi, di); + TRACE("file close - fi: %px, di: %px", fi, di); if (!di) return; @@ -781,7 +781,7 @@ static void fuse_size_grow_work(struct work_struct *w) BUG_ON(!r->exec.size_required); if (size >= r->exec.size_required) { - TRACE("resubmit ino:%ld r(%p)->size:%lld required:%lld\n", + TRACE("resubmit ino:%ld r(%px)->size:%lld required:%lld\n", inode->i_ino, r, r->exec.size_required, size); list_move(&ireq->list, &pending_reqs); } @@ -801,7 +801,7 @@ static void wait_grow(struct pcs_fuse_req *r, struct pcs_dentry_info *di, unsign BUG_ON(r->req.in.h.opcode != FUSE_WRITE && r->req.in.h.opcode != FUSE_FALLOCATE); BUG_ON(di->size.op != PCS_SIZE_INACTION && di->size.op != PCS_SIZE_GROW); - TRACE("insert ino:%ld->required:%lld r(%p)->required:%lld\n", + TRACE("insert ino:%ld->required:%lld r(%px)->required:%lld\n", r->req.args->io_inode->i_ino, di->size.required, r, required); r->exec.size_required = required; @@ -821,7 +821,7 @@ static void wait_shrink(struct pcs_fuse_req *r, struct pcs_dentry_info *di) /* Writes already blocked via fuse_set_nowrite */ BUG_ON(r->req.in.h.opcode != FUSE_READ && r->req.in.h.opcode != FUSE_FSYNC && r->req.in.h.opcode != FUSE_FLUSH); - TRACE("insert ino:%ld r:%p\n", r->req.args->io_inode->i_ino, r); + TRACE("insert ino:%ld r:%px\n", r->req.args->io_inode->i_ino, r); list_add_tail(&r->exec.ireq.list, &di->size.queue); } @@ -1078,7 +1078,7 @@ static void pcs_fuse_submit(struct pcs_fuse_cluster *pfc, struct fuse_req *req) } req->out.h.error = 0; error: - DTRACE("do fuse_request_end req:%p op:%d err:%d\n", req, req->in.h.opcode, req->out.h.error); + DTRACE("do fuse_request_end req:%px op:%d err:%d\n", req, req->in.h.opcode, req->out.h.error); __fuse_request_end(req, false); return; @@ -1146,7 +1146,7 @@ static void _pcs_shrink_end(struct fuse_mount *fm, struct fuse_args *args, int e BUG_ON(r->exec.size_required); BUG_ON(r->req.in.h.opcode != FUSE_READ && r->req.in.h.opcode != FUSE_FSYNC && r->req.in.h.opcode != FUSE_FLUSH); - TRACE("resubmit %p\n", &r->req); + TRACE("resubmit %px\n", &r->req); list_del_init(&ireq->list); pcs_fuse_submit(pfc, &r->req); } @@ -1264,7 +1264,7 @@ static int kpcs_req_classify(struct fuse_req *req, bool bg, bool lk) return 1; BUG_ON(!pfc); - DTRACE("Classify req:%p op:%d end:%p bg:%d lk:%d\n", req, req->in.h.opcode, + DTRACE("Classify req:%px op:%d end:%px bg:%d lk:%d\n", req, req->in.h.opcode, req->args->end, bg, lk); ret = pcs_kio_classify_req(req, lk); if (likely(!ret)) @@ -1295,7 +1295,7 @@ static void kpcs_req_send(struct fuse_req *req, bool bg) */ BUG_ON(!list_empty(&req->list)); - TRACE("Send req:%p op:%d end:%p bg:%d\n", + TRACE("Send req:%px op:%d end:%px bg:%d\n", req, req->in.h.opcode, req->args->end, bg); /* __request_end below will do fuse_put_request() */ @@ -1683,7 +1683,7 @@ static int fuse_ktrace_setup(struct fuse_conn * fc) return ret; } -static void kfuse_tracer(struct fuse_conn *fc, unsigned long ip, const char *fmt, va_list va) +static void kfuse_tracer(struct fuse_conn *fc, int level, unsigned long ip, const char *fmt, va_list va) { struct fuse_ktrace *tr; int cpu; @@ -1696,7 +1696,7 @@ static void kfuse_tracer(struct fuse_conn *fc, unsigned long ip, const char *fmt int len; len = vsnprintf(buf, KTRACE_LOG_BUF_SIZE, fmt, va); - t = fuse_trace_prepare(tr, FUSE_KTRACE_STRING, len + 1); + t = fuse_trace_prepare(tr, level >= LOG_TRACE ? FUSE_KTRACE_STRING : FUSE_KTRACE_STRING_WARN, len + 1); if (t) memcpy(t + 1, buf, len + 1); FUSE_TRACE_COMMIT(tr); @@ -1710,12 +1710,12 @@ static void kfuse_tracer(struct fuse_conn *fc, unsigned long ip, const char *fmt put_cpu(); } -void __kfuse_trace(struct fuse_conn *fc, unsigned long ip, const char *fmt, ...) +void __kfuse_trace(struct fuse_conn *fc, int level, unsigned long ip, const char *fmt, ...) { va_list va; va_start(va, fmt); - kfuse_tracer(fc, ip, fmt, va); + kfuse_tracer(fc, level, ip, fmt, va); va_end(va); } @@ -1725,7 +1725,7 @@ static void kfuse_trace(struct fuse_conn *fc, const char *fmt, ...) if (fc->ktrace_level >= LOG_TRACE) { va_start(va, fmt); - kfuse_tracer(fc, 0, fmt, va); + kfuse_tracer(fc, LOG_TRACE, 0, fmt, va); va_end(va); } } @@ -2095,9 +2095,6 @@ static int __init kpcs_mod_init(void) if (IS_ERR(crc_tfm)) crc_tfm = NULL; - printk("%s fuse_c:%p ireq_c:%p pcs_wq:%p\n", __FUNCTION__, - pcs_fuse_req_cachep, pcs_ireq_cachep, pcs_wq); - return 0; free_krpc: pcs_krpc_fini(); diff --git a/fs/fuse/kio/pcs/pcs_map.c b/fs/fuse/kio/pcs/pcs_map.c index 94ae8c41251a..8bccb1800988 100644 --- a/fs/fuse/kio/pcs/pcs_map.c +++ b/fs/fuse/kio/pcs/pcs_map.c @@ -82,7 +82,7 @@ void cslist_destroy(struct pcs_cs_list * csl) { int i; - TRACE("csl:%p csl->map:%p refcnt:%d\n", csl, csl->map, atomic_read(&csl->refcnt)); + TRACE("csl:%px csl->map:%px refcnt:%d\n", csl, csl->map, atomic_read(&csl->refcnt)); BUG_ON(csl->map); rcu_read_lock(); @@ -139,7 +139,7 @@ static void __pcs_map_free(struct pcs_map_entry *m) void __pcs_map_put(struct pcs_map_entry *m) __releases(m->lock) { - TRACE(" %p id:%lld state:%x ref:%d\n",m, m->id, m->state, atomic_read(&m->__refcnt)); + TRACE(" %px id:%lld state:%x ref:%d\n", m, m->id, m->state, atomic_read(&m->__refcnt)); assert_spin_locked(&m->lock); if (m->state & PCS_MAP_DEAD) { @@ -694,7 +694,7 @@ void cs_blacklist(struct pcs_cs * cs, int error, char * reason) spin_lock(&cs->css->lock); set_bit(CS_SF_BLACKLISTED, &cs->state); cs->blacklist_reason = error; - FUSE_KTRACE(cc_from_csset(cs->css)->fc, "Blacklisting CS" NODE_FMT " by %s, err=%d", NODE_ARGS(cs->id), reason, error); + FUSE_KDEBUG(cc_from_csset(cs->css)->fc, "Blacklisting CS" NODE_FMT " by %s, err=%d", NODE_ARGS(cs->id), reason, error); if (list_empty(&cs->css->bl_list)) { struct pcs_cluster_core *cc = cc_from_csset(cs->css); @@ -719,7 +719,7 @@ void cs_whitelist(struct pcs_cs * cs, char * reason) if (cs_is_blacklisted(cs)) { clear_bit(CS_SF_BLACKLISTED, &cs->state); - FUSE_KTRACE(cc_from_csset(cs->css)->fc, "Whitelisting CS" NODE_FMT " by %s", NODE_ARGS(cs->id), reason); + FUSE_KDEBUG(cc_from_csset(cs->css)->fc, "Whitelisting CS" NODE_FMT " by %s", NODE_ARGS(cs->id), reason); map_recalc_maps(cs); @@ -748,7 +748,7 @@ static inline void map_remote_error_nolock(struct pcs_map_entry *m , int error, static void pcs_map_mark_stale(struct pcs_map_entry *m, struct pcs_cs *cs) { if (!(m->state & (PCS_MAP_ERROR|PCS_MAP_DEAD|PCS_MAP_RESOLVING|PCS_MAP_NEW))) { - FUSE_KTRACE(cc_from_csset(cs->css)->fc, + FUSE_KDEBUG(cc_from_csset(cs->css)->fc, MAP_FMT " invalidating due to state of CS#"NODE_FMT, MAP_ARGS(m), NODE_ARGS(cs->id)); map_remote_error_nolock(m, PCS_ERR_CSD_STALE_MAP, cs->id.val); @@ -849,7 +849,7 @@ static void force_dirty(struct pcs_cs_record * rec, struct pcs_map_entry * m) if (!rec->sync.dirty_integrity) rec->sync.dirty_integrity = rec->info.integrity_seq; if (!rec->sync.dirty_integrity || !rec->sync.dirty_epoch || !rec->sync.dirty_seq) { - FUSE_KTRACE(cc_from_maps(m->maps)->fc, "cannot dirty "NODE_FMT" [%u/%u,%u/%u,%u/%u]", NODE_ARGS(rec->info.id), + FUSE_KDEBUG(cc_from_maps(m->maps)->fc, "cannot dirty "NODE_FMT" [%u/%u,%u/%u,%u/%u]", NODE_ARGS(rec->info.id), rec->sync.dirty_integrity, rec->info.integrity_seq, rec->sync.dirty_epoch, rec->sync.sync_epoch, rec->sync.dirty_seq, rec->sync.sync_seq); @@ -886,7 +886,7 @@ static void evaluate_dirty_status(struct pcs_map_entry * m) atomic_inc(&m->maps->dirty_count); } } else { - FUSE_KTRACE(cc_from_maps(m->maps)->fc, MAP_FMT " integrity seq advanced on CS#"NODE_FMT, + FUSE_KDEBUG(cc_from_maps(m->maps)->fc, MAP_FMT " integrity seq advanced on CS#"NODE_FMT, MAP_ARGS(m), NODE_ARGS(rec->info.id)); rec->sync.dirty_integrity = 0; @@ -900,9 +900,9 @@ static void evaluate_dirty_status(struct pcs_map_entry * m) if (!(m->flags & PCS_MAP_DIRTY)) { map_sync_work_del(m); - FUSE_KLOG(cc_from_maps(m->maps)->fc, LOG_DEBUG5, "map %p is clean", m); + FUSE_KLOG(cc_from_maps(m->maps)->fc, LOG_DEBUG5, "map %px is clean", m); } else { - FUSE_KLOG(cc_from_maps(m->maps)->fc, LOG_DEBUG5, "map %p is dirty", m); + FUSE_KLOG(cc_from_maps(m->maps)->fc, LOG_DEBUG5, "map %px is dirty", m); if (!timer_pending(&m->sync_work.timer) && !(m->flags & PCS_MAP_FLUSHING)) map_sync_work_add(m, pcs_sync_timeout(cc_from_map(m))); } @@ -964,7 +964,7 @@ int pcs_map_encode_req(struct pcs_map_entry*m, struct pcs_ioc_getmap *map, int d } #ifdef __PCS_DEBUG - printk("%s submit m(%p)->uid:%lld\n", __FUNCTION__, m, m->id); + printk("%s submit m(%px)->uid:%lld\n", __func__, m, m->id); printk("map {id:%lld [%lld, %lld] v:{" VER_FMT "} st:%x, cnt:%d max:%d SZ:%ld}\n", m->id, map->chunk_start, map->chunk_end, VER_ARGS(m->version), map->state, map->cs_cnt, map->cs_max, map_sz); @@ -1119,7 +1119,7 @@ void pcs_map_complete(struct pcs_map_entry *m, struct pcs_ioc_getmap *omap) spin_lock(&m->lock); - TRACE(" recv m:%p, state:%x resp{ st:%d, err:%d, v:" VER_FMT "}\n", + TRACE(" recv m:%px, state:%x resp{ st:%d, err:%d, v:" VER_FMT "}\n", m, m->state, omap->state, omap->error.value, VER_ARGS(omap->version)); if (pcs_if_error(&omap->error)) @@ -1157,7 +1157,7 @@ void pcs_map_complete(struct pcs_map_entry *m, struct pcs_ioc_getmap *omap) m->state = PCS_MAP_ERROR; If m->state becomes atomic bit fields this will be impossible. */ - TRACE("skip getmap resp: m:%p, state:%x resp{ st:%d, err:%d, v:" VER_FMT "}\n", + TRACE("skip getmap resp: m:%px, state:%x resp{ st:%d, err:%d, v:" VER_FMT "}\n", m, m->state, omap->state, omap->error.value, VER_ARGS(omap->version)); spin_unlock(&m->lock); goto out_ignore; @@ -1242,7 +1242,7 @@ void pcs_map_complete(struct pcs_map_entry *m, struct pcs_ioc_getmap *omap) return; error: - TRACE("map error: %d, m:%p, index:%lu, state:%x\n", error.value, m, + TRACE("map error: %d, m:%px, index:%lu, state:%x\n", error.value, m, m->index, m->state); BUG_ON(!pcs_if_error(&error)); @@ -1269,9 +1269,9 @@ __releases(m->lock) assert_spin_locked(&m->lock); - DTRACE("enter m:%p, state:%x, ireq:%p dir:%d \n", m, m->state, ireq, direction); + DTRACE("enter m:%px, state:%x, ireq:%px dir:%d\n", m, m->state, ireq, direction); DTRACE("dentry: "DENTRY_FMT, DENTRY_ARGS(pcs_dentry_from_map(m))); - DTRACE("%p {%p %p}\n",ireq, ireq->list.next, ireq->list.prev); + DTRACE("%px {%px %px}\n", ireq, ireq->list.next, ireq->list.prev); BUG_ON(!list_empty(&ireq->list)); list_add_tail(&ireq->list, &m->queue); @@ -1577,7 +1577,7 @@ static void pcs_cs_wakeup(struct pcs_cs * cs) } FUSE_KDTRACE(sreq->cc->fc, - "wakeup {%p} cpu%u %d %u/%u " DENTRY_FMT " %llu+%llu", + "wakeup {%px} cpu%u %d %u/%u " DENTRY_FMT " %llu+%llu", sreq, smp_processor_id(), cs->cong_queue_len, cs->in_flight, cs->eff_cwnd, DENTRY_ARGS(sreq->dentry), sreq->iochunk.chunk + sreq->iochunk.offset, @@ -2418,7 +2418,7 @@ void map_submit(struct pcs_map_entry * m, struct pcs_int_request *ireq) return; } - DTRACE("enter m: " MAP_FMT ", ireq:%p \n", MAP_ARGS(m), ireq); + DTRACE("enter m: " MAP_FMT ", ireq:%px\n", MAP_ARGS(m), ireq); csl = m->cs_list; if (csl) @@ -2548,7 +2548,7 @@ static void warp_sync_seq(struct pcs_map_entry * m, struct pcs_cs_record * rec, pcs_sync_seq_compare(sync->sync_epoch, srec->sync_epoch) < 0 || (sync->sync_epoch == srec->sync_epoch && pcs_sync_seq_compare(sync->sync_current, srec->sync_seq) < 0)) - FUSE_KTRACE(cc_from_maps(m->maps)->fc, "Warp [" NODE_FMT ",%u/%u,%u/%u,%u/%u] -> [%u/%u,%u/%u]", + FUSE_KDEBUG(cc_from_maps(m->maps)->fc, "Warp [" NODE_FMT ",%u/%u,%u/%u,%u/%u] -> [%u/%u,%u/%u]", NODE_ARGS(rec->info.id), rec->info.integrity_seq, srec->dirty_integrity, srec->dirty_epoch, srec->dirty_seq, srec->sync_epoch, srec->sync_seq, sync->sync_epoch, sync->sync_dirty, sync->sync_epoch, sync->sync_current); @@ -2581,7 +2581,7 @@ static int commit_cs_record(struct pcs_map_entry * m, struct pcs_cs_record * rec * * The request is restarted with new map. */ - FUSE_KTRACE(cc_from_maps(m->maps)->fc, MAP_FMT " integrity seq mismatch CS" NODE_FMT " %d != %d, %d", + FUSE_KDEBUG(cc_from_maps(m->maps)->fc, MAP_FMT " integrity seq mismatch CS" NODE_FMT " %d != %d, %d", MAP_ARGS(m), NODE_ARGS(rec->info.id), rec->info.integrity_seq, sync->integrity_seq, srec->dirty_integrity); @@ -2639,7 +2639,7 @@ static int commit_cs_record(struct pcs_map_entry * m, struct pcs_cs_record * rec /* This must not happen, dirty replica cannot remain dirty * for >> PCS_SYNC_TIMEOUT unless the cluster is very sick. */ - FUSE_KTRACE(cc_from_maps(m->maps)->fc, MAP_FMT " replica " NODE_FMT " is dirty for %ld hz; [%u/%u,%u/%u,%u/%u] -> [%u/%u]", + FUSE_KDEBUG(cc_from_maps(m->maps)->fc, MAP_FMT " replica " NODE_FMT " is dirty for %ld hz; [%u/%u,%u/%u,%u/%u] -> [%u/%u]", MAP_ARGS(m), NODE_ARGS(rec->info.id), (long)(jiffies - rec->dirty_ts), rec->info.integrity_seq, srec->dirty_integrity, srec->dirty_epoch, srec->dirty_seq, srec->sync_epoch, srec->sync_seq, @@ -2673,7 +2673,7 @@ static int commit_cs_record(struct pcs_map_entry * m, struct pcs_cs_record * rec } if (!was_dirty && !dirtying && cs_is_dirty(srec)) { - FUSE_KTRACE(cc_from_maps(m->maps)->fc, MAP_FMT " replica " NODE_FMT " is not expected to be dirty [%u/%u,%u/%u,%u/%u]", + FUSE_KDEBUG(cc_from_maps(m->maps)->fc, MAP_FMT " replica " NODE_FMT " is not expected to be dirty [%u/%u,%u/%u,%u/%u]", MAP_ARGS(m), NODE_ARGS(rec->info.id), rec->info.integrity_seq, srec->dirty_integrity, srec->dirty_epoch, srec->dirty_seq, srec->sync_epoch, srec->sync_seq); diff --git a/fs/fuse/kio/pcs/pcs_map.h b/fs/fuse/kio/pcs/pcs_map.h index 788a8cb16d8e..8e5344b8e22c 100644 --- a/fs/fuse/kio/pcs/pcs_map.h +++ b/fs/fuse/kio/pcs/pcs_map.h @@ -238,31 +238,31 @@ void cslist_destroy(struct pcs_cs_list * csl); */ static inline bool try_cslist_get(struct pcs_cs_list *csl) { - TRACE("csl:%p csl->map:%p refcnt:%d\n", csl, csl->map, atomic_read(&csl->refcnt)); + TRACE("csl:%px csl->map:%px refcnt:%d\n", csl, csl->map, atomic_read(&csl->refcnt)); return atomic_inc_not_zero(&csl->refcnt); } static inline void cslist_get(struct pcs_cs_list * csl) { - TRACE("csl:%p csl->map:%p refcnt:%d\n", csl, csl->map, atomic_read(&csl->refcnt)); + TRACE("csl:%px csl->map:%px refcnt:%d\n", csl, csl->map, atomic_read(&csl->refcnt)); BUG_ON(!atomic_inc_not_zero(&csl->refcnt)); } static inline void cslist_put(struct pcs_cs_list * csl) { - TRACE("csl:%p csl->map:%p refcnt:%d\n", csl, csl->map, atomic_read(&csl->refcnt)); + TRACE("csl:%px csl->map:%px refcnt:%d\n", csl, csl->map, atomic_read(&csl->refcnt)); if (atomic_dec_and_test(&csl->refcnt)) cslist_destroy(csl); } -#define MAP_FMT "(%p) 0x%lld s:%x" DENTRY_FMT +#define MAP_FMT "(%px) %lld s:%x" DENTRY_FMT #define MAP_ARGS(m) (m), (long long)(m)->index, (m)->state, DENTRY_ARGS(pcs_dentry_from_map((m))) static inline void pcs_map_put(struct pcs_map_entry *m) { - TRACE("m(%p)->index:%ld ref:%d \n", m, m->index, atomic_read(&m->__refcnt)); + TRACE("m(%px)->index:%ld ref:%d\n", m, m->index, atomic_read(&m->__refcnt)); BUG_ON(atomic_read(&m->__refcnt) <= 0); if (atomic_dec_and_lock(&m->__refcnt, &m->lock)) @@ -289,7 +289,7 @@ static inline void map_del_lru(struct pcs_map_entry *m) static inline void pcs_map_put_locked(struct pcs_map_entry *m) { - TRACE("m(%p)->index:%ld ref:%d \n", m, m->index, atomic_read(&m->__refcnt)); + TRACE("m(%px)->index:%ld ref:%d\n", m, m->index, atomic_read(&m->__refcnt)); BUG_ON(atomic_read(&m->__refcnt) <= 0); BUG_ON(m->state & PCS_MAP_DEAD); diff --git a/fs/fuse/kio/pcs/pcs_rdma_conn.c b/fs/fuse/kio/pcs/pcs_rdma_conn.c index 1cb9d2aa995c..3ca844996716 100644 --- a/fs/fuse/kio/pcs/pcs_rdma_conn.c +++ b/fs/fuse/kio/pcs/pcs_rdma_conn.c @@ -81,7 +81,7 @@ static int pcs_rdma_cm_event_handler(struct rdma_cm_id *cmid, conn_param_init(&conn_param, &rc->rio->conn_req, cmid); if (rdma_connect_locked(cmid, &conn_param)) { - TRACE("rdma_connect_locked failed: rio: 0x%p\n", rc->rio); + TRACE("rdma_connect_locked failed: rio: 0x%px\n", rc->rio); complete(&rc->cm_done); } break; @@ -90,7 +90,7 @@ static int pcs_rdma_cm_event_handler(struct rdma_cm_id *cmid, complete(&rc->cm_done); break; case RDMA_CM_EVENT_REJECTED: - TRACE("pcs_rdma_cm_event_handler reject: %s, rio: 0x%p\n", + TRACE("pcs_rdma_cm_event_handler reject: %s, rio: 0x%px\n", rdma_reject_msg(cmid, event->status), rc->rio); complete(&rc->cm_done); break; @@ -144,7 +144,7 @@ void pcs_rdmaconnect_start(struct pcs_rpc *ep) goto fail_cm; } - TRACE(PEER_FMT " state: %d, rio: 0x%p\n", PEER_ARGS(ep), ep->state, rc.rio); + TRACE(PEER_FMT " state: %d, rio: 0x%px\n", PEER_ARGS(ep), ep->state, rc.rio); cancel_delayed_work(&ep->timer_work); ep->retries++; @@ -164,7 +164,7 @@ void pcs_rdmaconnect_start(struct pcs_rpc *ep) /* setup rxs */ if (pcs_rdma_setup_rxs((rc.rio))) { - TRACE("pcs_rdma_setup_rxs failed, rio: 0x%p\n", rc.rio); + TRACE("pcs_rdma_setup_rxs failed, rio: 0x%px\n", rc.rio); pcs_rpc_report_error(ep, PCS_RPC_ERR_CONNECT_ERROR); goto fail; } @@ -172,7 +172,7 @@ void pcs_rdmaconnect_start(struct pcs_rpc *ep) ret = rpc_client_start_auth(ep, PCS_AUTH_DIGEST, cc_from_rpc(ep->eng)->cluster_name); if (ret < 0) { - TRACE("rdma authorization failed: %d, rio: 0x%p", + TRACE("rdma authorization failed: %d, rio: 0x%px", ret, rc.rio); pcs_rpc_report_error(ep, PCS_RPC_ERR_AUTH_ERR); goto fail; /* since ep->conn is initialized, @@ -180,7 +180,7 @@ void pcs_rdmaconnect_start(struct pcs_rpc *ep) */ } - TRACE("rdma connection established: rio: 0x%p\n", rc.rio); + TRACE("rdma connection established: rio: 0x%px\n", rc.rio); ep->state = PCS_RPC_APPWAIT; pcs_rpc_enable(ep, 0); diff --git a/fs/fuse/kio/pcs/pcs_rdma_io.c b/fs/fuse/kio/pcs/pcs_rdma_io.c index 63fb1e7130db..2001297010a6 100644 --- a/fs/fuse/kio/pcs/pcs_rdma_io.c +++ b/fs/fuse/kio/pcs/pcs_rdma_io.c @@ -304,7 +304,7 @@ static int rio_rx_post(struct pcs_rdmaio *rio, struct rio_rx *rx, ret = RE_INV(ib_post_recv(rio->cmid->qp, &rx->wr, NULL)); if (ret) { - TRACE("ib_post_recv failed: %d, rio: 0x%p\n", ret, rio); + TRACE("ib_post_recv failed: %d, rio: 0x%px\n", ret, rio); } else { rio->n_rx_posted++; } @@ -341,13 +341,13 @@ static int rio_tx_post(struct pcs_rdmaio *rio, struct rio_tx *tx, rio_cqe_init(&tx->err_cqe, 0, rio_tx_err_occured); if (rio->n_tx_posted + ib_wr_count > rio->max_send_wr) { - TRACE("ib send queue overflow: rio: 0x%p\n", rio); + TRACE("ib send queue overflow: rio: 0x%px\n", rio); return -ENOMEM; } ret = RE_INV(ib_post_send(rio->cmid->qp, send_wr, NULL)); if (ret) { - TRACE("ib_post_send failed: %d, rio: 0x%p\n", ret, rio); + TRACE("ib_post_send failed: %d, rio: 0x%px\n", ret, rio); } else { rio->n_tx_posted += ib_wr_count; } @@ -450,26 +450,26 @@ static int rio_submit_rdma_read(struct pcs_rdmaio *rio, struct pcs_msg *msg, DMA_FROM_DEVICE, rb->rbuf, rb->rkey, rio->dev->pd->local_dma_lkey, msg, offset, offset + rb->rlen, GFP_NOIO, rio->cmid->qp->max_read_sge)) { - TRACE("pcs_rdma_rw_init_from_msg failed, try fallback: rio: 0x%p\n", rio); + TRACE("pcs_rdma_rw_init_from_msg failed, try fallback: rio: 0x%px\n", rio); goto fallback; } tx->cleanup = rio_tx_cleanup_rdma_rw; if (rio_tx_post_rdma_rw_read(rio, tx)) { - TRACE("rio_tx_post_rdma_rw_read failed: rio: 0x%p\n", rio); + TRACE("rio_tx_post_rdma_rw_read failed: rio: 0x%px\n", rio); goto fail; } } else { fallback: if (pcs_rdma_msg_init(&tx->rdma_mr.msg, msg, offset, offset + rb->rlen, &dev->rd_mr_pool, rdmaio_use_map_for_mr)) { - TRACE("rio_rdma_mr_init failed: rio: 0x%p\n", rio); + TRACE("rio_rdma_mr_init failed: rio: 0x%px\n", rio); goto fail; } tx->cleanup = rio_tx_cleanup_rdma_mr; if (rio_tx_post_rdma_mr_read(rio, tx, rb->rbuf, rb->rkey, rb->rlen)) { - TRACE("rio_tx_post_rdma_mr_read failed: rio: 0x%p\n", rio); + TRACE("rio_tx_post_rdma_mr_read failed: rio: 0x%px\n", rio); goto fail; } } @@ -672,7 +672,7 @@ static int rio_submit(struct pcs_rdmaio *rio, struct pcs_msg *msg, int type, u64 } else { if (pcs_rdma_msg_init(&tx->send.msg, msg, offset, msg_size, &dev->sd_mr_pool, rdmaio_use_map_for_mr)) { - TRACE("rio_rdma_mr_init failed: rio: 0x%p\n", rio); + TRACE("rio_rdma_mr_init failed: rio: 0x%px\n", rio); goto fail; } tx->cleanup = rio_tx_cleanup_send; @@ -694,7 +694,7 @@ static int rio_submit(struct pcs_rdmaio *rio, struct pcs_msg *msg, int type, u64 } if (rio_tx_post_send(rio, tx, tx_length, first_tx_wr, last_tx_wr)) { - TRACE("rio_tx_post_send failed: rio: 0x%p\n", rio); + TRACE("rio_tx_post_send failed: rio: 0x%px\n", rio); goto fail; } @@ -849,7 +849,7 @@ static int rio_handle_rx_immediate(struct pcs_rdmaio *rio, char *buf, int len, } if (len < rio->hdr_size) { - TRACE("rio read short msg: %d < %d, rio: 0x%p\n", len, + TRACE("rio read short msg: %d < %d, rio: 0x%px\n", len, rio->hdr_size, rio); return PCS_ERR_NET_ABORT; } @@ -863,7 +863,7 @@ static int rio_handle_rx_immediate(struct pcs_rdmaio *rio, char *buf, int len, err = PCS_ERR_NOMEM; return err; } else if (msg == PCS_TRASH_MSG) { - TRACE("rio drop trash msg: %u, rio: 0x%p\n", msg_size, rio); + TRACE("rio drop trash msg: %u, rio: 0x%px\n", msg_size, rio); /* * We must Ack every RDMA_READ_REQ received from our peer in * order even it's going to be dropped. @@ -884,7 +884,7 @@ static int rio_handle_rx_immediate(struct pcs_rdmaio *rio, char *buf, int len, } if (msg->size != len + (rb ? rb->rlen : 0)) { - TRACE("rio read wrong len: %d != %d (%llx/%x/%d), rio: 0x%p", + TRACE("rio read wrong len: %d != %d (%llx/%x/%d), rio: 0x%px", len, msg->size, rb ? rb->rbuf : 0ULL, rb ? rb->rkey : 0, rb ? rb->rlen : -1, rio); @@ -991,7 +991,7 @@ static void rio_handle_rx(struct pcs_rdmaio *rio, struct rio_rx *rx, if (!throttle) { if (rio_rx_post(rio, rx, RIO_MSG_SIZE)) { - TRACE("rio_rx_post failed: rio: 0x%p\n", rio); + TRACE("rio_rx_post failed: rio: 0x%px\n", rio); rio_abort(rio, PCS_ERR_NET_ABORT); return; } @@ -1005,7 +1005,7 @@ static void rio_handle_rx(struct pcs_rdmaio *rio, struct rio_rx *rx, BUG_ON(rio->n_reserved_credits > rio->queue_depth); if (rio->n_os_credits > rio->queue_depth) { - TRACE("n_os_credits overflow: rio: 0x%p\n", rio); + TRACE("n_os_credits overflow: rio: 0x%px\n", rio); rio_abort(rio, PCS_ERR_NET_ABORT); return; } @@ -1133,7 +1133,7 @@ static inline int rio_comp_perform(struct pcs_rdmaio *rio) static void pcs_rdma_cq_event_handler(struct ib_event *event, void *private) { struct pcs_rdmaio *rio = private; - TRACE("rio: 0x%p\n", rio); + TRACE("rio: 0x%px\n", rio); } static int pcs_rdma_io_event_handler(struct rdma_cm_id *cmid, @@ -1143,7 +1143,7 @@ static int pcs_rdma_io_event_handler(struct rdma_cm_id *cmid, struct pcs_rdmaio *rio = container_of(id, struct pcs_rdmaio, id); struct pcs_rpc *ep = rio->netio.parent; - TRACE("rio: 0x%p, event: %d, status: %d\n", rio, event->event, event->status); + TRACE("rio: 0x%px, event: %d, status: %d\n", rio, event->event, event->status); set_bit(PCS_RDMA_IO_ERROR, &rio->io_flags); pcs_rpc_kick_queue(ep); @@ -1154,7 +1154,7 @@ static int pcs_rdma_io_event_handler(struct rdma_cm_id *cmid, static void pcs_rdma_qp_event_handler(struct ib_event *event, void *context) { struct pcs_rdmaio *rio = context; - TRACE("rio: 0x%p, event: %d\n", rio, event->event); + TRACE("rio: 0x%px, event: %d\n", rio, event->event); } static struct pcs_rdma_device *pcs_rdma_device_create(struct rdma_cm_id *cmid, @@ -1177,7 +1177,7 @@ static struct pcs_rdma_device *pcs_rdma_device_create(struct rdma_cm_id *cmid, for (i = 0; i < send_queue_depth; i++) { tx = rio_alloc_tx(dev, TX_MSG_DONE); if (!tx) { - TRACE("rio_alloc_tx failed: dev: 0x%p\n", dev); + TRACE("rio_alloc_tx failed: dev: 0x%px\n", dev); goto free_bufs; } rio_put_tx(dev, tx); @@ -1185,28 +1185,28 @@ static struct pcs_rdma_device *pcs_rdma_device_create(struct rdma_cm_id *cmid, dev->pd = RE_PTR_INV(ib_alloc_pd(dev->ib_dev, 0)); if (IS_ERR(dev->pd)) { - TRACE("ib_alloc_pd failed: dev: 0x%p\n", dev); + TRACE("ib_alloc_pd failed: dev: 0x%px\n", dev); goto free_bufs; } if (pcs_ib_mr_pool_init(&dev->ib_mr_pool, dev->pd, IB_MR_TYPE_MEM_REG, max_num_sg, queue_depth * 2)) { - TRACE("pcs_ib_mr_pool_init failed: dev: 0x%p\n", dev); + TRACE("pcs_ib_mr_pool_init failed: dev: 0x%px\n", dev); goto free_pd; } if (pcs_rdma_mr_pool_init(&dev->sd_mr_pool, RDMA_MAX_MSG_PAYLOAD, queue_depth, dev->ib_dev, dev->pd, DMA_TO_DEVICE, GFP_NOIO, &dev->ib_mr_pool)) { - TRACE("pcs_rdma_mr_pool_init failed: dev: 0x%p\n", dev); + TRACE("pcs_rdma_mr_pool_init failed: dev: 0x%px\n", dev); goto free_ib_mr; } if (pcs_rdma_mr_pool_init(&dev->rd_mr_pool, RDMA_MAX_MSG_PAYLOAD, queue_depth, dev->ib_dev, dev->pd, DMA_FROM_DEVICE, GFP_NOIO, &dev->ib_mr_pool)) { - TRACE("pcs_rdma_mr_pool_init failed: dev: 0x%p\n", dev); + TRACE("pcs_rdma_mr_pool_init failed: dev: 0x%px\n", dev); goto free_sd_mr; } @@ -1316,7 +1316,7 @@ struct pcs_rdmaio* pcs_rdma_create(int hdr_size, struct rdma_cm_id *cmid, rio->recv_queue_depth = 0; for (i = 0; i < recv_queue_depth; i++) { if (!rio_init_rx(rio->rx_descs + i, rio->cmid->device)) { - TRACE("rio_init_rx failed: rio: 0x%p\n", rio); + TRACE("rio_init_rx failed: rio: 0x%px\n", rio); goto free_bufs; } rio->recv_queue_depth++; @@ -1324,7 +1324,7 @@ struct pcs_rdmaio* pcs_rdma_create(int hdr_size, struct rdma_cm_id *cmid, rio->dev = pcs_rdma_device_create(rio->cmid, queue_depth, send_queue_depth); if (!rio->dev) { - TRACE("pcs_rdma_device_create failed: rio: 0x%p\n", rio); + TRACE("pcs_rdma_device_create failed: rio: 0x%px\n", rio); goto free_bufs; } @@ -1339,12 +1339,12 @@ struct pcs_rdmaio* pcs_rdma_create(int hdr_size, struct rdma_cm_id *cmid, rio->cq = RE_PTR_INV(ib_create_cq(rio->cmid->device, pcs_rdma_cq_comp_handler, pcs_rdma_cq_event_handler, rio, &cq_attr)); if (IS_ERR(rio->cq)) { - TRACE("ib_alloc_cq failed: rio: 0x%p\n", rio); + TRACE("ib_alloc_cq failed: rio: 0x%px\n", rio); goto free_dev; } if (cq_count && cq_period) { int ret = rdma_set_cq_moderation(rio->cq, cq_count, cq_period); - TRACE("rio: 0x%p, set cq moderation: cq_count %u, cq_period: %u, ret: %d\n", + TRACE("rio: 0x%px, set cq moderation: cq_count %u, cq_period: %u, ret: %d\n", rio, cq_count, cq_period, ret); } ib_req_notify_cq(rio->cq, IB_CQ_NEXT_COMP); @@ -1360,15 +1360,15 @@ struct pcs_rdmaio* pcs_rdma_create(int hdr_size, struct rdma_cm_id *cmid, qp_attr.sq_sig_type = IB_SIGNAL_REQ_WR; qp_attr.qp_type = IB_QPT_RC; - TRACE("rio: 0x%p, max_send wr/sge: %u/%u, max_recv wr/sge: %u/%u\n", + TRACE("rio: 0x%px, max_send wr/sge: %u/%u, max_recv wr/sge: %u/%u\n", rio, qp_attr.cap.max_send_wr, qp_attr.cap.max_send_sge, qp_attr.cap.max_recv_wr, qp_attr.cap.max_recv_sge); if (RE_INV(rdma_create_qp(rio->cmid, rio->dev->pd, &qp_attr))) { - TRACE("rdma_create_qp failed: rio: 0x%p\n", rio); + TRACE("rdma_create_qp failed: rio: 0x%px\n", rio); goto free_cq; } - TRACE("rio: 0x%p, dev: 0x%p, queue_depth: %d\n", rio, rio->dev, queue_depth); + TRACE("rio: 0x%px, dev: 0x%px, queue_depth: %d\n", rio, rio->dev, queue_depth); return rio; @@ -1392,7 +1392,7 @@ int pcs_rdma_setup_rxs(struct pcs_rdmaio *rio) for (rx = rio->rx_descs; rx - rio->rx_descs < rio->recv_queue_depth; rx++) if (rio_rx_post(rio, rx, RIO_MSG_SIZE)) { - TRACE("rio_rx_post failed: rio: 0x%p\n", rio); + TRACE("rio_rx_post failed: rio: 0x%px\n", rio); break; } @@ -1444,10 +1444,10 @@ static void rio_abort(struct pcs_rdmaio *rio, int error) rio->rio_error = error; if (rdma_disconnect(rio->cmid)) - TRACE("rdma_disconnect failed: rio: 0x%p\n", rio); + TRACE("rdma_disconnect failed: rio: 0x%px\n", rio); if (ib_modify_qp(rio->cmid->qp, &qp_attr, IB_QP_STATE)) - TRACE("ib_modify_qp failed: rio: 0x%p\n", rio); + TRACE("ib_modify_qp failed: rio: 0x%px\n", rio); if (netio->eof) { void (*eof)(struct pcs_netio *) = netio->eof; @@ -1472,7 +1472,7 @@ static void rio_destroy(struct work_struct *work) mutex_lock(&ep->mutex); - TRACE("rio: 0x%p\n", rio); + TRACE("rio: 0x%px\n", rio); while (rio->n_rx_posted || rio->n_tx_posted) { rio_req_notify_cq(rio); @@ -1518,7 +1518,7 @@ void pcs_rdma_destroy(struct pcs_rdmaio *rio) struct pcs_rpc *ep = rio->netio.parent; int i; - TRACE("rio: 0x%p\n", rio); + TRACE("rio: 0x%px\n", rio); BUG_ON(!mutex_is_locked(&ep->mutex)); @@ -1544,7 +1544,7 @@ void pcs_rdma_ioconn_destruct(struct pcs_ioconn *ioconn) struct pcs_rdmaio *rio = rio_from_ioconn(ioconn); struct pcs_rpc *ep = rio->netio.parent; - TRACE("rio: 0x%p\n", rio); + TRACE("rio: 0x%px\n", rio); BUG_ON(!mutex_is_locked(&ep->mutex)); @@ -1558,7 +1558,7 @@ static void pcs_rdma_throttle(struct pcs_netio *netio) struct pcs_rdmaio *rio = rio_from_netio(netio); struct pcs_rpc *ep = netio->parent; - TRACE("rio: 0x%p\n", rio); + TRACE("rio: 0x%px\n", rio); BUG_ON(!mutex_is_locked(&ep->mutex)); @@ -1573,7 +1573,7 @@ static void pcs_rdma_unthrottle(struct pcs_netio *netio) struct pcs_rdmaio *rio = rio_from_netio(netio); struct pcs_rpc *ep = netio->parent; - TRACE("rio: 0x%p\n", rio); + TRACE("rio: 0x%px\n", rio); BUG_ON(!mutex_is_locked(&ep->mutex)); @@ -1613,7 +1613,7 @@ static int pcs_rdma_cancel_msg(struct pcs_msg *msg) { struct pcs_rpc *ep = msg->netio->parent; - TRACE("msg: 0x%p\n", msg); + TRACE("msg: 0x%px\n", msg); BUG_ON(!mutex_is_locked(&ep->mutex)); @@ -1631,7 +1631,7 @@ static void pcs_rdma_abort_io(struct pcs_netio *netio, int error) struct pcs_rdmaio *rio = rio_from_netio(netio); struct pcs_rpc *ep = netio->parent; - TRACE("rio: 0x%p\n", rio); + TRACE("rio: 0x%px\n", rio); BUG_ON(!mutex_is_locked(&ep->mutex)); diff --git a/fs/fuse/kio/pcs/pcs_req.c b/fs/fuse/kio/pcs/pcs_req.c index 67b2daf509d2..cd35fce27016 100644 --- a/fs/fuse/kio/pcs/pcs_req.c +++ b/fs/fuse/kio/pcs/pcs_req.c @@ -107,7 +107,7 @@ void ireq_handle_hole(struct pcs_int_request *ireq) offset = 0; iov_iter_kvec(&it, READ, NULL, 0, 0); - DTRACE("enter m: " MAP_FMT ", ireq:%p \n", MAP_ARGS(ireq->iochunk.map), ireq); + DTRACE("enter m: " MAP_FMT ", ireq:%px\n", MAP_ARGS(ireq->iochunk.map), ireq); while (len > 0) { size_t copy; diff --git a/fs/fuse/kio/pcs/pcs_rpc.c b/fs/fuse/kio/pcs/pcs_rpc.c index 540225006726..fa9912c407b3 100644 --- a/fs/fuse/kio/pcs/pcs_rpc.c +++ b/fs/fuse/kio/pcs/pcs_rpc.c @@ -127,7 +127,7 @@ void rpc_abort(struct pcs_rpc * ep, int fatal, int error) struct list_head failed_list; BUG_ON(!mutex_is_locked(&ep->mutex)); - TRACE("ep:%p->state:%d fatal:%d error:%d\n", ep, state, fatal, error); + TRACE("ep:%px->state:%d fatal:%d error:%d\n", ep, state, fatal, error); ep->flags &= ~PCS_RPC_F_PEER_ID; @@ -143,7 +143,7 @@ void rpc_abort(struct pcs_rpc * ep, int fatal, int error) while (!list_empty(&ep->pending_queue)) { struct pcs_msg * msg = list_first_entry(&ep->pending_queue, struct pcs_msg, list); list_move_tail(&msg->list, &failed_list); - FUSE_KTRACE(cc_from_rpc(ep->eng)->fc, "aborted msg to " PEER_FMT ", tmo=%d, err=%d, %ld", PEER_ARGS(ep), + FUSE_KDEBUG(cc_from_rpc(ep->eng)->fc, "aborted msg to " PEER_FMT ", tmo=%d, err=%d, %ld", PEER_ARGS(ep), msg->timeout, error, (long)(msg->start_time + msg->timeout - jiffies)); pcs_msg_del_calendar(msg); msg->stage = PCS_MSG_STAGE_NONE; @@ -157,7 +157,7 @@ void rpc_abort(struct pcs_rpc * ep, int fatal, int error) while (!list_empty(&ep->state_queue)) { struct pcs_msg * msg = list_first_entry(&ep->state_queue, struct pcs_msg, list); list_move_tail(&msg->list, &failed_list); - FUSE_KTRACE(cc_from_rpc(ep->eng)->fc, "aborted unsent msg to " PEER_FMT ", tmo=%d, err=%d", PEER_ARGS(ep), + FUSE_KDEBUG(cc_from_rpc(ep->eng)->fc, "aborted unsent msg to " PEER_FMT ", tmo=%d, err=%d", PEER_ARGS(ep), msg->timeout, error); pcs_msg_del_calendar(msg); msg->stage = PCS_MSG_STAGE_NONE; @@ -420,7 +420,7 @@ void pcs_rpc_enable(struct pcs_rpc * ep, int error) list_lru_add_obj(&ep->gc->lru, &ep->lru_link); } } - TRACE("ep(%p)->state: WORK\n", ep); + TRACE("ep(%px)->state: WORK\n", ep); ep->state = PCS_RPC_WORK; ep->retries = 0; ep->kill_deadline = 0; @@ -492,7 +492,7 @@ static void handle_keep_waiting(struct pcs_rpc * ep, struct pcs_msg * msg) if (h->hdr.len < sizeof(struct pcs_rpc_keep_waiting)) return; - FUSE_KTRACE(cc_from_rpc(ep->eng)->fc, "Received keep wait from " NODE_FMT " for request " XID_FMT, + FUSE_KDEBUG(cc_from_rpc(ep->eng)->fc, "Received keep wait from " NODE_FMT " for request " XID_FMT, NODE_ARGS(h->hdr.xid.origin), XID_ARGS(h->xid)); req = pcs_rpc_lookup_xid(ep, &h->xid); @@ -654,7 +654,7 @@ void pcs_rpc_connect(struct pcs_rpc * ep) if (ep->state != PCS_RPC_UNCONN) return; - FUSE_KTRACE(cc_from_rpc(ep->eng)->fc, "Connecting to node " NODE_FMT, NODE_ARGS(ep->peer_id)); + FUSE_KDEBUG(cc_from_rpc(ep->eng)->fc, "Connecting to node " NODE_FMT, NODE_ARGS(ep->peer_id)); BUG_ON(!ep->ops->connect); ep->ops->connect(ep); @@ -668,7 +668,7 @@ static void pcs_rpc_send(struct pcs_rpc * ep, struct pcs_msg * msg, bool requeue BUG_ON(!mutex_is_locked(&ep->mutex)); BUG_ON(msg->rpc != (requeue ? ep: NULL)); - TRACE("ENTER ep:%p state:%d msg:%p\n", ep, ep->state, msg); + TRACE("ENTER ep:%px state:%d msg:%px\n", ep, ep->state, msg); if (ep->state == PCS_RPC_ABORT || ep->state == PCS_RPC_DESTROY) { pcs_set_rpc_error(&msg->error, PCS_ERR_NET_ABORT, ep); @@ -800,7 +800,7 @@ static void calendar_work(struct work_struct *w) struct pcs_rpc_hdr * h = (struct pcs_rpc_hdr *)msg_inline_head(msg); (void)h; - FUSE_KTRACE(cc->fc, "killing msg to " PEER_FMT " type=%u xid=" XID_FMT " stage=%d tmo=%d exp=%ld rem=%ld", + FUSE_KDEBUG(cc->fc, "killing msg to " PEER_FMT " type=%u xid=" XID_FMT " stage=%d tmo=%d exp=%ld rem=%ld", PEER_ARGS(msg->rpc), h->type, XID_ARGS(h->xid), msg->stage, msg->timeout, (long)(msg->start_time + msg->timeout - jiffies), @@ -845,7 +845,7 @@ static void calendar_work(struct work_struct *w) count++; } if (count) - FUSE_KTRACE(cc->fc, "%s %d messages to "PEER_FMT" destroyed\n", __FUNCTION__, + FUSE_KTRACE(cc->fc, "%s %d messages to "PEER_FMT" destroyed", __func__, count, PEER_ARGS(ep)); for (i=0; i < RPC_MAX_CALENDAR-1; i++) { @@ -1280,7 +1280,7 @@ static void timer_work(struct work_struct *w) } pcs_rpc_report_error(ep, PCS_RPC_ERR_RESPONSE_TOUT); - FUSE_KTRACE(cc_from_rpc(ep->eng)->fc, "rpc timer expired, killing connection to " PEER_FMT ", %d", + FUSE_KDEBUG(cc_from_rpc(ep->eng)->fc, "rpc timer expired, killing connection to " PEER_FMT ", %d", PEER_ARGS(ep), err); rpc_abort(ep, 0, err); break; @@ -1330,7 +1330,7 @@ static void pcs_rpc_fini_verify(struct pcs_rpc_engine *eng, struct hlist_head *r struct pcs_rpc * ep = hlist_entry(rpc_list->first, struct pcs_rpc, link); - WARN(1, "rpc connection isn't closed ep: %p (flags: %u, " + WARN(1, "rpc connection isn't closed ep: %px (flags: %u, " "state: %u, refcnt: %u)\n", ep, ep->flags, ep->state, atomic_read(&ep->refcnt)); } diff --git a/fs/fuse/kio/pcs/pcs_sock_conn.c b/fs/fuse/kio/pcs/pcs_sock_conn.c index a2985a7874c6..89689a8993f3 100644 --- a/fs/fuse/kio/pcs/pcs_sock_conn.c +++ b/fs/fuse/kio/pcs/pcs_sock_conn.c @@ -122,7 +122,7 @@ void pcs_sockconnect_start(struct pcs_rpc *ep) } set_sock_parameters(sock, container_of(ep->eng, struct pcs_cluster_core, eng)); - TRACE(PEER_FMT " ->state:%d sock:%p\n", PEER_ARGS(ep), ep->state, sock); + TRACE(PEER_FMT " ->state:%d sock:%px\n", PEER_ARGS(ep), ep->state, sock); cancel_delayed_work(&ep->timer_work); ep->retries++; diff --git a/fs/fuse/kio/pcs/pcs_sock_io.c b/fs/fuse/kio/pcs/pcs_sock_io.c index d1f1560db6d2..fa26105b2185 100644 --- a/fs/fuse/kio/pcs/pcs_sock_io.c +++ b/fs/fuse/kio/pcs/pcs_sock_io.c @@ -150,7 +150,7 @@ static int do_send_one_seg(struct socket *sock, struct iov_iter *it, size_t left if (unlikely(pcs_use_eor) && !more) flags |= MSG_EOR; - DTRACE("sock(%p) len:%ld, more:%d\n", sock, iov_iter_count(it), more); + DTRACE("sock(%px) len:%ld, more:%d\n", sock, iov_iter_count(it), more); if (unlikely(!size)) return 0; @@ -183,7 +183,7 @@ static int do_send_one_seg(struct socket *sock, struct iov_iter *it, size_t left ret = sock_sendmsg(sock, &msg); out: - DTRACE("sock(%p) len:%ld, more:%d ret:%d\n", sock, iov_iter_count(it), more, ret); + DTRACE("sock(%px) len:%ld, more:%d ret:%d\n", sock, iov_iter_count(it), more, ret); return ret; } @@ -262,7 +262,7 @@ static void pcs_sockio_recv(struct pcs_sockio *sio) u32 msg_size; unsigned long loop_timeout = jiffies + PCS_SIO_SLICE; - TRACE("ENTER:" PEER_FMT " sio:%p cur_msg:%p\n", PEER_ARGS(ep), sio, sio->current_msg); + TRACE("ENTER:" PEER_FMT " sio:%px cur_msg:%px\n", PEER_ARGS(ep), sio, sio->current_msg); while(!test_bit(PCS_IOCONN_BF_DEAD, &sio->io_flags)) { int n; @@ -302,7 +302,7 @@ static void pcs_sockio_recv(struct pcs_sockio *sio) sio->current_msg = msg; sio->current_msg_size = msg_size; rcv_get_iter(msg, sio->read_offset, it, READ); - TRACE(PEER_FMT" msg:%p read_off:%d iov_size:%ld\n", PEER_ARGS(ep), msg, sio->read_offset, + TRACE(PEER_FMT" msg:%px read_off:%d iov_size:%ld\n", PEER_ARGS(ep), msg, sio->read_offset, iov_iter_count(it)); } else { if (n == -EAGAIN) @@ -320,7 +320,7 @@ static void pcs_sockio_recv(struct pcs_sockio *sio) /* Current iter is exhausted, init new one */ rcv_get_iter(msg, sio->read_offset, it, READ); - TRACE(PEER_FMT" msg:%p->size:%d off:%d it_count:%ld\n", + TRACE(PEER_FMT" msg:%px->size:%d off:%d it_count:%ld\n", PEER_ARGS(ep), msg, msg_size, sio->read_offset, iov_iter_count(it)); @@ -364,7 +364,7 @@ static void pcs_sockio_send(struct pcs_sockio *sio) while (!list_empty(&sio->write_queue)) { msg = list_first_entry(&sio->write_queue, struct pcs_msg, list); - TRACE(PEER_FMT" sio(%p) offset:%d msg:%p\n", PEER_ARGS(ep), sio, sio->write_offset, msg); + TRACE(PEER_FMT" sio(%px) offset:%d msg:%px\n", PEER_ARGS(ep), sio, sio->write_offset, msg); /* This is original check, but it is not clear how connection can becomes dead before sio_abort() was called. Let's simplify it with BUG_ON @@ -397,7 +397,7 @@ static void pcs_sockio_send(struct pcs_sockio *sio) int has_more = (msg->list.next != &sio->write_queue); int n; - TRACE(PEER_FMT "offset:%d msg:%p left:%ld, it->len:%ld\n", PEER_ARGS(ep), sio->write_offset, msg, + TRACE(PEER_FMT "offset:%d msg:%px left:%ld, it->len:%ld\n", PEER_ARGS(ep), sio->write_offset, msg, left, iov_iter_count(it)); if (!iov_iter_count(it)) { @@ -479,7 +479,7 @@ static void pcs_sock_sendmsg(struct pcs_netio *netio, struct pcs_msg *msg) struct pcs_sockio *sio = sio_from_netio(netio); int was_idle = list_empty(&sio->write_queue); - DTRACE("sio(%p) msg:%p\n", sio, msg); + DTRACE("sio(%px) msg:%px\n", sio, msg); if (pcs_if_error(&sio->error)) { pcs_set_local_error(&msg->error, sio->error.value); @@ -561,7 +561,7 @@ void pcs_sock_ioconn_destruct(struct pcs_ioconn *ioconn) { struct pcs_sockio * sio = sio_from_ioconn(ioconn); - TRACE("Sock destruct_cb, sio: %p", sio); + TRACE("Sock destruct_cb, sio: %px", sio); BUG_ON(sio->current_msg); BUG_ON(!list_empty(&sio->write_queue)); @@ -791,7 +791,7 @@ static void pcs_sock_throttle(struct pcs_netio *netio) test_bit(PCS_IOCONN_BF_DEAD, &sio->io_flags)) return; - FUSE_KDTRACE(cc_from_rpc(sio->netio.parent->eng)->fc, "Throttle on socket %p rpc=%p", sio, sio->netio.parent); + FUSE_KDTRACE(cc_from_rpc(sio->netio.parent->eng)->fc, "Throttle on socket %px rpc=%px", sio, sio->netio.parent); sio->flags |= PCS_SOCK_F_THROTTLE; } @@ -803,7 +803,7 @@ static void pcs_sock_unthrottle(struct pcs_netio *netio) test_bit(PCS_IOCONN_BF_DEAD, &sio->io_flags)) return; - FUSE_KDTRACE(cc_from_rpc(sio->netio.parent->eng)->fc, "Unthrottle on socket %p rpc=%p", sio, sio->netio.parent); + FUSE_KDTRACE(cc_from_rpc(sio->netio.parent->eng)->fc, "Unthrottle on socket %px rpc=%px", sio, sio->netio.parent); sio->flags &= ~PCS_SOCK_F_THROTTLE; if ((sio->flags & PCS_SOCK_F_EOF)) return; -- 2.43.0 _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel